summaryrefslogtreecommitdiffstats
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
parentb00d649f109b080b7068c4a7a2a7731d7fb51ea1 (diff)
parentb2f82d77b8ebefc5cfe82b6e30250175c901b2ff (diff)
Merge "Merge remote-tracking branch 'origin/5.13.0' into 5.13"5.13
-rw-r--r--dist/changes-5.13.033
-rw-r--r--src/quicktemplates2/qquicksplitview.cpp12
-rw-r--r--tests/manual/testbench/controls/SplitView.qml4
3 files changed, 41 insertions, 8 deletions
diff --git a/dist/changes-5.13.0 b/dist/changes-5.13.0
new file mode 100644
index 00000000..5792b032
--- /dev/null
+++ b/dist/changes-5.13.0
@@ -0,0 +1,33 @@
+Qt 5.13 introduces many new features and improvements as well as bugfixes
+over the 5.12.x series. For more details, refer to the online documentation
+included in this distribution. The documentation is also available online:
+
+https://doc.qt.io/qt-5/index.html
+
+The Qt version 5.13 series is binary compatible with the 5.12.x series.
+Applications compiled for 5.12 will continue to run with 5.13.
+
+Some of the changes listed in this file include issue tracking numbers
+corresponding to tasks in the Qt Bug Tracker:
+
+https://bugreports.qt.io/
+
+Each of these identifiers can be entered in the bug tracker to obtain more
+information about a particular change.
+
+****************************************************************************
+* Controls *
+****************************************************************************
+
+ - Added SplitView, a control that lays out items horizontally or vertically
+ with a draggable splitter between each item.
+ - Added cache property to icon.
+ - [QTBUG-75072] ScrollBar: fixed value not changing when scrolling via
+ VoiceOver.
+ - [QTBUG-74661] QQuickComboBox: we no longer hide popup when it's focused.
+ - [QTBUG-69096] Doc: expanded upon Pane's Content Sizing section.
+ - [QTBUG-74902] Doc: added a Size section to explain StackView's sizing
+ behavior.
+ - [QTBUG-74688] SpinBox: fixed indicators being hovered when mouse is moved
+ while pressed.
+ - [QTBUG-74276] Fix SplitView crash when using certain attached properties.
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}
*/
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: [