From e7d9df8d593534c5e25df1ecba7281ccacae7671 Mon Sep 17 00:00:00 2001
From: J-P Nurmi <jpnurmi@qt.io>
Date: Tue, 9 Jan 2018 12:38:03 +0100
Subject: Palette: fix value type provider

The static value type provider instance must be moved from the plugin
(libqtquicktemplates2plugin.so) to the library (libQt5QuickTemplates2.so)
to keep it alive when qmlClearTypeRegistrations() is called and the
plugin is unloaded. This fixes the warning that was being thrown a lot
in tst_qquickmenubar on macOS:

    QWARN  : tst_qquickmenubar::Default::UnknownTestFunc() QQml_removeValueTypeProvider: was asked to remove provider 0x117dc97f8 but it was not found

Change-Id: I4448e497672c834786af0132b6ed5f03c3931773
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
---
 src/imports/templates/qtquicktemplates2plugin.cpp | 24 +++++++++++------------
 1 file changed, 11 insertions(+), 13 deletions(-)

(limited to 'src/imports/templates/qtquicktemplates2plugin.cpp')

diff --git a/src/imports/templates/qtquicktemplates2plugin.cpp b/src/imports/templates/qtquicktemplates2plugin.cpp
index ebd30bdc..b1a78e17 100644
--- a/src/imports/templates/qtquicktemplates2plugin.cpp
+++ b/src/imports/templates/qtquicktemplates2plugin.cpp
@@ -67,6 +67,7 @@
 #include <QtQuickTemplates2/private/qquickoverlay_p.h>
 #include <QtQuickTemplates2/private/qquickpage_p.h>
 #include <QtQuickTemplates2/private/qquickpageindicator_p.h>
+#include <QtQuickTemplates2/private/qquickpaletteprovider_p.h>
 #include <QtQuickTemplates2/private/qquickpane_p.h>
 #include <QtQuickTemplates2/private/qquickpopup_p.h>
 #include <QtQuickTemplates2/private/qquickprogressbar_p.h>
@@ -98,8 +99,6 @@
 #include <QtQuickTemplates2/private/qquicktumbler_p.h>
 #endif
 
-#include "qquicktemplates2valuetypeprovider_p.h"
-
 static inline void initResources()
 {
 #ifdef QT_STATIC
@@ -116,20 +115,14 @@ extern void qt_quick_set_shortcut_context_matcher(ShortcutContextMatcher matcher
 
 QT_BEGIN_NAMESPACE
 
-static QQmlValueTypeProvider *valueTypeProvider()
-{
-    static QQuickTemplates2ValueTypeProvider provider;
-    return &provider;
-}
-
 static void initProviders()
 {
-    QQml_addValueTypeProvider(valueTypeProvider());
+    QQuickPaletteProvider::init();
 }
 
 static void cleanupProviders()
 {
-    QQml_removeValueTypeProvider(valueTypeProvider());
+    QQuickPaletteProvider::cleanup();
 }
 
 class QtQuickTemplates2Plugin: public QQmlExtensionPlugin
@@ -144,15 +137,16 @@ public:
     void registerTypes(const char *uri) override;
 
 private:
+    bool registered;
 #if QT_CONFIG(shortcut)
     ShortcutContextMatcher originalContextMatcher;
 #endif
 };
 
-QtQuickTemplates2Plugin::QtQuickTemplates2Plugin(QObject *parent) : QQmlExtensionPlugin(parent)
+QtQuickTemplates2Plugin::QtQuickTemplates2Plugin(QObject *parent)
+    : QQmlExtensionPlugin(parent), registered(false)
 {
     initResources();
-    initProviders();
 
 #if QT_CONFIG(shortcut)
     originalContextMatcher = qt_quick_shortcut_context_matcher();
@@ -162,7 +156,8 @@ QtQuickTemplates2Plugin::QtQuickTemplates2Plugin(QObject *parent) : QQmlExtensio
 
 QtQuickTemplates2Plugin::~QtQuickTemplates2Plugin()
 {
-    cleanupProviders();
+    if (registered)
+        cleanupProviders();
 
 #if QT_CONFIG(shortcut)
     qt_quick_set_shortcut_context_matcher(originalContextMatcher);
@@ -171,6 +166,9 @@ QtQuickTemplates2Plugin::~QtQuickTemplates2Plugin()
 
 void QtQuickTemplates2Plugin::registerTypes(const char *uri)
 {
+    registered = true;
+    initProviders();
+
     qmlRegisterModule(uri, 2, QT_VERSION_MINOR - 7); // Qt 5.7->2.0, 5.8->2.1, 5.9->2.2...
 
     // QtQuick.Templates 2.0 (originally introduced in Qt 5.7)
-- 
cgit v1.2.3