diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2018-04-26 17:02:16 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2018-04-27 07:46:12 +0000 |
| commit | 84c64cf4188d51a6140ebd5560e3431cd5b5514c (patch) | |
| tree | 6d1f9a3df6edd6224dc6bb0cb1b3f71f42e12eea | |
| parent | 7a99dffd7764326c0ec5fdb470192a0a3e5c229f (diff) | |
| download | qtsensors-84c64cf4188d51a6140ebd5560e3431cd5b5514c.tar.gz | |
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 <lorn.potter@gmail.com>
| -rw-r--r-- | src/imports/sensors/sensors.cpp | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/src/imports/sensors/sensors.cpp b/src/imports/sensors/sensors.cpp index ffa09d8..fa4cb3c 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"; |