diff options
-rw-r--r-- | .qmake.conf | 2 | ||||
-rw-r--r-- | src/effects/plugin.cpp | 10 | ||||
-rw-r--r-- | src/effects/private/plugin.cpp | 9 |
3 files changed, 3 insertions, 18 deletions
diff --git a/.qmake.conf b/.qmake.conf index dc68d38..097d8b9 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -1,3 +1,3 @@ load(qt_build_config) -MODULE_VERSION = 5.11.0 +MODULE_VERSION = 5.12.0 diff --git a/src/effects/plugin.cpp b/src/effects/plugin.cpp index b30e2ae..d2baba2 100644 --- a/src/effects/plugin.cpp +++ b/src/effects/plugin.cpp @@ -41,14 +41,6 @@ #include <QtQml/qqml.h> #include <QtQml/qqmlengine.h> -static void initResources() -{ -#ifdef QT_STATIC - Q_INIT_RESOURCE(qmake_QtGraphicalEffects); - Q_INIT_RESOURCE(qtgraphicaleffectsshaders); -#endif -} - QT_BEGIN_NAMESPACE class QtGraphicalEffectsPlugin : public QQmlExtensionPlugin @@ -57,7 +49,7 @@ class QtGraphicalEffectsPlugin : public QQmlExtensionPlugin Q_PLUGIN_METADATA(IID QQmlExtensionInterface_iid) public: - QtGraphicalEffectsPlugin(QObject *parent = 0) : QQmlExtensionPlugin(parent) { initResources(); } + QtGraphicalEffectsPlugin(QObject *parent = 0) : QQmlExtensionPlugin(parent) { } virtual void registerTypes(const char *uri) { Q_ASSERT(QLatin1String(uri) == QLatin1String("QtGraphicalEffects")); diff --git a/src/effects/private/plugin.cpp b/src/effects/private/plugin.cpp index 2e5b17a..a9deb94 100644 --- a/src/effects/private/plugin.cpp +++ b/src/effects/private/plugin.cpp @@ -44,13 +44,6 @@ #include "qgfxsourceproxy_p.h" #include "qgfxshaderbuilder_p.h" -static void initResources() -{ -#ifdef QT_STATIC - Q_INIT_RESOURCE(qmake_QtGraphicalEffects_private); -#endif -} - QT_BEGIN_NAMESPACE static QObject *qgfxshaderbuilder_provider(QQmlEngine *, QJSEngine *) @@ -64,7 +57,7 @@ class QtGraphicalEffectsPrivatePlugin : public QQmlExtensionPlugin Q_PLUGIN_METADATA(IID QQmlExtensionInterface_iid) public: - QtGraphicalEffectsPrivatePlugin(QObject *parent = 0) : QQmlExtensionPlugin(parent) { initResources(); } + QtGraphicalEffectsPrivatePlugin(QObject *parent = 0) : QQmlExtensionPlugin(parent) { } virtual void registerTypes(const char *uri) { Q_ASSERT(QByteArray(uri) == QByteArrayLiteral("QtGraphicalEffects.private")); |