diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2018-04-26 16:57:21 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2018-04-27 15:24:20 +0000 |
| commit | ca6786a6cc9dd92f486dcca449c21ff529813b91 (patch) | |
| tree | 4330736422f53a1d0b878b04fa1356fd9b194d01 /src | |
| parent | ac1910ab4b54c4b4ef012d3373ed66ac7ea77f00 (diff) | |
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: Iebfa316887d144728ecd3d173e40139cd1c1fcce
Reviewed-by: Andy Nichols <andy.nichols@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/imports/gamepad/qtgamepad.cpp | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/src/imports/gamepad/qtgamepad.cpp b/src/imports/gamepad/qtgamepad.cpp index 3b81dec..f3f6439 100644 --- a/src/imports/gamepad/qtgamepad.cpp +++ b/src/imports/gamepad/qtgamepad.cpp @@ -43,13 +43,6 @@ #include "qgamepadmouseitem.h" -static void initResources() -{ -#ifdef QT_STATIC - Q_INIT_RESOURCE(qmake_QtGamepad); -#endif -} - QT_BEGIN_NAMESPACE static QObject *gamepadmanager_singletontype_provider(QQmlEngine * /* engine */, QJSEngine * /* scriptEngine */) @@ -64,7 +57,7 @@ class QGamepadModule : public QQmlExtensionPlugin Q_OBJECT Q_PLUGIN_METADATA(IID QQmlExtensionInterface_iid) public: - QGamepadModule(QObject *parent = 0) : QQmlExtensionPlugin(parent) { initResources(); } + QGamepadModule(QObject *parent = 0) : QQmlExtensionPlugin(parent) { } void registerTypes(const char *uri) { Q_ASSERT(QLatin1String(uri) == QLatin1String("QtGamepad")); |