diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2018-04-20 15:26:57 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2018-05-08 07:44:00 +0000 |
| commit | 57a849cf9ce2ce6632408302517130c445b8af52 (patch) | |
| tree | 9d983bdd870125b5e96cba990accbdffe367050a | |
| parent | df0baaa6c58c725617edf131e3ad849efe2acc53 (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: I075e2a855c27f87ad62d9ea45025e0481e3dd055
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
| -rw-r--r-- | src/imports/qtcanvas3d/qcanvas3d_plugin.cpp | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/src/imports/qtcanvas3d/qcanvas3d_plugin.cpp b/src/imports/qtcanvas3d/qcanvas3d_plugin.cpp index 3aee915..1a7abe6 100644 --- a/src/imports/qtcanvas3d/qcanvas3d_plugin.cpp +++ b/src/imports/qtcanvas3d/qcanvas3d_plugin.cpp @@ -41,20 +41,12 @@ #include <QtQml/qqml.h> -static void initResources() -{ -#ifdef QT_STATIC - Q_INIT_RESOURCE(qmake_QtCanvas3D); -#endif -} - QT_BEGIN_NAMESPACE QT_CANVAS3D_BEGIN_NAMESPACE QtCanvas3DPlugin::QtCanvas3DPlugin(QObject *parent) : QQmlExtensionPlugin(parent) { - initResources(); } void QtCanvas3DPlugin::registerTypes(const char *uri) |