summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Blasche <alexander.blasche@qt.io>2018-08-30 15:44:01 +0200
committerAlex Blasche <alexander.blasche@qt.io>2018-09-18 10:40:56 +0000
commit21927fdbdbe4d928d909b0a9e7992ed9bc817716 (patch)
tree7932657b25aaa0fc793267c31248784a93476fa5
parentcb92e437619c7fcb1d101bd89b033283bccd52f0 (diff)
Follow automatic Qt version bump on minor version for QML APIsv5.12.0-beta3v5.12.0-beta2v5.12.0-beta1
Task-number: QTBUG-70264 Change-Id: I6e3ec9e316a51ac8ad46e4c1012eb29a35917ca0 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
-rw-r--r--src/imports/purchasing/inapppurchase.cpp3
-rw-r--r--src/imports/purchasing/plugins.qmltypes11
-rw-r--r--src/imports/purchasing/purchasing.pro2
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 += \