diff options
Diffstat (limited to 'src/dialogs/dialogs.pro')
| -rw-r--r-- | src/dialogs/dialogs.pro | 33 |
1 files changed, 7 insertions, 26 deletions
diff --git a/src/dialogs/dialogs.pro b/src/dialogs/dialogs.pro index f19283f2..ca5f408e 100644 --- a/src/dialogs/dialogs.pro +++ b/src/dialogs/dialogs.pro @@ -7,8 +7,6 @@ IMPORT_VERSION = 1.2 QMAKE_DOCS = $$PWD/doc/qtquickdialogs.qdocconf -qtquickcompiler: DEFINES += ALWAYS_LOAD_FROM_RESOURCES - SOURCES += \ qquickabstractmessagedialog.cpp \ qquickplatformmessagedialog.cpp \ @@ -80,32 +78,15 @@ ios|android|blackberry|winrt { QT += quick-private gui gui-private core core-private qml qml-private -!static { - # Create the resource file - GENERATED_RESOURCE_FILE = $$OUT_PWD/dialogs.qrc - - RESOURCE_CONTENT = \ - "<RCC>" \ - "<qresource prefix=\"/QtQuick/Dialogs\">" - - for(resourcefile, DIALOGS_QML_FILES) { - resourcefileabsolutepath = $$absolute_path($$resourcefile) - relativepath_in = $$relative_path($$resourcefileabsolutepath, $$_PRO_FILE_PWD_) - relativepath_out = $$relative_path($$resourcefileabsolutepath, $$OUT_PWD) - RESOURCE_CONTENT += "<file alias=\"$$relativepath_in\">$$relativepath_out</file>" - } - - RESOURCE_CONTENT += \ - "</qresource>" \ - "</RCC>" - - write_file($$GENERATED_RESOURCE_FILE, RESOURCE_CONTENT)|error("Aborting.") +QML_FILES += $$DIALOGS_QML_FILES - RESOURCES += $$GENERATED_RESOURCE_FILE - # In case of a debug build, deploy the QML files too - !qtquickcompiler:CONFIG(debug, debug|release): QML_FILES += $$DIALOGS_QML_FILES +qtquickcompiler { + DEFINES += ALWAYS_LOAD_FROM_RESOURCES + dialogs.files = $$QML_FILES + dialogs.prefix = /QtQuick/Dialogs + RESOURCES += dialogs } else { - QML_FILES += $$DIALOGS_QML_FILES + !static: CONFIG += qmlcache } load(qml_plugin) |