diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2018-04-20 15:37:02 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2018-04-27 05:46:54 +0000 |
| commit | 32e5af2f9322e25ed4e9a61036f48262b8f56ee7 (patch) | |
| tree | e26c3ab914ab4f05e3edb84b860769b3e9fdc3e3 | |
| parent | d5478ce1bda5f1ba112fb67eff9e1b8c66fd3973 (diff) | |
| download | qtconnectivity-32e5af2f9322e25ed4e9a61036f48262b8f56ee7.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: Ic2200668bc1e5cacf78d2808d33eb5c4f30d2c6a
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| -rw-r--r-- | src/imports/bluetooth/plugin.cpp | 9 | ||||
| -rw-r--r-- | src/imports/nfc/plugin.cpp | 9 |
2 files changed, 2 insertions, 16 deletions
diff --git a/src/imports/bluetooth/plugin.cpp b/src/imports/bluetooth/plugin.cpp index 07654ca9..1e9737c6 100644 --- a/src/imports/bluetooth/plugin.cpp +++ b/src/imports/bluetooth/plugin.cpp @@ -45,13 +45,6 @@ #include "qdeclarativebluetoothservice_p.h" #include "qdeclarativebluetoothsocket_p.h" -static void initResources() -{ -#ifdef QT_STATIC - Q_INIT_RESOURCE(qmake_QtBluetooth); -#endif -} - QT_USE_NAMESPACE class QBluetoothQmlPlugin : public QQmlExtensionPlugin @@ -59,7 +52,7 @@ class QBluetoothQmlPlugin : public QQmlExtensionPlugin Q_OBJECT Q_PLUGIN_METADATA(IID QQmlExtensionInterface_iid) public: - QBluetoothQmlPlugin(QObject *parent = 0) : QQmlExtensionPlugin(parent) { initResources(); } + QBluetoothQmlPlugin(QObject *parent = 0) : QQmlExtensionPlugin(parent) { } void registerTypes(const char *uri) { // @uri QtBluetooth diff --git a/src/imports/nfc/plugin.cpp b/src/imports/nfc/plugin.cpp index 749e03d7..3a6806fa 100644 --- a/src/imports/nfc/plugin.cpp +++ b/src/imports/nfc/plugin.cpp @@ -47,13 +47,6 @@ #include "qdeclarativendefurirecord_p.h" #include "qdeclarativendefmimerecord_p.h" -static void initResources() -{ -#ifdef QT_STATIC - Q_INIT_RESOURCE(qmake_QtNfc); -#endif -} - QT_USE_NAMESPACE class QNfcQmlPlugin : public QQmlExtensionPlugin @@ -62,7 +55,7 @@ class QNfcQmlPlugin : public QQmlExtensionPlugin Q_PLUGIN_METADATA(IID QQmlExtensionInterface_iid) public: - QNfcQmlPlugin(QObject *parent = 0) : QQmlExtensionPlugin(parent) { initResources(); } + QNfcQmlPlugin(QObject *parent = 0) : QQmlExtensionPlugin(parent) { } void registerTypes(const char *uri) { Q_ASSERT(uri == QStringLiteral("QtNfc")); |