-
Notifications
You must be signed in to change notification settings - Fork 7
/
Copy pathQt57Dev-QtQuickControls-StaticQmlResourceFilesFix.patch-orig
458 lines (399 loc) · 18.1 KB
/
Qt57Dev-QtQuickControls-StaticQmlResourceFilesFix.patch-orig
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
Only in .\Qt56Beta: build_32
Only in .\Qt56Beta: build_64
Only in .\Qt56Beta/qtbase/include/QtCore: QtConfig
Only in .\Qt56Beta/qtbase/include/QtCore: qconfig.h
Only in .\Qt56Beta/qtbase/include/QtCore: qfeatures.h
diff -r -u "..\\Downloads\\qt-everywhere-opensource-src-5.6.0-beta/qtbase/mkspecs/features/qml_module.prf" ".\\Qt56Beta/qtbase/mkspecs/features/qml_module.prf"
--- "..\\Downloads\\qt-everywhere-opensource-src-5.6.0-beta/qtbase/mkspecs/features/qml_module.prf" 2015-12-14 15:49:46.000000000 -0500
+++ ".\\Qt56Beta/qtbase/mkspecs/features/qml_module.prf" 2016-01-16 00:41:14.062443500 -0500
@@ -13,7 +13,8 @@
isEmpty(TARGETPATH): error("Must set TARGETPATH (QML import name)")
-fq_qml_files = $$_PRO_FILE_PWD_/qmldir
+qmldir_file = $$_PRO_FILE_PWD_/qmldir
+fq_qml_files = $$qmldir_file
for(qmlf, QML_FILES): fq_qml_files += $$absolute_path($$qmlf, $$_PRO_FILE_PWD_)
@@ -25,6 +26,8 @@
else: \
instbase = $$[QT_INSTALL_QML]
+!qml1_target:static: CONFIG += builtin_resources
+
!force_independent:if(!debug_and_release|!build_all|CONFIG(release, debug|release)) {
# These bizarre rules copy the files to the qtbase build directory
@@ -32,7 +35,8 @@
return($$relative_path($$1, $$_PRO_FILE_PWD_))
}
- qmlfiles2build.input = fq_qml_files
+ !builtin_resources: qmlfiles2build.input = fq_qml_files
+ else: qmlfiles2build.input = qmldir_file
qmlfiles2build.output = $$instbase/$$TARGETPATH/${QMAKE_FUNC_FILE_IN_qmlModStripSrcDir}
!contains(TEMPLATE, vc.*): qmlfiles2build.variable_out = PRE_TARGETDEPS
qmlfiles2build.commands = $$QMAKE_COPY ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT}
@@ -42,8 +46,18 @@
QMAKE_EXTRA_COMPILERS += qmlfiles2build
}
+builtin_resources {
+ URITARGET = $$replace(URI, "\\.", "_")
+ # Ensure the qml files are included in the resources
+ $${URITARGET}.files = $$fq_qml_files
+ # qt-project.org/imports is the path used for locating imports inside the resources
+ $${URITARGET}.prefix = /qt-project.org/imports/$$TARGETPATH
+ RESOURCES += $${URITARGET}
+}
+
# Install rules
qmldir.base = $$_PRO_FILE_PWD_
-qmldir.files = $$fq_qml_files
+!builtin_resources: qmldir.files = $$fq_qml_files
+else: qmldir.files = $$qmldir_file
qmldir.path = $$instbase/$$TARGETPATH
INSTALLS += qmldir
diff -r -u "..\\Downloads\\qt-everywhere-opensource-src-5.6.0-beta/qtdeclarative/src/imports/folderlistmodel/plugin.cpp" ".\\Qt56Beta/qtdeclarative/src/imports/folderlistmodel/plugin.cpp"
--- "..\\Downloads\\qt-everywhere-opensource-src-5.6.0-beta/qtdeclarative/src/imports/folderlistmodel/plugin.cpp" 2015-12-10 09:48:59.000000000 -0500
+++ ".\\Qt56Beta/qtdeclarative/src/imports/folderlistmodel/plugin.cpp" 2016-01-16 00:41:03.765568500 -0500
@@ -36,6 +36,13 @@
#include "qquickfolderlistmodel.h"
+static void initResources()
+{
+#ifdef QT_STATIC
+ Q_INIT_RESOURCE(qmake_Qt_labs_folderlistmodel);
+#endif
+}
+
QT_BEGIN_NAMESPACE
//![class decl]
@@ -45,6 +52,7 @@
Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
public:
+ QmlFolderListModelPlugin(QObject *parent = 0) : QQmlExtensionPlugin(parent) { initResources(); }
virtual void registerTypes(const char *uri)
{
Q_ASSERT(QLatin1String(uri) == QLatin1String("Qt.labs.folderlistmodel"));
diff -r -u "..\\Downloads\\qt-everywhere-opensource-src-5.6.0-beta/qtdeclarative/src/imports/localstorage/plugin.cpp" ".\\Qt56Beta/qtdeclarative/src/imports/localstorage/plugin.cpp"
--- "..\\Downloads\\qt-everywhere-opensource-src-5.6.0-beta/qtdeclarative/src/imports/localstorage/plugin.cpp" 2015-12-10 09:48:59.000000000 -0500
+++ ".\\Qt56Beta/qtdeclarative/src/imports/localstorage/plugin.cpp" 2016-01-16 00:41:03.765568500 -0500
@@ -54,6 +54,13 @@
#include <private/qv4scopedvalue_p.h>
#include <private/qv4objectiterator_p.h>
+static void initResources()
+{
+#ifdef QT_STATIC
+ Q_INIT_RESOURCE(qmake_QtQuick_LocalStorage);
+#endif
+}
+
QT_BEGIN_NAMESPACE
#define V4THROW_SQL(error, desc) { \
@@ -744,10 +751,10 @@
Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
public:
- QQmlLocalStoragePlugin()
+ QQmlLocalStoragePlugin(QObject *parent = 0) : QQmlExtensionPlugin(parent)
{
+ initResources();
}
-
void registerTypes(const char *uri)
{
Q_ASSERT(QLatin1String(uri) == "QtQuick.LocalStorage");
diff -r -u "..\\Downloads\\qt-everywhere-opensource-src-5.6.0-beta/qtdeclarative/src/imports/models/plugin.cpp" ".\\Qt56Beta/qtdeclarative/src/imports/models/plugin.cpp"
--- "..\\Downloads\\qt-everywhere-opensource-src-5.6.0-beta/qtdeclarative/src/imports/models/plugin.cpp" 2015-12-10 09:48:59.000000000 -0500
+++ ".\\Qt56Beta/qtdeclarative/src/imports/models/plugin.cpp" 2016-01-16 00:41:03.781193500 -0500
@@ -35,6 +35,13 @@
#include <private/qqmlmodelsmodule_p.h>
+static void initResources()
+{
+#ifdef QT_STATIC
+ Q_INIT_RESOURCE(qmake_QtQml_Models_2);
+#endif
+}
+
QT_BEGIN_NAMESPACE
/*!
@@ -64,6 +71,7 @@
Q_OBJECT
Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface/1.0")
public:
+ QtQmlModelsPlugin(QObject *parent = 0) : QQmlExtensionPlugin(parent) { initResources(); }
virtual void registerTypes(const char *uri)
{
Q_ASSERT(QLatin1String(uri) == QLatin1String("QtQml.Models"));
diff -r -u "..\\Downloads\\qt-everywhere-opensource-src-5.6.0-beta/qtdeclarative/src/imports/particles/plugin.cpp" ".\\Qt56Beta/qtdeclarative/src/imports/particles/plugin.cpp"
--- "..\\Downloads\\qt-everywhere-opensource-src-5.6.0-beta/qtdeclarative/src/imports/particles/plugin.cpp" 2015-12-10 09:48:59.000000000 -0500
+++ ".\\Qt56Beta/qtdeclarative/src/imports/particles/plugin.cpp" 2016-01-16 00:41:03.781193500 -0500
@@ -35,6 +35,13 @@
#include <private/qquickparticlesmodule_p.h>
+static void initResources()
+{
+#ifdef QT_STATIC
+ Q_INIT_RESOURCE(qmake_QtQuick_Particles_2);
+#endif
+}
+
QT_BEGIN_NAMESPACE
//![class decl]
@@ -43,6 +50,7 @@
Q_OBJECT
Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface/1.0")
public:
+ QtQuick2ParticlesPlugin(QObject *parent = 0) : QQmlExtensionPlugin(parent) { initResources(); }
virtual void registerTypes(const char *uri)
{
Q_ASSERT(QLatin1String(uri) == QLatin1String("QtQuick.Particles"));
diff -r -u "..\\Downloads\\qt-everywhere-opensource-src-5.6.0-beta/qtdeclarative/src/imports/qtquick2/plugin.cpp" ".\\Qt56Beta/qtdeclarative/src/imports/qtquick2/plugin.cpp"
--- "..\\Downloads\\qt-everywhere-opensource-src-5.6.0-beta/qtdeclarative/src/imports/qtquick2/plugin.cpp" 2015-12-10 09:48:59.000000000 -0500
+++ ".\\Qt56Beta/qtdeclarative/src/imports/qtquick2/plugin.cpp" 2016-01-16 00:41:03.796818500 -0500
@@ -35,6 +35,13 @@
#include <private/qtquick2_p.h>
+static void initResources()
+{
+#ifdef QT_STATIC
+ Q_INIT_RESOURCE(qmake_QtQuick_2);
+#endif
+}
+
QT_BEGIN_NAMESPACE
//![class decl]
@@ -43,6 +50,7 @@
Q_OBJECT
Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface/1.0")
public:
+ QtQuick2Plugin(QObject *parent = 0) : QQmlExtensionPlugin(parent) { initResources(); }
virtual void registerTypes(const char *uri)
{
Q_ASSERT(QLatin1String(uri) == QLatin1String("QtQuick"));
diff -r -u "..\\Downloads\\qt-everywhere-opensource-src-5.6.0-beta/qtdeclarative/src/imports/settings/plugin.cpp" ".\\Qt56Beta/qtdeclarative/src/imports/settings/plugin.cpp"
--- "..\\Downloads\\qt-everywhere-opensource-src-5.6.0-beta/qtdeclarative/src/imports/settings/plugin.cpp" 2015-12-10 09:48:59.000000000 -0500
+++ ".\\Qt56Beta/qtdeclarative/src/imports/settings/plugin.cpp" 2016-01-16 00:41:03.796818500 -0500
@@ -36,6 +36,13 @@
#include "qqmlsettings_p.h"
+static void initResources()
+{
+#ifdef QT_STATIC
+ Q_INIT_RESOURCE(qmake_Qt_labs_settings);
+#endif
+}
+
QT_BEGIN_NAMESPACE
class QmlSettingsPlugin : public QQmlExtensionPlugin
@@ -44,6 +51,7 @@
Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
public:
+ QmlSettingsPlugin(QObject *parent = 0) : QQmlExtensionPlugin(parent) { initResources(); }
virtual void registerTypes(const char *uri)
{
Q_ASSERT(QByteArray(uri) == QByteArray("Qt.labs.settings"));
diff -r -u "..\\Downloads\\qt-everywhere-opensource-src-5.6.0-beta/qtdeclarative/src/imports/statemachine/plugin.cpp" ".\\Qt56Beta/qtdeclarative/src/imports/statemachine/plugin.cpp"
--- "..\\Downloads\\qt-everywhere-opensource-src-5.6.0-beta/qtdeclarative/src/imports/statemachine/plugin.cpp" 2015-12-10 09:48:59.000000000 -0500
+++ ".\\Qt56Beta/qtdeclarative/src/imports/statemachine/plugin.cpp" 2016-01-16 00:41:03.812443500 -0500
@@ -41,6 +41,13 @@
#include <QQmlExtensionPlugin>
#include <qqml.h>
+static void initResources()
+{
+#ifdef QT_STATIC
+ Q_INIT_RESOURCE(qmake_QtQml_StateMachine);
+#endif
+}
+
QT_BEGIN_NAMESPACE
class QtQmlStateMachinePlugin : public QQmlExtensionPlugin
@@ -49,6 +56,7 @@
Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QtQml.StateMachine/1.0")
public:
+ QtQmlStateMachinePlugin(QObject *parent = 0) : QQmlExtensionPlugin(parent) { initResources(); }
void registerTypes(const char *uri)
{
qmlRegisterType<State>(uri, 1, 0, "State");
diff -r -u "..\\Downloads\\qt-everywhere-opensource-src-5.6.0-beta/qtdeclarative/src/imports/testlib/main.cpp" ".\\Qt56Beta/qtdeclarative/src/imports/testlib/main.cpp"
--- "..\\Downloads\\qt-everywhere-opensource-src-5.6.0-beta/qtdeclarative/src/imports/testlib/main.cpp" 2015-12-10 09:48:59.000000000 -0500
+++ ".\\Qt56Beta/qtdeclarative/src/imports/testlib/main.cpp" 2016-01-16 00:41:03.828068500 -0500
@@ -48,6 +48,13 @@
#include <QtDebug>
+static void initResources()
+{
+#ifdef QT_STATIC
+ Q_INIT_RESOURCE(qmake_QtTest);
+#endif
+}
+
QT_BEGIN_NAMESPACE
class QuickTestUtil : public QObject
@@ -137,6 +144,7 @@
Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
public:
+ QTestQmlModule(QObject *parent = 0) : QQmlExtensionPlugin(parent) { initResources(); }
virtual void registerTypes(const char *uri)
{
Q_ASSERT(QLatin1String(uri) == QLatin1String("QtTest"));
diff -r -u "..\\Downloads\\qt-everywhere-opensource-src-5.6.0-beta/qtdeclarative/src/imports/window/plugin.cpp" ".\\Qt56Beta/qtdeclarative/src/imports/window/plugin.cpp"
--- "..\\Downloads\\qt-everywhere-opensource-src-5.6.0-beta/qtdeclarative/src/imports/window/plugin.cpp" 2015-12-10 09:48:59.000000000 -0500
+++ ".\\Qt56Beta/qtdeclarative/src/imports/window/plugin.cpp" 2016-01-16 00:41:03.828068500 -0500
@@ -35,6 +35,13 @@
#include <private/qquickwindowmodule_p.h>
+static void initResources()
+{
+#ifdef QT_STATIC
+ Q_INIT_RESOURCE(qmake_QtQuick_Window_2);
+#endif
+}
+
QT_BEGIN_NAMESPACE
/*!
@@ -53,13 +60,13 @@
*/
-
//![class decl]
class QtQuick2WindowPlugin : public QQmlExtensionPlugin
{
Q_OBJECT
Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface/1.0")
public:
+ QtQuick2WindowPlugin(QObject *parent = 0) : QQmlExtensionPlugin(parent) { initResources(); }
virtual void registerTypes(const char *uri)
{
Q_ASSERT(QLatin1String(uri) == QLatin1String("QtQuick.Window"));
diff -r -u "..\\Downloads\\qt-everywhere-opensource-src-5.6.0-beta/qtdeclarative/src/imports/xmllistmodel/plugin.cpp" ".\\Qt56Beta/qtdeclarative/src/imports/xmllistmodel/plugin.cpp"
--- "..\\Downloads\\qt-everywhere-opensource-src-5.6.0-beta/qtdeclarative/src/imports/xmllistmodel/plugin.cpp" 2015-12-10 09:48:59.000000000 -0500
+++ ".\\Qt56Beta/qtdeclarative/src/imports/xmllistmodel/plugin.cpp" 2016-01-16 00:41:03.828068500 -0500
@@ -36,6 +36,13 @@
#include "qqmlxmllistmodel_p.h"
+static void initResources()
+{
+#ifdef QT_STATIC
+ Q_INIT_RESOURCE(qmake_QtQuick_XmlListModel);
+#endif
+}
+
QT_BEGIN_NAMESPACE
class QmlXmlListModelPlugin : public QQmlExtensionPlugin
@@ -44,6 +51,7 @@
Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
public:
+ QmlXmlListModelPlugin(QObject *parent = 0) : QQmlExtensionPlugin(parent) { initResources(); }
virtual void registerTypes(const char *uri)
{
Q_ASSERT(QLatin1String(uri) == QLatin1String("QtQuick.XmlListModel"));
diff -r -u "..\\Downloads\\qt-everywhere-opensource-src-5.6.0-beta/qtdeclarative/src/qml/doc/src/qmllanguageref/syntax/imports.qdoc" ".\\Qt56Beta/qtdeclarative/src/qml/doc/src/qmllanguageref/syntax/imports.qdoc"
--- "..\\Downloads\\qt-everywhere-opensource-src-5.6.0-beta/qtdeclarative/src/qml/doc/src/qmllanguageref/syntax/imports.qdoc" 2015-12-15 14:02:25.000000000 -0500
+++ ".\\Qt56Beta/qtdeclarative/src/qml/doc/src/qmllanguageref/syntax/imports.qdoc" 2016-01-16 00:41:03.859318500 -0500
@@ -291,6 +291,7 @@
\li The directory of the current file
\li The location specified by QLibraryInfo::Qml2ImportsPath
\li Paths specified by the \c QML2_IMPORT_PATH environment variable
+\li The qrc:/qt-project.org/imports path inside the resources.
\endlist
Additional import paths can be added through QQmlEngine::addImportPath() or the
diff -r -u "..\\Downloads\\qt-everywhere-opensource-src-5.6.0-beta/qtdeclarative/src/qml/qml/qqmlimport.cpp" ".\\Qt56Beta/qtdeclarative/src/qml/qml/qqmlimport.cpp"
--- "..\\Downloads\\qt-everywhere-opensource-src-5.6.0-beta/qtdeclarative/src/qml/qml/qqmlimport.cpp" 2015-12-10 09:48:59.000000000 -0500
+++ ".\\Qt56Beta/qtdeclarative/src/qml/qml/qqmlimport.cpp" 2016-01-16 00:41:03.874943500 -0500
@@ -1555,8 +1555,8 @@
: engine(e)
{
filePluginPath << QLatin1String(".");
-
- // Search order is applicationDirPath(), $QML2_IMPORT_PATH, QLibraryInfo::Qml2ImportsPath
+ addImportPath(QStringLiteral("qrc:/qt-project.org/imports"));
+ // Search order is applicationDirPath(), qrc:/qt-project.org/imports, $QML2_IMPORT_PATH, QLibraryInfo::Qml2ImportsPath
QString installImportsPath = QLibraryInfo::location(QLibraryInfo::Qml2ImportsPath);
addImportPath(installImportsPath);
Only in .\Qt56Beta/qtdeclarative/src/qml/qml: qqmlimport.cpp.orig
diff -r -u "..\\Downloads\\qt-everywhere-opensource-src-5.6.0-beta/qtquickcontrols/src/controls/plugin.cpp" ".\\Qt56Beta/qtquickcontrols/src/controls/plugin.cpp"
--- "..\\Downloads\\qt-everywhere-opensource-src-5.6.0-beta/qtquickcontrols/src/controls/plugin.cpp" 2015-12-07 08:41:36.000000000 -0500
+++ ".\\Qt56Beta/qtquickcontrols/src/controls/plugin.cpp" 2016-01-16 21:58:53.166262000 -0500
@@ -68,11 +68,6 @@
#include <QtCore/qlocale.h>
#endif
-static void initResources()
-{
- Q_INIT_RESOURCE(controls);
-}
-
QT_BEGIN_NAMESPACE
static const struct {
diff -r -u "..\\Downloads\\qt-everywhere-opensource-src-5.6.0-beta/qtquickcontrols/src/controls/plugin.h" ".\\Qt56Beta/qtquickcontrols/src/controls/plugin.h"
--- "..\\Downloads\\qt-everywhere-opensource-src-5.6.0-beta/qtquickcontrols/src/controls/plugin.h" 2015-12-07 08:41:36.000000000 -0500
+++ ".\\Qt56Beta/qtquickcontrols/src/controls/plugin.h" 2016-01-16 21:58:57.123309100 -0500
@@ -45,6 +45,13 @@
#include <QtCore/qtranslator.h>
#endif
+static void initResources()
+{
+#ifdef QT_STATIC
+ Q_INIT_RESOURCE(qmake_QtQuick_Controls);
+#endif
+}
+
QT_BEGIN_NAMESPACE
class QtQuickControlsPlugin: public QQmlExtensionPlugin
@@ -52,6 +59,7 @@
Q_OBJECT
Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface/1.0")
public:
+ QtQuickControlsPlugin(QObject *parent = 0) : QQmlExtensionPlugin(parent) { initResources(); }
void registerTypes(const char *uri);
void initializeEngine(QQmlEngine *engine, const char *uri);
private:
diff -r -u "..\\Downloads\\qt-everywhere-opensource-src-5.6.0-beta/qtquickcontrols/src/dialogs/plugin.cpp" ".\\Qt56Beta/qtquickcontrols/src/dialogs/plugin.cpp"
--- "..\\Downloads\\qt-everywhere-opensource-src-5.6.0-beta/qtquickcontrols/src/dialogs/plugin.cpp" 2015-12-07 08:41:36.000000000 -0500
+++ ".\\Qt56Beta/qtquickcontrols/src/dialogs/plugin.cpp" 2016-01-16 20:42:10.803275700 -0500
@@ -61,7 +61,9 @@
static void initResources()
{
- Q_INIT_RESOURCE(dialogs);
+#ifdef QT_STATIC
+ Q_INIT_RESOURCE(qmake_QtQuick_Dialogs);
+#endif
}
QT_BEGIN_NAMESPACE
@@ -87,7 +89,7 @@
Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface/1.0")
public:
- QtQuick2DialogsPlugin() : QQmlExtensionPlugin(), m_useResources(true) { }
+ QtQuick2DialogsPlugin(QObject *parent = 0) : QQmlExtensionPlugin(parent), m_useResources(true) { initResources(); }
virtual void initializeEngine(QQmlEngine *engine, const char * uri) {
qCDebug(lcRegistration) << uri << m_decorationComponentUrl;
diff -r -u "..\\Downloads\\qt-everywhere-opensource-src-5.6.0-beta/qtquickcontrols/src/layouts/plugin.cpp" ".\\Qt56Beta/qtquickcontrols/src/layouts/plugin.cpp"
--- "..\\Downloads\\qt-everywhere-opensource-src-5.6.0-beta/qtquickcontrols/src/layouts/plugin.cpp" 2015-12-07 08:41:36.000000000 -0500
+++ ".\\Qt56Beta/qtquickcontrols/src/layouts/plugin.cpp" 2016-01-16 23:29:22.680421200 -0500
@@ -39,6 +39,13 @@
#include "qquicklinearlayout_p.h"
#include "qquickstacklayout_p.h"
+static void initResources()
+{
+#ifdef QT_STATIC
+ Q_INIT_RESOURCE(qmake_QtQuick_Layouts);
+#endif
+}
+
QT_BEGIN_NAMESPACE
//![class decl]
@@ -47,6 +54,7 @@
Q_OBJECT
Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface/1.0")
public:
+ QtQuickLayoutsPlugin(QObject *parent = 0) : QQmlExtensionPlugin(parent) { initResources(); }
virtual void registerTypes(const char *uri)
{
Q_ASSERT(QLatin1String(uri) == QLatin1String("QtQuick.Layouts"));
diff -r -u "..\\Downloads\\qt-everywhere-opensource-src-5.6.0-beta/qtquickcontrols/src/widgets/widgetsplugin.cpp" ".\\Qt56Beta/qtquickcontrols/src/widgets/widgetsplugin.cpp"
--- "..\\Downloads\\qt-everywhere-opensource-src-5.6.0-beta/qtquickcontrols/src/widgets/widgetsplugin.cpp" 2015-12-07 08:41:36.000000000 -0500
+++ ".\\Qt56Beta/qtquickcontrols/src/widgets/widgetsplugin.cpp" 2016-01-16 20:30:11.147025700 -0500
@@ -41,6 +41,13 @@
#include "qquickqcolordialog_p.h"
#include "qquickqfontdialog_p.h"
+static void initResources()
+{
+#ifdef QT_STATIC
+ Q_INIT_RESOURCE(qmake_QtQuick_Controls);
+#endif
+}
+
QT_BEGIN_NAMESPACE
/*!
@@ -68,6 +75,7 @@
Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface/1.0")
public:
+ QtQuick2PrivateWidgetsPlugin(QObject *parent = 0) : QQmlExtensionPlugin(parent) { initResources(); }
virtual void registerTypes(const char *uri)
{
Q_ASSERT(QLatin1String(uri) == QLatin1String("QtQuick.PrivateWidgets"));