From 59f72376602c306f6322c9482e2201f1cc9e3819 Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Mon, 11 Dec 2017 16:02:40 +0100 Subject: RangeSlider: use deferred execution Task-number: QTBUG-50992 Change-Id: Ibbc946c3402c65f9b100fc74dde04e4d439c8535 Reviewed-by: Mitch Curtis --- .../data/styles/override/RangeSlider.qml | 69 ++++++++++++++++++++++ 1 file changed, 69 insertions(+) create mode 100644 tests/auto/customization/data/styles/override/RangeSlider.qml (limited to 'tests/auto/customization/data/styles/override/RangeSlider.qml') diff --git a/tests/auto/customization/data/styles/override/RangeSlider.qml b/tests/auto/customization/data/styles/override/RangeSlider.qml new file mode 100644 index 00000000..21a0d820 --- /dev/null +++ b/tests/auto/customization/data/styles/override/RangeSlider.qml @@ -0,0 +1,69 @@ +/**************************************************************************** +** +** 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 2.9 +import "../incomplete" as Incomplete + +Incomplete.RangeSlider { + id: control + objectName: "rangeslider-override" + + first.handle: Rectangle { + objectName: "rangeslider-first-handle-override" + } + + second.handle: Rectangle { + objectName: "rangeslider-second-handle-override" + } + + background: Rectangle { + objectName: "rangeslider-background-override" + } +} -- cgit v1.2.3 From a31f0a1e7e187944eb8744c84c085f2e76752eb5 Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Thu, 14 Dec 2017 15:12:00 +0100 Subject: Extend and improve tst_customization Add more test cases, and clarify the roles of the test styles. - empty: no delegates at all - incomplete: has all delegates, but with no bindings that access delegates and therefore trigger creation (tests that delegates must be created regardless) - simple: has all delegates and creates bindings to simulate a full style - override: overrides the simple style and tests that the default instances of overridden delegates are not created There are still several non-popup controls that lack deferred execution. These are marked with QEXPECT_FAIL() to make it easy to track what's missing. This list still excludes all popups. Task-number: QTBUG-50992 Change-Id: I70ce42592e7a320251edebfab3030ccc7c0eb978 Reviewed-by: Mitch Curtis --- .../customization/data/styles/override/RangeSlider.qml | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) (limited to 'tests/auto/customization/data/styles/override/RangeSlider.qml') diff --git a/tests/auto/customization/data/styles/override/RangeSlider.qml b/tests/auto/customization/data/styles/override/RangeSlider.qml index 21a0d820..b10ff8a2 100644 --- a/tests/auto/customization/data/styles/override/RangeSlider.qml +++ b/tests/auto/customization/data/styles/override/RangeSlider.qml @@ -49,21 +49,25 @@ ****************************************************************************/ import QtQuick 2.9 -import "../incomplete" as Incomplete +import "../simple" as Simple -Incomplete.RangeSlider { +Simple.RangeSlider { id: control objectName: "rangeslider-override" - first.handle: Rectangle { - objectName: "rangeslider-first-handle-override" + first.handle: Item { + objectName: "rangeslider-first.handle-override" } - second.handle: Rectangle { - objectName: "rangeslider-second-handle-override" + second.handle: Item { + objectName: "rangeslider-second.handle-override" } - background: Rectangle { + contentItem: Item { + objectName: "rangeslider-contentItem-override" + } + + background: Item { objectName: "rangeslider-background-override" } } -- cgit v1.2.3