17 files changed, 219 insertions, 55 deletions
diff --git a/src/imports/controls/macos/Button.qml b/src/imports/controls/macos/Button.qml
index 7db1f9ed..6d5e1503 100644
--- a/src/imports/controls/macos/Button.qml
+++ b/src/imports/controls/macos/Button.qml
@@ -34,10 +34,9 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.12
-import QtQuick.Controls 2.12
-import QtQuick.Controls.impl 2.12
-import QtQuick.NativeStyle 6.0 as NativeStyle
+import QtQuick
+import QtQuick.Controls
+import QtQuick.NativeStyle as NativeStyle
 
 NativeStyle.DefaultButton {
 }
diff --git a/src/imports/controls/macos/CMakeLists.txt b/src/imports/controls/macos/CMakeLists.txt
new file mode 100644
index 00000000..59a1a1f7
--- /dev/null
+++ b/src/imports/controls/macos/CMakeLists.txt
@@ -0,0 +1,100 @@
+# Generated from macos.pro.
+
+#####################################################################
+## qtquickcontrols2macosstyleplugin Plugin:
+#####################################################################
+
+qt_add_qml_module(qtquickcontrols2macosstyleplugin
+    URI "QtQuick.Controls.macOS"
+    VERSION "6.0" # special case
+    CLASSNAME QtQuickControls2MacOSStylePlugin
+    IMPORTS
+        QtQuick.Controls.Fusion/auto
+    GENERATE_QMLTYPES
+    SOURCES
+        qtquickcontrols2macosstyleplugin.cpp
+    DEFINES
+        QT_NO_CAST_FROM_ASCII
+        QT_NO_CAST_TO_ASCII
+    LIBRARIES
+        Qt::CorePrivate
+        Qt::GuiPrivate
+        Qt::QmlPrivate
+        Qt::QuickControls2Private
+        Qt::QuickPrivate
+        Qt::QuickTemplates2Private
+    PUBLIC_LIBRARIES
+        Qt::Core
+        Qt::Gui
+        Qt::Qml
+        Qt::Quick
+        Qt::QuickControls2
+        Qt::QuickTemplates2
+)
+
+#### Keys ignored in scope 1:.:.:macos.pro:<TRUE>:
+# OTHER_FILES = "qmldir" "$$QML_FILES"
+# QML_IMPORT_NAME = "QtQuick.Controls.macOS"
+# QML_IMPORT_VERSION = "$$QT_VERSION"
+# TARGETPATH = "QtQuick/Controls/macOS"
+# _REQUIREMENTS = "qtConfig(quickcontrols2-macos)"
+
+set(qml_files
+    "Button.qml"
+    "Slider.qml"
+    "GroupBox.qml"
+    "CheckBox.qml"
+    "RadioButton.qml"
+    "SpinBox.qml"
+    "TextField.qml"
+    "Frame.qml"
+    "TextArea.qml"
+    "ComboBox.qml"
+    "ScrollBar.qml"
+    "ProgressBar.qml"
+    "Dial.qml"
+)
+set_source_files_properties(Button.qml PROPERTIES
+    QT_QML_SOURCE_VERSION "6.0"
+)
+set_source_files_properties(Slider.qml PROPERTIES
+    QT_QML_SOURCE_VERSION "6.0"
+)
+set_source_files_properties(GroupBox.qml PROPERTIES
+    QT_QML_SOURCE_VERSION "6.0"
+)
+set_source_files_properties(CheckBox.qml PROPERTIES
+    QT_QML_SOURCE_VERSION "6.0"
+)
+set_source_files_properties(RadioButton.qml PROPERTIES
+    QT_QML_SOURCE_VERSION "6.0"
+)
+set_source_files_properties(SpinBox.qml PROPERTIES
+    QT_QML_SOURCE_VERSION "6.0"
+)
+set_source_files_properties(TextField.qml PROPERTIES
+    QT_QML_SOURCE_VERSION "6.0"
+)
+set_source_files_properties(Frame.qml PROPERTIES
+    QT_QML_SOURCE_VERSION "6.0"
+)
+set_source_files_properties(TextArea.qml PROPERTIES
+    QT_QML_SOURCE_VERSION "6.0"
+)
+set_source_files_properties(ComboBox.qml PROPERTIES
+    QT_QML_SOURCE_VERSION "6.0"
+)
+set_source_files_properties(ScrollBar.qml PROPERTIES
+    QT_QML_SOURCE_VERSION "6.0"
+)
+set_source_files_properties(ProgressBar.qml PROPERTIES
+    QT_QML_SOURCE_VERSION "6.0"
+)
+set_source_files_properties(Dial.qml PROPERTIES
+    QT_QML_SOURCE_VERSION "6.0"
+)
+
+qt6_target_qml_files(qtquickcontrols2macosstyleplugin
+    FILES
+        ${qml_files}
+)
diff --git a/src/imports/controls/macos/CheckBox.qml b/src/imports/controls/macos/CheckBox.qml
index 00ab05d6..9caf3dd0 100644
--- a/src/imports/controls/macos/CheckBox.qml
+++ b/src/imports/controls/macos/CheckBox.qml
@@ -34,10 +34,9 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.12
-import QtQuick.Controls 2.12
-import QtQuick.Controls.impl 2.12
-import QtQuick.NativeStyle 6.0 as NativeStyle
+import QtQuick
+import QtQuick.Controls
+import QtQuick.NativeStyle as NativeStyle
 
 NativeStyle.DefaultCheckBox {
 }
