From 0e18524a84d2aae65c54edc676d8ad7348f7d61c Mon Sep 17 00:00:00 2001 From: Mitch Curtis Date: Fri, 15 May 2020 10:39:51 +0200 Subject: Remove Qt Labs Calendar This is getting its own repository as part of the move to the marketplace. Task-number: QTBUG-84172 Pick-to: 5.15 Change-Id: I2f963c298d6ef95e0832f95aa1e1ea809f4867a2 Reviewed-by: Volker Hilsheimer --- tests/benchmarks/creationtime/data/dependencies.qml | 1 - tests/benchmarks/creationtime/tst_creationtime.cpp | 15 --------------- tests/benchmarks/objectcount/data/dependencies.qml | 1 - 3 files changed, 17 deletions(-) (limited to 'tests/benchmarks') diff --git a/tests/benchmarks/creationtime/data/dependencies.qml b/tests/benchmarks/creationtime/data/dependencies.qml index 130ee37d..3ae7511b 100644 --- a/tests/benchmarks/creationtime/data/dependencies.qml +++ b/tests/benchmarks/creationtime/data/dependencies.qml @@ -4,6 +4,5 @@ import QtQuick.Controls.Fusion 2.12 import QtQuick.Controls.Imagine 2.12 import QtQuick.Controls.Material 2.12 import QtQuick.Controls.Universal 2.12 -import Qt.labs.calendar 1.0 Control { } diff --git a/tests/benchmarks/creationtime/tst_creationtime.cpp b/tests/benchmarks/creationtime/tst_creationtime.cpp index 41d7224d..3ebd9f2c 100644 --- a/tests/benchmarks/creationtime/tst_creationtime.cpp +++ b/tests/benchmarks/creationtime/tst_creationtime.cpp @@ -63,9 +63,6 @@ private slots: void universal(); void universal_data(); - void calendar(); - void calendar_data(); - private: QQmlEngine engine; }; @@ -150,18 +147,6 @@ void tst_CreationTime::universal_data() addTestRowForEachControl(&engine, "controls/universal", "QtQuick/Controls.2/Universal", QStringList() << "ApplicationWindow" << "CheckIndicator" << "RadioIndicator" << "SwitchIndicator"); } -void tst_CreationTime::calendar() -{ - QFETCH(QUrl, url); - doBenchmark(&engine, url); -} - -void tst_CreationTime::calendar_data() -{ - QTest::addColumn("url"); - addTestRowForEachControl(&engine, "calendar", "Qt/labs/calendar"); -} - QTEST_MAIN(tst_CreationTime) #include "tst_creationtime.moc" diff --git a/tests/benchmarks/objectcount/data/dependencies.qml b/tests/benchmarks/objectcount/data/dependencies.qml index 130ee37d..3ae7511b 100644 --- a/tests/benchmarks/objectcount/data/dependencies.qml +++ b/tests/benchmarks/objectcount/data/dependencies.qml @@ -4,6 +4,5 @@ import QtQuick.Controls.Fusion 2.12 import QtQuick.Controls.Imagine 2.12 import QtQuick.Controls.Material 2.12 import QtQuick.Controls.Universal 2.12 -import Qt.labs.calendar 1.0 Control { } -- cgit v1.2.3