From 5df2972e560dab4a1778444dc1dbe0c95c86be21 Mon Sep 17 00:00:00 2001
From: Simon Hausmann <simon.hausmann@qt.io>
Date: Fri, 20 Apr 2018 15:02:27 +0200
Subject: Remove the code to manually initialize resources in static builds

After commit be9a56e5e3ced5d0d668fa24e4c65ae928f2e25a in qtbase, this is
not needed anymore. Instead the resource system injects the plugin entry
point with a reference to all resources.

Change-Id: Ic3fa0827ee6719b0a22f73b48667deb129089a6f
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
---
 .../controls/fusion/qtquickcontrols2fusionstyleplugin.cpp        | 9 ---------
 .../controls/imagine/qtquickcontrols2imaginestyleplugin.cpp      | 9 ---------
 .../controls/material/qtquickcontrols2materialstyleplugin.cpp    | 9 ---------
 src/imports/controls/qtquickcontrols2plugin.cpp                  | 9 ---------
 .../controls/universal/qtquickcontrols2universalstyleplugin.cpp  | 9 ---------
 5 files changed, 45 deletions(-)

(limited to 'src/imports/controls')

diff --git a/src/imports/controls/fusion/qtquickcontrols2fusionstyleplugin.cpp b/src/imports/controls/fusion/qtquickcontrols2fusionstyleplugin.cpp
index 5bb1d062..d603f9f9 100644
--- a/src/imports/controls/fusion/qtquickcontrols2fusionstyleplugin.cpp
+++ b/src/imports/controls/fusion/qtquickcontrols2fusionstyleplugin.cpp
@@ -43,14 +43,6 @@
 #include "qquickfusionstyle_p.h"
 #include "qquickfusiontheme_p.h"
 
-static inline void initResources()
-{
-    Q_INIT_RESOURCE(qtquickcontrols2fusionstyle);
-#ifdef QT_STATIC
-    Q_INIT_RESOURCE(qmake_QtQuick_Controls_2_Fusion);
-#endif
-}
-
 QT_BEGIN_NAMESPACE
 
 static QObject *styleSingleton(QQmlEngine *engine, QJSEngine *scriptEngine)
@@ -76,7 +68,6 @@ public:
 
 QtQuickControls2FusionStylePlugin::QtQuickControls2FusionStylePlugin(QObject *parent) : QQuickStylePlugin(parent)
 {
-    initResources();
 }
 
 void QtQuickControls2FusionStylePlugin::registerTypes(const char *uri)
diff --git a/src/imports/controls/imagine/qtquickcontrols2imaginestyleplugin.cpp b/src/imports/controls/imagine/qtquickcontrols2imaginestyleplugin.cpp
index 292b8719..6dc142c9 100644
--- a/src/imports/controls/imagine/qtquickcontrols2imaginestyleplugin.cpp
+++ b/src/imports/controls/imagine/qtquickcontrols2imaginestyleplugin.cpp
@@ -43,14 +43,6 @@
 #include "qquickimaginetheme_p.h"
 #include "qquickninepatchimage_p.h"
 
-static inline void initResources()
-{
-    Q_INIT_RESOURCE(qmake_qtquickcontrols2imaginestyle);
-#ifdef QT_STATIC
-    Q_INIT_RESOURCE(qmake_QtQuick_Controls_2_Imagine);
-#endif
-}
-
 QT_BEGIN_NAMESPACE
 
 Q_LOGGING_CATEGORY(lcQtQuickControlsImagine, "qt.quick.controls.imagine")
@@ -71,7 +63,6 @@ public:
 
 QtQuickControls2ImagineStylePlugin::QtQuickControls2ImagineStylePlugin(QObject *parent) : QQuickStylePlugin(parent)
 {
-    initResources();
 }
 
 void QtQuickControls2ImagineStylePlugin::registerTypes(const char *uri)
diff --git a/src/imports/controls/material/qtquickcontrols2materialstyleplugin.cpp b/src/imports/controls/material/qtquickcontrols2materialstyleplugin.cpp
index f0cf8f3f..603582b0 100644
--- a/src/imports/controls/material/qtquickcontrols2materialstyleplugin.cpp
+++ b/src/imports/controls/material/qtquickcontrols2materialstyleplugin.cpp
@@ -45,14 +45,6 @@
 #include <QtQuickControls2/private/qquickstyleselector_p.h>
 #include <QtQuickControls2/private/qquickpaddedrectangle_p.h>
 
-static inline void initResources()
-{
-    Q_INIT_RESOURCE(qtquickcontrols2materialstyleplugin);
-#ifdef QT_STATIC
-    Q_INIT_RESOURCE(qmake_QtQuick_Controls_2_Material);
-#endif
-}
-
 QT_BEGIN_NAMESPACE
 
 class QtQuickControls2MaterialStylePlugin : public QQuickStylePlugin
@@ -71,7 +63,6 @@ public:
 
 QtQuickControls2MaterialStylePlugin::QtQuickControls2MaterialStylePlugin(QObject *parent) : QQuickStylePlugin(parent)
 {
-    initResources();
     QQuickMaterialStyle::initGlobals();
 }
 
diff --git a/src/imports/controls/qtquickcontrols2plugin.cpp b/src/imports/controls/qtquickcontrols2plugin.cpp
index d0018901..bff8110d 100644
--- a/src/imports/controls/qtquickcontrols2plugin.cpp
+++ b/src/imports/controls/qtquickcontrols2plugin.cpp
@@ -60,14 +60,6 @@
 #include "qquickdefaultstyle_p.h"
 #include "qquickdefaulttheme_p.h"
 
-static inline void initResources()
-{
-    Q_INIT_RESOURCE(qtquickcontrols2plugin);
-#ifdef QT_STATIC
-    Q_INIT_RESOURCE(qmake_QtQuick_Controls_2);
-#endif
-}
-
 QT_BEGIN_NAMESPACE
 
 class QtQuickControls2Plugin: public QQuickStylePlugin
@@ -87,7 +79,6 @@ public:
 
 QtQuickControls2Plugin::QtQuickControls2Plugin(QObject *parent) : QQuickStylePlugin(parent)
 {
-    initResources();
 }
 
 QtQuickControls2Plugin::~QtQuickControls2Plugin()
diff --git a/src/imports/controls/universal/qtquickcontrols2universalstyleplugin.cpp b/src/imports/controls/universal/qtquickcontrols2universalstyleplugin.cpp
index fa55e18a..8c0a79d4 100644
--- a/src/imports/controls/universal/qtquickcontrols2universalstyleplugin.cpp
+++ b/src/imports/controls/universal/qtquickcontrols2universalstyleplugin.cpp
@@ -42,14 +42,6 @@
 #include "qquickuniversalstyle_p.h"
 #include "qquickuniversaltheme_p.h"
 
-static inline void initResources()
-{
-    Q_INIT_RESOURCE(qtquickcontrols2universalstyleplugin);
-#ifdef QT_STATIC
-    Q_INIT_RESOURCE(qmake_QtQuick_Controls_2_Universal);
-#endif
-}
-
 QT_BEGIN_NAMESPACE
 
 class QtQuickControls2UniversalStylePlugin: public QQuickStylePlugin
@@ -68,7 +60,6 @@ public:
 
 QtQuickControls2UniversalStylePlugin::QtQuickControls2UniversalStylePlugin(QObject *parent) : QQuickStylePlugin(parent)
 {
-    initResources();
     QQuickUniversalStyle::initGlobals();
 }
 
-- 
cgit v1.2.3