1
=== modified file 'debian/control'
2
--- debian/control	2016-06-03 04:28:05 +0000
3
+++ debian/control	2016-06-24 13:11:14 +0000
4
@@ -94,6 +94,35 @@
5
94
 .
94
 .
6
95
 This package contains the Ubuntu Components QML plugin.
95
 This package contains the Ubuntu Components QML plugin.
7
96
96
8
97
Package: qml-module-ubuntu-components-labs
9
98
Architecture: any
10
99
Multi-Arch: same
11
100
Pre-Depends: dpkg (>= 1.15.6~),
12
101
             ${misc:Pre-Depends},
13
102
Depends: libqt5svg5,
14
103
         libubuntugestures5 (= ${binary:Version}),
15
104
         libubuntutoolkit5 (= ${binary:Version}),
16
105
         qml-module-qtfeedback,
17
106
         qml-module-qtgraphicaleffects,
18
107
         qml-module-qtquick-layouts,
19
108
         qml-module-qtquick-window2,
20
109
         qml-module-qtquick2,
21
110
         qml-module-ubuntu-performancemetrics,
22
111
         qtdeclarative5-unity-action-plugin (>= 1.1.0),
23
112
         suru-icon-theme,
24
113
         ttf-ubuntu-font-family,
25
114
         ubuntu-ui-toolkit-theme (= ${binary:Version}),
26
115
         ${misc:Depends},
27
116
         ${shlibs:Depends},
28
117
Conflicts: qt-components-ubuntu-labs,
29
118
Replaces: qt-components-ubuntu-labs,
30
119
Provides: qt-components-ubuntu-labs,
31
120
Description: Qt Components Labs for Ubuntu - Components QML plugin
32
121
 Qt Components Labs for Ubuntu offers a set of non-released and mostly
33
122
 unstable user interface components for Qt Quick 2 / QML.
34
123
 .
35
124
 This package contains the Ubuntu Components Labs QML plugin.
36
125
37
97
Package: qml-module-ubuntu-layouts
126
Package: qml-module-ubuntu-layouts
38
98
Architecture: any
127
Architecture: any
39
99
Multi-Arch: same
128
Multi-Arch: same
40
100
129
41
=== modified file 'debian/control.gles'
42
--- debian/control.gles	2016-06-03 06:01:35 +0000
43
+++ debian/control.gles	2016-06-24 13:11:14 +0000
44
@@ -114,6 +114,36 @@
45
114
 This package contains the Ubuntu Components QML plugin (built with
114
 This package contains the Ubuntu Components QML plugin (built with
46
115
 the OpenGLES backend).
115
 the OpenGLES backend).
47
116
116
48
117
Package: qml-module-ubuntu-components-labs-gles
49
118
Architecture: amd64 i386
50
119
Breaks: qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (<< ${source:Version}),
51
120
Conflicts: qml-module-ubuntu-components-labs,
52
121
Replaces: qml-module-ubuntu-components-labs,
53
122
Provides: qml-module-ubuntu-components-labs,
54
123
Multi-Arch: same
55
124
Pre-Depends: dpkg (>= 1.15.6~),
56
125
             ${misc:Pre-Depends},
57
126
Depends: libqt5svg5,
58
127
         libubuntugestures5-gles (= ${binary:Version}),
59
128
         libubuntutoolkit5-gles (= ${binary:Version}),
60
129
         qml-module-qtfeedback,
61
130
         qml-module-qtgraphicaleffects,
62
131
         qml-module-qtquick-layouts,
63
132
         qml-module-qtquick-window2,
64
133
         qml-module-qtquick2,
65
134
         qtdeclarative5-unity-action-plugin (>= 1.1.0),
66
135
         suru-icon-theme,
67
136
         ttf-ubuntu-font-family,
68
137
         ubuntu-ui-toolkit-theme,
69
138
         ${misc:Depends},
70
139
         ${shlibs:Depends},
71
140
Description: Qt Components Labs for Ubuntu - QML plugin - GLES
72
141
 Qt Components Labs for Ubuntu offers a set of non-released and mostly
73
142
 unstable user interface components for Qt Quick 2 / QML.
74
143
 .
75
144
 This package contains the Ubuntu Components Labs QML plugin (built with
76
145
 the OpenGLES backend).
