diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-09-22 03:00:28 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-09-22 03:00:28 +0200 |
| commit | 3477f4328e17ddb3893e0b557b2d3d874b6d1dfb (patch) | |
| tree | 7932657b25aaa0fc793267c31248784a93476fa5 | |
| parent | 0f10c4b8b20510890753be6de80391436448c8a9 (diff) | |
| parent | 21927fdbdbe4d928d909b0a9e7992ed9bc817716 (diff) | |
Merge remote-tracking branch 'origin/5.12' into dev
Change-Id: I79badb5b4269e63b4b3ee015d3d53f209522b302
| -rw-r--r-- | src/imports/purchasing/inapppurchase.cpp | 3 | ||||
| -rw-r--r-- | src/imports/purchasing/plugins.qmltypes | 11 | ||||
| -rw-r--r-- | src/imports/purchasing/purchasing.pro | 2 |
3 files changed, 10 insertions, 6 deletions
diff --git a/src/imports/purchasing/inapppurchase.cpp b/src/imports/purchasing/inapppurchase.cpp index 0a67a8f..5bc6679 100644 --- a/src/imports/purchasing/inapppurchase.cpp +++ b/src/imports/purchasing/inapppurchase.cpp @@ -56,6 +56,9 @@ public: 1, 0, "Transaction", trUtf8("Transaction is provided by InAppStore")); + + // Register the latest Qt version as QML type version + qmlRegisterModule(uri, 1, QT_VERSION_MINOR); } void initializeEngine(QQmlEngine *engine, const char *uri) diff --git a/src/imports/purchasing/plugins.qmltypes b/src/imports/purchasing/plugins.qmltypes index 2fc2398..91f4e49 100644 --- a/src/imports/purchasing/plugins.qmltypes +++ b/src/imports/purchasing/plugins.qmltypes @@ -1,16 +1,17 @@ -import QtQuick.tooling 1.1 +import QtQuick.tooling 1.2 // This file describes the plugin-supplied types contained in the library. // It is used for QML tooling purposes only. // // This file was auto-generated by: -// 'qmlplugindump QtPurchasing 1.0' +// 'qmlplugindump -nonrelocatable QtPurchasing 1.12' Module { + dependencies: ["QtQuick 2.12"] Component { name: "QInAppProductQmlType" prototype: "QObject" - exports: ["Product 1.0"] + exports: ["QtPurchasing/Product 1.0"] exportMetaObjectRevisions: [0] Enum { name: "Status" @@ -54,7 +55,7 @@ Module { name: "QInAppStoreQmlType" defaultProperty: "products" prototype: "QObject" - exports: ["Store 1.0"] + exports: ["QtPurchasing/Store 1.0"] exportMetaObjectRevisions: [0] Property { name: "products"; type: "QInAppProductQmlType"; isList: true; isReadonly: true } Method { name: "restorePurchases" } @@ -62,7 +63,7 @@ Module { Component { name: "QInAppTransaction" prototype: "QObject" - exports: ["Transaction 1.0"] + exports: ["QtPurchasing/Transaction 1.0"] isCreatable: false exportMetaObjectRevisions: [0] Enum { diff --git a/src/imports/purchasing/purchasing.pro b/src/imports/purchasing/purchasing.pro index 2f49773..881941c 100644 --- a/src/imports/purchasing/purchasing.pro +++ b/src/imports/purchasing/purchasing.pro @@ -1,7 +1,7 @@ CXX_MODULE = purchasing TARGET = declarative_purchasing TARGETPATH = QtPurchasing -IMPORT_VERSION = 1.0 +IMPORT_VERSION = 1.$$QT_MINOR_VERSION QT += qml quick purchasing purchasing-private SOURCES += \ |