From 84c64cf4188d51a6140ebd5560e3431cd5b5514c Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Thu, 26 Apr 2018 17:02:16 +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: I4e68865d242f35517fbc179db1c578850025d328 Reviewed-by: Lorn Potter --- src/imports/sensors/sensors.cpp | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'src/imports') diff --git a/src/imports/sensors/sensors.cpp b/src/imports/sensors/sensors.cpp index ffa09d80..fa4cb3c2 100644 --- a/src/imports/sensors/sensors.cpp +++ b/src/imports/sensors/sensors.cpp @@ -78,13 +78,6 @@ #include "qmlsensorgesture.h" #include "qmllidsensor.h" -static void initResources() -{ -#ifdef QT_STATIC - Q_INIT_RESOURCE(qmake_QtSensors); -#endif -} - QT_BEGIN_NAMESPACE static QObject *global_object_50(QQmlEngine *, QJSEngine *) @@ -97,7 +90,7 @@ class QtSensorsDeclarativeModule : public QQmlExtensionPlugin Q_OBJECT Q_PLUGIN_METADATA(IID QQmlExtensionInterface_iid FILE "plugin.json") public: - QtSensorsDeclarativeModule(QObject *parent = 0) : QQmlExtensionPlugin(parent) { initResources(); } + QtSensorsDeclarativeModule(QObject *parent = 0) : QQmlExtensionPlugin(parent) { } void registerTypes(const char *uri) override { char const * const package = "QtSensors"; -- cgit v1.2.3