diff options
author | Mitch Curtis <mitch.curtis@qt.io> | 2019-03-04 15:17:37 +0100 |
---|---|---|
committer | Mitch Curtis <mitch.curtis@qt.io> | 2019-03-07 08:06:44 +0000 |
commit | 359c81a8224cf90ef35ca0932ee146bc50a7292b (patch) | |
tree | 97f915df4bbc9159ef53aa3d4f09154f8564bc7a | |
parent | 18da9482bb52d7a59bc7ffac719bc03e2e164417 (diff) |
SplitView: fix revisions, imports and \since versions
Work was probably started before 5.12 but the patch ended up getting
merged in time for 5.13. It seems that I forgot to update the versions.
Change-Id: I19edf08158cca0967a7a536b3aee326e3b393d4c
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
-rw-r--r-- | src/imports/controls/SplitView.qml | 8 | ||||
-rw-r--r-- | src/imports/controls/doc/snippets/qtquickcontrols2-splitview-custom.qml | 4 | ||||
-rw-r--r-- | src/imports/controls/fusion/SplitView.qml | 10 | ||||
-rw-r--r-- | src/imports/controls/imagine/SplitView.qml | 8 | ||||
-rw-r--r-- | src/imports/controls/material/SplitView.qml | 10 | ||||
-rw-r--r-- | src/imports/controls/qtquickcontrols2plugin.cpp | 6 | ||||
-rw-r--r-- | src/imports/controls/universal/SplitView.qml | 10 | ||||
-rw-r--r-- | src/imports/templates/qtquicktemplates2plugin.cpp | 12 | ||||
-rw-r--r-- | src/quicktemplates2/qquicksplitview.cpp | 4 | ||||
-rw-r--r-- | tests/auto/controls/data/splitview/fillItemInMiddle.qml | 4 | ||||
-rw-r--r-- | tests/auto/controls/data/splitview/fillItemOnLeft.qml | 4 | ||||
-rw-r--r-- | tests/auto/controls/data/splitview/fillItemOnTop.qml | 4 | ||||
-rw-r--r-- | tests/auto/controls/data/tst_splitview.qml | 8 |
13 files changed, 47 insertions, 45 deletions
diff --git a/src/imports/controls/SplitView.qml b/src/imports/controls/SplitView.qml index 1953cf69..9d37a83e 100644 --- a/src/imports/controls/SplitView.qml +++ b/src/imports/controls/SplitView.qml @@ -34,10 +34,10 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 +import QtQuick 2.13 +import QtQuick.Templates 2.13 as T +import QtQuick.Controls 2.13 +import QtQuick.Controls.impl 2.13 T.SplitView { id: control diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-splitview-custom.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-splitview-custom.qml index e202e836..96e8ad2f 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-splitview-custom.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-splitview-custom.qml @@ -25,8 +25,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.5 +import QtQuick 2.13 +import QtQuick.Controls 2.13 Item { width: 200 diff --git a/src/imports/controls/fusion/SplitView.qml b/src/imports/controls/fusion/SplitView.qml index 4050b28a..6a04b4da 100644 --- a/src/imports/controls/fusion/SplitView.qml +++ b/src/imports/controls/fusion/SplitView.qml @@ -34,11 +34,11 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Controls.Fusion 2.5 +import QtQuick 2.13 +import QtQuick.Templates 2.13 as T +import QtQuick.Controls 2.13 +import QtQuick.Controls.impl 2.13 +import QtQuick.Controls.Fusion 2.13 T.SplitView { id: control diff --git a/src/imports/controls/imagine/SplitView.qml b/src/imports/controls/imagine/SplitView.qml index a90b3a86..a4a858f4 100644 --- a/src/imports/controls/imagine/SplitView.qml +++ b/src/imports/controls/imagine/SplitView.qml @@ -34,10 +34,10 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls.Imagine 2.5 -import QtQuick.Controls.Imagine.impl 2.5 +import QtQuick 2.13 +import QtQuick.Templates 2.13 as T +import QtQuick.Controls.Imagine 2.13 +import QtQuick.Controls.Imagine.impl 2.13 T.SplitView { id: control diff --git a/src/imports/controls/material/SplitView.qml b/src/imports/controls/material/SplitView.qml index 6e5eb54d..5544e833 100644 --- a/src/imports/controls/material/SplitView.qml +++ b/src/imports/controls/material/SplitView.qml @@ -34,11 +34,11 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Controls.Material 2.5 +import QtQuick 2.13 +import QtQuick.Templates 2.13 as T +import QtQuick.Controls 2.13 +import QtQuick.Controls.impl 2.13 +import QtQuick.Controls.Material 2.13 T.SplitView { id: control diff --git a/src/imports/controls/qtquickcontrols2plugin.cpp b/src/imports/controls/qtquickcontrols2plugin.cpp index 89d956bd..260e7297 100644 --- a/src/imports/controls/qtquickcontrols2plugin.cpp +++ b/src/imports/controls/qtquickcontrols2plugin.cpp @@ -193,9 +193,9 @@ void QtQuickControls2Plugin::registerTypes(const char *uri) qmlRegisterType(resolvedUrl(QStringLiteral("MenuBarItem.qml")), uri, 2, 3, "MenuBarItem"); qmlRegisterUncreatableType<QQuickOverlay>(uri, 2, 3, "Overlay", QStringLiteral("Overlay is only available as an attached property.")); - // QtQuick.Controls 2.5 (new types in Qt 5.12) - qmlRegisterType(resolvedUrl(QStringLiteral("SplitView.qml")), uri, 2, 5, "SplitView"); - qmlRegisterUncreatableType<QQuickSplitHandleAttached>(uri, 2, 5, "SplitHandle", + // QtQuick.Controls 2.13 (new types in Qt 5.13) + qmlRegisterType(resolvedUrl(QStringLiteral("SplitView.qml")), uri, 2, 13, "SplitView"); + qmlRegisterUncreatableType<QQuickSplitHandleAttached>(uri, 2, 13, "SplitHandle", QStringLiteral("SplitHandle is only available as an attached property.")); // Register the latest version, even if there are no new types or new revisions for existing types yet. diff --git a/src/imports/controls/universal/SplitView.qml b/src/imports/controls/universal/SplitView.qml index bbcdba9d..a4ed22dd 100644 --- a/src/imports/controls/universal/SplitView.qml +++ b/src/imports/controls/universal/SplitView.qml @@ -34,11 +34,11 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Controls.Universal 2.5 +import QtQuick 2.13 +import QtQuick.Templates 2.13 as T +import QtQuick.Controls 2.13 +import QtQuick.Controls.impl 2.13 +import QtQuick.Controls.Universal 2.13 T.SplitView { id: control diff --git a/src/imports/templates/qtquicktemplates2plugin.cpp b/src/imports/templates/qtquicktemplates2plugin.cpp index 510980e3..10f9b8dd 100644 --- a/src/imports/templates/qtquicktemplates2plugin.cpp +++ b/src/imports/templates/qtquicktemplates2plugin.cpp @@ -344,15 +344,17 @@ void QtQuickTemplates2Plugin::registerTypes(const char *uri) qmlRegisterType<QQuickPopupAnchors>(); qmlRegisterType<QQuickRangeSlider, 5>(uri, 2, 5, "RangeSlider"); qmlRegisterType<QQuickSlider, 5>(uri, 2, 5, "Slider"); - qmlRegisterType<QQuickSplitView, 5>(uri, 2, 5, "SplitView"); - qmlRegisterType<QQuickSplitViewAttached>(); - qmlRegisterUncreatableType<QQuickSplitHandleAttached>(uri, 2, 5, "SplitHandle", - QStringLiteral("SplitHandle is only available as an attached property.")); - qmlRegisterType<QQuickSplitHandleAttached>(); qmlRegisterType<QQuickSpinBox, 5>(uri, 2, 5, "SpinBox"); qmlRegisterType<QQuickTextArea, 5>(uri, 2, 5, "TextArea"); qmlRegisterType<QQuickTextField, 5>(uri, 2, 5, "TextField"); qmlRegisterType<QQuickToolTip, 5>(uri, 2, 5, "ToolTip"); + + // QtQuick.Templates 2.13 (new types and revisions in Qt 5.13) + qmlRegisterType<QQuickSplitView>(uri, 2, 13, "SplitView"); + qmlRegisterType<QQuickSplitViewAttached>(); + qmlRegisterUncreatableType<QQuickSplitHandleAttached>(uri, 2, 13, "SplitHandle", + QStringLiteral("SplitHandle is only available as an attached property.")); + qmlRegisterType<QQuickSplitHandleAttached>(); } QT_END_NAMESPACE diff --git a/src/quicktemplates2/qquicksplitview.cpp b/src/quicktemplates2/qquicksplitview.cpp index 40cc21f5..8aa47987 100644 --- a/src/quicktemplates2/qquicksplitview.cpp +++ b/src/quicktemplates2/qquicksplitview.cpp @@ -52,7 +52,7 @@ QT_BEGIN_NAMESPACE \inherits Control \instantiates QQuickSplitView \inqmlmodule QtQuick.Controls - \since 5.12 + \since 5.13 \ingroup qtquickcontrols2-containers \ingroup qtquickcontrols2-focusscopes \brief Lays out items with a draggable splitter between each item @@ -1998,7 +1998,7 @@ QQuickSplitHandleAttached::QQuickSplitHandleAttached(QObject *parent) \inherits QtObject \instantiates QQuickSplitHandleAttached \inqmlmodule QtQuick.Controls - \since 5.12 + \since 5.13 \brief Provides attached properties for SplitView handles SplitHandle provides attached properties for \l SplitView handles. diff --git a/tests/auto/controls/data/splitview/fillItemInMiddle.qml b/tests/auto/controls/data/splitview/fillItemInMiddle.qml index 33aa5a8b..174b6a2a 100644 --- a/tests/auto/controls/data/splitview/fillItemInMiddle.qml +++ b/tests/auto/controls/data/splitview/fillItemInMiddle.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.5 +import QtQuick 2.13 +import QtQuick.Controls 2.13 SplitView { anchors.fill: parent diff --git a/tests/auto/controls/data/splitview/fillItemOnLeft.qml b/tests/auto/controls/data/splitview/fillItemOnLeft.qml index ca20652b..dee68eac 100644 --- a/tests/auto/controls/data/splitview/fillItemOnLeft.qml +++ b/tests/auto/controls/data/splitview/fillItemOnLeft.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.5 +import QtQuick 2.13 +import QtQuick.Controls 2.13 SplitView { anchors.fill: parent diff --git a/tests/auto/controls/data/splitview/fillItemOnTop.qml b/tests/auto/controls/data/splitview/fillItemOnTop.qml index ea7aa2b6..2fc6f4d0 100644 --- a/tests/auto/controls/data/splitview/fillItemOnTop.qml +++ b/tests/auto/controls/data/splitview/fillItemOnTop.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.5 +import QtQuick 2.13 +import QtQuick.Controls 2.13 SplitView { anchors.fill: parent diff --git a/tests/auto/controls/data/tst_splitview.qml b/tests/auto/controls/data/tst_splitview.qml index 28c00179..8e9522a2 100644 --- a/tests/auto/controls/data/tst_splitview.qml +++ b/tests/auto/controls/data/tst_splitview.qml @@ -48,10 +48,10 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.5 -import QtQuick.Window 2.5 -import QtTest 1.0 +import QtQuick 2.13 +import QtQuick.Controls 2.13 +import QtQuick.Window 2.13 +import QtTest 1.13 import Qt.labs.settings 1.0 TestCase { |