summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-03-02 03:00:17 +0100
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-03-02 03:00:17 +0100
commit9363738ed780d32b40f2428ca5dfa1c919db424e (patch)
tree1671e67a5e840fc2c23d1a6c7ab4a61e7deff0e8
parentf4cbadce04bc07aa30017cdbef701f2b92fa1500 (diff)
parent098dd780b7e773f3e945c6e1b4b7fef51fb0a446 (diff)
Merge remote-tracking branch 'origin/5.12' into 5.13v5.13.0-beta1
-rw-r--r--src/purchasing/doc/src/gettingstarted-qml.qdoc4
-rw-r--r--src/purchasing/doc/src/qtpurchasing-qmltypes.qdoc2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/purchasing/doc/src/gettingstarted-qml.qdoc b/src/purchasing/doc/src/gettingstarted-qml.qdoc
index 4b25d91..76a27e3 100644
--- a/src/purchasing/doc/src/gettingstarted-qml.qdoc
+++ b/src/purchasing/doc/src/gettingstarted-qml.qdoc
@@ -41,8 +41,8 @@
Use the following \c import statement in the QML files to access the Qt
Purchasing QML types:
- \qml
- import QtPurchasing 1.0
+ \qml \QtMinorVersion
+ import QtPurchasing 1.\1
\endqml
Add the following statement to your \c .pro file to link against the Qt
diff --git a/src/purchasing/doc/src/qtpurchasing-qmltypes.qdoc b/src/purchasing/doc/src/qtpurchasing-qmltypes.qdoc
index 53fce3e..11c5162 100644
--- a/src/purchasing/doc/src/qtpurchasing-qmltypes.qdoc
+++ b/src/purchasing/doc/src/qtpurchasing-qmltypes.qdoc
@@ -26,7 +26,7 @@
****************************************************************************/
/*!
- \qmlmodule QtPurchasing 1.0
+ \qmlmodule QtPurchasing 1.\QtMinorVersion
\title Qt Purchasing QML Types
\ingroup qmlmodules
\brief Provides QML types for in-app purchasing.