diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-12-05 09:19:45 +0100 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-12-05 09:19:46 +0100 |
commit | 86f09add213e5067602f4bdf0cf659d693f03918 (patch) | |
tree | 38eda1246edccab49bd4ecc952f8ea887983c3a1 /examples/quickcontrols2/chattutorial/doc/src | |
parent | 05597ef3e576a7cc09d193cb46dba490b7886ec1 (diff) | |
parent | d3545dbdfdb30e310c6c962ba92f4fdf57354666 (diff) |
Merge remote-tracking branch 'origin/5.12.0' into 5.12
Change-Id: I7fe9e74beff3cdbfbf02ee0f129a8204ad31046e
Diffstat (limited to 'examples/quickcontrols2/chattutorial/doc/src')
-rw-r--r-- | examples/quickcontrols2/chattutorial/doc/src/qtquickcontrols2-chattutorial.qdoc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/examples/quickcontrols2/chattutorial/doc/src/qtquickcontrols2-chattutorial.qdoc b/examples/quickcontrols2/chattutorial/doc/src/qtquickcontrols2-chattutorial.qdoc index 0708b836..f7cbd32f 100644 --- a/examples/quickcontrols2/chattutorial/doc/src/qtquickcontrols2-chattutorial.qdoc +++ b/examples/quickcontrols2/chattutorial/doc/src/qtquickcontrols2-chattutorial.qdoc @@ -98,7 +98,7 @@ Let's modify the default QML code to suit our needs. \quotefromfile chattutorial/chapter1-settingup/main.qml \skipto import -\printuntil import QtQuick.Controls 2.1 +\printuntil import QtQuick.Controls 2.12 First, import the \l {Qt Quick} module. This gives us access to graphical primitives such as \l Item, \l Rectangle, \l Text, and so @@ -768,7 +768,7 @@ their text color to something lighter. The simplest way of doing so is to import the Material style directly and use the Material attached property: \code - import QtQuick.Controls.Material 2.1 + import QtQuick.Controls.Material 2.12 // ... |