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 /src/imports/controls/doc/src/qtquickcontrols2-universal.qdoc | |
| parent | 05597ef3e576a7cc09d193cb46dba490b7886ec1 (diff) | |
| parent | d3545dbdfdb30e310c6c962ba92f4fdf57354666 (diff) | |
Merge remote-tracking branch 'origin/5.12.0' into 5.12
Change-Id: I7fe9e74beff3cdbfbf02ee0f129a8204ad31046e
Diffstat (limited to 'src/imports/controls/doc/src/qtquickcontrols2-universal.qdoc')
| -rw-r--r-- | src/imports/controls/doc/src/qtquickcontrols2-universal.qdoc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/imports/controls/doc/src/qtquickcontrols2-universal.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-universal.qdoc index 80bf9ef7..f1bfb1c8 100644 --- a/src/imports/controls/doc/src/qtquickcontrols2-universal.qdoc +++ b/src/imports/controls/doc/src/qtquickcontrols2-universal.qdoc @@ -32,7 +32,7 @@ The Universal Style is based on the Microsoft Universal Design Guidelines. \l {detailed-desc-universal}{More...} - \styleimport {QtQuick.Controls.Universal 2.5} {Qt 5.7} + \styleimport {QtQuick.Controls.Universal 2.12} {Qt 5.7} \section1 Attached Properties @@ -92,9 +92,9 @@ \row \li \qml - import QtQuick 2.0 - import QtQuick.Controls 2.1 - import QtQuick.Controls.Universal 2.1 + import QtQuick 2.12 + import QtQuick.Controls 2.12 + import QtQuick.Controls.Universal 2.12 ApplicationWindow { visible: true |