From 3fc2c5329e09eb1a9db35797eca59d1ddf9f80bc Mon Sep 17 00:00:00 2001 From: Venugopal Shivashankar Date: Tue, 22 Mar 2016 15:48:01 +0100 Subject: Rename Qt Labs Controls to Qt Quick Controls 2 - doc update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Change \title, \page, and \l instances that used "qtlabs" instead of "qtquick". - Renamed the qdocconf file and changed the qch parameters in it to use "Qt Quick Controls 2". - Added "2" as output suffix for the html filenames. Change-Id: Ia2fdd1c835229e5216f42a2fdfa5f7e11965e21d Reviewed-by: Mitch Curtis Reviewed-by: Topi Reiniö --- src/imports/controls/controls.pro | 2 +- src/imports/controls/doc/qtlabscontrols.qdocconf | 64 -------------------- src/imports/controls/doc/qtquickcontrols2.qdocconf | 68 ++++++++++++++++++++++ .../doc/src/calendar/qtlabscalendar-index.qdoc | 2 +- .../controls/doc/src/calendar/qtlabscalendar.qdoc | 4 +- .../controls/doc/src/qtquickcontrols2-buttons.qdoc | 2 +- .../doc/src/qtquickcontrols2-containers.qdoc | 2 +- .../doc/src/qtquickcontrols2-customize.qdoc | 4 +- .../controls/doc/src/qtquickcontrols2-default.qdoc | 4 +- .../doc/src/qtquickcontrols2-differences.qdoc | 4 +- .../doc/src/qtquickcontrols2-examples.qdoc | 6 +- .../doc/src/qtquickcontrols2-fileselectors.qdoc | 6 +- .../doc/src/qtquickcontrols2-gettingstarted.qdoc | 4 +- .../controls/doc/src/qtquickcontrols2-highdpi.qdoc | 4 +- .../controls/doc/src/qtquickcontrols2-index.qdoc | 18 +++--- .../doc/src/qtquickcontrols2-indicators.qdoc | 2 +- .../controls/doc/src/qtquickcontrols2-input.qdoc | 2 +- .../doc/src/qtquickcontrols2-material.qdoc | 4 +- .../controls/doc/src/qtquickcontrols2-menus.qdoc | 2 +- .../doc/src/qtquickcontrols2-navigation.qdoc | 2 +- .../controls/doc/src/qtquickcontrols2-styles.qdoc | 6 +- .../doc/src/qtquickcontrols2-universal.qdoc | 4 +- src/imports/controls/doc/src/qtquickcontrols2.qdoc | 4 +- .../doc/src/templates/qtquicktemplates-index.qdoc | 10 ++-- .../doc/src/templates/qtquicktemplates.qdoc | 6 +- 25 files changed, 120 insertions(+), 116 deletions(-) delete mode 100644 src/imports/controls/doc/qtlabscontrols.qdocconf create mode 100644 src/imports/controls/doc/qtquickcontrols2.qdocconf diff --git a/src/imports/controls/controls.pro b/src/imports/controls/controls.pro index cff26aed..ea8da342 100644 --- a/src/imports/controls/controls.pro +++ b/src/imports/controls/controls.pro @@ -7,7 +7,7 @@ QT_PRIVATE += core-private gui-private qml-private quick-private quicktemplates- DEFINES += QT_NO_CAST_TO_ASCII QT_NO_CAST_FROM_ASCII -QMAKE_DOCS = $$PWD/doc/qtlabscontrols.qdocconf +QMAKE_DOCS = $$PWD/doc/qtquickcontrols2.qdocconf OTHER_FILES += \ qmldir diff --git a/src/imports/controls/doc/qtlabscontrols.qdocconf b/src/imports/controls/doc/qtlabscontrols.qdocconf deleted file mode 100644 index 626794a7..00000000 --- a/src/imports/controls/doc/qtlabscontrols.qdocconf +++ /dev/null @@ -1,64 +0,0 @@ -include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf) - -project = QtLabsControls -description = Qt Labs Controls Reference Documentation -version = $QT_VERSION - -qhp.projects = QtLabsControls - -qhp.QtLabsControls.file = qtlabscontrols.qhp -qhp.QtLabsControls.namespace = org.qt-project.qtlabscontrols.$QT_VERSION_TAG -qhp.QtLabsControls.virtualFolder = qtlabscontrols -qhp.QtLabsControls.indexTitle = Qt Labs Controls -qhp.QtLabsControls.indexRoot = - -qhp.QtLabsControls.filterAttributes = qtlabscontrols $QT_VERSION qtrefdoc -qhp.QtLabsControls.customFilters.Qt.name = QtLabsControls $QT_VERSION -qhp.QtLabsControls.customFilters.Qt.filterAttributes = qtlabscontrols $QT_VERSION - -qhp.QtLabsControls.subprojects = qtlabscontrolsqmltypes - -qhp.QtLabsControls.subprojects.qtlabscontrolsqmltypes.title = Controls QML Types -qhp.QtLabsControls.subprojects.qtlabscontrolsqmltypes.indexTitle = Qt Labs Controls QML Types -qhp.QtLabsControls.subprojects.qtlabscontrolsqmltypes.selectors = qmlclass -qhp.QtLabsControls.subprojects.qtlabscontrolsqmltypes.sortPages = true - -depends = qtcore qtgui qtdoc qtqml qtquick qtquickdialogs qtquickcontrols qmake qtsql qtwidgets - -# Specify the install path under QT_INSTALL_EXAMPLES -# Note: paths passed to \example command must contain the parent directory, e.g. -# \example controls/tabs -exampledirs += ../../../../examples/controls \ - ../ \ - ../../../templates \ - ../../calendar \ - ../../../../tests/auto/controls/data \ - snippets - -examplesinstallpath = qtquickcontrols2/controls - -headerdirs += ../../../templates \ - ../../calendar \ - -sourcedirs += ../../../templates \ - ../../calendar - -imagedirs += images - -navigation.landingpage = "Qt Labs Controls" -navigation.qmltypespage = "Qt Labs Controls QML Types" - -tagfile = qtlabscontrols.tags - -# \styleimport {Qt.labs.controls.universal 1.0} -macro.styleimport.HTML = "
Import Statement: import \1
" - -# \styleproperty {Universal.accent} {enumeration} {html-target-id} -# \target html-target-id -# This property holds ... -# (empty line) -# \endstyleproperty -macro.styleproperty.HTML = "

