From 0797e0cb2072a0b5cac4d8db2205d932cc64d25c Mon Sep 17 00:00:00 2001 From: Mitch Curtis Date: Fri, 18 Sep 2015 13:40:01 +0200 Subject: Merge Qt Quick Extras into Qt Quick Controls The original split existed because the public and enterprise controls were developed separately. Now that all controls are public and developed together, the split no longer makes sense and is difficult for users to understand. Change-Id: I00420f4d09f8c837232231d03fe818b7b3403fab Reviewed-by: Gabriel de Dietrich Reviewed-by: Frederik Gladhorn Reviewed-by: J-P Nurmi --- tests/benchmarks/creationtime/tst_creationtime.cpp | 17 ----------------- 1 file changed, 17 deletions(-) (limited to 'tests/benchmarks/creationtime/tst_creationtime.cpp') diff --git a/tests/benchmarks/creationtime/tst_creationtime.cpp b/tests/benchmarks/creationtime/tst_creationtime.cpp index 47416045..9185d5b5 100644 --- a/tests/benchmarks/creationtime/tst_creationtime.cpp +++ b/tests/benchmarks/creationtime/tst_creationtime.cpp @@ -50,9 +50,6 @@ private slots: void calendar(); void calendar_data(); - void extras(); - void extras_data(); - private: QQmlEngine engine; }; @@ -128,20 +125,6 @@ void tst_CreationTime::calendar_data() addTestRows(engine.importPathList(), "QtQuick/Calendar.2"); } -void tst_CreationTime::extras() -{ - QFETCH(QByteArray, control); - QQmlComponent component(&engine); - component.setData("import QtQuick.Extras 2.0;" + control + "{}", QUrl()); - doBenchmark(&component); -} - -void tst_CreationTime::extras_data() -{ - QTest::addColumn("control"); - addTestRows(engine.importPathList(), "QtQuick/Extras.2"); -} - QTEST_MAIN(tst_CreationTime) #include "tst_creationtime.moc" -- cgit v1.2.3