diff options
Diffstat (limited to 'tests/benchmarks')
8 files changed, 29 insertions, 16 deletions
diff --git a/tests/benchmarks/particles/affectors/tst_affectors.cpp b/tests/benchmarks/particles/affectors/tst_affectors.cpp index abce304f9a..172d986186 100644 --- a/tests/benchmarks/particles/affectors/tst_affectors.cpp +++ b/tests/benchmarks/particles/affectors/tst_affectors.cpp @@ -66,7 +66,7 @@ void tst_affectors::test_basic() int stillAlive = 0; QVERIFY(extremelyFuzzyCompare(system->groupData[0]->size(), 1000, 10));//Small simulation variance is permissible. - for (QQuickParticleData *d : qAsConst(system->groupData[0]->data)) { + for (QQuickParticleData *d : std::as_const(system->groupData[0]->data)) { if (d->t == -1) continue; //Particle data unused @@ -106,7 +106,7 @@ void tst_affectors::test_filtered() int stillAlive = 0; QVERIFY(extremelyFuzzyCompare(system->groupData[1]->size(), 1000, 10));//Small simulation variance is permissible. - for (QQuickParticleData *d : qAsConst(system->groupData[1]->data)) { + for (QQuickParticleData *d : std::as_const(system->groupData[1]->data)) { if (d->t == -1) continue; //Particle data unused diff --git a/tests/benchmarks/particles/emission/tst_emission.cpp b/tests/benchmarks/particles/emission/tst_emission.cpp index 155e2c6cff..875906ad45 100644 --- a/tests/benchmarks/particles/emission/tst_emission.cpp +++ b/tests/benchmarks/particles/emission/tst_emission.cpp @@ -54,7 +54,7 @@ void tst_emission::test_basic() int stillAlive = 0; QVERIFY(extremelyFuzzyCompare(system->groupData[0]->size(), 1000, 10));//Small simulation variance is permissible. - for (QQuickParticleData *d : qAsConst(system->groupData[0]->data)) { + for (QQuickParticleData *d : std::as_const(system->groupData[0]->data)) { if (d->t == -1) continue; //Particle data unused diff --git a/tests/benchmarks/qml/librarymetrics_performance/tst_librarymetrics_performance.cpp b/tests/benchmarks/qml/librarymetrics_performance/tst_librarymetrics_performance.cpp index c4400f4d1b..f64a44d66a 100644 --- a/tests/benchmarks/qml/librarymetrics_performance/tst_librarymetrics_performance.cpp +++ b/tests/benchmarks/qml/librarymetrics_performance/tst_librarymetrics_performance.cpp @@ -239,7 +239,7 @@ void tst_librarymetrics_performance::compilation() if (nResults.size() == 0) nResults.append(9999); for (int i = 0; i < nResults.size(); ++i) totaltime += nResults.at(i); - double average = ((double)totaltime) / nResults.count(); + double average = ((double)totaltime) / nResults.size(); // and return it as the result QTest::setBenchmarkResult(average, QTest::WalltimeNanoseconds); @@ -288,7 +288,7 @@ void tst_librarymetrics_performance::instantiation_cached() if (nResults.size() == 0) nResults.append(9999); for (int i = 0; i < nResults.size(); ++i) totaltime += nResults.at(i); - double average = ((double)totaltime) / nResults.count(); + double average = ((double)totaltime) / nResults.size(); // and return it as the result QTest::setBenchmarkResult(average, QTest::WalltimeNanoseconds); @@ -345,7 +345,7 @@ void tst_librarymetrics_performance::instantiation() if (nResults.size() == 0) nResults.append(9999); for (int i = 0; i < nResults.size(); ++i) totaltime += nResults.at(i); - double average = ((double)totaltime) / nResults.count(); + double average = ((double)totaltime) / nResults.size(); // and return it as the result QTest::setBenchmarkResult(average, QTest::WalltimeNanoseconds); @@ -411,7 +411,7 @@ void tst_librarymetrics_performance::positioners() if (nResults.size() == 0) nResults.append(9999); for (int i = 0; i < nResults.size(); ++i) totaltime += nResults.at(i); - double average = ((double)totaltime) / nResults.count(); + double average = ((double)totaltime) / nResults.size(); // and return it as the result QTest::setBenchmarkResult(average, QTest::WalltimeNanoseconds); diff --git a/tests/benchmarks/qml/qqmlchangeset/CMakeLists.txt b/tests/benchmarks/qml/qqmlchangeset/CMakeLists.txt index 2d6461eefd..ee61a372af 100644 --- a/tests/benchmarks/qml/qqmlchangeset/CMakeLists.txt +++ b/tests/benchmarks/qml/qqmlchangeset/CMakeLists.txt @@ -1,10 +1,10 @@ # Generated from qqmlchangeset.pro. ##################################################################### -## tst_qqmlchangeset Binary: +## tst_bench_qqmlchangeset Binary: ##################################################################### -qt_internal_add_benchmark(tst_qqmlchangeset +qt_internal_add_benchmark(tst_bench_qqmlchangeset SOURCES tst_qqmlchangeset.cpp DEFINES diff --git a/tests/benchmarks/quickcontrols2/creationtime/CMakeLists.txt b/tests/benchmarks/quickcontrols2/creationtime/CMakeLists.txt index 9e3a6d58c1..ad39b3ea0b 100644 --- a/tests/benchmarks/quickcontrols2/creationtime/CMakeLists.txt +++ b/tests/benchmarks/quickcontrols2/creationtime/CMakeLists.txt @@ -1,5 +1,11 @@ # Generated from creationtime.pro. +if (NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) + cmake_minimum_required(VERSION 3.16) + project(tst_creationtime LANGUAGES C CXX ASM) + find_package(Qt6BuildInternals COMPONENTS STANDALONE_TEST) +endif() + ##################################################################### ## tst_creationtime Test: ##################################################################### diff --git a/tests/benchmarks/quickcontrols2/creationtime/tst_creationtime.cpp b/tests/benchmarks/quickcontrols2/creationtime/tst_creationtime.cpp index 2e37d00dd8..82259269d9 100644 --- a/tests/benchmarks/quickcontrols2/creationtime/tst_creationtime.cpp +++ b/tests/benchmarks/quickcontrols2/creationtime/tst_creationtime.cpp @@ -57,7 +57,7 @@ static void doBenchmark(QQuickStyleHelper &styleHelper, const QUrl &url) QCOMPARE(styleAndFileName.size(), 2); QString style = styleAndFileName.first(); style[0] = style.at(0).toUpper(); - styleHelper.updateStyle(style); + QVERIFY(styleHelper.updateStyle(style)); QQmlComponent component(styleHelper.engine.data()); component.loadUrl(url); @@ -98,7 +98,7 @@ void tst_CreationTime::fusion_data() QTest::addColumn<QUrl>("url"); addTestRowForEachControl(styleHelper.engine.data(), QQC2_IMPORT_PATH, "fusion", "QtQuick/Controls/Fusion", QStringList() << "ApplicationWindow" << "ButtonPanel" << "CheckIndicator" - << "RadioIndicator" << "SliderGroove" << "SliderHandle" << "SwitchIndicator"); + << "RadioIndicator" << "SliderGroove" << "SliderHandle" << "SwitchIndicator" << "TreeViewDelegate"); } void tst_CreationTime::imagine() @@ -125,7 +125,7 @@ void tst_CreationTime::material_data() QTest::addColumn<QUrl>("url"); addTestRowForEachControl(styleHelper.engine.data(), QQC2_IMPORT_PATH, "material", "QtQuick/Controls/Material", QStringList() << "ApplicationWindow" << "Ripple" << "SliderHandle" << "CheckIndicator" << "RadioIndicator" - << "SwitchIndicator" << "BoxShadow" << "ElevationEffect" << "CursorDelegate"); + << "SwitchIndicator" << "BoxShadow" << "ElevationEffect" << "CursorDelegate" << "TreeViewDelegate"); } void tst_CreationTime::universal() diff --git a/tests/benchmarks/quickcontrols2/objectcount/CMakeLists.txt b/tests/benchmarks/quickcontrols2/objectcount/CMakeLists.txt index 752230ec7e..e0434a08eb 100644 --- a/tests/benchmarks/quickcontrols2/objectcount/CMakeLists.txt +++ b/tests/benchmarks/quickcontrols2/objectcount/CMakeLists.txt @@ -1,5 +1,11 @@ # Generated from objectcount.pro. +if (NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) + cmake_minimum_required(VERSION 3.16) + project(tst_objectcount LANGUAGES C CXX ASM) + find_package(Qt6BuildInternals COMPONENTS STANDALONE_TEST) +endif() + ##################################################################### ## tst_objectcount Test: ##################################################################### diff --git a/tests/benchmarks/quickcontrols2/objectcount/tst_objectcount.cpp b/tests/benchmarks/quickcontrols2/objectcount/tst_objectcount.cpp index aad8e7d571..e1d37eec8f 100644 --- a/tests/benchmarks/quickcontrols2/objectcount/tst_objectcount.cpp +++ b/tests/benchmarks/quickcontrols2/objectcount/tst_objectcount.cpp @@ -67,11 +67,12 @@ static void initTestRows(QQmlEngine *engine) addTestRowForEachControl(engine, QQC2_IMPORT_PATH, "basic", "QtQuick/Controls/Basic", QStringList() << "Calendar" << "TreeViewDelegate"); addTestRowForEachControl(engine, QQC2_IMPORT_PATH, "fusion", "QtQuick/Controls/Fusion", - QStringList() << "ButtonPanel" << "CheckIndicator" << "RadioIndicator" << "SliderGroove" << "SliderHandle" << "SwitchIndicator"); + QStringList() << "ButtonPanel" << "CheckIndicator" << "RadioIndicator" << "SliderGroove" + << "SliderHandle" << "SwitchIndicator" << "TreeViewDelegate"); addTestRowForEachControl(engine, QQC2_IMPORT_PATH, "imagine", "QtQuick/Controls/Imagine"); addTestRowForEachControl(engine, QQC2_IMPORT_PATH, "material", "QtQuick/Controls/Material", QStringList() << "Ripple" << "SliderHandle" << "CheckIndicator" << "RadioIndicator" - << "SwitchIndicator" << "BoxShadow" << "ElevationEffect" << "CursorDelegate"); + << "SwitchIndicator" << "BoxShadow" << "ElevationEffect" << "CursorDelegate" << "TreeViewDelegate"); addTestRowForEachControl(engine, QQC2_IMPORT_PATH, "universal", "QtQuick/Controls/Universal", QStringList() << "CheckIndicator" << "RadioIndicator" << "SwitchIndicator"); } @@ -88,7 +89,7 @@ static void doBenchmark(QQmlEngine *engine, const QUrl &url) QVERIFY2(object.data(), qPrintable(component.errorString())); QObjectList objects; - for (QObject *object : qAsConst(*qt_qobjects())) { + for (QObject *object : std::as_const(*qt_qobjects())) { if (qobject_cast<T *>(object)) objects += object; } @@ -98,7 +99,7 @@ static void doBenchmark(QQmlEngine *engine, const QUrl &url) qInfo() << "\t" << object; } - QTest::setBenchmarkResult(objects.count(), QTest::Events); + QTest::setBenchmarkResult(objects.size(), QTest::Events); } void tst_ObjectCount::qobjects() |