77
146
78
117
Package: qml-module-ubuntu-performancemetrics-gles
147
Package: qml-module-ubuntu-performancemetrics-gles
79
118
Architecture: amd64 i386
148
Architecture: amd64 i386
80
119
Breaks: qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (<< ${source:Version}),
149
Breaks: qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (<< ${source:Version}),
81
120
150
82
=== added file 'debian/qml-module-ubuntu-components-labs.install'
83
--- debian/qml-module-ubuntu-components-labs.install	1970-01-01 00:00:00 +0000
84
+++ debian/qml-module-ubuntu-components-labs.install	2016-06-24 13:11:14 +0000
85
@@ -0,0 +1,3 @@
86
1
usr/lib/*/qt5/qml/Ubuntu/Components/Labs/libUbuntuComponentsLabs.so
87
2
usr/lib/*/qt5/qml/Ubuntu/Components/Labs/plugins.qmltypes
88
3
usr/lib/*/qt5/qml/Ubuntu/Components/Labs/qmldir
89
0
4
90
=== modified file 'src/Ubuntu/Components/Components.pro'
91
--- src/Ubuntu/Components/Components.pro	2015-05-18 09:53:55 +0000
92
+++ src/Ubuntu/Components/Components.pro	2016-06-24 13:11:14 +0000
93
@@ -5,4 +5,5 @@
94
5
           Pickers   \
5
           Pickers   \
95
6
           Popups    \
6
           Popups    \
96
7
           Styles    \
7
           Styles    \
98
8
           Themes
8
           Themes    \
99
9
           Labs
100
9
10
101
=== added directory 'src/Ubuntu/Components/Labs'
102
=== added file 'src/Ubuntu/Components/Labs/Labs.pro'
103
--- src/Ubuntu/Components/Labs/Labs.pro	1970-01-01 00:00:00 +0000
104
+++ src/Ubuntu/Components/Labs/Labs.pro	2016-06-24 13:11:14 +0000
105
@@ -0,0 +1,10 @@
106
1
CXX_MODULE = qml
107
2
TARGET  = UbuntuComponentsLabs
108
3
TARGETPATH = Ubuntu/Components/Labs
109
4
IMPORT_VERSION = 1.0
110
5
111
6
include(plugin/plugin.pri)
112
7
113
8
load(ubuntu_qml_plugin)
114
9
115
10
OTHER_FILES+=qmldir
116
0
11
117
=== added directory 'src/Ubuntu/Components/Labs/plugin'
118
=== added file 'src/Ubuntu/Components/Labs/plugin/plugin.cpp'
119
--- src/Ubuntu/Components/Labs/plugin/plugin.cpp	1970-01-01 00:00:00 +0000
120
+++ src/Ubuntu/Components/Labs/plugin/plugin.cpp	2016-06-24 13:11:14 +0000
121
@@ -0,0 +1,47 @@
122
1
/*
123
2
 * Copyright 2016 Canonical Ltd.
124
3
 *
125
4
 * This program is free software; you can redistribute it and/or modify
126
5
 * it under the terms of the GNU Lesser General Public License as published by
127
6
 * the Free Software Foundation; version 3.
128
7
 *
129
8
 * This program is distributed in the hope that it will be useful,
130
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
131
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
132
11
 * GNU Lesser General Public License for more details.
133
12
 *
134
13
 * You should have received a copy of the GNU Lesser General Public License
135
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
136
15
 *
137
16
 * Author: Zsombor Egri <zsombor.egri@canonical.com>
138
17
 */
139
18
140
19
#include <QtQml/QQmlExtensionPlugin>
141
20
#include <ubuntutoolkitmodule.h>
142
21
143
22
class UbuntuComponentsLabsPlugin : public QQmlExtensionPlugin
144
23
{
145
24
    Q_OBJECT
146
25
    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface/1.0")
147
26
148
27
public:
149
28
    void registerTypes(const char *uri) override
150
29
    {
151
30
        Q_ASSERT(uri == QLatin1String("Ubuntu.Components.Labs"));
152
31
        UT_PREPEND_NAMESPACE(UbuntuLabsModule)::defineModule(uri);
153
32
    }
154
33
155
34
    void initializeEngine(QQmlEngine *engine, const char *uri) override
156
35
    {
157
36
        UT_PREPEND_NAMESPACE(UbuntuLabsModule)::initializeModule(engine, this);
158
37
        QQmlExtensionPlugin::initializeEngine(engine, uri);
159
38
    }
160
39
161
40
    ~UbuntuComponentsLabsPlugin()
162
41
    {
163
42
        UT_PREPEND_NAMESPACE(UbuntuLabsModule)::undefineModule();
164
43
    }
165
44
};
166
45
167
46
#include "plugin.moc"
168
47
169
0
48
170
=== added file 'src/Ubuntu/Components/Labs/plugin/plugin.pri'
171
--- src/Ubuntu/Components/Labs/plugin/plugin.pri	1970-01-01 00:00:00 +0000
172
+++ src/Ubuntu/Components/Labs/plugin/plugin.pri	2016-06-24 13:11:14 +0000
173
@@ -0,0 +1,8 @@
174
1
QT *= qml quick UbuntuToolkit UbuntuToolkit_private
175
2
176
3
CONFIG += no_keywords c++11
177
4
178
5
INCLUDEPATH+=$$PWD
179
6
180
7
SOURCES += \
181
8
    $$PWD/plugin.cpp
