aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJ-P Nurmi <jpnurmi@qt.io>2017-03-30 08:16:31 +0200
committerJ-P Nurmi <jpnurmi@qt.io>2017-04-03 07:11:38 +0000
commit8d1ad7261d265972af1e837a7d07c91164694abb (patch)
tree0fa1b8dca06c46fad5f16eeee5d8f5c3fe9875de
parent4f6f82bb5dd2ac5d64c1f5c22f6fd3e524662f98 (diff)
Doc: merge controls & styles columns in the version table
The version table added in c9cd624 looked fine in locally generated docs, but it seems to get a bit too wide in the online snapshots (the table becomes horizontally scrollable). => Merge the controls and styles columns that all have the same version. Change-Id: Icb8387f95211ddee030cb410594adc9a6fad5c97 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
-rw-r--r--src/imports/controls/doc/src/qtquickcontrols2-index.qdoc10
1 files changed, 3 insertions, 7 deletions
diff --git a/src/imports/controls/doc/src/qtquickcontrols2-index.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-index.qdoc
index fdc49855..5fa2980a 100644
--- a/src/imports/controls/doc/src/qtquickcontrols2-index.qdoc
+++ b/src/imports/controls/doc/src/qtquickcontrols2-index.qdoc
@@ -71,35 +71,31 @@
\li \c Qt
\li \l {Qt Quick QML Types}{\c QtQuick}
\li \l {Qt Quick Controls 2 QML Types}{\c QtQuick.Controls},\br
- \l {Qt Quick Templates 2 QML Types}{\c QtQuick.Templates},
- \li \l {Material Style}{\c QtQuick.Controls.Material},\br
- \l {Universal Style}{\c QtQuick.Controls.Universal}
+ \l {Material Style}{\c QtQuick.Controls.Material},\br
+ \l {Universal Style}{\c QtQuick.Controls.Universal},\br
+ \l {Qt Quick Templates 2 QML Types}{\c QtQuick.Templates}
\li \l {Qt Labs Calendar QML Types}{\c Qt.labs.calendar},\br
\l {Qt Labs Platform QML Types}{\c Qt.labs.platform}
\row
\li 5.7
\li 2.7
\li 2.0
- \li 2.0
\li 1.0
\row
\li 5.8
\li 2.8
\li 2.1
- \li 2.1
\li 1.0
\row
\li 5.9
\li 2.9
\li 2.2
- \li 2.2
\li 1.0
\row
\li ...
\li ...
\li ...
\li ...
- \li ...
\endtable
\section1 Important Concepts in Qt Quick Controls 2