diff options
| author | Richard Moe Gustavsen <richard.gustavsen@qt.io> | 2020-08-27 08:11:18 +0200 |
|---|---|---|
| committer | Richard Moe Gustavsen <richard.gustavsen@qt.io> | 2020-08-28 14:02:07 +0000 |
| commit | 9e9b1a04b013bb6c4a2ac316503fb397739289be (patch) | |
| tree | 4040bbec8a5d47d79ad0c3b6dc23023a57625246 | |
| parent | 7e54b75b8660c794d5e5ed5e252b4a87fa105c2b (diff) | |
Native style: move macOS and Windows into QtQuick/Controls instead of QtQuick/Controls.2
Change-Id: I12b0a3846a21cafac29615dbea53d88f9aed8e35
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| -rw-r--r-- | src/imports/controls/macos/CMakeLists.txt | 7 | ||||
| -rw-r--r-- | src/imports/controls/macos/macos.pro | 4 | ||||
| -rw-r--r-- | src/imports/controls/windows/CMakeLists.txt | 7 | ||||
| -rw-r--r-- | src/imports/controls/windows/windows.pro | 4 |
4 files changed, 10 insertions, 12 deletions
diff --git a/src/imports/controls/macos/CMakeLists.txt b/src/imports/controls/macos/CMakeLists.txt index 211d6871..5a5f8c37 100644 --- a/src/imports/controls/macos/CMakeLists.txt +++ b/src/imports/controls/macos/CMakeLists.txt @@ -5,9 +5,8 @@ ##################################################################### qt_add_qml_module(qtquickcontrols2macosstyleplugin - TARGET_PATH "QtQuick/Controls.2/macOS" URI "QtQuick.Controls.macOS" - VERSION "2.0" + VERSION "6.0" # special case CLASSNAME QtQuickControls2MacOSStylePlugin DEPENDENCIES QtQuick.Controls/2.5 @@ -36,9 +35,9 @@ qt_add_qml_module(qtquickcontrols2macosstyleplugin #### Keys ignored in scope 1:.:.:macos.pro:<TRUE>: # OTHER_FILES = "qmldir" "$$QML_FILES" -# QML_IMPORT_MAJOR_VERSION = "2" # QML_IMPORT_NAME = "QtQuick.Controls.macOS" -# TARGETPATH = "QtQuick/Controls.2/macOS" +# QML_IMPORT_VERSION = "$$QT_VERSION" +# TARGETPATH = "QtQuick/Controls/macOS" # _REQUIREMENTS = "qtConfig(quickcontrols2-macos)" set(qml_files diff --git a/src/imports/controls/macos/macos.pro b/src/imports/controls/macos/macos.pro index b8b2c19c..a190a6d2 100644 --- a/src/imports/controls/macos/macos.pro +++ b/src/imports/controls/macos/macos.pro @@ -1,8 +1,8 @@ TARGET = qtquickcontrols2macosstyleplugin -TARGETPATH = QtQuick/Controls.2/macOS +TARGETPATH = QtQuick/Controls/macOS QML_IMPORT_NAME = QtQuick.Controls.macOS -QML_IMPORT_MAJOR_VERSION = 2 +QML_IMPORT_VERSION = $$QT_VERSION QT += qml quick quickcontrols2 quicktemplates2 QT_PRIVATE += core-private gui-private qml-private quick-private quicktemplates2-private quickcontrols2-private diff --git a/src/imports/controls/windows/CMakeLists.txt b/src/imports/controls/windows/CMakeLists.txt index 0470f370..6a6606e4 100644 --- a/src/imports/controls/windows/CMakeLists.txt +++ b/src/imports/controls/windows/CMakeLists.txt @@ -5,9 +5,8 @@ ##################################################################### qt_add_qml_module(qtquickcontrols2windowsstyleplugin - TARGET_PATH "QtQuick/Controls.2/Windows" URI "QtQuick.Controls.Windows" - VERSION "6.0" + VERSION "6.0" # special case CLASSNAME QtQuickControls2WindowsStylePlugin DEPENDENCIES QtQuick.Controls/2.5 @@ -36,9 +35,9 @@ qt_add_qml_module(qtquickcontrols2windowsstyleplugin #### Keys ignored in scope 1:.:.:windows.pro:<TRUE>: # OTHER_FILES = "qmldir" "$$QML_FILES" -# QML_IMPORT_MAJOR_VERSION = "6" # QML_IMPORT_NAME = "QtQuick.Controls.Windows" -# TARGETPATH = "QtQuick/Controls.2/Windows" +# QML_IMPORT_VERSION = "$$QT_VERSION" +# TARGETPATH = "QtQuick/Controls/Windows" # _REQUIREMENTS = "qtConfig(quickcontrols2-windows)" set(qml_files diff --git a/src/imports/controls/windows/windows.pro b/src/imports/controls/windows/windows.pro index d78690ec..a72397d7 100644 --- a/src/imports/controls/windows/windows.pro +++ b/src/imports/controls/windows/windows.pro @@ -1,8 +1,8 @@ TARGET = qtquickcontrols2windowsstyleplugin -TARGETPATH = QtQuick/Controls.2/Windows +TARGETPATH = QtQuick/Controls/Windows QML_IMPORT_NAME = QtQuick.Controls.Windows -QML_IMPORT_MAJOR_VERSION = 6 +QML_IMPORT_VERSION = $$QT_VERSION QT += qml quick quickcontrols2 quicktemplates2 QT_PRIVATE += core-private gui-private qml-private quick-private quicktemplates2-private quickcontrols2-private |