diff options
| -rw-r--r-- | .qmake.conf | 2 | ||||
| -rw-r--r-- | src/imports/purchasing/inapppurchase.cpp | 9 |
2 files changed, 2 insertions, 9 deletions
diff --git a/.qmake.conf b/.qmake.conf index 58fef67..d42c801 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -2,6 +2,6 @@ load(qt_build_config) DEFINES += QT_NO_FOREACH -MODULE_VERSION = 5.11.1 +MODULE_VERSION = 5.12.0 CMAKE_MODULE_TESTS=- diff --git a/src/imports/purchasing/inapppurchase.cpp b/src/imports/purchasing/inapppurchase.cpp index db26736..0a67a8f 100644 --- a/src/imports/purchasing/inapppurchase.cpp +++ b/src/imports/purchasing/inapppurchase.cpp @@ -34,13 +34,6 @@ #include <QtPurchasing/qinappproduct.h> #include <QtPurchasing/qinapptransaction.h> -static void initResources() -{ -#ifdef QT_STATIC - Q_INIT_RESOURCE(qmake_QtPurchasing); -#endif -} - QT_BEGIN_NAMESPACE class QInAppPurchaseModule : public QQmlExtensionPlugin @@ -48,7 +41,7 @@ class QInAppPurchaseModule : public QQmlExtensionPlugin Q_OBJECT Q_PLUGIN_METADATA(IID QQmlExtensionInterface_iid) public: - QInAppPurchaseModule(QObject *parent = 0) : QQmlExtensionPlugin(parent) { initResources(); } + QInAppPurchaseModule(QObject *parent = 0) : QQmlExtensionPlugin(parent) { } void registerTypes(const char *uri) { Q_ASSERT(QLatin1String(uri) == QLatin1String("QtPurchasing")); |