diff options
| author | Topi Reinio <topi.reinio@qt.io> | 2018-09-14 13:52:37 +0200 |
|---|---|---|
| committer | Topi Reiniö <topi.reinio@qt.io> | 2018-09-28 10:07:41 +0000 |
| commit | 57b0b8b03a0f281de1735c1a65f3359627018274 (patch) | |
| tree | 33eb44a018ecd22d6a241729631b33afe3910f77 /src | |
| parent | b4e9cc6ab73019c04182248a8f65e9fa840d382b (diff) | |
Doc: Use a macro to resolve QML import versions
QDoc now supports macros for its command parameters, as well as passing
parameters to \code and \qml commands. Use these together with the
new \QtMinorVersion macro to automate bumping the QML import versions
within documentation.
Also, update the hard-coded version numbers in snippet files where we
cannot use the macro.
Task-number: QTBUG-67818
Change-Id: I93d92770314580efa933c5bf85c618ad8331afb5
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/bluetooth/doc/snippets/doc_src_qtbluetooth.qml | 2 | ||||
| -rw-r--r-- | src/bluetooth/doc/src/bluetooth-qml.qdoc | 7 | ||||
| -rw-r--r-- | src/nfc/doc/snippets/doc_src_qtnfc.qml | 2 | ||||
| -rw-r--r-- | src/nfc/doc/src/nfc-qml.qdoc | 7 |
4 files changed, 10 insertions, 8 deletions
diff --git a/src/bluetooth/doc/snippets/doc_src_qtbluetooth.qml b/src/bluetooth/doc/snippets/doc_src_qtbluetooth.qml index efed6cc7..8508a9e4 100644 --- a/src/bluetooth/doc/snippets/doc_src_qtbluetooth.qml +++ b/src/bluetooth/doc/snippets/doc_src_qtbluetooth.qml @@ -49,7 +49,7 @@ ****************************************************************************/ //! [import] -import QtBluetooth 5.2 +import QtBluetooth 5.12 //! [import] //! [service] diff --git a/src/bluetooth/doc/src/bluetooth-qml.qdoc b/src/bluetooth/doc/src/bluetooth-qml.qdoc index 2f37cb9b..a6870864 100644 --- a/src/bluetooth/doc/src/bluetooth-qml.qdoc +++ b/src/bluetooth/doc/src/bluetooth-qml.qdoc @@ -28,7 +28,7 @@ /*! -\qmlmodule QtBluetooth 5.11 +\qmlmodule QtBluetooth \QtVer \title Qt Bluetooth QML Types \ingroup qmlmodules \brief Provides QML types for basic Bluetooth operations on devices. @@ -41,7 +41,8 @@ plugins with the flexibility you need. To use the classes of the module in your application you need the following import statement in your \c .qml file: -\snippet doc_src_qtbluetooth.qml import - +\qml \QtVer +import QtBluetooth \1 +\endqml */ diff --git a/src/nfc/doc/snippets/doc_src_qtnfc.qml b/src/nfc/doc/snippets/doc_src_qtnfc.qml index 78f7f83d..e7a45e89 100644 --- a/src/nfc/doc/snippets/doc_src_qtnfc.qml +++ b/src/nfc/doc/snippets/doc_src_qtnfc.qml @@ -50,7 +50,7 @@ ****************************************************************************/ //! [import] -import QtNfc 5.2 +import QtNfc 5.12 //! [import] Item { diff --git a/src/nfc/doc/src/nfc-qml.qdoc b/src/nfc/doc/src/nfc-qml.qdoc index bbacb2de..48ae3bd2 100644 --- a/src/nfc/doc/src/nfc-qml.qdoc +++ b/src/nfc/doc/src/nfc-qml.qdoc @@ -28,7 +28,7 @@ /*! -\qmlmodule QtNfc 5.11 +\qmlmodule QtNfc \QtVer \title Qt NFC QML Types \ingroup qmlmodules \brief Provides QML types for accessing NFC Forum Tags. @@ -36,7 +36,8 @@ To use the classes of the module in your application, you need the following import statement in your \c .qml file: -\snippet doc_src_qtnfc.qml import - +\qml \QtVer +import QtNfc \1 +\endqml */ |