aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto/quickcontrols2/qquickuniversalstyle
diff options
context:
space:
mode:
authorMitch Curtis <mitch.curtis@qt.io>2021-08-12 14:39:51 +0200
committerMitch Curtis <mitch.curtis@qt.io>2021-08-16 12:52:59 +0200
commit809339d1484cf556512534367b8170bc26baf072 (patch)
tree12871313b658f36d058b5ef25af1e247e9c46ce9 /tests/auto/quickcontrols2/qquickuniversalstyle
parentb01b4f00eae8022c6a97d90f54dac395144ae095 (diff)
Remove qtquickcontrols2 sources and explain where they wentHEADdev
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 <alexandru.croitor@qt.io> Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Diffstat (limited to 'tests/auto/quickcontrols2/qquickuniversalstyle')
-rw-r--r--tests/auto/quickcontrols2/qquickuniversalstyle/CMakeLists.txt38
-rw-r--r--tests/auto/quickcontrols2/qquickuniversalstyle/data/tst_universal.qml441
-rw-r--r--tests/auto/quickcontrols2/qquickuniversalstyle/qtquickcontrols2.conf2
-rw-r--r--tests/auto/quickcontrols2/qquickuniversalstyle/tst_qquickuniversalstyle.cpp38
4 files changed, 0 insertions, 519 deletions
diff --git a/tests/auto/quickcontrols2/qquickuniversalstyle/CMakeLists.txt b/tests/auto/quickcontrols2/qquickuniversalstyle/CMakeLists.txt
deleted file mode 100644
index 43d4c10d..00000000
--- a/tests/auto/quickcontrols2/qquickuniversalstyle/CMakeLists.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-# Generated from qquickuniversalstyle.pro.
-
-#####################################################################
-## tst_qquickuniversalstyle Test:
-#####################################################################
-
-# Collect test data
-file(GLOB_RECURSE test_data_glob
- RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
- ${CMAKE_CURRENT_SOURCE_DIR}/data/tst_*)
-list(APPEND test_data ${test_data_glob})
-
-qt_internal_add_test(tst_qquickuniversalstyle
- GUI
- QMLTEST
- SOURCES
- tst_qquickuniversalstyle.cpp
- PUBLIC_LIBRARIES
- Qt::Gui
- TESTDATA ${test_data}
-)
-
-# Resources:
-set(qmake_immediate_resource_files
- "qtquickcontrols2.conf"
-)
-
-qt_internal_add_resource(tst_qquickuniversalstyle "qmake_immediate"
- PREFIX
- "/"
- FILES
- ${qmake_immediate_resource_files}
-)
-
-
-#### Keys ignored in scope 1:.:.:qquickuniversalstyle.pro:<TRUE>:
-# OTHER_FILES = "$$PWD/data/*.qml"
-# TEMPLATE = "app"
diff --git a/tests/auto/quickcontrols2/qquickuniversalstyle/data/tst_universal.qml b/tests/auto/quickcontrols2/qquickuniversalstyle/data/tst_universal.qml
deleted file mode 100644
index 356df731..00000000
--- a/tests/auto/quickcontrols2/qquickuniversalstyle/data/tst_universal.qml
+++ /dev/null
@@ -1,441 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2017 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.Window
-import QtTest
-import QtQuick.Controls
-import QtQuick.Controls.Universal
-
-TestCase {
- id: testCase
- width: 200
- height: 200
- visible: true
- when: windowShown
- name: "Universal"
-
- Component {
- id: button
- Button { }
- }
-
- Component {
- id: styledButton
- Button {
- Universal.theme: Universal.Dark
- Universal.accent: Universal.Violet
- Universal.foreground: Universal.Brown
- Universal.background: Universal.Yellow
- }
- }
-
- Component {
- id: window
- Window { }
- }
-
- Component {
- id: styledWindow
- Window {
- Universal.theme: Universal.Dark
- Universal.accent: Universal.Green
- }
- }
-
- Component {
- id: loader
- Loader {
- active: false
- sourceComponent: Button { }
- }
- }
-
- Component {
- id: swipeView
- SwipeView {
- Universal.theme: Universal.Dark
- Button { }
- }
- }
-
- Component {
- id: menu
- ApplicationWindow {
- Universal.accent: Universal.Red
- property alias menu: popup
- Menu {
- id: popup
- Universal.theme: Universal.Dark
- MenuItem { }
- }
- }
- }
-
- Component {
- id: comboBox
- ApplicationWindow {
- width: 200
- height: 200
- visible: true
- Universal.accent: Universal.Red
- property alias combo: box
- ComboBox {
- id: box
- Universal.theme: Universal.Dark
- model: 1
- }
- }
- }
-
- Component {
- id: windowPane
- ApplicationWindow {
- width: 200
- height: 200
- visible: true
- property alias pane: pane
- Pane { id: pane }
- }
- }
-
- function test_defaults() {
- var control = button.createObject(testCase)
- verify(control)
- verify(control.Universal)
- compare(control.Universal.accent, "#3e65ff") // Universal.Cobalt
- compare(control.Universal.foreground, "#000000") // SystemBaseHighColor
- compare(control.Universal.background, "#ffffff") // SystemAltHighColor
- compare(control.Universal.theme, Universal.Light)
- control.destroy()
- }
-
- function test_set() {
- var control = button.createObject(testCase)
- verify(control)
- control.Universal.accent = Universal.Steel
- control.Universal.foreground = Universal.Red
- control.Universal.background = Universal.Green
- control.Universal.theme = Universal.Dark
- compare(control.Universal.accent, "#647687") // Universal.Steel
- compare(control.Universal.foreground, "#e51400") // Universal.Red
- compare(control.Universal.background, "#60a917") // Universal.Green
- compare(control.Universal.theme, Universal.Dark)
- control.destroy()
- }
-
- function test_reset() {
- var control = styledButton.createObject(testCase)
- verify(control)
- compare(control.Universal.accent, "#aa00ff") // Universal.Violet
- compare(control.Universal.foreground, "#825a2c") // Universal.Brown
- compare(control.Universal.background, "#e3c800") // Universal.Yellow
- compare(control.Universal.theme, Universal.Dark)
- control.Universal.accent = undefined
- control.Universal.foreground = undefined
- control.Universal.background = undefined
- control.Universal.theme = undefined
- compare(control.Universal.accent, testCase.Universal.accent)
- compare(control.Universal.foreground, testCase.Universal.foreground)
- compare(control.Universal.background, testCase.Universal.background)
- compare(control.Universal.theme, testCase.Universal.theme)
- control.destroy()
- }
-
- function test_inheritance_data() {
- return [
- { tag: "accent", value1: "#a20025" /*Universal.Crimson*/, value2: "#6a00ff" /*Universal.Indigo*/ },
- { tag: "foreground", value1: "#a20025" /*Universal.Crimson*/, value2: "#6a00ff" /*Universal.Indigo*/ },
- { tag: "background", value1: "#a20025" /*Universal.Crimson*/, value2: "#6a00ff" /*Universal.Indigo*/ },
- { tag: "theme", value1: Universal.Dark, value2: Universal.Light },
- ]
- }
-
- function test_inheritance(data) {
- var prop = data.tag
- var parent = button.createObject(testCase)
- parent.Universal[prop] = data.value1
- compare(parent.Universal[prop], data.value1)
-
- var child1 = button.createObject(parent)
- compare(child1.Universal[prop], data.value1)
-
- parent.Universal[prop] = data.value2
- compare(parent.Universal[prop], data.value2)
- compare(child1.Universal[prop], data.value2)
-
- var child2 = button.createObject(parent)
- compare(child2.Universal[prop], data.value2)
-
- child2.Universal[prop] = data.value1
- compare(child2.Universal[prop], data.value1)
- compare(child1.Universal[prop], data.value2)
- compare(parent.Universal[prop], data.value2)
-
- parent.Universal[prop] = undefined
- verify(parent.Universal[prop] !== data.value1)
- verify(parent.Universal[prop] !== undefined)
- compare(child1.Universal[prop], parent.Universal[prop])
- verify(child2.Universal[prop] !== parent.Universal[prop])
-
- var grandChild1 = button.createObject(child1)
- var grandChild2 = button.createObject(child2)
- compare(grandChild1.Universal[prop], child1.Universal[prop])
- compare(grandChild2.Universal[prop], child2.Universal[prop])
-
- var themelessGrandGrandChild = button.createObject(grandChild1)
- var grandGrandGrandChild1 = button.createObject(themelessGrandGrandChild)
- compare(grandGrandGrandChild1.Universal[prop], parent.Universal[prop])
-
- child1.Universal[prop] = data.value2
- compare(child1.Universal[prop], data.value2)
- compare(grandChild1.Universal[prop], data.value2)
- compare(grandGrandGrandChild1.Universal[prop], data.value2)
-
- parent.destroy()
- }
-
- function test_window() {
- var parent = window.createObject()
-
- var control = button.createObject(parent.contentItem)
- compare(control.Universal.accent, parent.Universal.accent)
- compare(control.Universal.theme, parent.Universal.theme)
-
- var styledChild = styledWindow.createObject(window)
- verify(styledChild.Universal.accent !== parent.Universal.accent)
- verify(styledChild.Universal.theme !== parent.Universal.theme)
-
- var unstyledChild = window.createObject(window)
- compare(unstyledChild.Universal.accent, parent.Universal.accent)
- compare(unstyledChild.Universal.theme, parent.Universal.theme)
-
- parent.Universal.accent = Universal.Cyan
- compare(control.Universal.accent, "#1ba1e2") // Universal.Cyan
- verify(styledChild.Universal.accent !== Universal.Cyan)
- // ### TODO: compare(unstyledChild.Universal.accent, Universal.Cyan)
-
- parent.destroy()
- }
-
- function test_loader() {
- var control = loader.createObject(testCase)
- control.Universal.accent = Universal.Lime
- control.active = true
- compare(control.item.Universal.accent, "#a4c400") // Universal.Lime
- control.Universal.accent = Universal.Pink
- compare(control.item.Universal.accent, "#f472d0") // Universal.Pink
- control.active = false
- control.Universal.accent = Universal.Brown
- control.active = true
- compare(control.item.Universal.accent, "#825a2c") // Universal.Brown
- control.destroy()
- }
-
- function test_swipeView() {
- var control = swipeView.createObject(testCase)
- verify(control)
- var child = control.itemAt(0)
- verify(child)
- compare(control.Universal.theme, Universal.Dark)
- compare(child.Universal.theme, Universal.Dark)
- control.destroy()
- }
-
- function test_menu() {
- var container = menu.createObject(testCase)
- verify(container)
- verify(container.menu)
- container.menu.open()
- verify(container.menu.visible)
- var child = container.menu.itemAt(0)
- verify(child)
- compare(container.Universal.theme, Universal.Light)
- compare(container.menu.Universal.theme, Universal.Dark)
- compare(child.Universal.theme, Universal.Dark)
- compare(container.Universal.accent, "#e51400") // Red
- compare(container.menu.Universal.accent, "#e51400") // Red
- compare(child.Universal.accent, "#e51400") // Red
- container.destroy()
- }
-
- function test_comboBox() {
- var window = comboBox.createObject(testCase)
- verify(window)
- verify(window.combo)
- waitForRendering(window.combo)
- window.combo.forceActiveFocus()
- verify(window.combo.activeFocus)
- keyClick(Qt.Key_Space)
- verify(window.combo.popup.visible)
- var listView = window.combo.popup.contentItem
- verify(listView)
- var child = listView.contentItem.children[0]
- verify(child)
- compare(window.Universal.theme, Universal.Light)
- compare(window.combo.Universal.theme, Universal.Dark)
- compare(child.Universal.theme, Universal.Dark)
- compare(window.Universal.accent, "#e51400") // Red
- compare(window.combo.Universal.accent, "#e51400") // Red
- compare(child.Universal.accent, "#e51400") // Red
- window.destroy()
- }
-
- function test_windowChange() {
- var ldr = loader.createObject()
- verify(ldr)
-
- var wnd = window.createObject()
- verify(wnd)
-
- wnd.Universal.theme = Universal.Dark
- compare(wnd.Universal.theme, Universal.Dark)
-
- ldr.active = true
- verify(ldr.item)
- compare(ldr.item.Universal.theme, Universal.Light)
-
- ldr.parent = wnd.contentItem
- compare(ldr.item.Universal.theme, Universal.Dark)
-
- wnd.destroy()
- }
-
- function test_colors_data() {
- return [
- { tag: "accent" }, { tag: "background" }, { tag: "foreground" }
- ]
- }
-
- function test_colors(data) {
- var control = button.createObject(testCase)
- verify(control)
-
- var prop = data.tag
-
- // Universal.Color - enum
- control.Universal[prop] = Universal.Red
- compare(control.Universal[prop], "#e51400")
-
- // Universal.Color - string
- control.Universal[prop] = "Emerald"
- compare(control.Universal[prop], "#008a00")
-
- // SVG named color
- control.Universal[prop] = "tomato"
- compare(control.Universal[prop], "#ff6347")
-
- // #rrggbb
- control.Universal[prop] = "#123456"
- compare(control.Universal[prop], "#123456")
-
- // #aarrggbb
- control.Universal[prop] = "#12345678"
- compare(control.Universal[prop], "#12345678")
-
- // Qt.rgba() - no alpha
- control.Universal[prop] = Qt.rgba(0.5, 0.5, 0.5)
- compare(control.Universal[prop], "#808080")
-
- // Qt.rgba() - with alpha
- control.Universal[prop] = Qt.rgba(0.5, 0.5, 0.5, 0.5)
- compare(control.Universal[prop], "#80808080")
-
- // unknown
- ignoreWarning(Qt.resolvedUrl("tst_universal.qml") + ":67:9: QML Button: unknown Universal." + prop + " value: 123")
- control.Universal[prop] = 123
- ignoreWarning(Qt.resolvedUrl("tst_universal.qml") + ":67:9: QML Button: unknown Universal." + prop + " value: foo")
- control.Universal[prop] = "foo"
- ignoreWarning(Qt.resolvedUrl("tst_universal.qml") + ":67:9: QML Button: unknown Universal." + prop + " value: #1")
- control.Universal[prop] = "#1"
-
- control.destroy()
- }
-
- function test_font_data() {
- return [
- {tag: "Control:pixelSize", type: "Control", attribute: "pixelSize", value: 15, window: 20, pane: 10},
-
- {tag: "GroupBox:pixelSize", type: "GroupBox", attribute: "pixelSize", value: 15, window: 20, pane: 10},
- {tag: "GroupBox:weight", type: "GroupBox", attribute: "weight", value: Font.DemiBold, window: Font.Light, pane: Font.Medium},
-
- {tag: "TabButton:pixelSize", type: "TabButton", attribute: "pixelSize", value: 24, window: 20, pane: 10},
- {tag: "TabButton:weight", type: "TabButton", attribute: "weight", value: Font.Light, window: Font.Black, pane: Font.Bold}
- ]
- }
-
- function test_font(data) {
- var window = windowPane.createObject(testCase)
- verify(window)
- verify(window.pane)
-
- var control = Qt.createQmlObject("import QtQuick.Controls; " + data.type + " { }", window.pane)
- verify(control)
-
- compare(control.font[data.attribute], data.value)
-
- window.font[data.attribute] = data.window
- compare(window.font[data.attribute], data.window)
- compare(window.pane.font[data.attribute], data.window)
- compare(control.font[data.attribute], data.window)
-
- window.pane.font[data.attribute] = data.pane
- compare(window.font[data.attribute], data.window)
- compare(window.pane.font[data.attribute], data.pane)
- compare(control.font[data.attribute], data.pane)
-
- window.pane.font = undefined
- compare(window.font[data.attribute], data.window)
- compare(window.pane.font[data.attribute], data.window)
- compare(control.font[data.attribute], data.window)
-
- window.destroy()
- }
-}
diff --git a/tests/auto/quickcontrols2/qquickuniversalstyle/qtquickcontrols2.conf b/tests/auto/quickcontrols2/qquickuniversalstyle/qtquickcontrols2.conf
deleted file mode 100644
index 8c6dd807..00000000
--- a/tests/auto/quickcontrols2/qquickuniversalstyle/qtquickcontrols2.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-[Controls]
-Style=Universal
diff --git a/tests/auto/quickcontrols2/qquickuniversalstyle/tst_qquickuniversalstyle.cpp b/tests/auto/quickcontrols2/qquickuniversalstyle/tst_qquickuniversalstyle.cpp
deleted file mode 100644
index c5b6b566..00000000
--- a/tests/auto/quickcontrols2/qquickuniversalstyle/tst_qquickuniversalstyle.cpp
+++ /dev/null
@@ -1,38 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2017 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:LGPL3$
-** 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 Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPLv3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or later as published by the Free
-** Software Foundation and appearing in the file LICENSE.GPL included in
-** the packaging of this file. Please review the following information to
-** ensure the GNU General Public License version 2.0 requirements will be
-** met: http://www.gnu.org/licenses/gpl-2.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <QtQuickTest/quicktest.h>
-QUICK_TEST_MAIN(tst_qquickuniversalstyle)