summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndy Shaw <andy.shaw@qt.io>2019-05-28 14:47:51 +0200
committerAndy Shaw <andy.shaw@qt.io>2019-05-28 14:47:51 +0200
commit0f74e642bf1f13f6b097b1a8e1412ca3cb6e85b5 (patch)
tree740bf3aaa6c9ecbf107542bf0d1ce306e6357630
parent84fbb48832e984c7fce1c4091adb0d340974a75f (diff)
downloadqtquickcontrols-0f74e642bf1f13f6b097b1a8e1412ca3cb6e85b5.tar.gz
Exclude the resources when building statically as qmake will handle this
As qmake will combine all the QML files etc together for us in static mode then we should not include those added to the resources explicitly in the pro file otherwise we will end up with an extra copy. Additionally, if qrc:/ was added to the import path list it would end trying to load the files from there and not from the qrc:/qt-project.org/imports location as a result. Change-Id: Icbaea7c6103074f9468914365b099be4589bee37 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
-rw-r--r--src/controls/controls.pro2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/controls/controls.pro b/src/controls/controls.pro
index 3119d33d..39a78904 100644
--- a/src/controls/controls.pro
+++ b/src/controls/controls.pro
@@ -78,7 +78,7 @@ INCLUDED_RESOURCE_FILES += $$SHADER_FILES
controls.files = $$INCLUDED_RESOURCE_FILES
controls.prefix = /QtQuick/Controls
-RESOURCES += controls
+!static:RESOURCES += controls
CONFIG += no_cxx_module
load(qml_plugin)