summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVenugopal Shivashankar <Venugopal.Shivashankar@qt.io>2018-10-22 14:03:14 +0200
committerTopi Reiniƶ <topi.reinio@qt.io>2018-10-26 20:45:54 +0000
commit229e4efc076d6a6746f1e659c59696e05e1d1c4c (patch)
tree50930b9143d16dec3c2eca152996be96b2537de4
parent318035f0265a5331524540fc6f5ddaa8f5195c8a (diff)
downloadqtdoc-229e4efc076d6a6746f1e659c59696e05e1d1c4c.tar.gz
Doc: Fix links to the Qt Quick Controls 1 docs
This change is inline with the updated link targets in the Qt Quick Controls 1 docs. Task-number: QTBUG-70333 Change-Id: I4ab6f6729d450337570ff89d330aa431b4b0bd1b Reviewed-by: Topi Reiniƶ <topi.reinio@qt.io>
-rw-r--r--doc/config/qtdoc.qdocconf4
-rw-r--r--doc/src/examples.qdoc2
-rw-r--r--doc/src/getting-started/controls-texteditor.qdoc12
-rw-r--r--doc/src/howtos/scalabilityintro.qdoc4
-rw-r--r--doc/src/qmlapp/applicationdevelopers.qdoc4
-rw-r--r--doc/src/qmlapp/firststepsqml.qdoc2
-rw-r--r--doc/src/qmlapp/usecases/styling.qdoc22
-rw-r--r--doc/src/userinterfaces.qdoc2
-rw-r--r--doc/src/whatsnew/whatsnew51.qdoc6
-rw-r--r--doc/src/whatsnew/whatsnew52.qdoc8
-rw-r--r--examples/demos/photoviewer/doc/src/photoviewer.qdoc2
11 files changed, 35 insertions, 33 deletions
diff --git a/doc/config/qtdoc.qdocconf b/doc/config/qtdoc.qdocconf
index d1c770dc..2a337251 100644
--- a/doc/config/qtdoc.qdocconf
+++ b/doc/config/qtdoc.qdocconf
@@ -38,7 +38,7 @@ depends += \
qtqml \
qtqmltest \
qtquick \
- qtquickcontrols \
+ qtquickcontrols1 \
qtquickdialogs \
qtquickextras \
qtscript \
@@ -62,7 +62,7 @@ depends += \
qt3d \
qtcanvas3d \
qtwebview \
- qtquickcontrols2 \
+ qtquickcontrols \
qtwaylandcompositor \
qtcharts \
qtdatavisualization \
diff --git a/doc/src/examples.qdoc b/doc/src/examples.qdoc
index 54ef66be..31ef8256 100644
--- a/doc/src/examples.qdoc
+++ b/doc/src/examples.qdoc
@@ -88,7 +88,7 @@
\list
\li \l{First Steps with QML}
\li \l{Qt Creator: Developing Qt Quick Applications}{Developing Qt Quick Applications}
- \li \l{Qt Quick Controls - Gallery}
+ \li \l{Qt Quick Controls 1 - Gallery}
\li \l{Qt Quick Controls 2 - Gallery}
\li \l{QML Advanced Tutorial}{SameGame}
\li \l{Qt Quick Text Editor Guide}
diff --git a/doc/src/getting-started/controls-texteditor.qdoc b/doc/src/getting-started/controls-texteditor.qdoc
index da693108..87a36288 100644
--- a/doc/src/getting-started/controls-texteditor.qdoc
+++ b/doc/src/getting-started/controls-texteditor.qdoc
@@ -59,7 +59,7 @@ the application.
The files are part of the Qt package and are available when searched for
\uicontrol{Qt Quick Text Editor} in Qt Creator's \uicontrol{Welcome mode}.
All files used in the application are listed for viewing in the
-\l{Qt Quick Controls - Text Editor Example} page.
+\l{Qt Quick Controls 1 - Text Editor Example} page.
\section1 Setting Up the Environment and Project
@@ -105,7 +105,7 @@ later in the guide:
The text editor uses several icons to represent various actions. The icons are
in the \e images directory which is directly under the \e TextEditor project
directory. The images as well as the project files are also listed in the
-reference documentation on the \l{Qt Quick Controls - Text Editor Example} page.
+reference documentation on the \l{Qt Quick Controls 1 - Text Editor Example} page.
We first need to register the image files into the project's resource file,
\e qml.qrc. The resource files compact the images into the binary packages.
@@ -134,7 +134,7 @@ binary. For more information about resource files, see the
The accompanying examples files are listed in the following page:
\list
-\li \l{Qt Quick Controls - Text Editor Example}
+\li \l{Qt Quick Controls 1 - Text Editor Example}
\endlist
*/
@@ -331,7 +331,7 @@ QML type and \l{Signal and Handler Event System}.
The accompanying examples files are found in the following page:
\list
-\li \l{Qt Quick Controls - Text Editor Example}
+\li \l{Qt Quick Controls 1 - Text Editor Example}
\endlist
*/
@@ -521,7 +521,7 @@ these C++ functions in QML files.
The accompanying examples files are found in the following page:
\list
-\li \l{Qt Quick Controls - Text Editor Example}
+\li \l{Qt Quick Controls 1 - Text Editor Example}
\endlist
*/
@@ -679,7 +679,7 @@ and QML file are already packaged into the binary file.
The accompanying examples files are found in the following page:
\list
-\li \l{Qt Quick Controls - Text Editor Example}
+\li \l{Qt Quick Controls 1 - Text Editor Example}
\endlist
*/
diff --git a/doc/src/howtos/scalabilityintro.qdoc b/doc/src/howtos/scalabilityintro.qdoc
index e1a4bbcf..b6bc5212 100644
--- a/doc/src/howtos/scalabilityintro.qdoc
+++ b/doc/src/howtos/scalabilityintro.qdoc
@@ -117,9 +117,9 @@
In addition to controls that define standard parts of application windows,
controls are provided for creating views and menus, as well as presenting or
- receiving input from users. You can use \l{Qt Quick Controls Styles} to
+ receiving input from users. You can use \l{Qt Quick Controls 1 Styles} to
apply custom styling to the predefined controls. For examples of using the
- styles, see \l{Qt Quick Controls - Touch Gallery}.
+ styles, see \l{Qt Quick Controls 1 - Touch Gallery}.
Qt Quick Controls, such as the ToolBar, do not provide a layout
of their own, but require you to position their contents. For this, you can
diff --git a/doc/src/qmlapp/applicationdevelopers.qdoc b/doc/src/qmlapp/applicationdevelopers.qdoc
index 0e6af3e4..d3602849 100644
--- a/doc/src/qmlapp/applicationdevelopers.qdoc
+++ b/doc/src/qmlapp/applicationdevelopers.qdoc
@@ -98,8 +98,8 @@ several controls such as buttons, menus, and views. These controls mimic the
native behavior found in different platforms such as Windows, \macos, and Linux.
\list
-\li \l{Qt Quick Controls Overview}
-\li \l{Qt Quick Controls Styles}{Styles}
+\li \l{Qt Quick Controls 1 Overview}
+\li \l{Qt Quick Controls 1 Styles}{Styles}
\li \l{Qt Quick Dialogs}{Dialogs}
\li \l{Qt Quick Layouts}{Layouts}
\li \l{Qt Quick Extras}{Extras}
diff --git a/doc/src/qmlapp/firststepsqml.qdoc b/doc/src/qmlapp/firststepsqml.qdoc
index 2ad97fec..a563bead 100644
--- a/doc/src/qmlapp/firststepsqml.qdoc
+++ b/doc/src/qmlapp/firststepsqml.qdoc
@@ -179,7 +179,7 @@ Qt Creator and demonstrate different controls and layouts.
\list
\li \l{Qt Quick Layouts - Basic Example}{Basic Layouts}
-\li \l{Qt Quick Controls - Touch Gallery}{Touch Gallery}
+\li \l{Qt Quick Controls 1 - Touch Gallery}{Touch Gallery}
\endlist
Feel free to copy and paste the snippets onto this simple Hellow World
diff --git a/doc/src/qmlapp/usecases/styling.qdoc b/doc/src/qmlapp/usecases/styling.qdoc
index 74b51d61..92f80b50 100644
--- a/doc/src/qmlapp/usecases/styling.qdoc
+++ b/doc/src/qmlapp/usecases/styling.qdoc
@@ -27,29 +27,30 @@
/*!
\page qtquick-usecase-styling.html
\title Use Case - Style And Theme Support
-\brief Example of how to style user interface components in QML
+\brief Example of how to style user interface components in QML.
Styling with QML involves creating a visual type and binding that to a property
or by directly assigning a value to a property. For types that incorporate
Qt Quick's \l{Models and Views in Qt Quick}{delegates} the visual type attaches
to the \e delegate property.
-When using \l{Qt Quick Controls}, the controls automatically set
+When using \l{Qt Quick Controls 1}, the controls automatically set
the appropriate style from the respective \l{Supported Platforms}{platforms}.
\section1 Using the Styling QML Types
-The \l{Qt Quick Controls}{controls} have a \c style property to which the
+The \l{Qt Quick Controls 1}{controls} have a \c style property to which the
\e{styling types} bind. The controls have a corresponding styling type from the
-\l{Qt Quick Controls Styles QML Types}{Qt Quick Controls Styles} module.
-For example, \l Button has a \l ButtonStyle type and \l Menu has a
-\l MenuStyle type. The styling types provide properties applicable to their
-respective controls such as the background, label, or for some controls, the
-cursor appearance.
+\l{Qt Quick Controls 1 Styles QML Types}{Qt Quick Controls 1 Styles} module.
+For example, \l [QtQuickControls1] Button has a
+\l [QtQuickControls1] ButtonStyle type and \l [QtQuickControls1] Menu has a
+\l [QtQuickControls1] MenuStyle type. The styling types provide properties
+applicable to their respective controls such as the background, label, or for
+some controls, the cursor appearance.
\snippet qmlapp/usecases/styling.qml 0
-\note \l{Qt Quick Controls Styles QML Types}{Qt Quick Controls Styles} was
+\note \l{Qt Quick Controls 1 Styles QML Types}{Qt Quick Controls 1 Styles} was
introduced in Qt 5.1 and requires \l{Qt Quick} 2.1.
\section1 Accessing the System Palette
@@ -60,5 +61,6 @@ of visual types to match the native look-and-feel. In addition, on
\l{Desktop Platforms}{desktop} platforms, different color palettes are employed
when changing states, for example, when the application loses keyboard focus.
-When using the \l{Qt Quick Controls}{controls}, the system colors are already used.
+When using the \l{Qt Quick Controls 1}{controls}, the system colors are already
+used.
*/
diff --git a/doc/src/userinterfaces.qdoc b/doc/src/userinterfaces.qdoc
index 3148e099..3018b1d3 100644
--- a/doc/src/userinterfaces.qdoc
+++ b/doc/src/userinterfaces.qdoc
@@ -151,7 +151,7 @@ choose the tool best suited for the job.
\li \inlineimage ok
\li \inlineimage ok
\li
- \li Qt Widgets and Qt Quick Controls integrate well to the underlying
+ \li Qt Widgets and Qt Quick Controls 1 integrate well to the underlying
platform, providing a native look'n'feel on Windows, Linux, and \macos.
\row
\li Custom look'n'feel
diff --git a/doc/src/whatsnew/whatsnew51.qdoc b/doc/src/whatsnew/whatsnew51.qdoc
index dc555d1c..6125659c 100644
--- a/doc/src/whatsnew/whatsnew51.qdoc
+++ b/doc/src/whatsnew/whatsnew51.qdoc
@@ -44,9 +44,9 @@
platforms.
\list
- \li \l{Qt Quick Controls} - a set of reusable UI controls. Qt 5.1
- targets desktop platforms, while future releases will include more features
- useful on touch devices.
+ \li \l{Qt Quick Controls 1}{Qt Quick Controls} - a set of reusable UI
+ controls. Qt 5.1 targets desktop platforms, while future releases will
+ include more features useful on touch devices.
\li \l{Qt Quick Layouts} - provides layouts for \l{Qt Quick}
diff --git a/doc/src/whatsnew/whatsnew52.qdoc b/doc/src/whatsnew/whatsnew52.qdoc
index 462d58cd..afb94174 100644
--- a/doc/src/whatsnew/whatsnew52.qdoc
+++ b/doc/src/whatsnew/whatsnew52.qdoc
@@ -165,10 +165,10 @@
\section2 Qt Quick Controls Module
\list
\li Added support for an editable combo box
- \li Added support for multi-selection in \l TableView
- \li Added support for setting columns movable in \l TableView
- \li Added \l Switch type
- \li Added \l BusyIndicator type
+ \li Added support for multi-selection in \l [QtQuickControls1] TableView
+ \li Added support for setting columns movable in \l [QtQuickControls1] TableView
+ \li Added \l [QtQuickControls1] Switch type
+ \li Added \l [QtQuickControls1] BusyIndicator type
\li Simplified deployment
\endlist
diff --git a/examples/demos/photoviewer/doc/src/photoviewer.qdoc b/examples/demos/photoviewer/doc/src/photoviewer.qdoc
index da9029f8..bebeb9b5 100644
--- a/examples/demos/photoviewer/doc/src/photoviewer.qdoc
+++ b/examples/demos/photoviewer/doc/src/photoviewer.qdoc
@@ -38,7 +38,7 @@
\list
\li Using custom types to create screens and screen controls.
- \li Using Qt Quick Controls to create an application window.
+ \li Using Qt Quick Controls 1 to create an application window.
\li Using the \l Package type with a \l DelegateModel to provide
delegates with a shared context to multiple views.
\li Using XML list models to download Flickr feeds.