summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndy Shaw <andy.shaw@qt.io>2018-12-06 22:38:31 +0100
committerAndy Shaw <andy.shaw@qt.io>2018-12-07 11:51:29 +0000
commit8abf15b4ba974576e13f37b09117454fc1e6b1d9 (patch)
treeaaf0297ee4ee6f4e48e013b88a9ba640f7edfee5
parentbb0ed6b2a9b763927022d41faf80ebcf745c0d01 (diff)
Static: Install the qmldir for the Styles module
Mention qmldir in AUX_QML_FILES to ensure that it is always copied to the build directory. qml_module.prf usually takes care of this by having QML_FILES in qmldir.files with INSTALLS += qmldir, but with CONFIG += builtin_resources (set for static) that's not the case. AUX_QML_FILES is the correct variable though. Task-number: QTBUG-67644 Change-Id: I6cf580586dec0bf7b44c89b95134d7d7f683102e Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
-rw-r--r--src/controls/Styles/styles.pri2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/controls/Styles/styles.pri b/src/controls/Styles/styles.pri
index 67c1ab76c..ff3db8170 100644
--- a/src/controls/Styles/styles.pri
+++ b/src/controls/Styles/styles.pri
@@ -108,6 +108,6 @@ STYLES_QML_FILES += \
$$PWD/Base/images/knob.png \
$$PWD/Base/images/needle.png
-STYLES_QML_FILES += $$PWD/qmldir
+AUX_QML_FILES += $$PWD/qmldir
ios:static: include(iOS/iOS.pri)
!qtquickcompiler|static: QML_FILES += $$STYLES_QML_FILES