summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@qt.io>2017-04-26 09:09:52 +0200
committerSimon Hausmann <simon.hausmann@qt.io>2017-04-26 07:13:34 +0000
commitb70d45d3f3e8096fb88c5cee1cf1f0b6e7c15f34 (patch)
tree3d093f17bb58323206bbeb720be044ca17f969f9
parentffc1cab21ade6fc4b0ab574dbb5507c677d32841 (diff)
downloadqtquickcontrols-b70d45d3f3e8096fb88c5cee1cf1f0b6e7c15f34.tar.gz
Fix non-prefix builds on Windows
After commit 3ba11cf93820610273e2a16b13ab1d8c57a41d36 the shaders do not belong into QML_FILES anymore (and also don't need to be copied via COPIES consequently). Task-number: QTBUG-60214 Change-Id: I8d68fe76810c2d2d8945ef410a377aa2ce0068c1 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
-rw-r--r--src/controls/controls.pro4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/controls/controls.pro b/src/controls/controls.pro
index 6f78443e..07e8e002 100644
--- a/src/controls/controls.pro
+++ b/src/controls/controls.pro
@@ -68,9 +68,9 @@ osx: LIBS_PRIVATE += -framework Carbon
} else {
QML_FILES *= $$CONTROLS_QML_FILES \
$$PRIVATE_QML_FILES \
- $$STYLES_QML_FILES \
+ $$STYLES_QML_FILES
+ OTHER_FILES += $$QML_FILES \
$$SHADER_FILES
- OTHER_FILES += $$QML_FILES
}
INCLUDED_RESOURCE_FILES += $$SHADER_FILES