From 9824a71f1d1754485072d66fbac2c98854ace52a Mon Sep 17 00:00:00 2001 From: Mitch Curtis Date: Wed, 15 Jul 2020 14:52:09 +0200 Subject: Bump import version to 6.0 Task-number: QTBUG-82922 Change-Id: I2eb924eaaaddbe75d342f59f5fb3cd30c4a84fef Reviewed-by: Ulf Hermann --- src/imports/controls/controls.pro | 2 +- src/imports/controls/default/default.pro | 2 +- src/imports/controls/default/impl/default-impl.pro | 2 +- src/imports/controls/default/qmldir | 59 ++++++++++++++++++++++ src/imports/controls/fusion/fusion.pro | 2 +- src/imports/controls/fusion/impl/fusion-impl.pro | 2 +- src/imports/controls/fusion/qmldir | 50 ++++++++++++++++++ src/imports/controls/imagine/imagine.pro | 2 +- src/imports/controls/imagine/impl/imagine-impl.pro | 2 +- src/imports/controls/imagine/qmldir | 50 ++++++++++++++++++ .../controls/material/impl/material-impl.pro | 2 +- src/imports/controls/material/material.pro | 2 +- src/imports/controls/material/qmldir | 52 +++++++++++++++++++ .../controls/universal/impl/universal-impl.pro | 2 +- src/imports/controls/universal/qmldir | 51 +++++++++++++++++++ src/imports/controls/universal/universal.pro | 2 +- src/imports/controlsimpl/controlsimpl.pro | 2 +- src/imports/templates/templates.pro | 2 +- 18 files changed, 275 insertions(+), 13 deletions(-) (limited to 'src/imports') diff --git a/src/imports/controls/controls.pro b/src/imports/controls/controls.pro index 16a95510..4eb402a3 100644 --- a/src/imports/controls/controls.pro +++ b/src/imports/controls/controls.pro @@ -1,6 +1,6 @@ TARGET = qtquickcontrols2plugin TARGETPATH = QtQuick/Controls -IMPORT_VERSION = 2.$$QT_MINOR_VERSION +QML_IMPORT_VERSION = $$QT_VERSION QT += qml quick QT_PRIVATE += core-private gui-private qml-private quick-private quicktemplates2-private quickcontrols2-private quickcontrols2impl-private diff --git a/src/imports/controls/default/default.pro b/src/imports/controls/default/default.pro index 037cf2f7..5ecaafce 100644 --- a/src/imports/controls/default/default.pro +++ b/src/imports/controls/default/default.pro @@ -2,7 +2,7 @@ TARGET = qtquickcontrols2defaultstyleplugin TARGETPATH = QtQuick/Controls/Default QML_IMPORT_NAME = QtQuick.Controls.Default -QML_IMPORT_VERSION = 2.$$QT_MINOR_VERSION +QML_IMPORT_VERSION = $$QT_VERSION QT += qml quick QT_PRIVATE += core-private gui-private qml-private quick-private quicktemplates2-private quickcontrols2-private diff --git a/src/imports/controls/default/impl/default-impl.pro b/src/imports/controls/default/impl/default-impl.pro index 35368a5e..e26ae9ff 100644 --- a/src/imports/controls/default/impl/default-impl.pro +++ b/src/imports/controls/default/impl/default-impl.pro @@ -2,7 +2,7 @@ TARGET = qtquickcontrols2defaultstyleimplplugin TARGETPATH = QtQuick/Controls/Default/impl QML_IMPORT_NAME = QtQuick.Controls.Default.impl -QML_IMPORT_VERSION = 2.$$QT_MINOR_VERSION +QML_IMPORT_VERSION = $$QT_VERSION QT += qml quick QT_PRIVATE += core-private gui qml-private quick-private quicktemplates2-private quickcontrols2impl-private diff --git a/src/imports/controls/default/qmldir b/src/imports/controls/default/qmldir index 04510397..3f2501b7 100644 --- a/src/imports/controls/default/qmldir +++ b/src/imports/controls/default/qmldir @@ -71,3 +71,62 @@ SplitView 2.13 SplitView.qml # QtQuick.Controls 2.15 (new types in Qt 5.15) HorizontalHeaderView 2.15 HorizontalHeaderView.qml VerticalHeaderView 2.15 VerticalHeaderView.qml + +# Make sure we have types registered for Qt 6: QTBUG-85774, QTBUG-85685 +AbstractButton 6.0 AbstractButton.qml +Action 6.0 Action.qml +ActionGroup 6.0 ActionGroup.qml +ApplicationWindow 6.0 ApplicationWindow.qml +BusyIndicator 6.0 BusyIndicator.qml +Button 6.0 Button.qml +ButtonGroup 6.0 ButtonGroup.qml +CheckBox 6.0 CheckBox.qml +CheckDelegate 6.0 CheckDelegate.qml +ComboBox 6.0 ComboBox.qml +Container 6.0 Container.qml +Control 6.0 Control.qml +DelayButton 6.0 DelayButton.qml +Dial 6.0 Dial.qml +Dialog 6.0 Dialog.qml +DialogButtonBox 6.0 DialogButtonBox.qml +Drawer 6.0 Drawer.qml +Frame 6.0 Frame.qml +GroupBox 6.0 GroupBox.qml +HorizontalHeaderView 6.0 HorizontalHeaderView.qml +ItemDelegate 6.0 ItemDelegate.qml +Label 6.0 Label.qml +Menu 6.0 Menu.qml +MenuBar 6.0 MenuBar.qml +MenuBarItem 6.0 MenuBarItem.qml +MenuItem 6.0 MenuItem.qml +MenuSeparator 6.0 MenuSeparator.qml +Page 6.0 Page.qml +PageIndicator 6.0 PageIndicator.qml +Pane 6.0 Pane.qml +Popup 6.0 Popup.qml +ProgressBar 6.0 ProgressBar.qml +RadioButton 6.0 RadioButton.qml +RadioDelegate 6.0 RadioDelegate.qml +RangeSlider 6.0 RangeSlider.qml +RoundButton 6.0 RoundButton.qml +ScrollBar 6.0 ScrollBar.qml +ScrollIndicator 6.0 ScrollIndicator.qml +ScrollView 6.0 ScrollView.qml +Slider 6.0 Slider.qml +SpinBox 6.0 SpinBox.qml +SplitView 6.0 SplitView.qml +StackView 6.0 StackView.qml +SwipeDelegate 6.0 SwipeDelegate.qml +SwipeView 6.0 SwipeView.qml +Switch 6.0 Switch.qml +SwitchDelegate 6.0 SwitchDelegate.qml +TabBar 6.0 TabBar.qml +TabButton 6.0 TabButton.qml +TextArea 6.0 TextArea.qml +TextField 6.0 TextField.qml +ToolBar 6.0 ToolBar.qml +ToolButton 6.0 ToolButton.qml +ToolSeparator 6.0 ToolSeparator.qml +ToolTip 6.0 ToolTip.qml +Tumbler 6.0 Tumbler.qml +VerticalHeaderView 6.0 VerticalHeaderView.qml diff --git a/src/imports/controls/fusion/fusion.pro b/src/imports/controls/fusion/fusion.pro index bb27b3f1..eceaf0f5 100644 --- a/src/imports/controls/fusion/fusion.pro +++ b/src/imports/controls/fusion/fusion.pro @@ -2,7 +2,7 @@ TARGET = qtquickcontrols2fusionstyleplugin TARGETPATH = QtQuick/Controls/Fusion QML_IMPORT_NAME = QtQuick.Controls.Fusion -QML_IMPORT_VERSION = 2.$$QT_MINOR_VERSION +QML_IMPORT_VERSION = $$QT_VERSION QT += qml quick QT_PRIVATE += core-private gui-private qml-private quick-private quicktemplates2-private quickcontrols2-private diff --git a/src/imports/controls/fusion/impl/fusion-impl.pro b/src/imports/controls/fusion/impl/fusion-impl.pro index 78692abd..40abe7ac 100644 --- a/src/imports/controls/fusion/impl/fusion-impl.pro +++ b/src/imports/controls/fusion/impl/fusion-impl.pro @@ -2,7 +2,7 @@ TARGET = qtquickcontrols2fusionstyleimplplugin TARGETPATH = QtQuick/Controls/Fusion/impl QML_IMPORT_NAME = QtQuick.Controls.Fusion.impl -QML_IMPORT_VERSION = 2.$$QT_MINOR_VERSION +QML_IMPORT_VERSION = $$QT_VERSION QT += qml quick QT_PRIVATE += core-private gui qml-private quick-private quicktemplates2-private quickcontrols2impl-private diff --git a/src/imports/controls/fusion/qmldir b/src/imports/controls/fusion/qmldir index 84c0b211..c08f1e4a 100644 --- a/src/imports/controls/fusion/qmldir +++ b/src/imports/controls/fusion/qmldir @@ -62,3 +62,53 @@ SplitView 2.13 SplitView.qml # QtQuick.Controls 2.15 (new types in Qt 5.15) HorizontalHeaderView 2.15 HorizontalHeaderView.qml VerticalHeaderView 2.15 VerticalHeaderView.qml + +# Make sure we have types registered for Qt 6: QTBUG-85774, QTBUG-85685 +ApplicationWindow 6.0 ApplicationWindow.qml +BusyIndicator 6.0 BusyIndicator.qml +Button 6.0 Button.qml +CheckBox 6.0 CheckBox.qml +CheckDelegate 6.0 CheckDelegate.qml +ComboBox 6.0 ComboBox.qml +DelayButton 6.0 DelayButton.qml +Dial 6.0 Dial.qml +Dialog 6.0 Dialog.qml +DialogButtonBox 6.0 DialogButtonBox.qml +Drawer 6.0 Drawer.qml +Frame 6.0 Frame.qml +GroupBox 6.0 GroupBox.qml +HorizontalHeaderView 6.0 HorizontalHeaderView.qml +ItemDelegate 6.0 ItemDelegate.qml +Label 6.0 Label.qml +Menu 6.0 Menu.qml +MenuBar 6.0 MenuBar.qml +MenuBarItem 6.0 MenuBarItem.qml +MenuItem 6.0 MenuItem.qml +MenuSeparator 6.0 MenuSeparator.qml +Page 6.0 Page.qml +PageIndicator 6.0 PageIndicator.qml +Pane 6.0 Pane.qml +Popup 6.0 Popup.qml +ProgressBar 6.0 ProgressBar.qml +RadioButton 6.0 RadioButton.qml +RadioDelegate 6.0 RadioDelegate.qml +RangeSlider 6.0 RangeSlider.qml +RoundButton 6.0 RoundButton.qml +ScrollBar 6.0 ScrollBar.qml +ScrollIndicator 6.0 ScrollIndicator.qml +Slider 6.0 Slider.qml +SpinBox 6.0 SpinBox.qml +SplitView 6.0 SplitView.qml +SwipeDelegate 6.0 SwipeDelegate.qml +Switch 6.0 Switch.qml +SwitchDelegate 6.0 SwitchDelegate.qml +TabBar 6.0 TabBar.qml +TabButton 6.0 TabButton.qml +TextArea 6.0 TextArea.qml +TextField 6.0 TextField.qml +ToolBar 6.0 ToolBar.qml +ToolButton 6.0 ToolButton.qml +ToolSeparator 6.0 ToolSeparator.qml +ToolTip 6.0 ToolTip.qml +Tumbler 6.0 Tumbler.qml +VerticalHeaderView 6.0 VerticalHeaderView.qml diff --git a/src/imports/controls/imagine/imagine.pro b/src/imports/controls/imagine/imagine.pro index 4dcd080c..6a82f5e4 100644 --- a/src/imports/controls/imagine/imagine.pro +++ b/src/imports/controls/imagine/imagine.pro @@ -2,7 +2,7 @@ TARGET = qtquickcontrols2imaginestyleplugin TARGETPATH = QtQuick/Controls/Imagine QML_IMPORT_NAME = QtQuick.Controls.Imagine -QML_IMPORT_VERSION = 2.$$QT_MINOR_VERSION +QML_IMPORT_VERSION = $$QT_VERSION QT += qml quick QT_PRIVATE += core-private gui-private qml-private quick-private quicktemplates2-private quickcontrols2-private quickcontrols2impl-private diff --git a/src/imports/controls/imagine/impl/imagine-impl.pro b/src/imports/controls/imagine/impl/imagine-impl.pro index 9b45fd31..aeddd4cc 100644 --- a/src/imports/controls/imagine/impl/imagine-impl.pro +++ b/src/imports/controls/imagine/impl/imagine-impl.pro @@ -2,7 +2,7 @@ TARGET = qtquickcontrols2imaginestyleimplplugin TARGETPATH = QtQuick/Controls/Imagine/impl QML_IMPORT_NAME = QtQuick.Controls.Imagine.impl -QML_IMPORT_VERSION = 2.$$QT_MINOR_VERSION +QML_IMPORT_VERSION = $$QT_VERSION QT += qml quick QT_PRIVATE += core-private gui qml-private quick-private quicktemplates2-private quickcontrols2impl-private diff --git a/src/imports/controls/imagine/qmldir b/src/imports/controls/imagine/qmldir index e3d7d8d5..65165bf4 100644 --- a/src/imports/controls/imagine/qmldir +++ b/src/imports/controls/imagine/qmldir @@ -60,3 +60,53 @@ SplitView 2.13 SplitView.qml # QtQuick.Controls 2.15 (new types in Qt 5.15) HorizontalHeaderView 2.15 HorizontalHeaderView.qml VerticalHeaderView 2.15 VerticalHeaderView.qml + +# Make sure we have types registered for Qt 6: QTBUG-85774, QTBUG-85685 +ApplicationWindow 6.0 ApplicationWindow.qml +BusyIndicator 6.0 BusyIndicator.qml +Button 6.0 Button.qml +CheckBox 6.0 CheckBox.qml +CheckDelegate 6.0 CheckDelegate.qml +ComboBox 6.0 ComboBox.qml +DelayButton 6.0 DelayButton.qml +Dial 6.0 Dial.qml +Dialog 6.0 Dialog.qml +DialogButtonBox 6.0 DialogButtonBox.qml +Drawer 6.0 Drawer.qml +Frame 6.0 Frame.qml +GroupBox 6.0 GroupBox.qml +HorizontalHeaderView 6.0 HorizontalHeaderView.qml +ItemDelegate 6.0 ItemDelegate.qml +Label 6.0 Label.qml +Menu 6.0 Menu.qml +MenuItem 6.0 MenuItem.qml +MenuSeparator 6.0 MenuSeparator.qml +Page 6.0 Page.qml +PageIndicator 6.0 PageIndicator.qml +Pane 6.0 Pane.qml +Popup 6.0 Popup.qml +ProgressBar 6.0 ProgressBar.qml +RadioButton 6.0 RadioButton.qml +RadioDelegate 6.0 RadioDelegate.qml +RangeSlider 6.0 RangeSlider.qml +RoundButton 6.0 RoundButton.qml +ScrollBar 6.0 ScrollBar.qml +ScrollIndicator 6.0 ScrollIndicator.qml +Slider 6.0 Slider.qml +SpinBox 6.0 SpinBox.qml +SplitView 6.0 SplitView.qml +StackView 6.0 StackView.qml +SwipeDelegate 6.0 SwipeDelegate.qml +SwipeView 6.0 SwipeView.qml +Switch 6.0 Switch.qml +SwitchDelegate 6.0 SwitchDelegate.qml +TabBar 6.0 TabBar.qml +TabButton 6.0 TabButton.qml +TextArea 6.0 TextArea.qml +TextField 6.0 TextField.qml +ToolBar 6.0 ToolBar.qml +ToolButton 6.0 ToolButton.qml +ToolSeparator 6.0 ToolSeparator.qml +ToolTip 6.0 ToolTip.qml +Tumbler 6.0 Tumbler.qml +VerticalHeaderView 6.0 VerticalHeaderView.qml diff --git a/src/imports/controls/material/impl/material-impl.pro b/src/imports/controls/material/impl/material-impl.pro index bc063d84..b35ab58a 100644 --- a/src/imports/controls/material/impl/material-impl.pro +++ b/src/imports/controls/material/impl/material-impl.pro @@ -2,7 +2,7 @@ TARGET = qtquickcontrols2materialstyleimplplugin TARGETPATH = QtQuick/Controls/Material/impl QML_IMPORT_NAME = QtQuick.Controls.Material.impl -QML_IMPORT_VERSION = 2.$$QT_MINOR_VERSION +QML_IMPORT_VERSION = $$QT_VERSION QT += qml quick QT_PRIVATE += core-private gui qml-private quick-private quicktemplates2-private quickcontrols2impl-private diff --git a/src/imports/controls/material/material.pro b/src/imports/controls/material/material.pro index 7ff3ea07..e8d9db52 100644 --- a/src/imports/controls/material/material.pro +++ b/src/imports/controls/material/material.pro @@ -2,7 +2,7 @@ TARGET = qtquickcontrols2materialstyleplugin TARGETPATH = QtQuick/Controls/Material QML_IMPORT_NAME = QtQuick.Controls.Material -QML_IMPORT_VERSION = 2.$$QT_MINOR_VERSION +QML_IMPORT_VERSION = $$QT_VERSION QT += qml quick QT_PRIVATE += core-private gui-private qml-private quick-private quicktemplates2-private quickcontrols2-private quickcontrols2impl-private diff --git a/src/imports/controls/material/qmldir b/src/imports/controls/material/qmldir index 39dae48a..ae8a26fb 100644 --- a/src/imports/controls/material/qmldir +++ b/src/imports/controls/material/qmldir @@ -64,3 +64,55 @@ SplitView 2.13 SplitView.qml # QtQuick.Controls 2.15 (new types in Qt 5.15) HorizontalHeaderView 2.15 HorizontalHeaderView.qml VerticalHeaderView 2.15 VerticalHeaderView.qml + +# Make sure we have types registered for Qt 6: QTBUG-85774, QTBUG-85685 +ApplicationWindow 6.0 ApplicationWindow.qml +BusyIndicator 6.0 BusyIndicator.qml +Button 6.0 Button.qml +CheckBox 6.0 CheckBox.qml +CheckDelegate 6.0 CheckDelegate.qml +ComboBox 6.0 ComboBox.qml +DelayButton 6.0 DelayButton.qml +Dial 6.0 Dial.qml +Dialog 6.0 Dialog.qml +DialogButtonBox 6.0 DialogButtonBox.qml +Drawer 6.0 Drawer.qml +Frame 6.0 Frame.qml +GroupBox 6.0 GroupBox.qml +HorizontalHeaderView 6.0 HorizontalHeaderView.qml +ItemDelegate 6.0 ItemDelegate.qml +Label 6.0 Label.qml +Menu 6.0 Menu.qml +MenuBar 6.0 MenuBar.qml +MenuBarItem 6.0 MenuBarItem.qml +MenuItem 6.0 MenuItem.qml +MenuSeparator 6.0 MenuSeparator.qml +Page 6.0 Page.qml +PageIndicator 6.0 PageIndicator.qml +Pane 6.0 Pane.qml +Popup 6.0 Popup.qml +ProgressBar 6.0 ProgressBar.qml +RadioButton 6.0 RadioButton.qml +RadioDelegate 6.0 RadioDelegate.qml +RangeSlider 6.0 RangeSlider.qml +RoundButton 6.0 RoundButton.qml +ScrollBar 6.0 ScrollBar.qml +ScrollIndicator 6.0 ScrollIndicator.qml +Slider 6.0 Slider.qml +SpinBox 6.0 SpinBox.qml +SplitView 6.0 SplitView.qml +StackView 6.0 StackView.qml +SwipeDelegate 6.0 SwipeDelegate.qml +SwipeView 6.0 SwipeView.qml +Switch 6.0 Switch.qml +SwitchDelegate 6.0 SwitchDelegate.qml +TabBar 6.0 TabBar.qml +TabButton 6.0 TabButton.qml +TextArea 6.0 TextArea.qml +TextField 6.0 TextField.qml +ToolBar 6.0 ToolBar.qml +ToolButton 6.0 ToolButton.qml +ToolSeparator 6.0 ToolSeparator.qml +ToolTip 6.0 ToolTip.qml +Tumbler 6.0 Tumbler.qml +VerticalHeaderView 6.0 VerticalHeaderView.qml diff --git a/src/imports/controls/universal/impl/universal-impl.pro b/src/imports/controls/universal/impl/universal-impl.pro index a27ae154..dd4aab46 100644 --- a/src/imports/controls/universal/impl/universal-impl.pro +++ b/src/imports/controls/universal/impl/universal-impl.pro @@ -2,7 +2,7 @@ TARGET = qtquickcontrols2universalstyleimplplugin TARGETPATH = QtQuick/Controls/Universal/impl QML_IMPORT_NAME = QtQuick.Controls.Universal.impl -QML_IMPORT_VERSION = 2.$$QT_MINOR_VERSION +QML_IMPORT_VERSION = $$QT_VERSION QT += qml quick QT_PRIVATE += core-private gui qml-private quick-private quicktemplates2-private quickcontrols2impl-private diff --git a/src/imports/controls/universal/qmldir b/src/imports/controls/universal/qmldir index e2faf020..5891244a 100644 --- a/src/imports/controls/universal/qmldir +++ b/src/imports/controls/universal/qmldir @@ -63,3 +63,54 @@ SplitView 2.13 SplitView.qml # QtQuick.Controls 2.15 (new types in Qt 5.15) HorizontalHeaderView 2.15 HorizontalHeaderView.qml VerticalHeaderView 2.15 VerticalHeaderView.qml + +# Make sure we have types registered for Qt 6: QTBUG-85774, QTBUG-85685 +ApplicationWindow 6.0 ApplicationWindow.qml +BusyIndicator 6.0 BusyIndicator.qml +Button 6.0 Button.qml +CheckBox 6.0 CheckBox.qml +CheckDelegate 6.0 CheckDelegate.qml +ComboBox 6.0 ComboBox.qml +DelayButton 6.0 DelayButton.qml +Dial 6.0 Dial.qml +Dialog 6.0 Dialog.qml +DialogButtonBox 6.0 DialogButtonBox.qml +Drawer 6.0 Drawer.qml +Frame 6.0 Frame.qml +GroupBox 6.0 GroupBox.qml +HorizontalHeaderView 6.0 HorizontalHeaderView.qml +ItemDelegate 6.0 ItemDelegate.qml +Label 6.0 Label.qml +Menu 6.0 Menu.qml +MenuBar 6.0 MenuBar.qml +MenuBarItem 6.0 MenuBarItem.qml +MenuItem 6.0 MenuItem.qml +MenuSeparator 6.0 MenuSeparator.qml +Page 6.0 Page.qml +PageIndicator 6.0 PageIndicator.qml +Pane 6.0 Pane.qml +Popup 6.0 Popup.qml +ProgressBar 6.0 ProgressBar.qml +RadioButton 6.0 RadioButton.qml +RadioDelegate 6.0 RadioDelegate.qml +RangeSlider 6.0 RangeSlider.qml +RoundButton 6.0 RoundButton.qml +ScrollBar 6.0 ScrollBar.qml +ScrollIndicator 6.0 ScrollIndicator.qml +Slider 6.0 Slider.qml +SpinBox 6.0 SpinBox.qml +SplitView 6.0 SplitView.qml +StackView 6.0 StackView.qml +SwipeDelegate 6.0 SwipeDelegate.qml +Switch 6.0 Switch.qml +SwitchDelegate 6.0 SwitchDelegate.qml +TabBar 6.0 TabBar.qml +TabButton 6.0 TabButton.qml +TextArea 6.0 TextArea.qml +TextField 6.0 TextField.qml +ToolBar 6.0 ToolBar.qml +ToolButton 6.0 ToolButton.qml +ToolSeparator 6.0 ToolSeparator.qml +ToolTip 6.0 ToolTip.qml +Tumbler 6.0 Tumbler.qml +VerticalHeaderView 6.0 VerticalHeaderView.qml diff --git a/src/imports/controls/universal/universal.pro b/src/imports/controls/universal/universal.pro index f41e37b7..a8b98fa7 100644 --- a/src/imports/controls/universal/universal.pro +++ b/src/imports/controls/universal/universal.pro @@ -2,7 +2,7 @@ TARGET = qtquickcontrols2universalstyleplugin TARGETPATH = QtQuick/Controls/Universal QML_IMPORT_NAME = QtQuick.Controls.Universal -QML_IMPORT_VERSION = 2.$$QT_MINOR_VERSION +QML_IMPORT_VERSION = $$QT_VERSION QT += qml quick QT_PRIVATE += core-private gui-private qml-private quick-private quicktemplates2-private quickcontrols2-private quickcontrols2impl-private diff --git a/src/imports/controlsimpl/controlsimpl.pro b/src/imports/controlsimpl/controlsimpl.pro index 89d4e1bd..ed629ce9 100644 --- a/src/imports/controlsimpl/controlsimpl.pro +++ b/src/imports/controlsimpl/controlsimpl.pro @@ -1,6 +1,6 @@ TARGET = qtquickcontrols2implplugin TARGETPATH = QtQuick/Controls/impl -IMPORT_VERSION = 2.$$QT_MINOR_VERSION +QML_IMPORT_VERSION = $$QT_VERSION QT += qml quick QT_PRIVATE += core-private gui-private qml-private quick-private quicktemplates2-private quickcontrols2-private quickcontrols2impl-private diff --git a/src/imports/templates/templates.pro b/src/imports/templates/templates.pro index 72e32c47..52e4d03a 100644 --- a/src/imports/templates/templates.pro +++ b/src/imports/templates/templates.pro @@ -1,6 +1,6 @@ TARGET = qtquicktemplates2plugin TARGETPATH = QtQuick/Templates -IMPORT_VERSION = 2.15 +QML_IMPORT_VERSION = $$QT_VERSION QT += qml quick QT_PRIVATE += core-private gui-private qml-private quick-private quicktemplates2-private -- cgit v1.2.3