aboutsummaryrefslogtreecommitdiffstats
path: root/src/quicktemplates2
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-06-20 16:21:13 +0200
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-06-20 16:21:13 +0200
commitfe127d8da4688b74dc6b9ad1f7170c8b5f1ef609 (patch)
tree9bc11a498e63c2fac6605bfce2f670387705ae7a /src/quicktemplates2
parentb00d649f109b080b7068c4a7a2a7731d7fb51ea1 (diff)
parentb2f82d77b8ebefc5cfe82b6e30250175c901b2ff (diff)
Merge "Merge remote-tracking branch 'origin/5.13.0' into 5.13"
Diffstat (limited to 'src/quicktemplates2')
-rw-r--r--src/quicktemplates2/qquicksplitview.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/quicktemplates2/qquicksplitview.cpp b/src/quicktemplates2/qquicksplitview.cpp
index d1e7a8ae..75cd9674 100644
--- a/src/quicktemplates2/qquicksplitview.cpp
+++ b/src/quicktemplates2/qquicksplitview.cpp
@@ -202,8 +202,8 @@ QT_BEGIN_NAMESPACE
SplitView.preferredWidth and \c SplitView.preferredHeight properties can be
serialized using the \l saveState() and \l restoreState() functions:
- \code
- import QtQuick.Controls 2.5
+ \qml \QtMinorVersion
+ import QtQuick.Controls 2.\1
import Qt.labs.settings 1.0
ApplicationWindow {
@@ -222,13 +222,13 @@ QT_BEGIN_NAMESPACE
// ...
}
}
- \endcode
+ \endqml
Alternatively, the \l {Settings::}{value()} and \l {Settings::}{setValue()}
functions of \l Settings can be used:
- \code
- import QtQuick.Controls 2.5
+ \qml \QtMinorVersion
+ import QtQuick.Controls 2.\1
import Qt.labs.settings 1.0
ApplicationWindow {
@@ -246,7 +246,7 @@ QT_BEGIN_NAMESPACE
// ...
}
}
- \endcode
+ \endqml
\sa SplitHandle, {Customizing SplitView}, {Container Controls}
*/