diff options
Diffstat (limited to 'src/controls/doc/src')
-rw-r--r-- | src/controls/doc/src/qtquickcontrols-examples.qdoc | 34 | ||||
-rw-r--r-- | src/controls/doc/src/qtquickcontrols-index.qdoc | 16 | ||||
-rw-r--r-- | src/controls/doc/src/qtquickcontrols-overview.qdoc | 10 | ||||
-rw-r--r-- | src/controls/doc/src/qtquickcontrols-platformnotes.qdoc | 6 | ||||
-rw-r--r-- | src/controls/doc/src/qtquickcontrols.qdoc | 6 | ||||
-rw-r--r-- | src/controls/doc/src/qtquickcontrolsstyles-index.qdoc | 12 |
6 files changed, 42 insertions, 42 deletions
diff --git a/src/controls/doc/src/qtquickcontrols-examples.qdoc b/src/controls/doc/src/qtquickcontrols-examples.qdoc index fff6103e..b6f2dca0 100644 --- a/src/controls/doc/src/qtquickcontrols-examples.qdoc +++ b/src/controls/doc/src/qtquickcontrols-examples.qdoc @@ -28,16 +28,16 @@ /*! \group qtquickcontrols_examples \ingroup all-examples - \title Qt Quick Controls Examples - \brief A Collection of examples for \l{Qt Quick Controls}, written in QML. + \title Qt Quick Controls 1 Examples + \brief A Collection of examples for \l{Qt Quick Controls 1}, written in QML. These examples show how to create user interfaces using - \l{Qt Quick Controls}. + \l{Qt Quick Controls 1}. */ /*! \example gallery - \title Qt Quick Controls - Gallery + \title Qt Quick Controls 1 - Gallery \ingroup qtquickcontrols_examples \brief A collection of components for a classic desktop-style UI. @@ -58,14 +58,14 @@ \endraw This example project demonstrates the various UI components provided by - \l{Qt Quick Controls}. + \l{Qt Quick Controls 1}. \include examples-run.qdocinc */ /*! \example uiforms - \title Qt Quick Controls - UI Forms + \title Qt Quick Controls 1 - UI Forms \ingroup qtquickcontrols_examples \brief Demonstrates how to separate the application logic from the UI. @@ -126,13 +126,13 @@ /*! \example tableview - \title Qt Quick Controls - Table View Example + \title Qt Quick Controls 1 - Table View Example \ingroup qtquickcontrols_examples \brief An example for the TableView control. \image qtquickcontrols-example-tableview.png This example project demonstrates the usage of \l {TableView} from - \l{Qt Quick Controls} - a control to display one or more columns of + \l{Qt Quick Controls 1} - a control to display one or more columns of information from a data list model. The example includes a model that supports sorting and filtering. @@ -165,7 +165,7 @@ /*! \example texteditor - \title Qt Quick Controls - Text Editor Example + \title Qt Quick Controls 1 - Text Editor Example \ingroup qtquickcontrols_examples \brief A QML app using Qt Quick Controls and a C++ class to provide a fully-functional rich-text editor application. @@ -206,13 +206,13 @@ /*! \example touch - \title Qt Quick Controls - Touch Gallery + \title Qt Quick Controls 1 - Touch Gallery \ingroup qtquickcontrols_examples \brief Demonstrates UI controls for a touch interface. \image qtquickcontrols-example-touch.png \e {Touch Gallery} demonstrates how to implement a UI suitable for touch - input using the following \l{Qt Quick Controls}: + input using the following \l{Qt Quick Controls 1}: \list \li \l ApplicationWindow @@ -228,7 +228,7 @@ \endlist The appearance of the controls is customized by using - \l {Qt Quick Controls Styles}. + \l {Qt Quick Controls 1 Styles}. \include examples-run.qdocinc @@ -452,7 +452,7 @@ /*! \example calendar - \title Qt Quick Controls - Calendar Example + \title Qt Quick Controls 1 - Calendar Example \ingroup qtquickcontrols_examples \brief Demonstrates the use of Calendar control. \image qtquickcontrols-example-calendar.png @@ -540,25 +540,25 @@ /*! \example styles - \title Qt Quick Controls - Styles Example + \title Qt Quick Controls 1 - Styles Example \ingroup qtquickcontrols_examples \brief Demonstrates custom styles. \image qtquickcontrols-example-styles.png - This example shows how to create custom styles for \l{Qt Quick Controls}. + This example shows how to create custom styles for \l{Qt Quick Controls 1}. \include examples-run.qdocinc */ /*! \example filesystembrowser - \title Qt Quick Controls - File System Browser Example + \title Qt Quick Controls 1 - File System Browser Example \ingroup qtquickcontrols_examples \brief An example for the TreeView control. \image qtquickcontrols-example-filesystembrowser.png This example project demonstrates the usage of \l {TreeView} from - \l{Qt Quick Controls} - a control to display a tree representation of items + \l{Qt Quick Controls 1} - a control to display a tree representation of items from a model derived from the QAbstractItemModel class. The example displays the home path data given by the QFileSystemModel model. diff --git a/src/controls/doc/src/qtquickcontrols-index.qdoc b/src/controls/doc/src/qtquickcontrols-index.qdoc index 28bc3644..727be41e 100644 --- a/src/controls/doc/src/qtquickcontrols-index.qdoc +++ b/src/controls/doc/src/qtquickcontrols-index.qdoc @@ -26,8 +26,8 @@ ****************************************************************************/ /*! - \page qtquickcontrols-index.html - \title Qt Quick Controls + \page qtquickcontrols1-index.html + \title Qt Quick Controls 1 \brief The Qt Quick Controls module provides a set of UI controls for Qt Quick. @@ -36,7 +36,7 @@ The module was introduced in Qt 5.1. - Visit the \l{Qt Quick Controls Overview} page to get started. + Visit the \l{Qt Quick Controls 1 Overview} page to get started. \section1 Application Window Components used to describe the basic window properties of an application. @@ -67,11 +67,11 @@ \list \li \l{Qt Quick} - \li \l{Qt Quick Controls Overview} - \li \l{Qt Quick Controls QML Types}{Qt Quick Controls QML Types} - \li \l{Qt Quick Controls Platform Notes} - \li \l{Qt Quick Controls Examples} - \li \l{Qt Quick Controls Styles} + \li \l{Qt Quick Controls 1 Overview} + \li \l{Qt Quick Controls 1 QML Types} + \li \l{Qt Quick Controls 1 Platform Notes} + \li \l{Qt Quick Controls 1 Examples} + \li \l{Qt Quick Controls 1 Styles} \li \l{Qt Quick Layouts} \li \l{Qt Quick Dialogs} \endlist diff --git a/src/controls/doc/src/qtquickcontrols-overview.qdoc b/src/controls/doc/src/qtquickcontrols-overview.qdoc index 5b7b1c07..dddec50b 100644 --- a/src/controls/doc/src/qtquickcontrols-overview.qdoc +++ b/src/controls/doc/src/qtquickcontrols-overview.qdoc @@ -27,7 +27,7 @@ /*! \page qtquickcontrols-overview.html - \title Qt Quick Controls Overview + \title Qt Quick Controls 1 Overview \brief A set of UI controls to create user interfaces in Qt Quick The Qt Quick Controls provide a set of UI controls to create user interfaces @@ -61,8 +61,8 @@ } \endcode - For an overview of the controls provided by \l{Qt Quick Controls}, you can look at - the \l{Qt Quick Controls - Gallery}{Gallery} example. + For an overview of the controls provided by \l{Qt Quick Controls 1}, you can look at + the \l{Qt Quick Controls 1 - Gallery}{Gallery} example. \image qtquickcontrols-example-gallery-osx.png @@ -134,7 +134,7 @@ \list \li \l{Qt Quick} - \li \l{Qt Quick Controls} - \li \l{Qt Quick Controls Examples} + \li \l{Qt Quick Controls 1} + \li \l{Qt Quick Controls 1 Examples} \endlist */ diff --git a/src/controls/doc/src/qtquickcontrols-platformnotes.qdoc b/src/controls/doc/src/qtquickcontrols-platformnotes.qdoc index 92010562..60d5e797 100644 --- a/src/controls/doc/src/qtquickcontrols-platformnotes.qdoc +++ b/src/controls/doc/src/qtquickcontrols-platformnotes.qdoc @@ -27,11 +27,11 @@ /*! \page qtquickcontrols-platformnotes.html - \title Qt Quick Controls Platform Notes + \title Qt Quick Controls 1 Platform Notes \brief Platform specific notes for Qt Quick Controls. This page contains platform specific notes for creating applications - that use \l{Qt Quick Controls}. + that use \l{Qt Quick Controls 1}. \section1 Android Style @@ -71,7 +71,7 @@ including various navigation modes, actions, an options menu, a back button, and also displays the application icon and title. - Unlike \l{Qt Widgets}, Qt Quick Controls do not use the native action + Unlike \l{Qt Widgets}, Qt Quick Controls 1 do not use the native action bar on Android. ToolBar and MenuBar are offered as a cross-platform replacement. They are unified to a single "action bar" when assigned to the appropriate ApplicationWindow properties. diff --git a/src/controls/doc/src/qtquickcontrols.qdoc b/src/controls/doc/src/qtquickcontrols.qdoc index 974345f5..a57521d1 100644 --- a/src/controls/doc/src/qtquickcontrols.qdoc +++ b/src/controls/doc/src/qtquickcontrols.qdoc @@ -27,15 +27,15 @@ /*! \qmlmodule QtQuick.Controls 1.4 - \title Qt Quick Controls QML Types + \title Qt Quick Controls 1 QML Types \ingroup qmlmodules \brief Provides QML types for user interfaces. - The \l{Qt Quick Controls} module provides QML types for creating user + The \l{Qt Quick Controls 1} module provides QML types for creating user interfaces. These QML types work in conjunction with \l{Qt Quick} and \l{Qt Quick Layouts}. - Controls can be styled using the \l{Qt Quick Controls Styles QML Types}{Styles QML Types}. + Controls can be styled using the \l{Qt Quick Controls 1 Styles QML Types}{Styles QML Types}. The QML types can be imported into your application using the following import statement in your .qml file. diff --git a/src/controls/doc/src/qtquickcontrolsstyles-index.qdoc b/src/controls/doc/src/qtquickcontrolsstyles-index.qdoc index 100868a9..dfe8f4d0 100644 --- a/src/controls/doc/src/qtquickcontrolsstyles-index.qdoc +++ b/src/controls/doc/src/qtquickcontrolsstyles-index.qdoc @@ -57,10 +57,10 @@ /*! \page qtquickcontrolsstyles-index.html - \title Qt Quick Controls Styles + \title Qt Quick Controls 1 Styles \brief The Qt Quick Controls Styles submodule provides custom styles for Qt Quick Controls. - The Qt Quick Controls Styles submodule allows custom styling for \l {Qt Quick Controls}. + The Qt Quick Controls Styles submodule allows custom styling for \l {Qt Quick Controls 1}. The submodule was introduced in Qt 5.1. @@ -118,19 +118,19 @@ \list \li \l{Qt Quick} - \li \l{Qt Quick Controls} - \li \l{Qt Quick Controls Styles QML Types} + \li \l{Qt Quick Controls 1} + \li \l{Qt Quick Controls 1 Styles QML Types} \endlist */ /*! \qmlmodule QtQuick.Controls.Styles 1.4 - \title Qt Quick Controls Styles QML Types + \title Qt Quick Controls 1 Styles QML Types \ingroup qmlmodules \brief Provides QML types for Qt Quick Controls styles. - The \l{Qt Quick Controls} module provides a set of QML types for handling + The \l{Qt Quick Controls 1} module provides a set of QML types for handling styles. Some of the controls allow custom styling similar to widget style sheets. |