From 84cd2f6b30ac107c0daa9ec37b114eb1a94323a5 Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Thu, 27 Oct 2016 16:44:50 +0200 Subject: Material: share the CursorDelegate Duplicate code in TextField, TextArea, and SpinBox. The next one is editable ComboBox. Change-Id: Ibbd054d2f945f4964ee0007f9e9dc8a9450902e9 Reviewed-by: Mitch Curtis --- tests/auto/sanity/BLACKLIST | 6 +----- tests/auto/sanity/tst_sanity.cpp | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) (limited to 'tests/auto') diff --git a/tests/auto/sanity/BLACKLIST b/tests/auto/sanity/BLACKLIST index 768f3985..2954a35f 100644 --- a/tests/auto/sanity/BLACKLIST +++ b/tests/auto/sanity/BLACKLIST @@ -1,8 +1,4 @@ -[signalHandlers:material/SpinBox.qml] -* -[signalHandlers:material/TextArea.qml] -* -[signalHandlers:material/TextField.qml] +[signalHandlers:material/CursorDelegate.qml] * [attachedObjects:controls/ComboBox.qml] * diff --git a/tests/auto/sanity/tst_sanity.cpp b/tests/auto/sanity/tst_sanity.cpp index 23b56384..823cbc02 100644 --- a/tests/auto/sanity/tst_sanity.cpp +++ b/tests/auto/sanity/tst_sanity.cpp @@ -314,7 +314,7 @@ void tst_Sanity::attachedObjects_data() QTest::addColumn("url"); addTestRows(&engine, "calendar", "Qt/labs/calendar"); addTestRows(&engine, "controls", "QtQuick/Controls.2", QStringList() << "CheckIndicator" << "RadioIndicator" << "SwitchIndicator"); - addTestRows(&engine, "controls/material", "QtQuick/Controls.2/Material", QStringList() << "Ripple" << "SliderHandle" << "CheckIndicator" << "RadioIndicator" << "SwitchIndicator" << "BoxShadow" << "ElevationEffect"); + addTestRows(&engine, "controls/material", "QtQuick/Controls.2/Material", QStringList() << "Ripple" << "SliderHandle" << "CheckIndicator" << "RadioIndicator" << "SwitchIndicator" << "BoxShadow" << "ElevationEffect" << "CursorDelegate"); addTestRows(&engine, "controls/universal", "QtQuick/Controls.2/Universal", QStringList() << "CheckIndicator" << "RadioIndicator" << "SwitchIndicator"); } -- cgit v1.2.3