From c0913e0b2a0e4cac7e7cc779b7ef3b78ba9d17cd Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Thu, 26 Apr 2018 17:04:08 +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: I9c47e29e336efac47e41a583bb1ba4368f3170fd Reviewed-by: Friedemann Kleint --- src/imports/winextras/plugin.cpp | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'src') diff --git a/src/imports/winextras/plugin.cpp b/src/imports/winextras/plugin.cpp index 55be331..60d2525 100644 --- a/src/imports/winextras/plugin.cpp +++ b/src/imports/winextras/plugin.cpp @@ -49,13 +49,6 @@ #include -static void initResources() -{ -#ifdef QT_STATIC - Q_INIT_RESOURCE(qmake_QtWinExtras); -#endif -} - QT_BEGIN_NAMESPACE class QWinExtrasQmlPlugin : public QQmlExtensionPlugin @@ -64,7 +57,7 @@ class QWinExtrasQmlPlugin : public QQmlExtensionPlugin Q_PLUGIN_METADATA(IID QQmlExtensionInterface_iid) public: - QWinExtrasQmlPlugin(QObject *parent = 0) : QQmlExtensionPlugin(parent) { initResources(); } + QWinExtrasQmlPlugin(QObject *parent = 0) : QQmlExtensionPlugin(parent) { } void registerTypes(const char *uri) Q_DECL_OVERRIDE { Q_ASSERT(uri == QLatin1String("QtWinExtras")); -- cgit v1.2.3