summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJulian Strobl <stroblju@gmail.com>2017-05-03 18:37:51 +0200
committerJani Heikkinen <jani.heikkinen@qt.io>2017-05-05 04:52:02 +0000
commit08b5290b67df7b9f077b85069d1e19662e8c3847 (patch)
treecfda76774001f565d16ff2fb5d2c8247555ff1f4
parenteb81ec29b71d33696ff504834070c3b0a6d7c2e5 (diff)
Fix bundling of module for static buildsv5.9.0-beta4
Without this patch the module is not bundled in static builds correctly causing 'module "<QtModule>" is not installed' errors in during runtime. As reference: this happens, because 'QQmlMetaType::isAnyModule(importUri)' at 'qtdeclarative/src/qml/qml/qqmltypeloader.cpp:1422:' returns 'false', which indicates that the module was not registered. Task-number: QTBUG-59559 Change-Id: Ib8dc1fe6a1d16d06e037cfec4310528aef8fd9cb Reviewed-by: J-P Nurmi <jpnurmi@qt.io> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
-rw-r--r--src/imports/purchasing/inapppurchase.cpp8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/imports/purchasing/inapppurchase.cpp b/src/imports/purchasing/inapppurchase.cpp
index b0b3e3a..db26736 100644
--- a/src/imports/purchasing/inapppurchase.cpp
+++ b/src/imports/purchasing/inapppurchase.cpp
@@ -34,6 +34,13 @@
#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
@@ -41,6 +48,7 @@ class QInAppPurchaseModule : public QQmlExtensionPlugin
Q_OBJECT
Q_PLUGIN_METADATA(IID QQmlExtensionInterface_iid)
public:
+ QInAppPurchaseModule(QObject *parent = 0) : QQmlExtensionPlugin(parent) { initResources(); }
void registerTypes(const char *uri)
{
Q_ASSERT(QLatin1String(uri) == QLatin1String("QtPurchasing"));