diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2017-05-23 15:31:54 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2017-05-23 15:32:04 +0200 |
| commit | 7b0d285d8ae3636d554688eefe19707e67e31dca (patch) | |
| tree | 75361880749476de16d1de98b08e8fdb90279db1 /src | |
| parent | c65bde25f04304bdcc995191f5f076e5f7532678 (diff) | |
| parent | dacb91916b202208681471ba764504c7c7d086f0 (diff) | |
| download | qtquickcontrols-7b0d285d8ae3636d554688eefe19707e67e31dca.tar.gz | |
Merge remote-tracking branch 'origin/5.9.0' into 5.9
Change-Id: I67b3761e42ad377d090a9dd20ad6309bd72c5484
Diffstat (limited to 'src')
| -rw-r--r-- | src/dialogs/dialogs.pro | 28 |
1 files changed, 1 insertions, 27 deletions
diff --git a/src/dialogs/dialogs.pro b/src/dialogs/dialogs.pro index e5cc7d79..69b64e00 100644 --- a/src/dialogs/dialogs.pro +++ b/src/dialogs/dialogs.pro @@ -84,32 +84,6 @@ ios|android|blackberry|winrt { QT += quick-private gui gui-private core core-private qml qml-private -!qmlcache { - # 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.") - - 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 -} else { - QML_FILES += $$DIALOGS_QML_FILES -} +QML_FILES += $$DIALOGS_QML_FILES load(qml_plugin) |