182
0
9
183
=== added file 'src/Ubuntu/Components/Labs/qmldir'
184
--- src/Ubuntu/Components/Labs/qmldir	1970-01-01 00:00:00 +0000
185
+++ src/Ubuntu/Components/Labs/qmldir	2016-06-24 13:11:14 +0000
186
@@ -0,0 +1,3 @@
187
1
module Ubuntu.Components.Labs
188
2
plugin UbuntuComponentsLabs
189
3
typeinfo plugins.qmltypes
190
0
4
191
=== modified file 'src/Ubuntu/UbuntuToolkit/ubuntutoolkitmodule.cpp'
192
--- src/Ubuntu/UbuntuToolkit/ubuntutoolkitmodule.cpp	2016-06-23 07:09:59 +0000
193
+++ src/Ubuntu/UbuntuToolkit/ubuntutoolkitmodule.cpp	2016-06-24 13:11:14 +0000
194
@@ -19,6 +19,7 @@
195
19
#include "ubuntutoolkitmodule.h"
19
#include "ubuntutoolkitmodule.h"
196
20
#include <QtQml/QQmlEngine>
20
#include <QtQml/QQmlEngine>
197
21
#include <QtQml/QQmlContext>
21
#include <QtQml/QQmlContext>
198
22
#include <QtQml/QQmlExtensionPlugin>
199
22
#include <QtQuick/private/qquickimagebase_p.h>
23
#include <QtQuick/private/qquickimagebase_p.h>
200
23
#include <QDBusConnection>
24
#include <QDBusConnection>
201
24
#include <QtGui/QGuiApplication>
25
#include <QtGui/QGuiApplication>
202
@@ -286,6 +287,25 @@
203
286
    // nothing yet
287
    // nothing yet
204
287
}
288
}
205
288
289
207
289
290
/******************************************************************************
208
291
 * Labs module
209
292
 */
210
293
void UbuntuLabsModule::initializeModule(QQmlEngine *engine, QQmlExtensionPlugin *plugin)
211
294
{
212
295
    Q_UNUSED(engine);
213
296
    Q_UNUSED(plugin);
214
297
}
215
298
216
299
void UbuntuLabsModule::defineModule(const char *uri)
217
300
{
218
301
    Q_UNUSED(uri);
219
302
    // a fake component so we can have the module types file created
220
303
    qmlRegisterType<QObject>(uri, 1, 0, "ZiObject");
221
304
}
222
305
223
306
void UbuntuLabsModule::undefineModule()
224
307
{
225
308
    // nothing yet
226
309
}
227
290
310
228
291
UT_NAMESPACE_END
311
UT_NAMESPACE_END
229
292
312
230
=== modified file 'src/Ubuntu/UbuntuToolkit/ubuntutoolkitmodule.h'
231
--- src/Ubuntu/UbuntuToolkit/ubuntutoolkitmodule.h	2016-06-23 07:09:59 +0000
232
+++ src/Ubuntu/UbuntuToolkit/ubuntutoolkitmodule.h	2016-06-24 13:11:14 +0000
233
@@ -27,6 +27,7 @@
234
27
27
235
28
class QQmlEngine;
28
class QQmlEngine;
236
29
class QWindow;
29
class QWindow;
237
30
class QQmlExtensionPlugin;
238
30
/*
31
/*
239
31
 * Type registration functions.
32
 * Type registration functions.
240
32
 */
33
 */
241
@@ -75,6 +76,14 @@
242
75
    static void undefineModule();
76
    static void undefineModule();
243
76
};
77
};
244
77
78
245
79
class UBUNTUTOOLKIT_EXPORT UbuntuLabsModule
246
80
{
247
81
public:
248
82
    static void initializeModule(QQmlEngine *engine, QQmlExtensionPlugin *plugin);
249
83
    static void defineModule(const char *uri);
250
84
    static void undefineModule();
251
85
};
252
86
253
78
UT_NAMESPACE_END
87
UT_NAMESPACE_END
254
79
88
255
80
#endif // UBUNTUTOOLKITMODULE_H
89
#endif // UBUNTUTOOLKITMODULE_H
Status:	Merged
Approved by:	Cris Dywan on 2016-06-24
Approved revision:	2022
Merged at revision:	2020
Proposed branch:	lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/ucLabs
Merge into:	lp:ubuntu-ui-toolkit/staging
Diff against target:	255 lines (+162/-2) 10 files modified debian/control (+29/-0) debian/control.gles (+30/-0) debian/qml-module-ubuntu-components-labs.install (+3/-0) src/Ubuntu/Components/Components.pro (+2/-1) src/Ubuntu/Components/Labs/Labs.pro (+10/-0) src/Ubuntu/Components/Labs/plugin/plugin.cpp (+47/-0) src/Ubuntu/Components/Labs/plugin/plugin.pri (+8/-0) src/Ubuntu/Components/Labs/qmldir (+3/-0) src/Ubuntu/UbuntuToolkit/ubuntutoolkitmodule.cpp (+21/-1) src/Ubuntu/UbuntuToolkit/ubuntutoolkitmodule.h (+9/-0)
To merge this branch:	bzr merge lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/ucLabs
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
ubuntu-sdk-build-bot	continuous-integration		Approve on 2016-06-24
Cris Dywan		2016-06-23	Approve on 2016-06-24
Review via email: mp+298220@code.launchpad.net