From dacb91916b202208681471ba764504c7c7d086f0 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Mon, 22 May 2017 11:39:31 +0200 Subject: Fix inclusion of QML files of the Dialogs module in static builds This is a regression introduce by commit 751f08cf46f505980b8ebe9a228a6c229b470152. For a build with QML Ahead-of-Time cache creation, we need the qml files in QML_FILES and qml_module.prf takes care of installing them correctly into the file system (caches and sources). For a static build we also need the sources in QML_FILES, in order for their automatic inclusion in the resource system (also by qml_module.prf). Task-number: QTBUG-60861 Change-Id: Id9125530d8b385101994600c1224dbcb2a5333f9 Reviewed-by: Andy Shaw --- src/dialogs/dialogs.pro | 28 +--------------------------- 1 file changed, 1 insertion(+), 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 = \ - "" \ - "" - - 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 += "$$relativepath_out" - } - - RESOURCE_CONTENT += \ - "" \ - "" - - 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) -- cgit v1.2.1