diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2017-05-23 15:38:16 +0200 |
|---|---|---|
| committer | Erik Verbruggen <erik.verbruggen@qt.io> | 2017-06-01 11:07:46 +0000 |
| commit | ae688459bc845ab919ce256f315843d97ba9ff32 (patch) | |
| tree | 63bd910e72d59ca85a07cf14e7e40022c501e118 | |
| parent | 1b09866db77cd532ff1858f3f98ee1e928174961 (diff) | |
| download | qtquickcontrols-ae688459bc845ab919ce256f315843d97ba9ff32.tar.gz | |
Fix support for using QtQuick Dialogs with the QML compiler
This is a regression from commit
dacb91916b202208681471ba764504c7c7d086f0. Make sure to include the
dialogs sources in the resource system when using the compiler.
Task-number: QTBUG-60991
Change-Id: I35c3e2e677e4f44ec56fe02b086ce08a8b765d37
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| -rw-r--r-- | src/dialogs/dialogs.pro | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/src/dialogs/dialogs.pro b/src/dialogs/dialogs.pro index 69b64e00..ca5f408e 100644 --- a/src/dialogs/dialogs.pro +++ b/src/dialogs/dialogs.pro @@ -7,12 +7,6 @@ IMPORT_VERSION = 1.2 QMAKE_DOCS = $$PWD/doc/qtquickdialogs.qdocconf -qtquickcompiler { - DEFINES += ALWAYS_LOAD_FROM_RESOURCES -} else { - !static: CONFIG += qmlcache -} - SOURCES += \ qquickabstractmessagedialog.cpp \ qquickplatformmessagedialog.cpp \ @@ -86,4 +80,13 @@ QT += quick-private gui gui-private core core-private qml qml-private QML_FILES += $$DIALOGS_QML_FILES +qtquickcompiler { + DEFINES += ALWAYS_LOAD_FROM_RESOURCES + dialogs.files = $$QML_FILES + dialogs.prefix = /QtQuick/Dialogs + RESOURCES += dialogs +} else { + !static: CONFIG += qmlcache +} + load(qml_plugin) |