diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2017-04-21 08:00:01 +0300 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2017-04-21 08:00:01 +0300 |
| commit | 284057d12fea9339744ddc646aa53cfe6c3c95a1 (patch) | |
| tree | 61bb12637c56a282830d683e346057b00d332b7a /src/imports/controls/controls.pro | |
| parent | 91b2721fdc2aba28d3c45111779fed70f7c4f87d (diff) | |
| parent | c8e9b5f25fb12c3b7983658d738165181b4d6672 (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
src/imports/controls/RoundButton.qml
src/imports/controls/universal/RadioDelegate.qml
Change-Id: I4cb14c19bd5f6e19b70b03fb394c76712e6dda08
Diffstat (limited to 'src/imports/controls/controls.pro')
| -rw-r--r-- | src/imports/controls/controls.pro | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/imports/controls/controls.pro b/src/imports/controls/controls.pro index 309f103c..145b468c 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) |