aboutsummaryrefslogtreecommitdiffstats
path: root/src/imports
diff options
context:
space:
mode:
Diffstat (limited to 'src/imports')
-rw-r--r--src/imports/controls/controls.pri4
-rw-r--r--src/imports/controls/controls.pro12
2 files changed, 3 insertions, 13 deletions
diff --git a/src/imports/controls/controls.pri b/src/imports/controls/controls.pri
index 7840f6bf..675fcf39 100644
--- a/src/imports/controls/controls.pri
+++ b/src/imports/controls/controls.pri
@@ -12,7 +12,7 @@ SOURCES += \
$$PWD/qquickdefaultstyle.cpp \
$$PWD/qquickdefaulttheme.cpp
-QML_CONTROLS = \
+QML_FILES += \
$$PWD/AbstractButton.qml \
$$PWD/Action.qml \
$$PWD/ActionGroup.qml \
@@ -67,5 +67,3 @@ QML_CONTROLS = \
$$PWD/ToolSeparator.qml \
$$PWD/ToolTip.qml \
$$PWD/Tumbler.qml
-
-!qtquickcompiler: QML_FILES += $$QML_CONTROLS
diff --git a/src/imports/controls/controls.pro b/src/imports/controls/controls.pro
index 8624e243..db0d14ae 100644
--- a/src/imports/controls/controls.pro
+++ b/src/imports/controls/controls.pro
@@ -11,7 +11,7 @@ include(controls.pri)
OTHER_FILES += \
qmldir \
- $$QML_CONTROLS
+ $$QML_FILES
SOURCES += \
$$PWD/qtquickcontrols2plugin.cpp
@@ -22,15 +22,7 @@ RESOURCES += \
!static: qtConfig(quick-designer): include(designer/designer.pri)
include(doc/doc.pri)
-qtquickcompiler {
- qmlfiles.prefix = /qt-project.org/imports/QtQuick/Controls.2
- qmlfiles.files += $$QML_CONTROLS
- RESOURCES += qmlfiles
-} else:!static {
- CONFIG += qmlcache
-}
-
-CONFIG += no_cxx_module
+CONFIG += no_cxx_module install_qml_files builtin_resources qtquickcompiler
load(qml_plugin)
requires(qtConfig(quickcontrols2-default))