From 05597ef3e576a7cc09d193cb46dba490b7886ec1 Mon Sep 17 00:00:00 2001 From: Venugopal Shivashankar Date: Mon, 3 Dec 2018 15:40:51 +0100 Subject: Doc: Update \titles with "Controls 2" in it Alternatively, the old \title is now a \keyword, to avoid broken links to the page. Change-Id: Ib8b97efe8be13559c45c7ca430b2afc93edaa3e7 Reviewed-by: Mitch Curtis --- .../chattutorial/doc/src/qtquickcontrols2-chattutorial.qdoc | 3 ++- .../contactlist/doc/src/qtquickcontrols2-contactlist.qdoc | 3 ++- .../quickcontrols2/flatstyle/doc/src/qtquickcontrols2-flatstyle.qdoc | 3 ++- examples/quickcontrols2/gallery/doc/src/qtquickcontrols2-gallery.qdoc | 3 ++- .../imagine/automotive/doc/src/qtquickcontrols2-automotive.qdoc | 3 ++- .../imagine/musicplayer/doc/src/qtquickcontrols2-musicplayer.qdoc | 3 ++- .../quickcontrols2/sidepanel/doc/src/qtquickcontrols2-sidepanel.qdoc | 3 ++- .../swipetoremove/doc/src/qtquickcontrols2-swipetoremove.qdoc | 3 ++- .../quickcontrols2/texteditor/doc/src/qtquickcontrols2-texteditor.qdoc | 3 ++- .../quickcontrols2/wearable/doc/src/qtquickcontrols2-wearable.qdoc | 3 ++- src/imports/controls/doc/src/qtquickcontrols2-configuration.qdoc | 3 ++- src/imports/controls/doc/src/qtquickcontrols2-cppclasses.qdoc | 3 ++- src/imports/controls/doc/src/qtquickcontrols2-examples.qdoc | 3 ++- src/imports/controls/doc/src/qtquickcontrols2-guidelines.qdoc | 3 ++- src/imports/controls/doc/src/qtquickcontrols2-qmltypes.qdoc | 3 ++- 15 files changed, 30 insertions(+), 15 deletions(-) diff --git a/examples/quickcontrols2/chattutorial/doc/src/qtquickcontrols2-chattutorial.qdoc b/examples/quickcontrols2/chattutorial/doc/src/qtquickcontrols2-chattutorial.qdoc index aea27d94..0708b836 100644 --- a/examples/quickcontrols2/chattutorial/doc/src/qtquickcontrols2-chattutorial.qdoc +++ b/examples/quickcontrols2/chattutorial/doc/src/qtquickcontrols2-chattutorial.qdoc @@ -28,7 +28,8 @@ /*! \example chattutorial \keyword Qt Quick Controls - Chat Tutorial - \title Qt Quick Controls 2 - Chat Tutorial + \title Qt Quick Controls - Chat Tutorial + \keyword Qt Quick Controls 2 - Chat Tutorial \brief Tutorial about writing a basic chat client using Qt Quick Controls 2. \ingroup qtquickcontrols2-examples diff --git a/examples/quickcontrols2/contactlist/doc/src/qtquickcontrols2-contactlist.qdoc b/examples/quickcontrols2/contactlist/doc/src/qtquickcontrols2-contactlist.qdoc index 110f398f..2c692430 100644 --- a/examples/quickcontrols2/contactlist/doc/src/qtquickcontrols2-contactlist.qdoc +++ b/examples/quickcontrols2/contactlist/doc/src/qtquickcontrols2-contactlist.qdoc @@ -27,7 +27,8 @@ /*! \example contactlist \keyword Qt Quick Controls - Contact List - \title Qt Quick Controls 2 - Contact List + \title Qt Quick Controls - Contact List + \keyword Qt Quick Controls 2 - Contact List \ingroup qtquickcontrols2-examples \brief A QML app using Qt Quick Controls 2 and a C++ class that implements a simple contact list. diff --git a/examples/quickcontrols2/flatstyle/doc/src/qtquickcontrols2-flatstyle.qdoc b/examples/quickcontrols2/flatstyle/doc/src/qtquickcontrols2-flatstyle.qdoc index c123b27e..a71c2093 100644 --- a/examples/quickcontrols2/flatstyle/doc/src/qtquickcontrols2-flatstyle.qdoc +++ b/examples/quickcontrols2/flatstyle/doc/src/qtquickcontrols2-flatstyle.qdoc @@ -28,7 +28,8 @@ /*! \example flatstyle \keyword Qt Quick Controls - Flat Style - \title Qt Quick Controls 2 - Flat Style + \title Qt Quick Controls - Flat Style + \keyword Qt Quick Controls 2 - Flat Style \ingroup qtquickcontrols2-examples \brief A QML app using Qt Quick Controls 2 and a QML plugin with customized controls. diff --git a/examples/quickcontrols2/gallery/doc/src/qtquickcontrols2-gallery.qdoc b/examples/quickcontrols2/gallery/doc/src/qtquickcontrols2-gallery.qdoc index 560acf52..463acdee 100644 --- a/examples/quickcontrols2/gallery/doc/src/qtquickcontrols2-gallery.qdoc +++ b/examples/quickcontrols2/gallery/doc/src/qtquickcontrols2-gallery.qdoc @@ -28,7 +28,8 @@ /*! \example gallery \keyword Qt Quick Controls - Gallery - \title Qt Quick Controls 2 - Gallery + \title Qt Quick Controls - Gallery + \keyword Qt Quick Controls 2 - Gallery \ingroup qtquickcontrols2-examples \brief A gallery of controls. diff --git a/examples/quickcontrols2/imagine/automotive/doc/src/qtquickcontrols2-automotive.qdoc b/examples/quickcontrols2/imagine/automotive/doc/src/qtquickcontrols2-automotive.qdoc index 6e293450..4e3d3352 100644 --- a/examples/quickcontrols2/imagine/automotive/doc/src/qtquickcontrols2-automotive.qdoc +++ b/examples/quickcontrols2/imagine/automotive/doc/src/qtquickcontrols2-automotive.qdoc @@ -28,7 +28,8 @@ /*! \example imagine/automotive \keyword Qt Quick Controls - Imagine Style Example: Automotive - \title Qt Quick Controls 2 - Imagine Style Example: Automotive + \title Qt Quick Controls - Imagine Style Example: Automotive + \keyword Qt Quick Controls 2 - Imagine Style Example: Automotive \ingroup qtquickcontrols2-examples \brief An automotive user interface using custom Imagine style assets. diff --git a/examples/quickcontrols2/imagine/musicplayer/doc/src/qtquickcontrols2-musicplayer.qdoc b/examples/quickcontrols2/imagine/musicplayer/doc/src/qtquickcontrols2-musicplayer.qdoc index f6c2189f..28d298e7 100644 --- a/examples/quickcontrols2/imagine/musicplayer/doc/src/qtquickcontrols2-musicplayer.qdoc +++ b/examples/quickcontrols2/imagine/musicplayer/doc/src/qtquickcontrols2-musicplayer.qdoc @@ -28,7 +28,8 @@ /*! \example imagine/musicplayer \keyword Qt Quick Controls - Imagine Style Example: Music Player - \title Qt Quick Controls 2 - Imagine Style Example: Music Player + \title Qt Quick Controls - Imagine Style Example: Music Player + \keyword Qt Quick Controls 2 - Imagine Style Example: Music Player \ingroup qtquickcontrols2-examples \brief An audio player user interface using custom Imagine style assets. diff --git a/examples/quickcontrols2/sidepanel/doc/src/qtquickcontrols2-sidepanel.qdoc b/examples/quickcontrols2/sidepanel/doc/src/qtquickcontrols2-sidepanel.qdoc index a7d0828e..49e997fb 100644 --- a/examples/quickcontrols2/sidepanel/doc/src/qtquickcontrols2-sidepanel.qdoc +++ b/examples/quickcontrols2/sidepanel/doc/src/qtquickcontrols2-sidepanel.qdoc @@ -28,7 +28,8 @@ /*! \example sidepanel \keyword Qt Quick Controls - Side Panel - \title Qt Quick Controls 2 - Side Panel + \title Qt Quick Controls - Side Panel + \keyword Qt Quick Controls 2 - Side Panel \ingroup qtquickcontrols2-examples \brief A persistent side panel with Drawer. diff --git a/examples/quickcontrols2/swipetoremove/doc/src/qtquickcontrols2-swipetoremove.qdoc b/examples/quickcontrols2/swipetoremove/doc/src/qtquickcontrols2-swipetoremove.qdoc index 9fd05261..c359a423 100644 --- a/examples/quickcontrols2/swipetoremove/doc/src/qtquickcontrols2-swipetoremove.qdoc +++ b/examples/quickcontrols2/swipetoremove/doc/src/qtquickcontrols2-swipetoremove.qdoc @@ -28,7 +28,8 @@ /*! \example swipetoremove \keyword Qt Quick Controls - Swipe to Remove - \title Qt Quick Controls 2 - Swipe to Remove + \title Qt Quick Controls - Swipe to Remove + \keyword Qt Quick Controls 2 - Swipe to Remove \ingroup qtquickcontrols2-examples \brief Demonstrates removal of list items by swipe gesture. diff --git a/examples/quickcontrols2/texteditor/doc/src/qtquickcontrols2-texteditor.qdoc b/examples/quickcontrols2/texteditor/doc/src/qtquickcontrols2-texteditor.qdoc index 6ba64b34..3e9a9268 100644 --- a/examples/quickcontrols2/texteditor/doc/src/qtquickcontrols2-texteditor.qdoc +++ b/examples/quickcontrols2/texteditor/doc/src/qtquickcontrols2-texteditor.qdoc @@ -27,7 +27,8 @@ /*! \example texteditor \keyword Qt Quick Controls - Text Editor - \title Qt Quick Controls 2 - Text Editor + \title Qt Quick Controls - Text Editor + \keyword Qt Quick Controls 2 - Text Editor \ingroup qtquickcontrols2-examples \brief A QML app using Qt Quick Controls 2 and a C++ class to provide a fully-functional rich-text editor application. diff --git a/examples/quickcontrols2/wearable/doc/src/qtquickcontrols2-wearable.qdoc b/examples/quickcontrols2/wearable/doc/src/qtquickcontrols2-wearable.qdoc index fae719f8..95e8329d 100644 --- a/examples/quickcontrols2/wearable/doc/src/qtquickcontrols2-wearable.qdoc +++ b/examples/quickcontrols2/wearable/doc/src/qtquickcontrols2-wearable.qdoc @@ -28,7 +28,8 @@ /*! \example wearable \keyword Qt Quick Controls - Wearable Demo - \title Qt Quick Controls 2 - Wearable Demo + \title Qt Quick Controls - Wearable Demo + \keyword Qt Quick Controls 2 - Wearable Demo \ingroup qtquickcontrols2-examples \brief Demonstrates an application launcher designed for wearable devices. diff --git a/src/imports/controls/doc/src/qtquickcontrols2-configuration.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-configuration.qdoc index a907f532..a846f607 100644 --- a/src/imports/controls/doc/src/qtquickcontrols2-configuration.qdoc +++ b/src/imports/controls/doc/src/qtquickcontrols2-configuration.qdoc @@ -28,7 +28,8 @@ /*! \page qtquickcontrols2-configuration.html \keyword Qt Quick Controls Configuration File - \title Qt Quick Controls 2 Configuration File + \title Qt Quick Controls Configuration File + \keyword Qt Quick Controls 2 Configuration File Qt Quick Controls 2 support a special configuration file, \c :/qtquickcontrols2.conf, that is built into an application's resources. diff --git a/src/imports/controls/doc/src/qtquickcontrols2-cppclasses.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-cppclasses.qdoc index 1397e974..4a8ecfea 100644 --- a/src/imports/controls/doc/src/qtquickcontrols2-cppclasses.qdoc +++ b/src/imports/controls/doc/src/qtquickcontrols2-cppclasses.qdoc @@ -28,7 +28,8 @@ /*! \module QtQuickControls2 \keyword Qt Quick Controls C++ Classes - \title Qt Quick Controls 2 C++ Classes + \title Qt Quick Controls C++ Classes + \keyword Qt Quick Controls 2 C++ Classes \ingroup modules \qtvariable quickcontrols2 diff --git a/src/imports/controls/doc/src/qtquickcontrols2-examples.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-examples.qdoc index e10037df..b828f32c 100644 --- a/src/imports/controls/doc/src/qtquickcontrols2-examples.qdoc +++ b/src/imports/controls/doc/src/qtquickcontrols2-examples.qdoc @@ -29,7 +29,8 @@ \group qtquickcontrols2-examples \ingroup all-examples \keyword Qt Quick Controls Examples - \title Qt Quick Controls 2 Examples + \title Qt Quick Controls Examples + \keyword 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 Quick Controls 2}. diff --git a/src/imports/controls/doc/src/qtquickcontrols2-guidelines.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-guidelines.qdoc index 24a5be62..034ed0f9 100644 --- a/src/imports/controls/doc/src/qtquickcontrols2-guidelines.qdoc +++ b/src/imports/controls/doc/src/qtquickcontrols2-guidelines.qdoc @@ -28,7 +28,8 @@ /*! \page qtquickcontrols2-guidelines.html \keyword Qt Quick Controls Guidelines - \title Qt Quick Controls 2 Guidelines + \title Qt Quick Controls Guidelines + \keyword Qt Quick Controls 2 Guidelines Qt Quick Controls 2 offers a selection of controls that can be used to build complete interfaces in Qt Quick. diff --git a/src/imports/controls/doc/src/qtquickcontrols2-qmltypes.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-qmltypes.qdoc index 5f0f704c..350c4670 100644 --- a/src/imports/controls/doc/src/qtquickcontrols2-qmltypes.qdoc +++ b/src/imports/controls/doc/src/qtquickcontrols2-qmltypes.qdoc @@ -28,7 +28,8 @@ /*! \qmlmodule QtQuick.Controls 2.5 \keyword Qt Quick Controls QML Types - \title Qt Quick Controls 2 QML Types + \title Qt Quick Controls QML Types + \keyword Qt Quick Controls 2 QML Types \ingroup qmlmodules \brief Provides QML types for user interfaces (Qt Quick Controls 2). -- cgit v1.2.3