From f38e35dcd46bd4ac0c9859ec4f974702f6c8ad03 Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Wed, 23 Dec 2015 12:59:10 +0100 Subject: tst_objectcount: remove legacy controls Moved to the qtquickcontrols repo, where they belong... Change-Id: I56e240d4b718dea123f83ab37f7f67e8a9489213 Reviewed-by: Mitch Curtis --- tests/benchmarks/objectcount/tst_objectcount.cpp | 70 ------------------------ 1 file changed, 70 deletions(-) (limited to 'tests/benchmarks') diff --git a/tests/benchmarks/objectcount/tst_objectcount.cpp b/tests/benchmarks/objectcount/tst_objectcount.cpp index 2d14e9eb..b479b0e2 100644 --- a/tests/benchmarks/objectcount/tst_objectcount.cpp +++ b/tests/benchmarks/objectcount/tst_objectcount.cpp @@ -64,9 +64,6 @@ private slots: void calendar(); void calendar_data(); - void legacy(); - void legacy_data(); - void controls(); void controls_data(); @@ -167,73 +164,6 @@ void tst_ObjectCount::calendar_data() addTestRows(&engine, "/calendar"); } -void tst_ObjectCount::legacy() -{ - QFETCH(QByteArray, data); - - QQmlComponent component(&engine); - - qt_qobjects->clear(); - - component.setData(data, QUrl()); - QScopedPointer object(component.create()); - QVERIFY2(object.data(), qPrintable(component.errorString())); - - QList items; - foreach (QObject *object, *qt_qobjects()) { - QQuickItem *item = qobject_cast(object); - if (item) - items += item; - } - printItems(items); -} - -void tst_ObjectCount::legacy_data() -{ - QTest::addColumn("data"); - - QTest::newRow("ApplicationWindow") - << QByteArray("import QtQuick.Controls 1.3; ApplicationWindow { }"); - QTest::newRow("BusyIndicator") - << QByteArray("import QtQuick.Controls 1.3; BusyIndicator { }"); - QTest::newRow("Button") - << QByteArray("import QtQuick.Controls 1.3; Button { }"); - QTest::newRow("CheckBox") - << QByteArray("import QtQuick.Controls 1.3; CheckBox { }"); - QTest::newRow("Dial") - << QByteArray("import QtQuick.Extras 1.3; Dial { }"); - QTest::newRow("GroupBox") - << QByteArray("import QtQuick.Controls 1.3; GroupBox { }"); - QTest::newRow("Label") - << QByteArray("import QtQuick.Controls 1.3; Label { }"); - QTest::newRow("ProgressBar") - << QByteArray("import QtQuick.Controls 1.3; ProgressBar { }"); - QTest::newRow("RadioButton") - << QByteArray("import QtQuick.Controls 1.3; RadioButton { }"); - QTest::newRow("ScrollView") - << QByteArray("import QtQuick.Controls 1.3; ScrollView { }"); - QTest::newRow("Slider") - << QByteArray("import QtQuick.Controls 1.3; Slider { }"); - QTest::newRow("SpinBox") - << QByteArray("import QtQuick.Controls 1.3; SpinBox { }"); - QTest::newRow("StackView") - << QByteArray("import QtQuick.Controls 1.3; StackView { }"); - QTest::newRow("Switch") - << QByteArray("import QtQuick.Controls 1.3; Switch { }"); - QTest::newRow("TabView") - << QByteArray("import QtQuick.Controls 1.3; TabView { }"); - QTest::newRow("TextArea") - << QByteArray("import QtQuick.Controls 1.3; TextArea { }"); - QTest::newRow("TextField") - << QByteArray("import QtQuick.Controls 1.3; TextField { }"); - QTest::newRow("ToolBar") - << QByteArray("import QtQuick.Controls 1.3; ToolBar { }"); - QTest::newRow("ToolButton") - << QByteArray("import QtQuick.Controls 1.3; ToolButton { }"); - QTest::newRow("Tumbler") - << QByteArray("import QtQuick.Extras 1.3; Tumbler { }"); -} - void tst_ObjectCount::controls() { QFETCH(QUrl, url); -- cgit v1.2.3