diff options
| author | J-P Nurmi <jpnurmi@gmail.com> | 2017-04-03 09:53:19 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@gmail.com> | 2017-04-03 09:53:19 +0200 |
| commit | 4bd9acec8876e1c36168010758d0fea645a25ba2 (patch) | |
| tree | a79345df4902efdf7827cc6c4ac6aafefdfaa39b /src/imports/controls/doc | |
| parent | c3cc73e3087db62a8427ff569abff1a8289dae83 (diff) | |
| parent | f720bc8e38dfdc14c48ffe3178a704f5d130f932 (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
src/imports/controls/ComboBox.qml
src/imports/controls/material/ComboBox.qml
src/imports/controls/universal/ComboBox.qml
Change-Id: Ib900bb6298c32245399f52980b44575b64b7409f
Diffstat (limited to 'src/imports/controls/doc')
| -rw-r--r-- | src/imports/controls/doc/src/qtquickcontrols2-customize.qdoc | 4 | ||||
| -rw-r--r-- | src/imports/controls/doc/src/qtquickcontrols2-index.qdoc | 42 |
2 files changed, 44 insertions, 2 deletions
diff --git a/src/imports/controls/doc/src/qtquickcontrols2-customize.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-customize.qdoc index 633fb217..c2b1e640 100644 --- a/src/imports/controls/doc/src/qtquickcontrols2-customize.qdoc +++ b/src/imports/controls/doc/src/qtquickcontrols2-customize.qdoc @@ -200,9 +200,9 @@ style will illustrate the elevation with a drop shadow; the higher the elevation, the larger the shadow. - The first step is to \l {Creating Qt Quick Projects}{create a new Qt Quick + The first step is to \l {Qt Creator: Creating Qt Quick Projects}{create a new Qt Quick Controls 2 application} in Qt Creator. After that, we - \l {Creating C++ Classes}{add a C++ type} that stores the elevation. Since + \l {Qt Creator: Creating C++ Classes}{add a C++ type} that stores the elevation. Since the type will be used for every control supported by our style, and because we may wish to add other attached properties later on, we'll call it MyStyle. Here is \c MyStyle.h: diff --git a/src/imports/controls/doc/src/qtquickcontrols2-index.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-index.qdoc index 90d0c9d7..99b6c2ea 100644 --- a/src/imports/controls/doc/src/qtquickcontrols2-index.qdoc +++ b/src/imports/controls/doc/src/qtquickcontrols2-index.qdoc @@ -60,6 +60,48 @@ For more details, see \l {Getting Started with Qt Quick Controls 2}. + \section1 Versions + + Qt Quick Controls 2.0 was released in Qt 5.7. Subsequent minor Qt releases + increment the import version of the Qt Quick Controls 2 modules by one. The + experimental Qt Labs modules use import version 1.0. + + \table + \header + \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} + \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 \list |