aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJ-P Nurmi <jpnurmi@qt.io>2017-04-20 11:45:37 +0200
committerJ-P Nurmi <jpnurmi@qt.io>2017-04-20 11:11:06 +0000
commit048e9d35207edb41c043a6a8d19252e55b21dfae (patch)
treed2b8c8aadd8b3f9433434482f1f7a24efe72c64f
parent87c1ec3f3586a5dac7b3ba599249393d090f2300 (diff)
Add .qml files to OTHER_FILES to force them visible in Qt Creator
Change-Id: I50f26b1a0fd5d6bc79e125e46fe9a546a3441db3 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
-rw-r--r--src/imports/controls/controls.pro6
-rw-r--r--src/imports/controls/material/material.pro7
-rw-r--r--src/imports/controls/universal/universal.pro7
3 files changed, 12 insertions, 8 deletions
diff --git a/src/imports/controls/controls.pro b/src/imports/controls/controls.pro
index e6fd3cfa..1d57973f 100644
--- a/src/imports/controls/controls.pro
+++ b/src/imports/controls/controls.pro
@@ -7,8 +7,11 @@ QT_PRIVATE += core-private gui-private qml-private quick-private quicktemplates2
DEFINES += QT_NO_CAST_TO_ASCII QT_NO_CAST_FROM_ASCII
+include(controls.pri)
+
OTHER_FILES += \
- qmldir
+ qmldir \
+ $$QML_CONTROLS
SOURCES += \
$$PWD/qtquickcontrols2plugin.cpp
@@ -16,7 +19,6 @@ SOURCES += \
RESOURCES += \
$$PWD/qtquickcontrols2plugin.qrc
-include(controls.pri)
!static: qtConfig(quick-designer): include(designer/designer.pri)
include(doc/doc.pri)
diff --git a/src/imports/controls/material/material.pro b/src/imports/controls/material/material.pro
index c5e85485..72e937f3 100644
--- a/src/imports/controls/material/material.pro
+++ b/src/imports/controls/material/material.pro
@@ -7,8 +7,11 @@ QT_PRIVATE += core-private gui-private qml-private quick-private quicktemplates2
DEFINES += QT_NO_CAST_TO_ASCII QT_NO_CAST_FROM_ASCII
+include(material.pri)
+
OTHER_FILES += \
- qmldir
+ qmldir \
+ $$QML_FILES
SOURCES += \
$$PWD/qtquickcontrols2materialstyleplugin.cpp
@@ -16,8 +19,6 @@ SOURCES += \
RESOURCES += \
$$PWD/qtquickcontrols2materialstyleplugin.qrc
-include(material.pri)
-
CONFIG += no_cxx_module
load(qml_plugin)
diff --git a/src/imports/controls/universal/universal.pro b/src/imports/controls/universal/universal.pro
index eba5a9d8..f2515205 100644
--- a/src/imports/controls/universal/universal.pro
+++ b/src/imports/controls/universal/universal.pro
@@ -7,8 +7,11 @@ QT_PRIVATE += core-private gui-private qml-private quick-private quicktemplates2
DEFINES += QT_NO_CAST_TO_ASCII QT_NO_CAST_FROM_ASCII
+include(universal.pri)
+
OTHER_FILES += \
- qmldir
+ qmldir \
+ $$QML_FILES
SOURCES += \
$$PWD/qtquickcontrols2universalstyleplugin.cpp
@@ -16,8 +19,6 @@ SOURCES += \
RESOURCES += \
$$PWD/qtquickcontrols2universalstyleplugin.qrc
-include(universal.pri)
-
CONFIG += no_cxx_module
load(qml_plugin)