diff options
author | Mitch Curtis <[email protected]> | 2021-08-12 14:39:51 +0200 |
---|---|---|
committer | Mitch Curtis <[email protected]> | 2021-08-16 12:52:59 +0200 |
commit | 809339d1484cf556512534367b8170bc26baf072 (patch) | |
tree | 12871313b658f36d058b5ef25af1e247e9c46ce9 /tests/manual/quickcontrols2/qquickdialog | |
parent | b01b4f00eae8022c6a97d90f54dac395144ae095 (diff) |
Now that qtquickcontrols2 has been merged into qtdeclarative,
we should make it obvious that this repo should no longer be
used, by preventing it from being built.
Task-number: QTBUG-95173
Pick-to: 6.2
Change-Id: I95bd6a214f3d75a865ab163ee0a1f9ffbeb7a051
Reviewed-by: Alexandru Croitor <[email protected]>
Reviewed-by: Volker Hilsheimer <[email protected]>
Diffstat (limited to 'tests/manual/quickcontrols2/qquickdialog')
8 files changed, 0 insertions, 559 deletions
diff --git a/tests/manual/quickcontrols2/qquickdialog/CMakeLists.txt b/tests/manual/quickcontrols2/qquickdialog/CMakeLists.txt deleted file mode 100644 index 661a7dc7..00000000 --- a/tests/manual/quickcontrols2/qquickdialog/CMakeLists.txt +++ /dev/null @@ -1,31 +0,0 @@ -if (NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) - cmake_minimum_required(VERSION 3.16) - project(qquickdialog LANGUAGES C CXX ASM) - find_package(Qt6BuildInternals COMPONENTS STANDALONE_TEST) -endif() - -qt_internal_add_manual_test(qquickdialog - GUI - SOURCES - qquickdialog.cpp - PUBLIC_LIBRARIES - Qt::Gui - Qt::Qml - Qt::QuickControls2 -) - -# Resources: -set(qmake_immediate_resource_files - "CustomDialog.qml" - "DialogLabel.qml" - "Marker.qml" - "qquickdialog.qml" - "qtquickcontrols2.conf" -) - -qt_internal_add_resource(qquickdialog "qmake_immediate" - PREFIX - "/" - FILES - ${qmake_immediate_resource_files} -) diff --git a/tests/manual/quickcontrols2/qquickdialog/CustomDialog.qml b/tests/manual/quickcontrols2/qquickdialog/CustomDialog.qml deleted file mode 100644 index fb191c9f..00000000 --- a/tests/manual/quickcontrols2/qquickdialog/CustomDialog.qml +++ /dev/null @@ -1,74 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2019 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the test suite of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** 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 https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** BSD License Usage -** Alternatively, 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$ -** -****************************************************************************/ - -import QtQuick.Controls - -Dialog { - id: root - x: previousDialog ? previousDialog.x + previousDialog.width + space : 0 - y: previousDialog ? previousDialog.y : 0 - closePolicy: Dialog.NoAutoClose - visible: true - - property Dialog previousDialog - property int space: dialogSpacing - - Marker { - parent: root.footer.contentItem - visible: visualizeDialogButtonBoxContentItem - text: "footer.contentItem" - } - Marker { - parent: root.footer - visible: visualizeDialogButtonBox - text: "footer" - border.color: "red" - } -} diff --git a/tests/manual/quickcontrols2/qquickdialog/DialogLabel.qml b/tests/manual/quickcontrols2/qquickdialog/DialogLabel.qml deleted file mode 100644 index 3a1533eb..00000000 --- a/tests/manual/quickcontrols2/qquickdialog/DialogLabel.qml +++ /dev/null @@ -1,60 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2019 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the test suite of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** 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 https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** BSD License Usage -** Alternatively, 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$ -** -****************************************************************************/ - -import QtQuick.Controls - -Label { - x: dialog.x + (dialog.width - width) / 2 - y: dialog.y - height - width: dialog.width - wrapMode: Label.Wrap - - property Dialog dialog -} diff --git a/tests/manual/quickcontrols2/qquickdialog/Marker.qml b/tests/manual/quickcontrols2/qquickdialog/Marker.qml deleted file mode 100644 index cd93d055..00000000 --- a/tests/manual/quickcontrols2/qquickdialog/Marker.qml +++ /dev/null @@ -1,68 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2019 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the test suite of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** 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 https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** BSD License Usage -** Alternatively, 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$ -** -****************************************************************************/ - -import QtQuick - -Rectangle { - anchors.fill: parent - color: "transparent" - border.color: "darkorange" - - property alias text: label.text - - Text { - id: label - font.pixelSize: Qt.application.font.pixelSize * 0.6 - color: parent.border.color - anchors.left: parent.left - anchors.bottom: parent.bottom - anchors.margins: 4 - } -} diff --git a/tests/manual/quickcontrols2/qquickdialog/qquickdialog.cpp b/tests/manual/quickcontrols2/qquickdialog/qquickdialog.cpp deleted file mode 100644 index 77863abe..00000000 --- a/tests/manual/quickcontrols2/qquickdialog/qquickdialog.cpp +++ /dev/null @@ -1,62 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2019 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the test suite of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** 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 https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** BSD License Usage -** Alternatively, 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$ -** -****************************************************************************/ - -#include <QGuiApplication> -#include <QQmlApplicationEngine> - -int main(int argc, char *argv[]) -{ - QGuiApplication app(argc, argv); - - QQmlApplicationEngine engine; - engine.load(QUrl("qrc:/qquickdialog.qml")); - - return app.exec(); -} diff --git a/tests/manual/quickcontrols2/qquickdialog/qquickdialog.pro b/tests/manual/quickcontrols2/qquickdialog/qquickdialog.pro deleted file mode 100644 index aee7655b..00000000 --- a/tests/manual/quickcontrols2/qquickdialog/qquickdialog.pro +++ /dev/null @@ -1,11 +0,0 @@ -TEMPLATE = app -TARGET = qquickdialog -QT += qml quickcontrols2 - -SOURCES += qquickdialog.cpp -RESOURCES += \ - qtquickcontrols2.conf \ - qquickdialog.qml \ - Marker.qml \ - CustomDialog.qml \ - DialogLabel.qml diff --git a/tests/manual/quickcontrols2/qquickdialog/qquickdialog.qml b/tests/manual/quickcontrols2/qquickdialog/qquickdialog.qml deleted file mode 100644 index 41bf6ab7..00000000 --- a/tests/manual/quickcontrols2/qquickdialog/qquickdialog.qml +++ /dev/null @@ -1,247 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2019 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the test suite of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** 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 https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** BSD License Usage -** Alternatively, 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$ -** -****************************************************************************/ - -import QtQuick -import QtQuick.Controls -import QtQuick.Layouts - -ApplicationWindow { - id: window - width: 1200 - height: 800 - title: "qquickdialog" - visible: true - - property alias visualizeDialogButtonBoxContentItem: visualizeDialogButtonBoxContentItemMenuItem.checked - property alias visualizeDialogButtonBox: visualizeDialogButtonBoxMenuItem.checked - - property int dialogSpacing: 60 - - header: ToolBar { - RowLayout { - anchors.fill: parent - Item { - Layout.fillWidth: true - } - - ToolButton { - text: "Settings" - onClicked: settingsMenu.open() - - Menu { - id: settingsMenu - width: 400 - - MenuItem { - id: visualizeDialogButtonBoxContentItemMenuItem - text: "Visualize DialogButtonBox contentItem" - checkable: true - } - - MenuItem { - id: visualizeDialogButtonBoxMenuItem - text: "Visualize DialogButtonBox" - checkable: true - } - } - } - } - } - - - DialogLabel { - text: "implicit width" - dialog: dialogImplicitWidthNoButtons - width: 100 - } - CustomDialog { - id: dialogImplicitWidthNoButtons - x: dialogSpacing - y: dialogSpacing - space: 200 - } - - DialogLabel { - text: "title, implicit width" - dialog: dialogImplicitWidthTitleNoButtons - width: 150 - } - CustomDialog { - id: dialogImplicitWidthTitleNoButtons - y: dialogSpacing - title: "Test" - previousDialog: dialogImplicitWidthNoButtons - space: 200 - } - - DialogLabel { - text: "title, fixed width" - dialog: dialogFixedWidthTitleNoButtons - } - CustomDialog { - id: dialogFixedWidthTitleNoButtons - y: dialogSpacing - width: 300 - title: "Test" - previousDialog: dialogImplicitWidthTitleNoButtons - space: 200 - } - - - DialogLabel { - text: "one standard button, implicit width" - dialog: dialogImplicitWidthOneButton - } - CustomDialog { - id: dialogImplicitWidthOneButton - x: dialogSpacing - y: dialogFixedWidthTitleNoButtons.y + dialogFixedWidthTitleNoButtons.height + dialogSpacing - standardButtons: Dialog.Ok - } - - DialogLabel { - text: "two standard buttons, implicit width" - dialog: dialogImplicitWidthTwoButtons - } - CustomDialog { - id: dialogImplicitWidthTwoButtons - standardButtons: Dialog.Ok | Dialog.Cancel - previousDialog: dialogImplicitWidthOneButton - } - - DialogLabel { - text: "three standard buttons, implicit width" - dialog: dialogImplicitWidthThreeButtons - } - CustomDialog { - id: dialogImplicitWidthThreeButtons - standardButtons: Dialog.Apply | Dialog.RestoreDefaults | Dialog.Cancel - previousDialog: dialogImplicitWidthTwoButtons - } - - - DialogLabel { - text: "text, one standard button, implicit width" - dialog: dialogTextImplicitWidthOneButton - } - CustomDialog { - id: dialogTextImplicitWidthOneButton - x: dialogSpacing - y: dialogImplicitWidthThreeButtons.y + dialogImplicitWidthThreeButtons.height + dialogSpacing - standardButtons: Dialog.Ok - - Label { - text: "A Label" - } - } - - DialogLabel { - text: "text, two standard buttons, implicit width" - dialog: dialogTextImplicitWidthTwoButtons - } - CustomDialog { - id: dialogTextImplicitWidthTwoButtons - standardButtons: Dialog.Ok | Dialog.Cancel - previousDialog: dialogTextImplicitWidthOneButton - - Label { - text: "A Label" - } - } - - DialogLabel { - text: "text, three standard buttons, implicit width" - dialog: dialogTextImplicitWidthThreeButtons - } - CustomDialog { - id: dialogTextImplicitWidthThreeButtons - standardButtons: Dialog.Apply | Dialog.RestoreDefaults | Dialog.Cancel - previousDialog: dialogTextImplicitWidthTwoButtons - - Label { - text: "A Label" - } - } - - - DialogLabel { - text: "one standard button, fixed width (300)" - dialog: dialogFixedWidthOneButton - } - CustomDialog { - id: dialogFixedWidthOneButton - x: dialogSpacing - y: dialogTextImplicitWidthThreeButtons.y + dialogTextImplicitWidthThreeButtons.height + dialogSpacing - width: 300 - standardButtons: Dialog.Ok - } - - DialogLabel { - text: "two standard buttons, fixed width (300)" - dialog: dialogFixedWidthTwoButtons - } - CustomDialog { - id: dialogFixedWidthTwoButtons - width: 300 - standardButtons: Dialog.Ok | Dialog.Cancel - previousDialog: dialogFixedWidthOneButton - } - - DialogLabel { - text: "three standard buttons, fixed width (300)" - dialog: dialogFixedWidthThreeButtons - } - CustomDialog { - id: dialogFixedWidthThreeButtons - width: 300 - standardButtons: Dialog.Apply | Dialog.RestoreDefaults | Dialog.Cancel - previousDialog: dialogFixedWidthTwoButtons - } -} diff --git a/tests/manual/quickcontrols2/qquickdialog/qtquickcontrols2.conf b/tests/manual/quickcontrols2/qquickdialog/qtquickcontrols2.conf deleted file mode 100644 index 53f380bf..00000000 --- a/tests/manual/quickcontrols2/qquickdialog/qtquickcontrols2.conf +++ /dev/null @@ -1,6 +0,0 @@ -[Controls] -Style=Basic -;Style=Fusion -;Style=Imagine -;Style=Material -;Style=Universal |