From ae688459bc845ab919ce256f315843d97ba9ff32 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Tue, 23 May 2017 15:38:16 +0200 Subject: 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 --- src/dialogs/dialogs.pro | 15 +++++++++------ 1 file 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) -- cgit v1.2.1