aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKai Koehne <kai.koehne@qt.io>2020-03-05 16:37:44 +0100
committerKai Koehne <kai.koehne@qt.io>2020-03-20 10:03:12 +0100
commitac9d427cd22e9b0c820dafd68ab17cca930c841d (patch)
tree513141d349a1936a842391daab55c98ea7659a88
parent4df52eee2b40244ba1a3d115a43ed51cfd742105 (diff)
Doc: Make sure import is highlighted
Use \qml ... \endqml to allow qdoc highlighting the import as QML. Also parameterize the example import QtQuick.Templates import so that it always uses the last import version. Change-Id: I3fecc8b301c58a89769caf5aa3a764551ff683b3 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
-rw-r--r--src/imports/calendar/doc/src/qtlabscalendar-qmltypes.qdoc4
-rw-r--r--src/imports/controls/doc/src/qtquickcontrols2-qmltypes.qdoc4
-rw-r--r--src/imports/platform/doc/src/qtlabsplatform-qmltypes.qdoc4
-rw-r--r--src/imports/templates/doc/src/qtquicktemplates2-qmltypes.qdoc6
4 files changed, 9 insertions, 9 deletions
diff --git a/src/imports/calendar/doc/src/qtlabscalendar-qmltypes.qdoc b/src/imports/calendar/doc/src/qtlabscalendar-qmltypes.qdoc
index 81abf52a..b63263a9 100644
--- a/src/imports/calendar/doc/src/qtlabscalendar-qmltypes.qdoc
+++ b/src/imports/calendar/doc/src/qtlabscalendar-qmltypes.qdoc
@@ -38,9 +38,9 @@
The QML types can be imported into your application using the
following import statement in your .qml file:
- \badcode
+ \qml
import Qt.labs.calendar 1.0
- \endcode
+ \endqml
\section1 QML Types
diff --git a/src/imports/controls/doc/src/qtquickcontrols2-qmltypes.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-qmltypes.qdoc
index 360d2059..7fbc8c4d 100644
--- a/src/imports/controls/doc/src/qtquickcontrols2-qmltypes.qdoc
+++ b/src/imports/controls/doc/src/qtquickcontrols2-qmltypes.qdoc
@@ -40,9 +40,9 @@
Qt Quick Controls QML types can be imported into your application
using the following import statement in your .qml file:
- \badcode \QtMinorVersion
+ \qml \QtMinorVersion
import QtQuick.Controls 2.\1
- \endcode
+ \endqml
\section1 QML Types
\generatelist {qmltypesbymodule QtQuick.Controls}
diff --git a/src/imports/platform/doc/src/qtlabsplatform-qmltypes.qdoc b/src/imports/platform/doc/src/qtlabsplatform-qmltypes.qdoc
index dec67b72..f1a4daf3 100644
--- a/src/imports/platform/doc/src/qtlabsplatform-qmltypes.qdoc
+++ b/src/imports/platform/doc/src/qtlabsplatform-qmltypes.qdoc
@@ -38,9 +38,9 @@
The QML types can be imported into your application using the
following import statement in your .qml file:
- \badcode
+ \qml
import Qt.labs.platform 1.1
- \endcode
+ \endqml
\section1 QML Types
diff --git a/src/imports/templates/doc/src/qtquicktemplates2-qmltypes.qdoc b/src/imports/templates/doc/src/qtquicktemplates2-qmltypes.qdoc
index f93d6a37..fb7809e4 100644
--- a/src/imports/templates/doc/src/qtquicktemplates2-qmltypes.qdoc
+++ b/src/imports/templates/doc/src/qtquicktemplates2-qmltypes.qdoc
@@ -37,9 +37,9 @@
The QML types can be imported using the following import statement in your
\c .qml file:
- \badcode
- import QtQuick.Templates 2.12 as T
- \endcode
+ \qml \QtMinorVersion
+ import QtQuick.Templates 2.\1 as T
+ \endqml
For the sake of clarity, there is a one-to-one mapping between the types
provided by the \c QtQuick.Templates and \c QtQuick.Controls imports. For