Create and init QQuickTheme from QtQuickControls2Plugin

Instead of creating and setting the QQuickTheme instance from each
style plugin (e.g. QtQuickControls2MaterialStylePlugin), create the
QQuickTheme instance in QtQuickControls2Plugin when the style is
being resolved, and just pass the instance to be initialized by the
style plugin(s). This avoids the problem that QQuickTheme API was
virtual, and sub-classes created from plugins would have vtables
destroyed before the QQuickTheme was destroyed.

Task-number: QTBUG-67062
Task-number: QTBUG-68087
Change-Id: I19e9ced5296b708c2668c30163389cb3da6be7cf
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>

1 files changed, 0 insertions, 4 deletions

diff --git a/src/quicktemplates2/qquicktheme_p_p.h b/src/quicktemplates2/qquicktheme_p_p.h
index 6a32440f..c7421677 100644
--- a/src/quicktemplates2/qquicktheme_p_p.h
+++ b/src/quicktemplates2/qquicktheme_p_p.h
@@ -62,14 +62,10 @@ public:
         return theme->d_func();
     }
 
-    const QFont *resolveThemeFont(QQuickTheme::Scope scope);
-    const QPalette *resolveThemePalette(QQuickTheme::Scope scope);
-
     static QScopedPointer<QQuickTheme> instance;
 
     static const int NScopes = QQuickTheme::Tumbler + 1;
 
-    bool hasResolved = false;
     QScopedPointer<const QFont> defaultFont;
     QScopedPointer<const QPalette> defaultPalette;
     QSharedPointer<QFont> fonts[NScopes];