diff options
Diffstat (limited to 'src/tools/qdoc')
5 files changed, 8 insertions, 7 deletions
diff --git a/src/tools/qdoc/doc/examples/componentset/ProgressBar.qml b/src/tools/qdoc/doc/examples/componentset/ProgressBar.qml index 72e0815d19..f7aeb29865 100644 --- a/src/tools/qdoc/doc/examples/componentset/ProgressBar.qml +++ b/src/tools/qdoc/doc/examples/componentset/ProgressBar.qml @@ -42,7 +42,7 @@ import QtQuick 1.0 /*! \qmltype ProgressBar - \inqmlmodule UIComponents 1.0 + \inqmlmodule UIComponents \brief A component that shows the progress of an event A ProgressBar shows the linear progress of an event as its \l value. diff --git a/src/tools/qdoc/doc/examples/componentset/Switch.qml b/src/tools/qdoc/doc/examples/componentset/Switch.qml index ae760e566e..7dee33eb3c 100644 --- a/src/tools/qdoc/doc/examples/componentset/Switch.qml +++ b/src/tools/qdoc/doc/examples/componentset/Switch.qml @@ -42,7 +42,7 @@ import QtQuick 1.0 /*! \qmltype ToggleSwitch - \inqmlmodule UIComponents 1.0 + \inqmlmodule UIComponents \brief A component that can be turned on or off A toggle switch has two states: an \c on and an \c off state. The \c off diff --git a/src/tools/qdoc/doc/examples/componentset/TabWidget.qml b/src/tools/qdoc/doc/examples/componentset/TabWidget.qml index 337f23fdad..0fbac1604e 100644 --- a/src/tools/qdoc/doc/examples/componentset/TabWidget.qml +++ b/src/tools/qdoc/doc/examples/componentset/TabWidget.qml @@ -42,7 +42,7 @@ import QtQuick 1.0 /*! \qmltype TabWidget - \inqmlmodule UIComponents 1.0 + \inqmlmodule UIComponents \brief A widget that places its children as tabs A TabWidget places its children as tabs in a view. Selecting diff --git a/src/tools/qdoc/doc/examples/qml.qdoc.sample b/src/tools/qdoc/doc/examples/qml.qdoc.sample index d913c6f164..11713b4e4d 100644 --- a/src/tools/qdoc/doc/examples/qml.qdoc.sample +++ b/src/tools/qdoc/doc/examples/qml.qdoc.sample @@ -28,7 +28,7 @@ //![qmltype] \qmltype TextEdit \instantiates QQuickTextEdit - \inqmlmodule QtQuick 2 + \inqmlmodule QtQuick \ingroup qtquick-visual \ingroup qtquick-input \inherits Item diff --git a/src/tools/qdoc/doc/qdoc-manual-topiccmds.qdoc b/src/tools/qdoc/doc/qdoc-manual-topiccmds.qdoc index b50a343a22..1d78eff386 100644 --- a/src/tools/qdoc/doc/qdoc-manual-topiccmds.qdoc +++ b/src/tools/qdoc/doc/qdoc-manual-topiccmds.qdoc @@ -1376,9 +1376,10 @@ \section1 \\inqmlmodule A QML class may belong to a \l{qmlmodule-command}{QML module} by inserting - the \l{inqmlmodule-command}{\\inqmlmodule} command as a topic command. - Every member of a group must be linked to using the module name and two - colons (\c{::}). + the \l{inqmlmodule-command}{\\inqmlmodule} command as a topic command, with + the module name (without a version number) as the only argument. Every + member of a group must be linked to using the module name and two colons + (\c{::}). \code \qmltype ClickableButton |