From b70d45d3f3e8096fb88c5cee1cf1f0b6e7c15f34 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Wed, 26 Apr 2017 09:09:52 +0200 Subject: 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 --- src/controls/controls.pro | 4 ++-- 1 file 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 -- cgit v1.2.1