diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2018-04-26 16:56:06 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2018-05-08 10:36:23 +0000 |
| commit | f6411c53d194755dda29524ec650e2e3143810bc (patch) | |
| tree | 95a7e7589ef73834ecd793065447a226c805714e /src/quick3d/imports/scene2d | |
| parent | df9f91e7e0e056a93d1c85f56705aaca997b3e9a (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: I04a1430720da6ae55fafad04253c23a25a2532cd
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
Diffstat (limited to 'src/quick3d/imports/scene2d')
| -rw-r--r-- | src/quick3d/imports/scene2d/qtquickscene2dplugin.h | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/src/quick3d/imports/scene2d/qtquickscene2dplugin.h b/src/quick3d/imports/scene2d/qtquickscene2dplugin.h index 7e97fd662..22a4e9b7a 100644 --- a/src/quick3d/imports/scene2d/qtquickscene2dplugin.h +++ b/src/quick3d/imports/scene2d/qtquickscene2dplugin.h @@ -39,13 +39,6 @@ #include <QtQml/qqmlextensionplugin.h> -static void initResources() -{ -#ifdef QT_STATIC - Q_INIT_RESOURCE(qmake_QtQuick_Scene2D); -#endif -} - QT_BEGIN_NAMESPACE class QtQuickScene2DPlugin : public QQmlExtensionPlugin @@ -53,7 +46,7 @@ class QtQuickScene2DPlugin : public QQmlExtensionPlugin Q_OBJECT Q_PLUGIN_METADATA(IID QQmlExtensionInterface_iid) public: - QtQuickScene2DPlugin(QObject *parent = 0) : QQmlExtensionPlugin(parent) { initResources(); } + QtQuickScene2DPlugin(QObject *parent = 0) : QQmlExtensionPlugin(parent) { } void registerTypes(const char *uri) override; }; |