aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMitch Curtis <mitch.curtis@qt.io>2019-05-28 14:58:44 +0200
committerMitch Curtis <mitch.curtis@qt.io>2019-06-04 10:58:30 +0200
commitea80013b2e990c8c28a9dfe7d6afaaa250bf2402 (patch)
tree9fc55bcb3fe4237bbfae22726542c50fbfd2f8b1
parenta87188ace95ad9818e078aae72cfab7ea4a9cfaa (diff)
Doc: fix import versions in SplitView documentationv5.13.0-rc3v5.13.0-rc2v5.13.05.13.0
Change-Id: Ib491000bf2751f24e3dc635958bdf997193c225e Fixes: QTBUG-76077 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
-rw-r--r--src/quicktemplates2/qquicksplitview.cpp12
-rw-r--r--tests/manual/testbench/controls/SplitView.qml4
2 files changed, 8 insertions, 8 deletions
diff --git a/src/quicktemplates2/qquicksplitview.cpp b/src/quicktemplates2/qquicksplitview.cpp
index 2c02d442..c1841e5b 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}
*/
diff --git a/tests/manual/testbench/controls/SplitView.qml b/tests/manual/testbench/controls/SplitView.qml
index 7d534de4..94f06221 100644
--- a/tests/manual/testbench/controls/SplitView.qml
+++ b/tests/manual/testbench/controls/SplitView.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Controls 2.5
+import QtQuick 2.13
+import QtQuick.Controls 2.13
QtObject {
property var supportedStates: [