diff options
| -rw-r--r-- | .qmake.conf | 2 | ||||
| -rw-r--r-- | src/imports/qtcanvas3d/qcanvas3d_plugin.cpp | 8 |
2 files changed, 1 insertions, 9 deletions
diff --git a/.qmake.conf b/.qmake.conf index ff8a3a7..d42c801 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -2,6 +2,6 @@ load(qt_build_config) DEFINES += QT_NO_FOREACH -MODULE_VERSION = 5.11.0 +MODULE_VERSION = 5.12.0 CMAKE_MODULE_TESTS=- 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) |