\1 : \2

" -macro.endstyleproperty = "\\br" - -macro.labs = "\\note \\e{Types in the Qt.labs module are not guaranteed to remain compatible in future versions.}" diff --git a/src/imports/controls/doc/qtquickcontrols2.qdocconf b/src/imports/controls/doc/qtquickcontrols2.qdocconf new file mode 100644 index 00000000..ab369e21 --- /dev/null +++ b/src/imports/controls/doc/qtquickcontrols2.qdocconf @@ -0,0 +1,68 @@ +include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf) + +project = QtLabsControls +description = Qt Labs Controls Reference Documentation +version = $QT_VERSION + +qhp.projects = QtQuickControls2 + +qhp.QtQuickControls2.file = qtquickcontrols2.qhp +qhp.QtQuickControls2.namespace = org.qt-project.qtquickcontrols.$QT_VERSION_TAG +qhp.QtQuickControls2.virtualFolder = qtquickcontrols2 +qhp.QtQuickControls2.indexTitle = Qt Quick Controls 2 +qhp.QtQuickControls2.indexRoot = + +qhp.QtQuickControls2.filterAttributes = qtquickcontrols2 $QT_VERSION qtrefdoc +qhp.QtQuickControls2.customFilters.Qt.name = QtQuickControls2 $QT_VERSION +qhp.QtQuickControls2.customFilters.Qt.filterAttributes = qtquickcontrols2 $QT_VERSION + +qhp.QtQuickControls2.subprojects = qtquickcontrols2qmltypes + +qhp.QtQuickControls2.subprojects.qtquickcontrols2qmltypes.title = Controls 2 QML Types +qhp.QtQuickControls2.subprojects.qtquickcontrols2qmltypes.indexTitle = Qt Quick Controls 2 QML Types +qhp.QtQuickControls2.subprojects.qtquickcontrols2qmltypes.selectors = qmlclass +qhp.QtQuickControls2.subprojects.qtquickcontrols2qmltypes.sortPages = true + +depends = qtcore qtgui qtdoc qtqml qtquick qtquickdialogs qtquickcontrols qmake qtsql qtwidgets + +# Specify the install path under QT_INSTALL_EXAMPLES +# Note: paths passed to \example command must contain the parent directory, e.g. +# \example controls/tabs +exampledirs += ../../../../examples/controls \ + ../ \ + ../../../templates \ + ../../calendar \ + ../../../../tests/auto/controls/data \ + snippets + +examplesinstallpath = qtquickcontrols2/controls + +headerdirs += ../../../templates \ + ../../calendar \ + +sourcedirs += ../../../templates \ + ../../calendar + +imagedirs += images + +navigation.landingpage = "Qt Labs Controls" +navigation.qmltypespage = "Qt Labs Controls QML Types" + +tagfile = qtlabscontrols.tags + +# \styleimport {Qt.labs.controls.universal 1.0} +macro.styleimport.HTML = "
Import Statement: import \1
" + +# \styleproperty {Universal.accent} {enumeration} {html-target-id} +# \target html-target-id +# This property holds ... +# (empty line) +# \endstyleproperty +macro.styleproperty.HTML = "