diff --git a/src/imports/controls/macos/ComboBox.qml b/src/imports/controls/macos/ComboBox.qml
index e331c401..c3880aba 100644
--- a/src/imports/controls/macos/ComboBox.qml
+++ b/src/imports/controls/macos/ComboBox.qml
@@ -34,10 +34,9 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.12
-import QtQuick.Controls 2.12
-import QtQuick.Controls.impl 2.12
-import QtQuick.NativeStyle 6.0 as NativeStyle
+import QtQuick
+import QtQuick.Controls
+import QtQuick.NativeStyle as NativeStyle
 
 NativeStyle.DefaultComboBox {
 }
diff --git a/src/imports/controls/macos/Dial.qml b/src/imports/controls/macos/Dial.qml
new file mode 100644
index 00000000..90779f71
--- /dev/null
+++ b/src/imports/controls/macos/Dial.qml
@@ -0,0 +1,42 @@
+/****************************************************************************
+**
+** Copyright (C) 2020 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
+**
+** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL3$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPLv3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or later as published by the Free
+** Software Foundation and appearing in the file LICENSE.GPL included in
+** the packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 2.0 requirements will be
+** met: http://www.gnu.org/licenses/gpl-2.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick
+import QtQuick.Controls
+import QtQuick.NativeStyle as NativeStyle
+
+NativeStyle.DefaultDial {
+}
diff --git a/src/imports/controls/macos/Frame.qml b/src/imports/controls/macos/Frame.qml
index 024e31a2..0b45b352 100644
--- a/src/imports/controls/macos/Frame.qml
+++ b/src/imports/controls/macos/Frame.qml
@@ -34,10 +34,9 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.12
-import QtQuick.Controls 2.12
-import QtQuick.Controls.impl 2.12
-import QtQuick.NativeStyle 6.0 as NativeStyle
+import QtQuick
+import QtQuick.Controls
+import QtQuick.NativeStyle as NativeStyle
 
 NativeStyle.DefaultFrame {
 }
diff --git a/src/imports/controls/macos/GroupBox.qml b/src/imports/controls/macos/GroupBox.qml
index 45911ba1..42e6993d 100644
--- a/src/imports/controls/macos/GroupBox.qml
+++ b/src/imports/controls/macos/GroupBox.qml
@@ -34,10 +34,9 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.12
-import QtQuick.Controls 2.12
-import QtQuick.Controls.impl 2.12
-import QtQuick.NativeStyle 6.0 as NativeStyle
+import QtQuick
+import QtQuick.Controls
+import QtQuick.NativeStyle as NativeStyle
 
 NativeStyle.DefaultGroupBox {
 }
diff --git a/src/imports/controls/macos/ProgressBar.qml b/src/imports/controls/macos/ProgressBar.qml
index 6c4c9c22..feeaca23 100644
--- a/src/imports/controls/macos/ProgressBar.qml
+++ b/src/imports/controls/macos/ProgressBar.qml
@@ -34,11 +34,10 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.12
-import QtQuick.Controls 2.12
-import QtQuick.Controls.impl 2.12
-import QtQuick.Templates 2.12 as T
-import QtQuick.NativeStyle 6.0 as NativeStyle
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Templates as T
+import QtQuick.NativeStyle as NativeStyle
 
 T.ProgressBar {
     id: control
diff --git a/src/imports/controls/macos/RadioButton.qml b/src/imports/controls/macos/RadioButton.qml
index 6f1bdb04..9670abef 100644
--- a/src/imports/controls/macos/RadioButton.qml
+++ b/src/imports/controls/macos/RadioButton.qml
@@ -34,10 +34,9 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.12
-import QtQuick.Controls 2.12
-import QtQuick.Controls.impl 2.12
-import QtQuick.NativeStyle 6.0 as NativeStyle
+import QtQuick
+import QtQuick.Controls
+import QtQuick.NativeStyle as NativeStyle
 
 NativeStyle.DefaultRadioButton {
 }
diff --git a/src/imports/controls/macos/ScrollBar.qml b/src/imports/controls/macos/ScrollBar.qml
index cfd5735e..72430e95 100644
--- a/src/imports/controls/macos/ScrollBar.qml
+++ b/src/imports/controls/macos/ScrollBar.qml
@@ -34,10 +34,29 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.12
-import QtQuick.Controls 2.12
-import QtQuick.Controls.impl 2.12
-import QtQuick.NativeStyle 6.0 as NativeStyle
+import QtQuick
+import QtQuick.Controls
+import QtQuick.NativeStyle as NativeStyle
 
 NativeStyle.DefaultScrollBar {
+    id: controlRoot
+
+    contentItem: NativeStyle.ScrollBar {
+        control: controlRoot
+        subControl: NativeStyle.ScrollBar.Handle
+        overrideState: NativeStyle.ScrollBar.NeverHovered
+    }
+
+    NativeStyle.ScrollBar {
+        // Fade a hovered-looking version of the handle
+        // on top of the default handle when hovering it
+        anchors.fill: contentItem
+        control: controlRoot
+        subControl: NativeStyle.ScrollBar.Handle
+        overrideState: NativeStyle.ScrollBar.AlwaysHovered
+        opacity: controlRoot.hovered || control.pressed ? 1 : 0
+        visible: contentItem instanceof NativeStyle.StyleItem
+        Behavior on opacity { NumberAnimation { duration: 150 } }
+    }
+
 }
diff --git a/src/imports/controls/macos/Slider.qml b/src/imports/controls/macos/Slider.qml
index 3aed431f..1d04beca 100644
--- a/src/imports/controls/macos/Slider.qml
+++ b/src/imports/controls/macos/Slider.qml
@@ -34,10 +34,9 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.12
-import QtQuick.Controls 2.12
-import QtQuick.Controls.impl 2.12
-import QtQuick.NativeStyle 6.0 as NativeStyle
+import QtQuick
+import QtQuick.Controls
+import QtQuick.NativeStyle as NativeStyle
 
 NativeStyle.DefaultSlider {
 }
diff --git a/src/imports/controls/macos/SpinBox.qml b/src/imports/controls/macos/SpinBox.qml
index 57b7669d..06663375 100644
--- a/src/imports/controls/macos/SpinBox.qml
+++ b/src/imports/controls/macos/SpinBox.qml
@@ -34,11 +34,10 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.12
-import QtQuick.Controls 2.12
-import QtQuick.Controls.impl 2.12
-import QtQuick.Templates 2.12 as T
-import QtQuick.NativeStyle 6.0 as NativeStyle
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Templates as T
+import QtQuick.NativeStyle as NativeStyle
 
 T.SpinBox {
     id: control
diff --git a/src/imports/controls/macos/TextArea.qml b/src/imports/controls/macos/TextArea.qml
index 6845c13e..51982ff6 100644
--- a/src/imports/controls/macos/TextArea.qml
+++ b/src/imports/controls/macos/TextArea.qml
@@ -34,10 +34,9 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.12
-import QtQuick.Controls 2.12
-import QtQuick.Controls.impl 2.12
-import QtQuick.NativeStyle 6.0 as NativeStyle
+import QtQuick
+import QtQuick.Controls
+import QtQuick.NativeStyle as NativeStyle
 
 NativeStyle.DefaultTextArea {
 }
diff --git a/src/imports/controls/macos/TextField.qml b/src/imports/controls/macos/TextField.qml
index 5728689b..f96023a6 100644
--- a/src/imports/controls/macos/TextField.qml
+++ b/src/imports/controls/macos/TextField.qml
@@ -34,10 +34,9 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.12
-import QtQuick.Controls 2.12
-import QtQuick.Controls.impl 2.12
-import QtQuick.NativeStyle 6.0 as NativeStyle
+import QtQuick
+import QtQuick.Controls
+import QtQuick.NativeStyle as NativeStyle
 
 NativeStyle.DefaultTextField {
 }
diff --git a/src/imports/controls/macos/macos.pri b/src/imports/controls/macos/macos.pri
index aeafdcb3..98474a92 100644
--- a/src/imports/controls/macos/macos.pri
+++ b/src/imports/controls/macos/macos.pri
@@ -11,3 +11,4 @@ QML_FILES += \
     $$PWD/ComboBox.qml \
     $$PWD/ScrollBar.qml \
     $$PWD/ProgressBar.qml \
+    $$PWD/Dial.qml \
diff --git a/src/imports/controls/macos/macos.pro b/src/imports/controls/macos/macos.pro
index 3ed55ef8..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
@@ -23,7 +23,6 @@ CONFIG += qmltypes install_qmltypes
 
 load(qml_plugin)
 
-# TODO: add config flag
-#requires(qtConfig(quickcontrols2-nativestyle))
+requires(qtConfig(quickcontrols2-macos))
 
 HEADERS +=
diff --git a/src/imports/controls/macos/qmldir b/src/imports/controls/macos/qmldir
index acc73818..ea71d8fc 100644
--- a/src/imports/controls/macos/qmldir
+++ b/src/imports/controls/macos/qmldir
@@ -1,4 +1,18 @@
 module QtQuick.Controls.macOS
 plugin qtquickcontrols2macosstyleplugin
 classname QtQuickControls2MacOSStylePlugin
-depends QtQuick.Controls 2.5
+import QtQuick.Controls.Fusion auto
+
+Button 6.0 Button.qml
+CheckBox 6.0 CheckBox.qml
+RadioButton 6.0 RadioButton.qml
+Slider 6.0 Slider.qml
+GroupBox 6.0 GroupBox.qml
+SpinBox 6.0 SpinBox.qml
+TextField 6.0 TextField.qml
+Frame 6.0 Frame.qml
+TextArea 6.0 TextArea.qml
+ComboBox 6.0 ComboBox.qml
+ScrollBar 6.0 ScrollBar.qml
+ProgressBar 6.0 ProgressBar.qml
+Dial 6.0 Dial.qml