diff options
Diffstat (limited to 'src/imports/controls/doc/snippets')
92 files changed, 573 insertions, 214 deletions
diff --git a/src/imports/controls/doc/snippets/screenshots/qtlabscalendar-weeknumbercolumn.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-dialog-modal.qml index e58e5c7b..c151ceed 100644 --- a/src/imports/controls/doc/snippets/screenshots/qtlabscalendar-weeknumbercolumn.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-dialog-modal.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. +** Copyright (C) 2016 The Qt Company Ltd. ** Contact: http://www.qt.io/licensing/ ** ** This file is part of the documentation of the Qt Toolkit. @@ -26,12 +26,16 @@ ****************************************************************************/ import QtQuick 2.0 -import Qt.labs.calendar 1.0 +import QtQuick.Controls 2.1 +Item { + width: dialog.implicitWidth + height: dialog.implicitHeight //! [1] -WeekNumberColumn { - month: Calendar.December - year: 2015 - locale: Qt.locale("en_US") +Dialog { + id: dialog + modal: true + standardButtons: Dialog.Ok } //! [1] +} diff --git a/src/imports/controls/doc/snippets/screenshots/qtlabscalendar-dayofweekrow.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-dialog-modeless.qml index 5ea3714c..45e1c2c0 100644 --- a/src/imports/controls/doc/snippets/screenshots/qtlabscalendar-dayofweekrow.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-dialog-modeless.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. +** Copyright (C) 2016 The Qt Company Ltd. ** Contact: http://www.qt.io/licensing/ ** ** This file is part of the documentation of the Qt Toolkit. @@ -26,10 +26,16 @@ ****************************************************************************/ import QtQuick 2.0 -import Qt.labs.calendar 1.0 +import QtQuick.Controls 2.1 +Item { + width: dialog.implicitWidth + height: dialog.implicitHeight //! [1] -DayOfWeekRow { - locale: Qt.locale("en_US") +Dialog { + id: dialog + modal: false + standardButtons: Dialog.Ok } //! [1] +} diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-dialog.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-dialog.qml new file mode 100644 index 00000000..c5de0b71 --- /dev/null +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-dialog.qml @@ -0,0 +1,43 @@ +/**************************************************************************** +** +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the documentation of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:FDL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Free Documentation License Usage +** Alternatively, this file may be used under the terms of the GNU Free +** Documentation License version 1.3 as published by the Free Software +** Foundation and appearing in the file included in the packaging of +** this file. Please review the following information to ensure +** the GNU Free Documentation License version 1.3 requirements +** will be met: http://www.gnu.org/copyleft/fdl.html. +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.0 +import QtQuick.Controls 2.1 + +Item { + width: dialog.implicitWidth + height: dialog.implicitHeight +//! [1] +Dialog { + id: dialog + standardButtons: Dialog.Ok | Dialog.Cancel + + onAccepted: console.log("Ok clicked") + onRejected: console.log("Cancel clicked") +} +//! [1] +} diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-dialogbuttonbox-attached.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-dialogbuttonbox-attached.qml new file mode 100644 index 00000000..a93cda30 --- /dev/null +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-dialogbuttonbox-attached.qml @@ -0,0 +1,42 @@ +/**************************************************************************** +** +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the documentation of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:FDL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Free Documentation License Usage +** Alternatively, this file may be used under the terms of the GNU Free +** Documentation License version 1.3 as published by the Free Software +** Foundation and appearing in the file included in the packaging of +** this file. Please review the following information to ensure +** the GNU Free Documentation License version 1.3 requirements +** will be met: http://www.gnu.org/copyleft/fdl.html. +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.0 +import QtQuick.Controls 2.1 + +//! [1] +DialogButtonBox { + Button { + text: qsTr("Save") + DialogButtonBox.buttonRole: DialogButtonBox.AcceptRole + } + Button { + text: qsTr("Close") + DialogButtonBox.buttonRole: DialogButtonBox.DestructiveRole + } +} +//! [1] diff --git a/src/imports/controls/doc/snippets/basic-example.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-dialogbuttonbox.qml index 62ab2466..41e6cf23 100644 --- a/src/imports/controls/doc/snippets/basic-example.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-dialogbuttonbox.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. +** Copyright (C) 2016 The Qt Company Ltd. ** Contact: http://www.qt.io/licensing/ ** ** This file is part of the documentation of the Qt Toolkit. @@ -25,19 +25,14 @@ ** ****************************************************************************/ -//! [0] -import QtQuick 2.6 -import QtQuick.Controls 2.0 +import QtQuick 2.0 +import QtQuick.Controls 2.1 -ApplicationWindow { - title: "My Application" - width: 640 - height: 480 - visible: true +//! [1] +DialogButtonBox { + standardButtons: DialogButtonBox.Ok | DialogButtonBox.Cancel - Button { - text: "Push Me" - anchors.centerIn: parent - } + onAccepted: console.log("Ok clicked") + onRejected: console.log("Cancel clicked") } -//! [0] +//! [1] diff --git a/src/imports/controls/doc/snippets/screenshots/qtlabscalendar-calendarmodel.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-menuseparator-custom.qml index dfbf4fbc..b5d8b18b 100644 --- a/src/imports/controls/doc/snippets/screenshots/qtlabscalendar-calendarmodel.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-menuseparator-custom.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. +** Copyright (C) 2016 The Qt Company Ltd. ** Contact: http://www.qt.io/licensing/ ** ** This file is part of the documentation of the Qt Toolkit. @@ -25,33 +25,45 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import Qt.labs.calendar 1.0 -import QtQuick.Controls 2.0 +//! [file] +import QtQuick 2.6 +import QtQuick.Controls 2.1 -//! [1] -ListView { - id: listview +Item { + id: window + width: menu.contentItem.width + height: menu.contentItem.height + visible: true - width: 200; height: 200 - snapMode: ListView.SnapOneItem - orientation: ListView.Horizontal - highlightRangeMode: ListView.StrictlyEnforceRange +// Indent it like this so that the indenting in the generated doc is normal. +Menu { + id: menu + contentItem.parent: window - model: CalendarModel { - from: new Date(2015, 0, 1) - to: new Date(2015, 11, 31) + MenuItem { + text: qsTr("New...") + } + MenuItem { + text: qsTr("Open...") + } + MenuItem { + text: qsTr("Save") } - delegate: MonthGrid { - width: listview.width - height: listview.height - - month: model.month - year: model.year - locale: Qt.locale("en_US") + MenuSeparator { + padding: 0 + topPadding: 12 + bottomPadding: 12 + contentItem: Rectangle { + implicitWidth: 200 + implicitHeight: 1 + color: "#1E000000" + } } - ScrollIndicator.horizontal: ScrollIndicator { } + MenuItem { + text: qsTr("Exit") + } +} } -//! [1] +//! [file] diff --git a/src/imports/controls/doc/snippets/screenshots/qtlabscalendar-dayofweekrow-layout.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-menuseparator.qml index ce41d224..d41d3cf9 100644 --- a/src/imports/controls/doc/snippets/screenshots/qtlabscalendar-dayofweekrow-layout.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-menuseparator.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. +** Copyright (C) 2016 The Qt Company Ltd. ** Contact: http://www.qt.io/licensing/ ** ** This file is part of the documentation of the Qt Toolkit. @@ -25,23 +25,36 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtQuick.Layouts 1.0 -import Qt.labs.calendar 1.0 +//! [file] +import QtQuick 2.6 +import QtQuick.Controls 2.1 -//! [1] -ColumnLayout { - DayOfWeekRow { - locale: grid.locale - Layout.fillWidth: true +Item { + id: window + width: menu.contentItem.width + height: menu.contentItem.height + visible: true + +// Indent it like this so that the indenting in the generated doc is normal. +Menu { + id: menu + contentItem.parent: window + + MenuItem { + text: qsTr("New...") + } + MenuItem { + text: qsTr("Open...") } + MenuItem { + text: qsTr("Save") + } + + MenuSeparator {} - MonthGrid { - id: grid - month: Calendar.December - year: 2015 - locale: Qt.locale("en_US") - Layout.fillWidth: true + MenuItem { + text: qsTr("Exit") } } -//! [1] +} +//! [file] diff --git a/src/imports/controls/doc/snippets/screenshots/qtlabscalendar-monthgrid.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-roundbutton.qml index 16f872b8..fa926302 100644 --- a/src/imports/controls/doc/snippets/screenshots/qtlabscalendar-monthgrid.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-roundbutton.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. +** Copyright (C) 2016 The Qt Company Ltd. ** Contact: http://www.qt.io/licensing/ ** ** This file is part of the documentation of the Qt Toolkit. @@ -26,12 +26,11 @@ ****************************************************************************/ import QtQuick 2.0 -import Qt.labs.calendar 1.0 +import QtQuick.Controls 2.1 //! [1] -MonthGrid { - month: Calendar.December - year: 2015 - locale: Qt.locale("en_US") +RoundButton { + text: "\u2713" // Unicode Character 'CHECK MARK' + onClicked: textArea.readOnly = true } //! [1] diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-stackview-custom.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-stackview-custom.qml index 3e40ea2d..898ff6af 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-stackview-custom.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-stackview-custom.qml @@ -27,7 +27,7 @@ //! [file] import QtQuick 2.6 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.1 StackView { id: control diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-swipedelegate.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-swipedelegate.qml index db077057..46b2809f 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-swipedelegate.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-swipedelegate.qml @@ -25,39 +25,56 @@ ** ****************************************************************************/ -import QtQuick 2.7 -import QtQuick.Controls 2.0 +import QtQuick 2.8 +import QtQuick.Controls 2.1 //! [1] ListView { - width: 200 - height: 300 - clip: true + id: listView + anchors.fill: parent model: ListModel { - id: listModel - ListElement { title: "Electricity bill" } - ListElement { title: "Happy Birthday!" } - ListElement { title: "FW: Cat pictures" } - ListElement { title: "Hotel visit receipt" } - ListElement { title: "Customer service" } + ListElement { sender: "Bob Bobbleton"; title: "How are you going?" } + ListElement { sender: "Rug Emporium"; title: "SALE! All rugs MUST go!" } + ListElement { sender: "Electric Co."; title: "Electricity bill 15/07/2016 overdue" } + ListElement { sender: "Tips"; title: "Five ways this tip will save your life" } } delegate: SwipeDelegate { id: swipeDelegate - text: title + text: model.sender + " - " + model.title width: parent.width - onClicked: if (swipe.complete) listModel.remove(index) + ListView.onRemove: SequentialAnimation { + PropertyAction { + target: swipeDelegate + property: "ListView.delayRemove" + value: true + } + NumberAnimation { + target: swipeDelegate + property: "height" + to: 0 + easing.type: Easing.InOutQuad + } + PropertyAction { + target: swipeDelegate; + property: "ListView.delayRemove"; + value: false + } + } - swipe.right: Rectangle { - color: swipeDelegate.swipe.complete && swipeDelegate.pressed ? "#333" : "#444" - width: parent.width + swipe.right: Label { + id: deleteLabel + text: qsTr("Delete") + color: "white" + verticalAlignment: Label.AlignVCenter + padding: 12 height: parent.height + anchors.right: parent.right + + SwipeDelegate.onClicked: listView.model.remove(index) - Label { - font.pixelSize: swipeDelegate.font.pixelSize - text: qsTr("Remove") - color: "white" - anchors.centerIn: parent + background: Rectangle { + color: deleteLabel.SwipeDelegate.pressed ? Qt.darker("tomato", 1.1) : "tomato" } } } diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-swipeview-custom.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-swipeview-custom.qml index 04b12512..0f862276 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-swipeview-custom.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-swipeview-custom.qml @@ -27,7 +27,7 @@ //! [file] import QtQuick 2.6 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.1 SwipeView { id: control diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-toolseparator-custom.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-toolseparator-custom.qml new file mode 100644 index 00000000..7495a993 --- /dev/null +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-toolseparator-custom.qml @@ -0,0 +1,69 @@ +/**************************************************************************** +** +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the documentation of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:FDL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Free Documentation License Usage +** Alternatively, this file may be used under the terms of the GNU Free +** Documentation License version 1.3 as published by the Free Software +** Foundation and appearing in the file included in the packaging of +** this file. Please review the following information to ensure +** the GNU Free Documentation License version 1.3 requirements +** will be met: http://www.gnu.org/copyleft/fdl.html. +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.8 +import QtQuick.Layouts 1.1 +import QtQuick.Window 2.2 +import QtQuick.Controls 2.1 + +//! [file] +ToolBar { + RowLayout { + anchors.fill: parent + + ToolButton { + text: qsTr("Action 1") + } + ToolButton { + text: qsTr("Action 2") + } + + ToolSeparator { + padding: vertical ? 10 : 2 + topPadding: vertical ? 2 : 10 + bottomPadding: vertical ? 2 : 10 + + contentItem: Rectangle { + implicitWidth: parent.vertical ? 1 : 24 + implicitHeight: parent.vertical ? 24 : 1 + color: "#c3c3c3" + } + } + + ToolButton { + text: qsTr("Action 3") + } + ToolButton { + text: qsTr("Action 4") + } + + Item { + Layout.fillWidth: true + } + } +} +//! [file] diff --git a/src/imports/controls/doc/snippets/screenshots/qtlabscalendar-monthgrid-layout.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-toolseparator.qml index 346e6099..7770d14c 100644 --- a/src/imports/controls/doc/snippets/screenshots/qtlabscalendar-monthgrid-layout.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-toolseparator.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. +** Copyright (C) 2016 The Qt Company Ltd. ** Contact: http://www.qt.io/licensing/ ** ** This file is part of the documentation of the Qt Toolkit. @@ -25,37 +25,44 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtQuick.Layouts 1.0 -import Qt.labs.calendar 1.0 +import QtQuick 2.8 +import QtQuick.Layouts 1.1 +import QtQuick.Window 2.2 +import QtQuick.Controls 2.1 //! [1] -GridLayout { - columns: 2 +ToolBar { + RowLayout { + anchors.fill: parent - DayOfWeekRow { - locale: grid.locale + ToolButton { + text: qsTr("Action 1") + } + ToolButton { + text: qsTr("Action 2") + } - Layout.column: 1 - Layout.fillWidth: true - } + ToolSeparator {} - WeekNumberColumn { - month: grid.month - year: grid.year - locale: grid.locale + ToolButton { + text: qsTr("Action 3") + } + ToolButton { + text: qsTr("Action 4") + } - Layout.fillHeight: true - } + ToolSeparator {} - MonthGrid { - id: grid - month: Calendar.December - year: 2015 - locale: Qt.locale("en_US") + ToolButton { + text: qsTr("Action 5") + } + ToolButton { + text: qsTr("Action 6") + } - Layout.fillWidth: true - Layout.fillHeight: true + Item { + Layout.fillWidth: true + } } } //! [1] diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-tooltip-custom.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-tooltip-custom.qml index 94d9c12e..6bb8a45e 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-tooltip-custom.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-tooltip-custom.qml @@ -27,7 +27,7 @@ //! [file] import QtQuick 2.6 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.1 Item { ToolTip { diff --git a/src/imports/controls/doc/snippets/screenshots/qtlabscalendar-weeknumbercolumn-layout.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-tumbler-listView.qml index d105553f..ff3ecd81 100644 --- a/src/imports/controls/doc/snippets/screenshots/qtlabscalendar-weeknumbercolumn-layout.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-tumbler-listView.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. +** Copyright (C) 2016 The Qt Company Ltd. ** Contact: http://www.qt.io/licensing/ ** ** This file is part of the documentation of the Qt Toolkit. @@ -25,25 +25,22 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtQuick.Layouts 1.0 -import Qt.labs.calendar 1.0 +import QtQuick 2.8 +import QtQuick.Controls 2.1 -//! [1] -RowLayout { - WeekNumberColumn { - month: grid.month - year: grid.year - locale: grid.locale - Layout.fillHeight: true - } +//! [contentItem] +Tumbler { + id: tumbler + + contentItem: ListView { + model: tumbler.model + delegate: tumbler.delegate - MonthGrid { - id: grid - month: Calendar.December - year: 2015 - locale: Qt.locale("en_US") - Layout.fillHeight: true + snapMode: ListView.SnapToItem + highlightRangeMode: ListView.StrictlyEnforceRange + preferredHighlightBegin: height / 2 - (height / tumbler.visibleItemCount / 2) + preferredHighlightEnd: height / 2 + (height / tumbler.visibleItemCount / 2) + clip: true } } -//! [1] +//! [contentItem] diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-tumbler-pathView.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-tumbler-pathView.qml new file mode 100644 index 00000000..957112e0 --- /dev/null +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-tumbler-pathView.qml @@ -0,0 +1,57 @@ +/**************************************************************************** +** +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the documentation of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:FDL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Free Documentation License Usage +** Alternatively, this file may be used under the terms of the GNU Free +** Documentation License version 1.3 as published by the Free Software +** Foundation and appearing in the file included in the packaging of +** this file. Please review the following information to ensure +** the GNU Free Documentation License version 1.3 requirements +** will be met: http://www.gnu.org/copyleft/fdl.html. +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.8 +import QtQuick.Controls 2.1 + +//! [contentItem] +Tumbler { + id: tumbler + + contentItem: PathView { + id: pathView + model: tumbler.model + delegate: tumbler.delegate + clip: true + pathItemCount: tumbler.visibleItemCount + 1 + preferredHighlightBegin: 0.5 + preferredHighlightEnd: 0.5 + dragMargin: width / 2 + + path: Path { + startX: pathView.width / 2 + startY: -pathView.delegateHeight / 2 + PathLine { + x: pathView.width / 2 + y: pathView.pathItemCount * pathView.delegateHeight - pathView.delegateHeight / 2 + } + } + + property real delegateHeight: tumbler.availableHeight / tumbler.visibleItemCount + } +} +//! [contentItem] diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-tumbler-timePicker.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-tumbler-timePicker.qml new file mode 100644 index 00000000..86276266 --- /dev/null +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-tumbler-timePicker.qml @@ -0,0 +1,99 @@ +/**************************************************************************** +** +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the test suite of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of The Qt Company Ltd nor the names of its +** contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +//! [tumbler] +import QtQuick 2.8 +import QtQuick.Window 2.2 +import QtQuick.Controls 2.1 + +Rectangle { + width: frame.implicitWidth + 10 + height: frame.implicitHeight + 10 + + function formatText(count, modelData) { + var data = count === 12 ? modelData + 1 : modelData; + return data.toString().length < 2 ? "0" + data : data; + } + + FontMetrics { + id: fontMetrics + } + + Component { + id: delegateComponent + + Label { + text: formatText(Tumbler.tumbler.count, modelData) + opacity: 1.0 - Math.abs(Tumbler.displacement) / (Tumbler.tumbler.visibleItemCount / 2) + horizontalAlignment: Text.AlignHCenter + verticalAlignment: Text.AlignVCenter + font.pixelSize: fontMetrics.font.pixelSize * 1.25 + } + } + + Frame { + id: frame + padding: 0 + anchors.centerIn: parent + + Row { + id: row + + Tumbler { + id: hoursTumbler + model: 12 + delegate: delegateComponent + } + + Tumbler { + id: minutesTumbler + model: 60 + delegate: delegateComponent + } + + Tumbler { + id: amPmTumbler + model: ["AM", "PM"] + delegate: delegateComponent + } + } + } +} +//! [tumbler] diff --git a/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-busyindicator-custom.qml b/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-busyindicator-custom.qml index 82ed9cdc..847ad736 100644 --- a/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-busyindicator-custom.qml +++ b/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-busyindicator-custom.qml @@ -27,7 +27,7 @@ //! [file] import QtQuick 2.6 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.1 BusyIndicator { id: control diff --git a/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-button-custom.qml b/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-button-custom.qml index eac6b831..dbe53f4d 100644 --- a/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-button-custom.qml +++ b/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-button-custom.qml @@ -27,7 +27,7 @@ //! [file] import QtQuick 2.6 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.1 Button { id: control diff --git a/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-button-disabled.qml b/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-button-disabled.qml index f4555c90..c7399b9a 100644 --- a/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-button-disabled.qml +++ b/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-button-disabled.qml @@ -26,7 +26,7 @@ ****************************************************************************/ import QtQuick 2.0 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.1 Button { width: 80 diff --git a/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-button-focused.qml b/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-button-focused.qml index a99346a6..ea220fde 100644 --- a/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-button-focused.qml +++ b/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-button-focused.qml @@ -26,7 +26,7 @@ ****************************************************************************/ import QtQuick 2.0 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.1 Button { width: 80 diff --git a/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-button-normal.qml b/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-button-normal.qml index f206bcec..385d4abb 100644 --- a/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-button-normal.qml +++ b/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-button-normal.qml @@ -26,7 +26,7 @@ ****************************************************************************/ import QtQuick 2.0 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.1 Button { width: 80 diff --git a/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-button-pressed.qml b/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-button-pressed.qml index 8a941561..edf0b324 100644 --- a/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-button-pressed.qml +++ b/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-button-pressed.qml @@ -26,7 +26,7 @@ ****************************************************************************/ import QtQuick 2.0 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.1 Button { width: 80 diff --git a/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-checkbox-checked.qml b/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-checkbox-checked.qml index 075e6342..e5c466da 100644 --- a/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-checkbox-checked.qml +++ b/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-checkbox-checked.qml @@ -26,7 +26,7 @@ ****************************************************************************/ import QtQuick 2.0 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.1 CheckBox { text: "Checked" diff --git a/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-checkbox-custom.qml b/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-checkbox-custom.qml index 0465ec80..9645a4b6 100644 --- a/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-checkbox-custom.qml +++ b/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-checkbox-custom.qml @@ -27,7 +27,7 @@ //! [file] import QtQuick 2.6 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.1 CheckBox { id: control diff --git a/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-checkbox-disabled.qml b/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-checkbox-disabled.qml index 4878cf31..3bfbb730 100644 --- a/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-checkbox-disabled.qml +++ b/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-checkbox-disabled.qml @@ -26,7 +26,7 @@ ****************************************************************************/ import QtQuick 2.0 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.1 CheckBox { text: "Disabled" diff --git a/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-checkbox-focused.qml b/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-checkbox-focused.qml index 93f1c214..fd7c7fea 100644 --- a/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-checkbox-focused.qml +++ b/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-checkbox-focused.qml @@ -26,7 +26,7 @@ ****************************************************************************/ import QtQuick 2.0 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.1 CheckBox { text: "Focused" diff --git a/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-checkbox-normal.qml b/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-checkbox-normal.qml index a840116e..dba9e7e9 100644 --- a/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-checkbox-normal.qml +++ b/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-checkbox-normal.qml @@ -26,7 +26,7 @@ ****************************************************************************/ import QtQuick 2.0 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.1 CheckBox { text: "Normal" diff --git a/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-checkdelegate-custom.qml b/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-checkdelegate-custom.qml index 483f9838..83f0ef86 100644 --- a/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-checkdelegate-custom.qml +++ b/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-checkdelegate-custom.qml @@ -27,7 +27,7 @@ //! [file] import QtQuick 2.6 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.1 CheckDelegate { id: control diff --git a/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-combobox-custom.qml b/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-combobox-custom.qml index bd261e52..12d56a56 100644 --- a/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-combobox-custom.qml +++ b/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-combobox-custom.qml @@ -27,7 +27,7 @@ //! [file] import QtQuick 2.6 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.1 ComboBox { id: control diff --git a/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-combobox-delegate.qml b/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-combobox-delegate.qml index d8b5d1fa..2817d956 100644 --- a/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-combobox-delegate.qml +++ b/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-combobox-delegate.qml @@ -26,7 +26,7 @@ ****************************************************************************/ import QtQuick 2.0 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.1 Item { id: root diff --git a/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-combobox-popup.qml b/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-combobox-popup.qml index 36569e15..1ac43234 100644 --- a/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-combobox-popup.qml +++ b/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-combobox-popup.qml @@ -26,7 +26,7 @@ ****************************************************************************/ import QtQuick 2.0 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.1 Item { id: root diff --git a/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-dial-custom.qml b/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-dial-custom.qml index efe061d3..1bf9baf4 100644 --- a/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-dial-custom.qml +++ b/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-dial-custom.qml @@ -27,7 +27,7 @@ //! [file] import QtQuick 2.6 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.1 Dial { id: control diff --git a/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-dial-handle.qml b/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-dial-handle.qml index 19d943a6..d9a61682 100644 --- a/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-dial-handle.qml +++ b/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-dial-handle.qml @@ -26,7 +26,7 @@ ****************************************************************************/ import QtQuick 2.0 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.1 Dial { id: dial diff --git a/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-frame-custom.qml b/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-frame-custom.qml index d11c431e..f2b5d254 100644 --- a/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-frame-custom.qml +++ b/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-frame-custom.qml @@ -27,7 +27,7 @@ //! [file] import QtQuick 2.6 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.1 Frame { background: Rectangle { diff --git a/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-frame.qml b/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-frame.qml index 1ede733d..98f177ef 100644 --- a/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-frame.qml +++ b/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-frame.qml @@ -27,7 +27,7 @@ import QtQuick 2.0 import QtQuick.Layouts 1.0 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.1 //! [1] Frame { diff --git a/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-groupbox-checkable.qml b/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-groupbox-checkable.qml index a2999925..db58593f 100644 --- a/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-groupbox-checkable.qml +++ b/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-groupbox-checkable.qml @@ -27,7 +27,7 @@ import QtQuick 2.0 import QtQuick.Layouts 1.0 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.1 //! [1] GroupBox { diff --git a/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-groupbox-custom.qml b/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-groupbox-custom.qml index cb9ed049..bf21e022 100644 --- a/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-groupbox-custom.qml +++ b/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-groupbox-custom.qml @@ -27,7 +27,7 @@ //! [file] import QtQuick 2.6 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.1 GroupBox { id: control diff --git a/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-groupbox-label.qml b/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-groupbox-label.qml index 74d0ea52..bef99d0b 100644 --- a/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-groupbox-label.qml +++ b/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-groupbox-label.qml @@ -26,7 +26,7 @@ ****************************************************************************/ import QtQuick 2.0 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.1 GroupBox { width: 100 diff --git a/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-groupbox.qml b/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-groupbox.qml index f79f3aef..7d4f328c 100644 --- a/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-groupbox.qml +++ b/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-groupbox.qml @@ -27,7 +27,7 @@ import QtQuick 2.0 import QtQuick.Layouts 1.0 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.1 //! [1] GroupBox { diff --git a/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-itemdelegate-custom.qml b/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-itemdelegate-custom.qml index 002aae69..0935d8f6 100644 --- a/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-itemdelegate-custom.qml +++ b/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-itemdelegate-custom.qml @@ -27,7 +27,7 @@ //! [file] import QtQuick 2.6 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.1 ItemDelegate { id: control diff --git a/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-itemdelegate.qml b/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-itemdelegate.qml index 143b3323..733434e8 100644 --- a/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-itemdelegate.qml +++ b/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-itemdelegate.qml @@ -26,7 +26,7 @@ ****************************************************************************/ import QtQuick 2.0 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.1 //! [1] ListView { diff --git a/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-label-custom.qml b/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-label-custom.qml index 98dbdc5e..2eedb29f 100644 --- a/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-label-custom.qml +++ b/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-label-custom.qml @@ -27,7 +27,7 @@ //! [file] import QtQuick 2.6 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.1 Label { text: qsTr("Label") diff --git a/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-label.qml b/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-label.qml index 4346c0eb..cf59c49a 100644 --- a/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-label.qml +++ b/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-label.qml @@ -26,7 +26,7 @@ ****************************************************************************/ import QtQuick 2.0 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.1 //! [1] Label { diff --git a/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-menu-custom.qml b/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-menu-custom.qml index a6971232..f4507714 100644 --- a/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-menu-custom.qml +++ b/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-menu-custom.qml @@ -27,7 +27,7 @@ //! [file] import QtQuick 2.6 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.1 Item { id: window diff --git a/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-pageindicator-custom.qml b/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-pageindicator-custom.qml index 65112ef4..225ba423 100644 --- a/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-pageindicator-custom.qml +++ b/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-pageindicator-custom.qml @@ -27,7 +27,7 @@ //! [file] import QtQuick 2.6 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.1 PageIndicator { id: control diff --git a/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-pageindicator-delegate.qml b/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-pageindicator-delegate.qml index 4b3ccf23..c7ae046f 100644 --- a/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-pageindicator-delegate.qml +++ b/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-pageindicator-delegate.qml @@ -26,7 +26,7 @@ ****************************************************************************/ import QtQuick 2.0 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.1 PageIndicator { count: 5 diff --git a/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-pageindicator.qml b/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-pageindicator.qml index 237bc6e7..cf91d6f2 100644 --- a/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-pageindicator.qml +++ b/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-pageindicator.qml @@ -25,7 +25,7 @@ ** ****************************************************************************/ import QtQuick 2.0 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.1 //! [1] PageIndicator { diff --git a/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-pane-custom.qml b/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-pane-custom.qml index 80519939..42c30795 100644 --- a/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-pane-custom.qml +++ b/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-pane-custom.qml @@ -27,7 +27,7 @@ //! [file] import QtQuick 2.6 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.1 Pane { background: Rectangle { diff --git a/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-pane.qml b/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-pane.qml index 3d86499f..b7b8fa5d 100644 --- a/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-pane.qml +++ b/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-pane.qml @@ -27,7 +27,7 @@ import QtQuick 2.0 import QtQuick.Layouts 1.0 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.1 //! [1] Pane { diff --git a/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-progressbar-custom.qml b/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-progressbar-custom.qml index 88faed20..9e6779d6 100644 --- a/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-progressbar-custom.qml +++ b/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-progressbar-custom.qml @@ -27,7 +27,7 @@ //! [file] import QtQuick 2.6 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.1 ProgressBar { id: control diff --git a/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-radiobutton-custom.qml b/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-radiobutton-custom.qml index dba262be..1d9661a5 100644 --- a/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-radiobutton-custom.qml +++ b/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-radiobutton-custom.qml @@ -27,7 +27,7 @@ //! [file] import QtQuick 2.6 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.1 RadioButton { id: control diff --git a/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-radiodelegate-custom.qml b/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-radiodelegate-custom.qml index 6efb7803..91125921 100644 --- a/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-radiodelegate-custom.qml +++ b/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-radiodelegate-custom.qml @@ -27,7 +27,7 @@ //! [file] import QtQuick 2.6 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.1 RadioDelegate { id: control diff --git a/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-rangeslider-custom.qml b/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-rangeslider-custom.qml index 7e488d14..86fae061 100644 --- a/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-rangeslider-custom.qml +++ b/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-rangeslider-custom.qml @@ -27,7 +27,7 @@ //! [file] import QtQuick 2.6 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.1 RangeSlider { id: control diff --git a/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-scrollbar-active.qml b/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-scrollbar-active.qml index 086541c8..1570aff4 100644 --- a/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-scrollbar-active.qml +++ b/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-scrollbar-active.qml @@ -26,7 +26,7 @@ ****************************************************************************/ import QtQuick 2.0 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.1 Item { width: 100 diff --git a/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-scrollbar-custom.qml b/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-scrollbar-custom.qml index 0bf13b3c..05b3f3aa 100644 --- a/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-scrollbar-custom.qml +++ b/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-scrollbar-custom.qml @@ -27,7 +27,7 @@ //! [file] import QtQuick 2.6 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.1 ScrollBar { id: control diff --git a/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-scrollindicator-active.qml b/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-scrollindicator-active.qml index c118c7aa..954b449c 100644 --- a/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-scrollindicator-active.qml +++ b/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-scrollindicator-active.qml @@ -26,7 +26,7 @@ ****************************************************************************/ import QtQuick 2.0 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.1 Item { width: 100 diff --git a/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-scrollindicator-custom.qml b/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-scrollindicator-custom.qml index 5720f4f7..97930e1e 100644 --- a/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-scrollindicator-custom.qml +++ b/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-scrollindicator-custom.qml @@ -27,7 +27,7 @@ //! [file] import QtQuick 2.6 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.1 ScrollIndicator { id: control diff --git a/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-slider-custom.qml b/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-slider-custom.qml index ebc11f46..6201cbf8 100644 --- a/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-slider-custom.qml +++ b/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-slider-custom.qml @@ -27,7 +27,7 @@ //! [file] import QtQuick 2.6 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.1 Slider { id: control diff --git a/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-slider-handle.qml b/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-slider-handle.qml index 20b569f3..fa23972c 100644 --- a/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-slider-handle.qml +++ b/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-slider-handle.qml @@ -26,7 +26,7 @@ ****************************************************************************/ import QtQuick 2.0 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.1 Slider { value: 0.5 diff --git a/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-spinbox-custom.qml b/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-spinbox-custom.qml index 6433fd80..cfbd8400 100644 --- a/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-spinbox-custom.qml +++ b/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-spinbox-custom.qml @@ -27,7 +27,7 @@ //! [file] import QtQuick 2.6 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.1 SpinBox { id: control diff --git a/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-spinbox-double.qml b/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-spinbox-double.qml index 15af31ae..ad22b856 100644 --- a/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-spinbox-double.qml +++ b/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-spinbox-double.qml @@ -26,7 +26,7 @@ ****************************************************************************/ import QtQuick 2.6 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.1 //! [1] SpinBox { diff --git a/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-spinbox-down.qml b/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-spinbox-down.qml index 419dae5c..ecd2a659 100644 --- a/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-spinbox-down.qml +++ b/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-spinbox-down.qml @@ -26,7 +26,7 @@ ****************************************************************************/ import QtQuick 2.0 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.1 SpinBox { value: 50 diff --git a/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-spinbox-textual.qml b/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-spinbox-textual.qml index 814b8b28..e6b7c735 100644 --- a/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-spinbox-textual.qml +++ b/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-spinbox-textual.qml @@ -26,7 +26,7 @@ ****************************************************************************/ import QtQuick 2.0 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.1 //! [1] SpinBox { diff --git a/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-spinbox-up.qml b/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-spinbox-up.qml index b4b0fab3..0b2c3fea 100644 --- a/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-spinbox-up.qml +++ b/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-spinbox-up.qml @@ -26,7 +26,7 @@ ****************************************************************************/ import QtQuick 2.0 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.1 SpinBox { value: 50 diff --git a/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-spinbox.qml b/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-spinbox.qml index 6616ed60..d8c54714 100644 --- a/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-spinbox.qml +++ b/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-spinbox.qml @@ -26,7 +26,7 @@ ****************************************************************************/ import QtQuick 2.0 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.1 //! [1] SpinBox { diff --git a/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-swipedelegate-custom.qml b/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-swipedelegate-custom.qml index ae63efed..087e17fe 100644 --- a/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-swipedelegate-custom.qml +++ b/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-swipedelegate-custom.qml @@ -27,7 +27,7 @@ //! [file] import QtQuick 2.6 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.1 SwipeDelegate { id: control @@ -37,7 +37,7 @@ SwipeDelegate { id: component Rectangle { - color: control.swipe.complete && control.down ? "#333" : "#444" + color: SwipeDelegate.pressed ? "#333" : "#444" width: parent.width height: parent.height clip: true diff --git a/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-swipeview-indicator.qml b/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-swipeview-indicator.qml index 2ba8df9c..3afcc3e2 100644 --- a/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-swipeview-indicator.qml +++ b/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-swipeview-indicator.qml @@ -26,7 +26,7 @@ ****************************************************************************/ import QtQuick 2.0 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.1 Item { width: 200 diff --git a/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-switch-checked.qml b/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-switch-checked.qml index f9a18b1c..3a6dfc7c 100644 --- a/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-switch-checked.qml +++ b/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-switch-checked.qml @@ -26,7 +26,7 @@ ****************************************************************************/ import QtQuick 2.0 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.1 Switch { text: "Checked" diff --git a/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-switch-custom.qml b/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-switch-custom.qml index 698c1a05..5152040d 100644 --- a/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-switch-custom.qml +++ b/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-switch-custom.qml @@ -27,7 +27,7 @@ //! [file] import QtQuick 2.6 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.1 Switch { id: control diff --git a/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-switch-disabled.qml b/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-switch-disabled.qml index a40586b5..6eb53084 100644 --- a/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-switch-disabled.qml +++ b/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-switch-disabled.qml @@ -26,7 +26,7 @@ ****************************************************************************/ import QtQuick 2.0 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.1 Switch { text: "Disabled" diff --git a/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-switch-focused.qml b/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-switch-focused.qml index f98f2c90..6ca19062 100644 --- a/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-switch-focused.qml +++ b/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-switch-focused.qml @@ -26,7 +26,7 @@ ****************************************************************************/ import QtQuick 2.0 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.1 Switch { text: "Focused" diff --git a/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-switch-normal.qml b/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-switch-normal.qml index a55c2854..339874d7 100644 --- a/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-switch-normal.qml +++ b/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-switch-normal.qml @@ -26,7 +26,7 @@ ****************************************************************************/ import QtQuick 2.0 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.1 Switch { text: "Normal" diff --git a/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-switchdelegate-custom.qml b/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-switchdelegate-custom.qml index 8d0daa0a..e06af484 100644 --- a/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-switchdelegate-custom.qml +++ b/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-switchdelegate-custom.qml @@ -27,7 +27,7 @@ //! [file] import QtQuick 2.6 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.1 SwitchDelegate { id: control diff --git a/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-tabbar-custom.qml b/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-tabbar-custom.qml index 1873fba9..305101c0 100644 --- a/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-tabbar-custom.qml +++ b/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-tabbar-custom.qml @@ -27,7 +27,7 @@ //! [file] import QtQuick 2.6 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.1 TabBar { id: control diff --git a/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-tabbar.qml b/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-tabbar.qml index b445ee67..e3a67c30 100644 --- a/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-tabbar.qml +++ b/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-tabbar.qml @@ -27,7 +27,7 @@ import QtQuick 2.0 import QtQuick.Layouts 1.3 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.1 Column { width: 300 diff --git a/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-tabbutton.qml b/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-tabbutton.qml index 67e5e1e0..9fef1e59 100644 --- a/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-tabbutton.qml +++ b/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-tabbutton.qml @@ -26,7 +26,7 @@ ****************************************************************************/ import QtQuick 2.0 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.1 //! [1] TabBar { diff --git a/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-textarea-custom.qml b/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-textarea-custom.qml index f70c7135..dd6035c0 100644 --- a/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-textarea-custom.qml +++ b/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-textarea-custom.qml @@ -27,7 +27,7 @@ //! [file] import QtQuick 2.6 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.1 TextArea { id: control diff --git a/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-textarea-flickable.qml b/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-textarea-flickable.qml index e11750cb..500e09c3 100644 --- a/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-textarea-flickable.qml +++ b/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-textarea-flickable.qml @@ -26,7 +26,7 @@ ****************************************************************************/ import QtQuick 2.0 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.1 Item { width: 100 diff --git a/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-textfield-custom.qml b/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-textfield-custom.qml index 0deb0e5c..8e5d897c 100644 --- a/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-textfield-custom.qml +++ b/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-textfield-custom.qml @@ -27,7 +27,7 @@ //! [file] import QtQuick 2.6 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.1 TextField { id: control diff --git a/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-textfield-disabled.qml b/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-textfield-disabled.qml index ac798f53..21c351c4 100644 --- a/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-textfield-disabled.qml +++ b/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-textfield-disabled.qml @@ -26,7 +26,7 @@ ****************************************************************************/ import QtQuick 2.0 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.1 TextField { width: 80 diff --git a/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-textfield-focused.qml b/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-textfield-focused.qml index a4e1b3b1..ddea7c51 100644 --- a/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-textfield-focused.qml +++ b/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-textfield-focused.qml @@ -26,7 +26,7 @@ ****************************************************************************/ import QtQuick 2.0 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.1 TextField { width: 80 diff --git a/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-textfield-normal.qml b/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-textfield-normal.qml index 12c7ead9..29f7fb9c 100644 --- a/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-textfield-normal.qml +++ b/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-textfield-normal.qml @@ -26,7 +26,7 @@ ****************************************************************************/ import QtQuick 2.0 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.1 TextField { width: 80 diff --git a/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-toolbar-custom.qml b/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-toolbar-custom.qml index 3e98808c..e8d268c5 100644 --- a/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-toolbar-custom.qml +++ b/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-toolbar-custom.qml @@ -27,7 +27,7 @@ import QtQuick 2.6 import QtQuick.Layouts 1.0 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.1 //! [file] ToolBar { diff --git a/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-toolbar.qml b/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-toolbar.qml index fd6754f8..98a13b7b 100644 --- a/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-toolbar.qml +++ b/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-toolbar.qml @@ -27,7 +27,7 @@ import QtQuick 2.0 import QtQuick.Layouts 1.0 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.1 //! [1] ToolBar { diff --git a/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-toolbutton-custom.qml b/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-toolbutton-custom.qml index 10491cb5..449266c1 100644 --- a/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-toolbutton-custom.qml +++ b/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-toolbutton-custom.qml @@ -27,7 +27,7 @@ //! [file] import QtQuick 2.6 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.1 ToolButton { id: control diff --git a/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-tooltip-hover.qml b/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-tooltip-hover.qml index 330ab83c..27b03a63 100644 --- a/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-tooltip-hover.qml +++ b/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-tooltip-hover.qml @@ -26,7 +26,7 @@ ****************************************************************************/ import QtQuick 2.0 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.1 //! [1] Button { diff --git a/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-tooltip-pressandhold.qml b/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-tooltip-pressandhold.qml index eddb09e6..7d285528 100644 --- a/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-tooltip-pressandhold.qml +++ b/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-tooltip-pressandhold.qml @@ -26,7 +26,7 @@ ****************************************************************************/ import QtQuick 2.0 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.1 //! [1] Button { diff --git a/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-tooltip-slider.qml b/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-tooltip-slider.qml index e6a386c1..ca08ce72 100644 --- a/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-tooltip-slider.qml +++ b/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-tooltip-slider.qml @@ -27,7 +27,7 @@ import QtQuick 2.0 import QtQuick.Window 2.2 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.1 Item { id: root @@ -46,7 +46,7 @@ Item { ToolTip { parent: slider.handle visible: slider.pressed - text: slider.position.toFixed(1) + text: slider.valueAt(slider.position).toFixed(1) } } //! [1] diff --git a/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-tooltip.qml b/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-tooltip.qml index 146fe477..3aa26908 100644 --- a/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-tooltip.qml +++ b/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-tooltip.qml @@ -27,7 +27,7 @@ import QtQuick 2.0 import QtQuick.Window 2.2 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.1 Item { id: root diff --git a/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-tumbler-custom.qml b/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-tumbler-custom.qml index d2b4f960..f1c2b806 100644 --- a/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-tumbler-custom.qml +++ b/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-tumbler-custom.qml @@ -27,12 +27,11 @@ //! [file] import QtQuick 2.6 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.1 Tumbler { id: control model: 15 - visibleItemCount: 5 background: Item { Rectangle { diff --git a/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-tumbler-delegate.qml b/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-tumbler-delegate.qml index 4d389ab7..4d2c7349 100644 --- a/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-tumbler-delegate.qml +++ b/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-tumbler-delegate.qml @@ -26,7 +26,7 @@ ****************************************************************************/ import QtQuick 2.0 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.1 Tumbler { id: tumbler |