\1 : \2

" +macro.endstyleproperty = "\\br" + +macro.labs = "\\note \\e{Types in the Qt.labs module are not guaranteed to remain compatible in future versions.}" + +#Add output suffix to the html filenames +outputsuffixes = QML +outputsuffixes.QML = 2 diff --git a/src/imports/controls/doc/src/calendar/qtlabscalendar-index.qdoc b/src/imports/controls/doc/src/calendar/qtlabscalendar-index.qdoc index 02e92bf0..dedfad4c 100644 --- a/src/imports/controls/doc/src/calendar/qtlabscalendar-index.qdoc +++ b/src/imports/controls/doc/src/calendar/qtlabscalendar-index.qdoc @@ -44,6 +44,6 @@ \list \li \l{Qt Quick} \li \l{Qt Quick Layouts} - \li \l{Qt Labs Controls} + \li \l{Qt Quick Controls 2} \endlist */ diff --git a/src/imports/controls/doc/src/calendar/qtlabscalendar.qdoc b/src/imports/controls/doc/src/calendar/qtlabscalendar.qdoc index f483ae91..b363195a 100644 --- a/src/imports/controls/doc/src/calendar/qtlabscalendar.qdoc +++ b/src/imports/controls/doc/src/calendar/qtlabscalendar.qdoc @@ -33,7 +33,7 @@ The \l{Qt Labs Calendar} module provides QML types for creating calendars. These QML types work in conjunction with \l{Qt Quick} and - \l{Qt Labs Controls}. + \l{Qt Quick Controls 2}. The QML types can be imported into your application using the following import statement in your .qml file: @@ -49,7 +49,7 @@ \section1 Related Information \list - \li \l {Qt Labs Controls QML Types} + \li \l {Qt Quick Controls 2 QML Types} \endlist \noautolist diff --git a/src/imports/controls/doc/src/qtquickcontrols2-buttons.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-buttons.qdoc index b6610949..a1d642ac 100644 --- a/src/imports/controls/doc/src/qtquickcontrols2-buttons.qdoc +++ b/src/imports/controls/doc/src/qtquickcontrols2-buttons.qdoc @@ -26,7 +26,7 @@ ****************************************************************************/ /*! - \page qtlabscontrols-buttons.html + \page qtquickcontrols2-buttons.html \title Button Controls Qt Labs Controls offers a selection of button-like controls. diff --git a/src/imports/controls/doc/src/qtquickcontrols2-containers.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-containers.qdoc index 9503f4d0..6a136597 100644 --- a/src/imports/controls/doc/src/qtquickcontrols2-containers.qdoc +++ b/src/imports/controls/doc/src/qtquickcontrols2-containers.qdoc @@ -26,7 +26,7 @@ ****************************************************************************/ /*! - \page qtlabscontrols-containers.html + \page qtquickcontrols2-containers.html \title Container Controls Qt Labs Controls offers a selection of container-like controls. diff --git a/src/imports/controls/doc/src/qtquickcontrols2-customize.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-customize.qdoc index 57d310f0..0a0cd13d 100644 --- a/src/imports/controls/doc/src/qtquickcontrols2-customize.qdoc +++ b/src/imports/controls/doc/src/qtquickcontrols2-customize.qdoc @@ -26,8 +26,8 @@ ****************************************************************************/ /*! - \page qtlabscontrols-customize.html - \title Customizing Qt Labs Controls + \page qtquickcontrols2-customize.html + \title Customizing Qt Quick Controls 2 \brief A set of UI controls to create user interfaces in Qt Quick Qt Labs Controls consist of a hierarchy (tree) of items. In order to diff --git a/src/imports/controls/doc/src/qtquickcontrols2-default.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-default.qdoc index 00e70e39..d4f61fda 100644 --- a/src/imports/controls/doc/src/qtquickcontrols2-default.qdoc +++ b/src/imports/controls/doc/src/qtquickcontrols2-default.qdoc @@ -26,7 +26,7 @@ ****************************************************************************/ /*! - \page qtlabscontrols-default.html + \page qtquickcontrols2-default.html \title Default Style The Default style is a basic all-round style. @@ -48,6 +48,6 @@ \section1 Related Information \list - \li \l{Styling Qt Labs Controls} + \li \l{Styling Qt Quick Controls 2} \endlist */ diff --git a/src/imports/controls/doc/src/qtquickcontrols2-differences.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-differences.qdoc index ccdab0ef..4c07d199 100644 --- a/src/imports/controls/doc/src/qtquickcontrols2-differences.qdoc +++ b/src/imports/controls/doc/src/qtquickcontrols2-differences.qdoc @@ -26,7 +26,7 @@ ****************************************************************************/ /*! - \page qtlabscontrols-differences.html + \page qtquickcontrols2-differences.html \title Differences between Qt Quick Controls Qt Quick Controls were originally developed to support desktop platforms, @@ -278,6 +278,6 @@ \list \li \l{Qt Quick} \li \l{Qt Quick Controls} - \li \l{Qt Labs Controls QML Types}{Qt Labs Controls QML Types} + \li \l{Qt Quick Controls 2 QML Types} \endlist */ diff --git a/src/imports/controls/doc/src/qtquickcontrols2-examples.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-examples.qdoc index 1533b546..4a6f8393 100644 --- a/src/imports/controls/doc/src/qtquickcontrols2-examples.qdoc +++ b/src/imports/controls/doc/src/qtquickcontrols2-examples.qdoc @@ -28,8 +28,8 @@ /*! \group qtlabscontrols-examples \ingroup all-examples - \title Qt Labs Controls Examples - \brief A collection of examples for \l {Qt Labs Controls} + \title Qt Quick Controls 2 Examples + \brief A collection of examples for \l {Qt Quick Controls 2} - These examples demonstrate creating user interfaces using \l {Qt Labs Controls}. + These examples demonstrate creating user interfaces using \l {Qt Quick Controls 2}. */ diff --git a/src/imports/controls/doc/src/qtquickcontrols2-fileselectors.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-fileselectors.qdoc index 4e14c37b..fc95f7b8 100644 --- a/src/imports/controls/doc/src/qtquickcontrols2-fileselectors.qdoc +++ b/src/imports/controls/doc/src/qtquickcontrols2-fileselectors.qdoc @@ -26,8 +26,8 @@ ****************************************************************************/ /*! - \page qtlabscontrols-fileselectors.html - \title Using File Selectors with Qt Labs Controls + \page qtquickcontrols2-fileselectors.html + \title Using File Selectors with Qt Quick Controls 2 \l {QFileSelector}{File selectors} provide a convenient way of selecting file variants. Qt offers the platform name and the locale as built-in @@ -136,6 +136,6 @@ \list \li \l {QFileSelector} \li \l {QQmlFileSelector} - \li \l {Styling Qt Labs Controls} + \li \l {Styling Qt Quick Controls 2} \endlist */ diff --git a/src/imports/controls/doc/src/qtquickcontrols2-gettingstarted.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-gettingstarted.qdoc index fda89d5b..1267a94b 100644 --- a/src/imports/controls/doc/src/qtquickcontrols2-gettingstarted.qdoc +++ b/src/imports/controls/doc/src/qtquickcontrols2-gettingstarted.qdoc @@ -26,8 +26,8 @@ ****************************************************************************/ /*! - \page qtlabscontrols-gettingstarted.html - \title Getting Started with Qt Labs Controls + \page qtquickcontrols2-gettingstarted.html + \title Getting Started with Qt Quick Controls 2 A basic example of a QML file that makes use of controls is shown here: diff --git a/src/imports/controls/doc/src/qtquickcontrols2-highdpi.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-highdpi.qdoc index e9f6a88b..e0e26a0b 100644 --- a/src/imports/controls/doc/src/qtquickcontrols2-highdpi.qdoc +++ b/src/imports/controls/doc/src/qtquickcontrols2-highdpi.qdoc @@ -26,8 +26,8 @@ ****************************************************************************/ /*! - \page qtlabscontrols-highdpi.html - \title High-DPI Support in Qt Labs Controls + \page qtquickcontrols2-highdpi.html + \title High-DPI Support in Qt Quick Controls 2 Qt Labs Controls support Qt's cross-platform high-DPI scaling introduced in Qt 5.6. The feature is opt-in, and can be enabled by setting the \c Qt::AA_EnableHighDpiScaling diff --git a/src/imports/controls/doc/src/qtquickcontrols2-index.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-index.qdoc index e8fa2303..0ecb5b53 100644 --- a/src/imports/controls/doc/src/qtquickcontrols2-index.qdoc +++ b/src/imports/controls/doc/src/qtquickcontrols2-index.qdoc @@ -26,8 +26,8 @@ ****************************************************************************/ /*! - \page qtlabscontrols-index.html - \title Qt Labs Controls + \page qtquickcontrols2-index.html + \title Qt Quick Controls 2 \brief Provides a set of UI controls for Qt Quick. @@ -45,10 +45,10 @@ \section1 Important Concepts in Qt Labs Controls \list - \li \l{Getting Started with Qt Labs Controls} - \li \l{Styling Qt Labs Controls} - \li \l{High-DPI Support in Qt Labs Controls} - \li \l{Using File Selectors with Qt Labs Controls} + \li \l{Getting Started with Qt Quick Controls 2} + \li \l{Styling Qt Quick Controls 2} + \li \l{High-DPI Support in Qt Quick Controls 2} + \li \l{Using File Selectors with Qt Quick Controls 2} \li \l{Differences between Qt Quick Controls} \endlist @@ -58,8 +58,8 @@ \li \l{Qt Quick} \li \l{Qt Quick Layouts} \li \l{Qt Labs Calendar} - \li \l{Qt Labs Templates} - \li \l{Qt Labs Controls QML Types}{Qt Labs Controls QML Types} - \li \l{Qt Labs Controls Examples} + \li \l{Qt Quick Templates 2} + \li \l{Qt Quick Controls 2 QML Types} + \li \l{Qt Quick Controls 2 Examples} \endlist */ diff --git a/src/imports/controls/doc/src/qtquickcontrols2-indicators.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-indicators.qdoc index b48a3eaa..3a2fcb66 100644 --- a/src/imports/controls/doc/src/qtquickcontrols2-indicators.qdoc +++ b/src/imports/controls/doc/src/qtquickcontrols2-indicators.qdoc @@ -26,7 +26,7 @@ ****************************************************************************/ /*! - \page qtlabscontrols-indicators.html + \page qtquickcontrols2-indicators.html \title Indicator Controls Qt Labs Controls offers a selection of indicator-like controls. diff --git a/src/imports/controls/doc/src/qtquickcontrols2-input.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-input.qdoc index 16401749..77eba230 100644 --- a/src/imports/controls/doc/src/qtquickcontrols2-input.qdoc +++ b/src/imports/controls/doc/src/qtquickcontrols2-input.qdoc @@ -26,7 +26,7 @@ ****************************************************************************/ /*! - \page qtlabscontrols-input.html + \page qtquickcontrols2-input.html \title Input Controls Qt Labs Controls offers a variety of input controls for both numeric diff --git a/src/imports/controls/doc/src/qtquickcontrols2-material.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-material.qdoc index ad807262..b669ed53 100644 --- a/src/imports/controls/doc/src/qtquickcontrols2-material.qdoc +++ b/src/imports/controls/doc/src/qtquickcontrols2-material.qdoc @@ -26,7 +26,7 @@ ****************************************************************************/ /*! - \page qtlabscontrols-material.html + \page qtquickcontrols2-material.html \title Material Style The Material Style is based on the Google Material Design Guidelines. @@ -228,6 +228,6 @@ \section1 Related Information \list - \li \l{Styling Qt Labs Controls} + \li \l{Styling Qt Quick Controls 2} \endlist */ diff --git a/src/imports/controls/doc/src/qtquickcontrols2-menus.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-menus.qdoc index 8d4aca3e..c469da43 100644 --- a/src/imports/controls/doc/src/qtquickcontrols2-menus.qdoc +++ b/src/imports/controls/doc/src/qtquickcontrols2-menus.qdoc @@ -26,7 +26,7 @@ ****************************************************************************/ /*! - \page qtlabscontrols-menus.html + \page qtquickcontrols2-menus.html \title Menu Controls \annotatedlist qtlabscontrols-menus diff --git a/src/imports/controls/doc/src/qtquickcontrols2-navigation.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-navigation.qdoc index 7601fbf2..bf5d59e4 100644 --- a/src/imports/controls/doc/src/qtquickcontrols2-navigation.qdoc +++ b/src/imports/controls/doc/src/qtquickcontrols2-navigation.qdoc @@ -26,7 +26,7 @@ ****************************************************************************/ /*! - \page qtlabscontrols-navigation.html + \page qtquickcontrols2-navigation.html \title Navigation Controls Qt Labs Controls offers a selection of navigation models. diff --git a/src/imports/controls/doc/src/qtquickcontrols2-styles.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-styles.qdoc index a4f036e6..b38b047c 100644 --- a/src/imports/controls/doc/src/qtquickcontrols2-styles.qdoc +++ b/src/imports/controls/doc/src/qtquickcontrols2-styles.qdoc @@ -26,8 +26,8 @@ ****************************************************************************/ /*! - \page qtlabscontrols-styles.html - \title Styling Qt Labs Controls + \page qtquickcontrols2-styles.html + \title Styling Qt Quick Controls 2 Qt Labs Controls comes with a selection of styles. The \l {Default Style} {Default} style is a simple and light-weight all-round style that offers @@ -145,6 +145,6 @@ \li \l {Default Style} \li \l {Material Style} \li \l {Universal Style} - \li \l{Using File Selectors with Qt Labs Controls} + \li \l{Using File Selectors with Qt Quick Controls 2} \endlist */ diff --git a/src/imports/controls/doc/src/qtquickcontrols2-universal.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-universal.qdoc index 78065ebd..8f227ea7 100644 --- a/src/imports/controls/doc/src/qtquickcontrols2-universal.qdoc +++ b/src/imports/controls/doc/src/qtquickcontrols2-universal.qdoc @@ -26,7 +26,7 @@ ****************************************************************************/ /*! - \page qtlabscontrols-universal.html + \page qtquickcontrols2-universal.html \title Universal Style The Universal Style is based on the Microsoft Universal Design Guidelines. @@ -202,6 +202,6 @@ \section1 Related Information \list - \li \l{Styling Qt Labs Controls} + \li \l{Styling Qt Quick Controls 2} \endlist */ diff --git a/src/imports/controls/doc/src/qtquickcontrols2.qdoc b/src/imports/controls/doc/src/qtquickcontrols2.qdoc index 17e93a44..6ae64929 100644 --- a/src/imports/controls/doc/src/qtquickcontrols2.qdoc +++ b/src/imports/controls/doc/src/qtquickcontrols2.qdoc @@ -27,11 +27,11 @@ /*! \qmlmodule Qt.labs.controls 1.0 - \title Qt Labs Controls QML Types + \title Qt Quick Controls 2 QML Types \ingroup qmlmodules \brief Provides QML types for user interfaces (Qt Labs Controls). - \l{Qt Labs Controls} provides QML types for creating user interfaces. + \l{Qt Quick Controls 2} provides QML types for creating user interfaces. These QML types work in conjunction with \l{Qt Quick} and \l{Qt Quick Layouts}. diff --git a/src/imports/controls/doc/src/templates/qtquicktemplates-index.qdoc b/src/imports/controls/doc/src/templates/qtquicktemplates-index.qdoc index fded42cd..58958369 100644 --- a/src/imports/controls/doc/src/templates/qtquicktemplates-index.qdoc +++ b/src/imports/controls/doc/src/templates/qtquicktemplates-index.qdoc @@ -26,11 +26,11 @@ ****************************************************************************/ /*! - \page qtlabstemplates-index.html - \title Qt Labs Templates + \page qtquicktemplates-index.html + \title Qt Quick Templates 2 \brief A set of templates to create user interface controls in Qt Quick - Qt Labs Templates are the foundations of \l {Qt Labs Controls}. Templates + Qt Labs Templates are the foundations of \l {Qt Quick Controls 2}. Templates are non-visual implementations of controls' logic and behavior. They offer an interface to visualize the controls in QML using \l {Qt Quick}. @@ -48,7 +48,7 @@ \list \li \l{Qt Quick} - \li \l{Qt Labs Controls} - \li \l{Qt Labs Templates QML Types} + \li \l{Qt Quick Controls 2} + \li \l{Qt Quick Templates 2 QML Types} \endlist */ diff --git a/src/imports/controls/doc/src/templates/qtquicktemplates.qdoc b/src/imports/controls/doc/src/templates/qtquicktemplates.qdoc index 0f7f7d86..8efe108e 100644 --- a/src/imports/controls/doc/src/templates/qtquicktemplates.qdoc +++ b/src/imports/controls/doc/src/templates/qtquicktemplates.qdoc @@ -27,11 +27,11 @@ /*! \qmlmodule Qt.labs.templates 1.0 - \title Qt Labs Templates QML Types + \title Qt Quick Templates 2 QML Types \ingroup qmlmodules \brief Provides QML types for templates (Qt Labs Templates). - The \l {Qt Labs Templates} module provides a set of non-visual templates + The \l {Qt Quick Templates 2} module provides a set of non-visual templates that can be used to build user interface controls in QML using \l {Qt Quick}. The QML types can be imported using the following import statement in your @@ -58,7 +58,7 @@ \section1 Related Information \list - \li \l {Qt Labs Controls QML Types} + \li \l {Qt Quick Controls 2 QML Types} \endlist \noautolist -- cgit v1.2.3