From 5df2972e560dab4a1778444dc1dbe0c95c86be21 Mon Sep 17 00:00:00 2001 From: Simon Hausmann 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 --- src/imports/controls/qtquickcontrols2plugin.cpp | 9 --------- 1 file changed, 9 deletions(-) (limited to 'src/imports/controls/qtquickcontrols2plugin.cpp') 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() -- cgit v1.2.3