1 files changed, 13 insertions, 1 deletions
diff --git a/src/imports/controls/qtquickcontrols2plugin.cpp b/src/imports/controls/qtquickcontrols2plugin.cpp
index 5d59d8ca..6730848f 100644
--- a/src/imports/controls/qtquickcontrols2plugin.cpp
+++ b/src/imports/controls/qtquickcontrols2plugin.cpp
@@ -79,6 +79,7 @@ public:
     ~QtQuickControls2Plugin();
 
     void registerTypes(const char *uri) override;
+    void unregisterTypes() override;
 
     QString name() const override;
     void initializeTheme(QQuickTheme *theme) override;
@@ -94,7 +95,8 @@ QtQuickControls2Plugin::QtQuickControls2Plugin(QObject *parent) : QQuickStylePlu
 
 QtQuickControls2Plugin::~QtQuickControls2Plugin()
 {
-    QQuickStylePrivate::reset();
+    // Intentionally empty: we use register/unregisterTypes() to do
+    // initialization and cleanup, as plugins are not unloaded on macOS.
 }
 
 static bool isDefaultStyle(const QString &style)
@@ -194,6 +196,10 @@ void QtQuickControls2Plugin::registerTypes(const char *uri)
     qmlRegisterUncreatableType<QQuickSplitHandleAttached>(uri, 2, 13, "SplitHandle",
         QStringLiteral("SplitHandle is only available as an attached property."));
 
+    // QtQuick.Controls 2.15 (new types in Qt 5.15)
+    qmlRegisterType(resolvedUrl(QStringLiteral("HorizontalHeaderView.qml")), uri, 2, 15, "HorizontalHeaderView");
+    qmlRegisterType(resolvedUrl(QStringLiteral("VerticalHeaderView.qml")), uri, 2, 15, "VerticalHeaderView");
+
     // The minor version used to be the current Qt 5 minor. For compatibility it is the last
     // Qt 5 release.
     const QByteArray import = QByteArray(uri) + ".impl";
@@ -234,6 +240,12 @@ void QtQuickControls2Plugin::registerTypes(const char *uri)
     qmlRegisterRevision<QQuickText, 6>(import, 2, 3);
 }
 
+void QtQuickControls2Plugin::unregisterTypes()
+{
+    QQuickStylePlugin::unregisterTypes();
+    QQuickStylePrivate::reset();
+}
+
 QString QtQuickControls2Plugin::name() const
 {
     return QStringLiteral("Default");