aboutsummaryrefslogtreecommitdiffstats
path: root/src/imports/controls/doc/src/qtquickcontrols2-index.qdoc
diff options
context:
space:
mode:
authorJ-P Nurmi <jpnurmi@qt.io>2017-05-20 11:11:42 +0200
committerJ-P Nurmi <jpnurmi@qt.io>2017-05-20 11:11:42 +0200
commiteb70f8179628fe1298ff8fa0032589513e28e303 (patch)
tree690140ebca31c20480c358317fd41541ef26d07b /src/imports/controls/doc/src/qtquickcontrols2-index.qdoc
parentea043d5d838f638e4bc5461aa23fb69a1a9e1eb6 (diff)
parentedded3b5179de4e387f8bb173311bf39df9c43d7 (diff)
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts: src/imports/controls/ApplicationWindow.qml src/imports/controls/material/ApplicationWindow.qml src/imports/controls/universal/ApplicationWindow.qml src/imports/templates/qtquicktemplates2plugin.cpp Change-Id: I9041c69f4ce5dab1d1b994d2318feddb696e56bf
Diffstat (limited to 'src/imports/controls/doc/src/qtquickcontrols2-index.qdoc')
-rw-r--r--src/imports/controls/doc/src/qtquickcontrols2-index.qdoc18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/imports/controls/doc/src/qtquickcontrols2-index.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-index.qdoc
index 66a377bd..703c5d33 100644
--- a/src/imports/controls/doc/src/qtquickcontrols2-index.qdoc
+++ b/src/imports/controls/doc/src/qtquickcontrols2-index.qdoc
@@ -133,18 +133,18 @@
\li ...
\endtable
- \section1 Important Concepts in Qt Quick Controls 2
+ \section1 Topics
\list
- \li \l{Qt Quick Controls 2 Guidelines}
- \li \l{Styling Qt Quick Controls 2}
- \li \l{Customizing 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{Qt Quick Controls 2 Guidelines}{Guidelines}
+ \li \l{Styling Qt Quick Controls 2}{Styling}
+ \li \l{Customizing Qt Quick Controls 2}{Customization}
+ \li \l{High-DPI Support in Qt Quick Controls 2}{High-DPI Support}
+ \li \l{Using File Selectors with Qt Quick Controls 2}{Using File Selectors}
+ \li \l{Deploying Qt Quick Controls 2 Applications}{Deployment}
+ \li \l{Qt Quick Controls 2 Configuration File}{Configuration File}
+ \li \l{Supported Environment Variables in Qt Quick Controls 2}{Environment Variables}
\li \l{Differences between Qt Quick Controls}
- \li \l{Deploying Qt Quick Controls 2 Applications}
- \li \l{Qt Quick Controls 2 Configuration File}
- \li \l{Supported Environment Variables in Qt Quick Controls 2}
\endlist
\section1 Reference