From 9824a71f1d1754485072d66fbac2c98854ace52a Mon Sep 17 00:00:00 2001
From: Mitch Curtis <mitch.curtis@qt.io>
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 <ulf.hermann@qt.io>
---
 src/imports/controls/fusion/fusion.pro           |  2 +-
 src/imports/controls/fusion/impl/fusion-impl.pro |  2 +-
 src/imports/controls/fusion/qmldir               | 50 ++++++++++++++++++++++++
 3 files changed, 52 insertions(+), 2 deletions(-)

(limited to 'src/imports/controls/fusion')

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
-- 
cgit v1.2.3