diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2018-07-17 12:39:11 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2018-07-17 12:39:11 +0200 |
| commit | e137877eaaa3975a6769fd2dd574bd75876fcfa5 (patch) | |
| tree | a397bdb1389ea02e6fb7b083e3e149b8a0de50cf /src/quick/doc | |
| parent | 6b53e7e16df0a2451d2b7948ad35485301c564b6 (diff) | |
| parent | 369998639b37b5de46ab1b19b3dd6ca6c2b77d34 (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Conflicts:
examples/quick/demos/photoviewer/i18n/qml_de.ts
examples/quick/demos/photoviewer/i18n/qml_fr.ts
examples/quick/demos/photoviewer/photoviewer.pro
examples/quick/demos/photoviewer/qml.qrc
src/qml/compiler/qv4instr_moth_p.h
tests/auto/quick/qquickanimations/tst_qquickanimations.cpp
Change-Id: Ibea76b468577c2a68bd305cee82ae6444d0f8073
Diffstat (limited to 'src/quick/doc')
| -rw-r--r-- | src/quick/doc/src/qtquick.qdoc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/quick/doc/src/qtquick.qdoc b/src/quick/doc/src/qtquick.qdoc index 4b843f366b..7f72217279 100644 --- a/src/quick/doc/src/qtquick.qdoc +++ b/src/quick/doc/src/qtquick.qdoc @@ -43,7 +43,7 @@ QML types for creating user interfaces with the QML language, and a \l{Qt Quick C++ Classes}{C++ API} for extending QML applications with C++ code. \note A set of Qt Quick-based UI controls is also available to create user -interfaces. See \l{Qt Quick Controls} for more information. +interfaces. See \l{Qt Quick Controls 2} for more information. For those new to QML and Qt Quick, please see \l{QML Applications} |