diff options
Diffstat (limited to 'tests/benchmarks')
54 files changed, 195 insertions, 178 deletions
diff --git a/tests/benchmarks/creationtime/CMakeLists.txt b/tests/benchmarks/creationtime/CMakeLists.txt index 1162bace..7979a42f 100644 --- a/tests/benchmarks/creationtime/CMakeLists.txt +++ b/tests/benchmarks/creationtime/CMakeLists.txt @@ -19,6 +19,7 @@ qt_add_test(tst_creationtime Qt::Qml Qt::QmlPrivate Qt::QuickControls2 + Qt::QuickControls2Private Qt::QuickPrivate Qt::QuickTemplates2Private Qt::TestPrivate diff --git a/tests/benchmarks/creationtime/creationtime.pro b/tests/benchmarks/creationtime/creationtime.pro index a594027e..613cf60d 100644 --- a/tests/benchmarks/creationtime/creationtime.pro +++ b/tests/benchmarks/creationtime/creationtime.pro @@ -1,7 +1,7 @@ TEMPLATE = app TARGET = tst_creationtime -QT += qml testlib +QT += qml testlib quickcontrols2 CONFIG += testcase macos:CONFIG -= app_bundle diff --git a/tests/benchmarks/creationtime/data/dependencies.qml b/tests/benchmarks/creationtime/data/dependencies.qml index 3ae7511b..3b847617 100644 --- a/tests/benchmarks/creationtime/data/dependencies.qml +++ b/tests/benchmarks/creationtime/data/dependencies.qml @@ -1,8 +1,8 @@ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -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 QtQuick +import QtQuick.Controls +import QtQuick.Controls.Fusion +import QtQuick.Controls.Imagine +import QtQuick.Controls.Material +import QtQuick.Controls.Universal Control { } diff --git a/tests/benchmarks/creationtime/tst_creationtime.cpp b/tests/benchmarks/creationtime/tst_creationtime.cpp index 3ebd9f2c..d186dc83 100644 --- a/tests/benchmarks/creationtime/tst_creationtime.cpp +++ b/tests/benchmarks/creationtime/tst_creationtime.cpp @@ -34,8 +34,10 @@ ** ****************************************************************************/ -#include <QtQml> +#include <QtCore/qscopedpointer.h> #include <QtTest> +#include <QtQml> +#include <QtQuickControls2/qquickstyle.h> #include "../../auto/shared/visualtestutil.h" @@ -46,10 +48,11 @@ class tst_CreationTime : public QObject Q_OBJECT private slots: + void initTestCase(); void init(); - void controls(); - void controls_data(); + void defaultStyle(); + void defaultStyle_data(); void fusion(); void fusion_data(); @@ -64,17 +67,29 @@ private slots: void universal_data(); private: - QQmlEngine engine; + QQuickStyleHelper styleHelper; }; +void tst_CreationTime::initTestCase() +{ + styleHelper.engine.reset(new QQmlEngine); +} + void tst_CreationTime::init() { - engine.clearComponentCache(); + styleHelper.engine->clearComponentCache(); } -static void doBenchmark(QQmlEngine *engine, const QUrl &url) +static void doBenchmark(QQuickStyleHelper &styleHelper, const QUrl &url) { - QQmlComponent component(engine); + const QString tagStr = QString::fromLatin1(QTest::currentDataTag()); + QStringList styleAndFileName = tagStr.split('/'); + QCOMPARE(styleAndFileName.size(), 2); + QString style = styleAndFileName.first(); + style[0] = style.at(0).toUpper(); + styleHelper.updateStyle(style); + + QQmlComponent component(styleHelper.engine.data()); component.loadUrl(url); QObjectList objects; @@ -87,64 +102,64 @@ static void doBenchmark(QQmlEngine *engine, const QUrl &url) qDeleteAll(objects); } -void tst_CreationTime::controls() +void tst_CreationTime::defaultStyle() { QFETCH(QUrl, url); - doBenchmark(&engine, url); + doBenchmark(styleHelper, url); } -void tst_CreationTime::controls_data() +void tst_CreationTime::defaultStyle_data() { QTest::addColumn<QUrl>("url"); - addTestRowForEachControl(&engine, "controls", "QtQuick/Controls.2", QStringList() << "ApplicationWindow"); + addTestRowForEachControl(styleHelper.engine.data(), "controls/default", "QtQuick/Controls/Default", QStringList() << "ApplicationWindow"); } void tst_CreationTime::fusion() { QFETCH(QUrl, url); - doBenchmark(&engine, url); + doBenchmark(styleHelper, url); } void tst_CreationTime::fusion_data() { QTest::addColumn<QUrl>("url"); - addTestRowForEachControl(&engine, "controls/fusion", "QtQuick/Controls.2/Fusion", QStringList() << "ApplicationWindow" << "ButtonPanel" << "CheckIndicator" << "RadioIndicator" << "SliderGroove" << "SliderHandle" << "SwitchIndicator"); + addTestRowForEachControl(styleHelper.engine.data(), "controls/fusion", "QtQuick/Controls/Fusion", QStringList() << "ApplicationWindow" << "ButtonPanel" << "CheckIndicator" << "RadioIndicator" << "SliderGroove" << "SliderHandle" << "SwitchIndicator"); } void tst_CreationTime::imagine() { QFETCH(QUrl, url); - doBenchmark(&engine, url); + doBenchmark(styleHelper, url); } void tst_CreationTime::imagine_data() { QTest::addColumn<QUrl>("url"); - addTestRowForEachControl(&engine, "controls/imagine", "QtQuick/Controls.2/Imagine", QStringList() << "ApplicationWindow"); + addTestRowForEachControl(styleHelper.engine.data(), "controls/imagine", "QtQuick/Controls/Imagine", QStringList() << "ApplicationWindow"); } void tst_CreationTime::material() { QFETCH(QUrl, url); - doBenchmark(&engine, url); + doBenchmark(styleHelper, url); } void tst_CreationTime::material_data() { QTest::addColumn<QUrl>("url"); - addTestRowForEachControl(&engine, "controls/material", "QtQuick/Controls.2/Material", QStringList() << "ApplicationWindow" << "Ripple" << "SliderHandle" << "CheckIndicator" << "RadioIndicator" << "SwitchIndicator" << "BoxShadow" << "ElevationEffect" << "CursorDelegate"); + addTestRowForEachControl(styleHelper.engine.data(), "controls/material", "QtQuick/Controls/Material", QStringList() << "ApplicationWindow" << "Ripple" << "SliderHandle" << "CheckIndicator" << "RadioIndicator" << "SwitchIndicator" << "BoxShadow" << "ElevationEffect" << "CursorDelegate"); } void tst_CreationTime::universal() { QFETCH(QUrl, url); - doBenchmark(&engine, url); + doBenchmark(styleHelper, url); } void tst_CreationTime::universal_data() { QTest::addColumn<QUrl>("url"); - addTestRowForEachControl(&engine, "controls/universal", "QtQuick/Controls.2/Universal", QStringList() << "ApplicationWindow" << "CheckIndicator" << "RadioIndicator" << "SwitchIndicator"); + addTestRowForEachControl(styleHelper.engine.data(), "controls/universal", "QtQuick/Controls/Universal", QStringList() << "ApplicationWindow" << "CheckIndicator" << "RadioIndicator" << "SwitchIndicator"); } QTEST_MAIN(tst_CreationTime) diff --git a/tests/benchmarks/objectcount/CMakeLists.txt b/tests/benchmarks/objectcount/CMakeLists.txt index 21ea537d..909fa988 100644 --- a/tests/benchmarks/objectcount/CMakeLists.txt +++ b/tests/benchmarks/objectcount/CMakeLists.txt @@ -19,6 +19,7 @@ qt_add_test(tst_objectcount Qt::QmlPrivate Qt::Quick Qt::QuickControls2 + Qt::QuickControls2Private Qt::QuickPrivate Qt::QuickTemplates2Private Qt::TestPrivate diff --git a/tests/benchmarks/objectcount/data/dependencies.qml b/tests/benchmarks/objectcount/data/dependencies.qml index 3ae7511b..3b847617 100644 --- a/tests/benchmarks/objectcount/data/dependencies.qml +++ b/tests/benchmarks/objectcount/data/dependencies.qml @@ -1,8 +1,8 @@ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -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 QtQuick +import QtQuick.Controls +import QtQuick.Controls.Fusion +import QtQuick.Controls.Imagine +import QtQuick.Controls.Material +import QtQuick.Controls.Universal Control { } diff --git a/tests/benchmarks/objectcount/tst_objectcount.cpp b/tests/benchmarks/objectcount/tst_objectcount.cpp index c37469c3..cb5a0956 100644 --- a/tests/benchmarks/objectcount/tst_objectcount.cpp +++ b/tests/benchmarks/objectcount/tst_objectcount.cpp @@ -93,11 +93,11 @@ void tst_ObjectCount::cleanup() static void initTestRows(QQmlEngine *engine) { - addTestRowForEachControl(engine, "controls", "QtQuick/Controls.2"); - addTestRowForEachControl(engine, "controls/fusion", "QtQuick/Controls.2/Fusion", QStringList() << "ButtonPanel" << "CheckIndicator" << "RadioIndicator" << "SliderGroove" << "SliderHandle" << "SwitchIndicator"); - addTestRowForEachControl(engine, "controls/imagine", "QtQuick/Controls.2/Imagine"); - addTestRowForEachControl(engine, "controls/material", "QtQuick/Controls.2/Material", QStringList() << "Ripple" << "SliderHandle" << "CheckIndicator" << "RadioIndicator" << "SwitchIndicator" << "BoxShadow" << "ElevationEffect" << "CursorDelegate"); - addTestRowForEachControl(engine, "controls/universal", "QtQuick/Controls.2/Universal", QStringList() << "CheckIndicator" << "RadioIndicator" << "SwitchIndicator"); + addTestRowForEachControl(engine, "controls/default", "QtQuick/Controls/Default"); + addTestRowForEachControl(engine, "controls/fusion", "QtQuick/Controls/Fusion", QStringList() << "ButtonPanel" << "CheckIndicator" << "RadioIndicator" << "SliderGroove" << "SliderHandle" << "SwitchIndicator"); + addTestRowForEachControl(engine, "controls/imagine", "QtQuick/Controls/Imagine"); + addTestRowForEachControl(engine, "controls/material", "QtQuick/Controls/Material", QStringList() << "Ripple" << "SliderHandle" << "CheckIndicator" << "RadioIndicator" << "SwitchIndicator" << "BoxShadow" << "ElevationEffect" << "CursorDelegate"); + addTestRowForEachControl(engine, "controls/universal", "QtQuick/Controls/Universal", QStringList() << "CheckIndicator" << "RadioIndicator" << "SwitchIndicator"); } template <typename T> diff --git a/tests/benchmarks/qmlbench/creation/delegates_abstractbutton.qml b/tests/benchmarks/qmlbench/creation/delegates_abstractbutton.qml index 02074cb0..87b137fb 100644 --- a/tests/benchmarks/qmlbench/creation/delegates_abstractbutton.qml +++ b/tests/benchmarks/qmlbench/creation/delegates_abstractbutton.qml @@ -1,6 +1,6 @@ -import QtQuick 2.12 -import QmlBench 1.0 -import QtQuick.Controls 2.12 +import QtQuick +import QmlBench +import QtQuick.Controls CreationBenchmark { id: root diff --git a/tests/benchmarks/qmlbench/creation/delegates_busyindicator.qml b/tests/benchmarks/qmlbench/creation/delegates_busyindicator.qml index c6e53bcf..bc0be402 100644 --- a/tests/benchmarks/qmlbench/creation/delegates_busyindicator.qml +++ b/tests/benchmarks/qmlbench/creation/delegates_busyindicator.qml @@ -1,6 +1,6 @@ -import QtQuick 2.12 -import QmlBench 1.0 -import QtQuick.Controls 2.12 +import QtQuick +import QmlBench +import QtQuick.Controls CreationBenchmark { id: root diff --git a/tests/benchmarks/qmlbench/creation/delegates_button.qml b/tests/benchmarks/qmlbench/creation/delegates_button.qml index 5e6cc12f..9505ebf0 100644 --- a/tests/benchmarks/qmlbench/creation/delegates_button.qml +++ b/tests/benchmarks/qmlbench/creation/delegates_button.qml @@ -1,6 +1,6 @@ -import QtQuick 2.12 -import QmlBench 1.0 -import QtQuick.Controls 2.12 +import QtQuick +import QmlBench +import QtQuick.Controls CreationBenchmark { id: root diff --git a/tests/benchmarks/qmlbench/creation/delegates_checkbox.qml b/tests/benchmarks/qmlbench/creation/delegates_checkbox.qml index 73b18865..67d9e382 100644 --- a/tests/benchmarks/qmlbench/creation/delegates_checkbox.qml +++ b/tests/benchmarks/qmlbench/creation/delegates_checkbox.qml @@ -1,6 +1,6 @@ -import QtQuick 2.12 -import QmlBench 1.0 -import QtQuick.Controls 2.12 +import QtQuick +import QmlBench +import QtQuick.Controls CreationBenchmark { id: root diff --git a/tests/benchmarks/qmlbench/creation/delegates_checkdelegate.qml b/tests/benchmarks/qmlbench/creation/delegates_checkdelegate.qml index b4fde74a..bd7b64cc 100644 --- a/tests/benchmarks/qmlbench/creation/delegates_checkdelegate.qml +++ b/tests/benchmarks/qmlbench/creation/delegates_checkdelegate.qml @@ -1,6 +1,6 @@ -import QtQuick 2.12 -import QmlBench 1.0 -import QtQuick.Controls 2.12 +import QtQuick +import QmlBench +import QtQuick.Controls CreationBenchmark { id: root diff --git a/tests/benchmarks/qmlbench/creation/delegates_combobox.qml b/tests/benchmarks/qmlbench/creation/delegates_combobox.qml index 6519fc77..f8552b74 100644 --- a/tests/benchmarks/qmlbench/creation/delegates_combobox.qml +++ b/tests/benchmarks/qmlbench/creation/delegates_combobox.qml @@ -1,6 +1,6 @@ -import QtQuick 2.12 -import QmlBench 1.0 -import QtQuick.Controls 2.12 +import QtQuick +import QmlBench +import QtQuick.Controls CreationBenchmark { id: root diff --git a/tests/benchmarks/qmlbench/creation/delegates_container.qml b/tests/benchmarks/qmlbench/creation/delegates_container.qml index eb684a74..238e95e3 100644 --- a/tests/benchmarks/qmlbench/creation/delegates_container.qml +++ b/tests/benchmarks/qmlbench/creation/delegates_container.qml @@ -1,6 +1,6 @@ -import QtQuick 2.12 -import QmlBench 1.0 -import QtQuick.Controls 2.12 +import QtQuick +import QmlBench +import QtQuick.Controls CreationBenchmark { id: root diff --git a/tests/benchmarks/qmlbench/creation/delegates_control.qml b/tests/benchmarks/qmlbench/creation/delegates_control.qml index da4263dc..20f09477 100644 --- a/tests/benchmarks/qmlbench/creation/delegates_control.qml +++ b/tests/benchmarks/qmlbench/creation/delegates_control.qml @@ -1,6 +1,6 @@ -import QtQuick 2.12 -import QmlBench 1.0 -import QtQuick.Controls 2.12 +import QtQuick +import QmlBench +import QtQuick.Controls CreationBenchmark { id: root diff --git a/tests/benchmarks/qmlbench/creation/delegates_delaybutton.qml b/tests/benchmarks/qmlbench/creation/delegates_delaybutton.qml index ae8aa0b7..05ec8748 100644 --- a/tests/benchmarks/qmlbench/creation/delegates_delaybutton.qml +++ b/tests/benchmarks/qmlbench/creation/delegates_delaybutton.qml @@ -1,6 +1,6 @@ -import QtQuick 2.12 -import QmlBench 1.0 -import QtQuick.Controls 2.12 +import QtQuick +import QmlBench +import QtQuick.Controls CreationBenchmark { id: root diff --git a/tests/benchmarks/qmlbench/creation/delegates_dial.qml b/tests/benchmarks/qmlbench/creation/delegates_dial.qml index 6fd33c70..de742c7b 100644 --- a/tests/benchmarks/qmlbench/creation/delegates_dial.qml +++ b/tests/benchmarks/qmlbench/creation/delegates_dial.qml @@ -1,6 +1,6 @@ -import QtQuick 2.12 -import QmlBench 1.0 -import QtQuick.Controls 2.12 +import QtQuick +import QmlBench +import QtQuick.Controls CreationBenchmark { id: root diff --git a/tests/benchmarks/qmlbench/creation/delegates_dialog.qml b/tests/benchmarks/qmlbench/creation/delegates_dialog.qml index 36b1fbe1..686149f7 100644 --- a/tests/benchmarks/qmlbench/creation/delegates_dialog.qml +++ b/tests/benchmarks/qmlbench/creation/delegates_dialog.qml @@ -1,6 +1,6 @@ -import QtQuick 2.12 -import QmlBench 1.0 -import QtQuick.Controls 2.12 +import QtQuick +import QmlBench +import QtQuick.Controls CreationBenchmark { id: root diff --git a/tests/benchmarks/qmlbench/creation/delegates_dialogbuttonbox.qml b/tests/benchmarks/qmlbench/creation/delegates_dialogbuttonbox.qml index e5fac0eb..f13d65c5 100644 --- a/tests/benchmarks/qmlbench/creation/delegates_dialogbuttonbox.qml +++ b/tests/benchmarks/qmlbench/creation/delegates_dialogbuttonbox.qml @@ -1,6 +1,6 @@ -import QtQuick 2.12 -import QmlBench 1.0 -import QtQuick.Controls 2.12 +import QtQuick +import QmlBench +import QtQuick.Controls CreationBenchmark { id: root diff --git a/tests/benchmarks/qmlbench/creation/delegates_drawer.qml b/tests/benchmarks/qmlbench/creation/delegates_drawer.qml index 9c1e74b5..3f7290a4 100644 --- a/tests/benchmarks/qmlbench/creation/delegates_drawer.qml +++ b/tests/benchmarks/qmlbench/creation/delegates_drawer.qml @@ -1,6 +1,6 @@ -import QtQuick 2.12 -import QmlBench 1.0 -import QtQuick.Controls 2.12 +import QtQuick +import QmlBench +import QtQuick.Controls CreationBenchmark { id: root diff --git a/tests/benchmarks/qmlbench/creation/delegates_frame.qml b/tests/benchmarks/qmlbench/creation/delegates_frame.qml index 27852898..2d3c9a66 100644 --- a/tests/benchmarks/qmlbench/creation/delegates_frame.qml +++ b/tests/benchmarks/qmlbench/creation/delegates_frame.qml @@ -1,6 +1,6 @@ -import QtQuick 2.12 -import QmlBench 1.0 -import QtQuick.Controls 2.12 +import QtQuick +import QmlBench +import QtQuick.Controls CreationBenchmark { id: root diff --git a/tests/benchmarks/qmlbench/creation/delegates_groupbox.qml b/tests/benchmarks/qmlbench/creation/delegates_groupbox.qml index ccfe2927..3696f847 100644 --- a/tests/benchmarks/qmlbench/creation/delegates_groupbox.qml +++ b/tests/benchmarks/qmlbench/creation/delegates_groupbox.qml @@ -1,6 +1,6 @@ -import QtQuick 2.12 -import QmlBench 1.0 -import QtQuick.Controls 2.12 +import QtQuick +import QmlBench +import QtQuick.Controls CreationBenchmark { id: root diff --git a/tests/benchmarks/qmlbench/creation/delegates_itemdelegate.qml b/tests/benchmarks/qmlbench/creation/delegates_itemdelegate.qml index 8c7f67dd..07128da1 100644 --- a/tests/benchmarks/qmlbench/creation/delegates_itemdelegate.qml +++ b/tests/benchmarks/qmlbench/creation/delegates_itemdelegate.qml @@ -1,6 +1,6 @@ -import QtQuick 2.12 -import QmlBench 1.0 -import QtQuick.Controls 2.12 +import QtQuick +import QmlBench +import QtQuick.Controls CreationBenchmark { id: root diff --git a/tests/benchmarks/qmlbench/creation/delegates_label.qml b/tests/benchmarks/qmlbench/creation/delegates_label.qml index 3c3e76b1..788006a4 100644 --- a/tests/benchmarks/qmlbench/creation/delegates_label.qml +++ b/tests/benchmarks/qmlbench/creation/delegates_label.qml @@ -1,6 +1,6 @@ -import QtQuick 2.12 -import QmlBench 1.0 -import QtQuick.Controls 2.12 +import QtQuick +import QmlBench +import QtQuick.Controls CreationBenchmark { id: root diff --git a/tests/benchmarks/qmlbench/creation/delegates_menu.qml b/tests/benchmarks/qmlbench/creation/delegates_menu.qml index 1566f40a..fd8e53b4 100644 --- a/tests/benchmarks/qmlbench/creation/delegates_menu.qml +++ b/tests/benchmarks/qmlbench/creation/delegates_menu.qml @@ -1,6 +1,6 @@ -import QtQuick 2.12 -import QmlBench 1.0 -import QtQuick.Controls 2.12 +import QtQuick +import QmlBench +import QtQuick.Controls CreationBenchmark { id: root diff --git a/tests/benchmarks/qmlbench/creation/delegates_menuitem.qml b/tests/benchmarks/qmlbench/creation/delegates_menuitem.qml index 5c700707..6732bc18 100644 --- a/tests/benchmarks/qmlbench/creation/delegates_menuitem.qml +++ b/tests/benchmarks/qmlbench/creation/delegates_menuitem.qml @@ -1,6 +1,6 @@ -import QtQuick 2.12 -import QmlBench 1.0 -import QtQuick.Controls 2.12 +import QtQuick +import QmlBench +import QtQuick.Controls CreationBenchmark { id: root diff --git a/tests/benchmarks/qmlbench/creation/delegates_menuseparator.qml b/tests/benchmarks/qmlbench/creation/delegates_menuseparator.qml index 59abe333..8effa173 100644 --- a/tests/benchmarks/qmlbench/creation/delegates_menuseparator.qml +++ b/tests/benchmarks/qmlbench/creation/delegates_menuseparator.qml @@ -1,6 +1,6 @@ -import QtQuick 2.12 -import QmlBench 1.0 -import QtQuick.Controls 2.12 +import QtQuick +import QmlBench +import QtQuick.Controls CreationBenchmark { id: root diff --git a/tests/benchmarks/qmlbench/creation/delegates_page.qml b/tests/benchmarks/qmlbench/creation/delegates_page.qml index 9c9124dc..f9d06b38 100644 --- a/tests/benchmarks/qmlbench/creation/delegates_page.qml +++ b/tests/benchmarks/qmlbench/creation/delegates_page.qml @@ -1,6 +1,6 @@ -import QtQuick 2.12 -import QmlBench 1.0 -import QtQuick.Controls 2.12 +import QtQuick +import QmlBench +import QtQuick.Controls CreationBenchmark { id: root diff --git a/tests/benchmarks/qmlbench/creation/delegates_pageindicator.qml b/tests/benchmarks/qmlbench/creation/delegates_pageindicator.qml index 37eee037..9b5a6918 100644 --- a/tests/benchmarks/qmlbench/creation/delegates_pageindicator.qml +++ b/tests/benchmarks/qmlbench/creation/delegates_pageindicator.qml @@ -1,6 +1,6 @@ -import QtQuick 2.12 -import QmlBench 1.0 -import QtQuick.Controls 2.12 +import QtQuick +import QmlBench +import QtQuick.Controls CreationBenchmark { id: root diff --git a/tests/benchmarks/qmlbench/creation/delegates_pane.qml b/tests/benchmarks/qmlbench/creation/delegates_pane.qml index e811df93..a391f695 100644 --- a/tests/benchmarks/qmlbench/creation/delegates_pane.qml +++ b/tests/benchmarks/qmlbench/creation/delegates_pane.qml @@ -1,6 +1,6 @@ -import QtQuick 2.12 -import QmlBench 1.0 -import QtQuick.Controls 2.12 +import QtQuick +import QmlBench +import QtQuick.Controls CreationBenchmark { id: root diff --git a/tests/benchmarks/qmlbench/creation/delegates_popup.qml b/tests/benchmarks/qmlbench/creation/delegates_popup.qml index 9effd917..c2cdaab5 100644 --- a/tests/benchmarks/qmlbench/creation/delegates_popup.qml +++ b/tests/benchmarks/qmlbench/creation/delegates_popup.qml @@ -1,6 +1,6 @@ -import QtQuick 2.12 -import QmlBench 1.0 -import QtQuick.Controls 2.12 +import QtQuick +import QmlBench +import QtQuick.Controls CreationBenchmark { id: root diff --git a/tests/benchmarks/qmlbench/creation/delegates_progressbar.qml b/tests/benchmarks/qmlbench/creation/delegates_progressbar.qml index 4bb773f2..d50d9d26 100644 --- a/tests/benchmarks/qmlbench/creation/delegates_progressbar.qml +++ b/tests/benchmarks/qmlbench/creation/delegates_progressbar.qml @@ -1,6 +1,6 @@ -import QtQuick 2.12 -import QmlBench 1.0 -import QtQuick.Controls 2.12 +import QtQuick +import QmlBench +import QtQuick.Controls CreationBenchmark { id: root diff --git a/tests/benchmarks/qmlbench/creation/delegates_radiobutton.qml b/tests/benchmarks/qmlbench/creation/delegates_radiobutton.qml index 3236835f..f596e852 100644 --- a/tests/benchmarks/qmlbench/creation/delegates_radiobutton.qml +++ b/tests/benchmarks/qmlbench/creation/delegates_radiobutton.qml @@ -1,6 +1,6 @@ -import QtQuick 2.12 -import QmlBench 1.0 -import QtQuick.Controls 2.12 +import QtQuick +import QmlBench +import QtQuick.Controls CreationBenchmark { id: root diff --git a/tests/benchmarks/qmlbench/creation/delegates_radiodelegate.qml b/tests/benchmarks/qmlbench/creation/delegates_radiodelegate.qml index b6ffe174..7f573466 100644 --- a/tests/benchmarks/qmlbench/creation/delegates_radiodelegate.qml +++ b/tests/benchmarks/qmlbench/creation/delegates_radiodelegate.qml @@ -1,6 +1,6 @@ -import QtQuick 2.12 -import QmlBench 1.0 -import QtQuick.Controls 2.12 +import QtQuick +import QmlBench +import QtQuick.Controls CreationBenchmark { id: root diff --git a/tests/benchmarks/qmlbench/creation/delegates_rangeslider.qml b/tests/benchmarks/qmlbench/creation/delegates_rangeslider.qml index a595bd7a..725cab29 100644 --- a/tests/benchmarks/qmlbench/creation/delegates_rangeslider.qml +++ b/tests/benchmarks/qmlbench/creation/delegates_rangeslider.qml @@ -1,6 +1,6 @@ -import QtQuick 2.12 -import QmlBench 1.0 -import QtQuick.Controls 2.12 +import QtQuick +import QmlBench +import QtQuick.Controls CreationBenchmark { id: root diff --git a/tests/benchmarks/qmlbench/creation/delegates_roundbutton.qml b/tests/benchmarks/qmlbench/creation/delegates_roundbutton.qml index 572bf5e9..0337a66d 100644 --- a/tests/benchmarks/qmlbench/creation/delegates_roundbutton.qml +++ b/tests/benchmarks/qmlbench/creation/delegates_roundbutton.qml @@ -1,6 +1,6 @@ -import QtQuick 2.12 -import QmlBench 1.0 -import QtQuick.Controls 2.12 +import QtQuick +import QmlBench +import QtQuick.Controls CreationBenchmark { id: root diff --git a/tests/benchmarks/qmlbench/creation/delegates_scrollbar.qml b/tests/benchmarks/qmlbench/creation/delegates_scrollbar.qml index 2e6fc1fd..2635240f 100644 --- a/tests/benchmarks/qmlbench/creation/delegates_scrollbar.qml +++ b/tests/benchmarks/qmlbench/creation/delegates_scrollbar.qml @@ -1,6 +1,6 @@ -import QtQuick 2.12 -import QmlBench 1.0 -import QtQuick.Controls 2.12 +import QtQuick +import QmlBench +import QtQuick.Controls CreationBenchmark { id: root diff --git a/tests/benchmarks/qmlbench/creation/delegates_scrollindicator.qml b/tests/benchmarks/qmlbench/creation/delegates_scrollindicator.qml index fd9e52e6..4e2b90a3 100644 --- a/tests/benchmarks/qmlbench/creation/delegates_scrollindicator.qml +++ b/tests/benchmarks/qmlbench/creation/delegates_scrollindicator.qml @@ -1,6 +1,6 @@ -import QtQuick 2.12 -import QmlBench 1.0 -import QtQuick.Controls 2.12 +import QtQuick +import QmlBench +import QtQuick.Controls CreationBenchmark { id: root diff --git a/tests/benchmarks/qmlbench/creation/delegates_scrollview.qml b/tests/benchmarks/qmlbench/creation/delegates_scrollview.qml index 0daa44dd..b5f155cb 100644 --- a/tests/benchmarks/qmlbench/creation/delegates_scrollview.qml +++ b/tests/benchmarks/qmlbench/creation/delegates_scrollview.qml @@ -1,6 +1,6 @@ -import QtQuick 2.12 -import QmlBench 1.0 -import QtQuick.Controls 2.12 +import QtQuick +import QmlBench +import QtQuick.Controls CreationBenchmark { id: root diff --git a/tests/benchmarks/qmlbench/creation/delegates_slider.qml b/tests/benchmarks/qmlbench/creation/delegates_slider.qml index 44dac819..0ef3b3fa 100644 --- a/tests/benchmarks/qmlbench/creation/delegates_slider.qml +++ b/tests/benchmarks/qmlbench/creation/delegates_slider.qml @@ -1,6 +1,6 @@ -import QtQuick 2.12 -import QmlBench 1.0 -import QtQuick.Controls 2.12 +import QtQuick +import QmlBench +import QtQuick.Controls CreationBenchmark { id: root diff --git a/tests/benchmarks/qmlbench/creation/delegates_spinbox.qml b/tests/benchmarks/qmlbench/creation/delegates_spinbox.qml index 90695102..9120a921 100644 --- a/tests/benchmarks/qmlbench/creation/delegates_spinbox.qml +++ b/tests/benchmarks/qmlbench/creation/delegates_spinbox.qml @@ -1,6 +1,6 @@ -import QtQuick 2.12 -import QmlBench 1.0 -import QtQuick.Controls 2.12 +import QtQuick +import QmlBench +import QtQuick.Controls CreationBenchmark { id: root diff --git a/tests/benchmarks/qmlbench/creation/delegates_stackview.qml b/tests/benchmarks/qmlbench/creation/delegates_stackview.qml index e2644aef..cb6cee10 100644 --- a/tests/benchmarks/qmlbench/creation/delegates_stackview.qml +++ b/tests/benchmarks/qmlbench/creation/delegates_stackview.qml @@ -1,6 +1,6 @@ -import QtQuick 2.12 -import QmlBench 1.0 -import QtQuick.Controls 2.12 +import QtQuick +import QmlBench +import QtQuick.Controls CreationBenchmark { id: root diff --git a/tests/benchmarks/qmlbench/creation/delegates_swipedelegate.qml b/tests/benchmarks/qmlbench/creation/delegates_swipedelegate.qml index 752dc37b..5147bbb6 100644 --- a/tests/benchmarks/qmlbench/creation/delegates_swipedelegate.qml +++ b/tests/benchmarks/qmlbench/creation/delegates_swipedelegate.qml @@ -1,6 +1,6 @@ -import QtQuick 2.12 -import QmlBench 1.0 -import QtQuick.Controls 2.12 +import QtQuick +import QmlBench +import QtQuick.Controls CreationBenchmark { id: root diff --git a/tests/benchmarks/qmlbench/creation/delegates_swipeview.qml b/tests/benchmarks/qmlbench/creation/delegates_swipeview.qml index 0a922343..b263e620 100644 --- a/tests/benchmarks/qmlbench/creation/delegates_swipeview.qml +++ b/tests/benchmarks/qmlbench/creation/delegates_swipeview.qml @@ -1,6 +1,6 @@ -import QtQuick 2.12 -import QmlBench 1.0 -import QtQuick.Controls 2.12 +import QtQuick +import QmlBench +import QtQuick.Controls CreationBenchmark { id: root diff --git a/tests/benchmarks/qmlbench/creation/delegates_switch.qml b/tests/benchmarks/qmlbench/creation/delegates_switch.qml index 9381342d..79cc48e3 100644 --- a/tests/benchmarks/qmlbench/creation/delegates_switch.qml +++ b/tests/benchmarks/qmlbench/creation/delegates_switch.qml @@ -1,6 +1,6 @@ -import QtQuick 2.12 -import QmlBench 1.0 -import QtQuick.Controls 2.12 +import QtQuick +import QmlBench +import QtQuick.Controls CreationBenchmark { id: root diff --git a/tests/benchmarks/qmlbench/creation/delegates_switchdelegate.qml b/tests/benchmarks/qmlbench/creation/delegates_switchdelegate.qml index f41281fa..f6f8a7df 100644 --- a/tests/benchmarks/qmlbench/creation/delegates_switchdelegate.qml +++ b/tests/benchmarks/qmlbench/creation/delegates_switchdelegate.qml @@ -1,6 +1,6 @@ -import QtQuick 2.12 -import QmlBench 1.0 -import QtQuick.Controls 2.12 +import QtQuick +import QmlBench +import QtQuick.Controls CreationBenchmark { id: root diff --git a/tests/benchmarks/qmlbench/creation/delegates_tabbar.qml b/tests/benchmarks/qmlbench/creation/delegates_tabbar.qml index 95bb7291..37f6a463 100644 --- a/tests/benchmarks/qmlbench/creation/delegates_tabbar.qml +++ b/tests/benchmarks/qmlbench/creation/delegates_tabbar.qml @@ -1,6 +1,6 @@ -import QtQuick 2.12 -import QmlBench 1.0 -import QtQuick.Controls 2.12 +import QtQuick +import QmlBench +import QtQuick.Controls CreationBenchmark { id: root diff --git a/tests/benchmarks/qmlbench/creation/delegates_tabbutton.qml b/tests/benchmarks/qmlbench/creation/delegates_tabbutton.qml index dc549a3a..27442a7d 100644 --- a/tests/benchmarks/qmlbench/creation/delegates_tabbutton.qml +++ b/tests/benchmarks/qmlbench/creation/delegates_tabbutton.qml @@ -1,6 +1,6 @@ -import QtQuick 2.12 -import QmlBench 1.0 -import QtQuick.Controls 2.12 +import QtQuick +import QmlBench +import QtQuick.Controls CreationBenchmark { id: root diff --git a/tests/benchmarks/qmlbench/creation/delegates_textarea.qml b/tests/benchmarks/qmlbench/creation/delegates_textarea.qml index ab383ad4..88454c0b 100644 --- a/tests/benchmarks/qmlbench/creation/delegates_textarea.qml +++ b/tests/benchmarks/qmlbench/creation/delegates_textarea.qml @@ -1,6 +1,6 @@ -import QtQuick 2.12 -import QmlBench 1.0 -import QtQuick.Controls 2.12 +import QtQuick +import QmlBench +import QtQuick.Controls CreationBenchmark { id: root diff --git a/tests/benchmarks/qmlbench/creation/delegates_textfield.qml b/tests/benchmarks/qmlbench/creation/delegates_textfield.qml index 32f31fe8..eb279724 100644 --- a/tests/benchmarks/qmlbench/creation/delegates_textfield.qml +++ b/tests/benchmarks/qmlbench/creation/delegates_textfield.qml @@ -1,6 +1,6 @@ -import QtQuick 2.12 -import QmlBench 1.0 -import QtQuick.Controls 2.12 +import QtQuick +import QmlBench +import QtQuick.Controls CreationBenchmark { id: root diff --git a/tests/benchmarks/qmlbench/creation/delegates_toolbutton.qml b/tests/benchmarks/qmlbench/creation/delegates_toolbutton.qml index 38e9a59f..7dcd85a3 100644 --- a/tests/benchmarks/qmlbench/creation/delegates_toolbutton.qml +++ b/tests/benchmarks/qmlbench/creation/delegates_toolbutton.qml @@ -1,6 +1,6 @@ -import QtQuick 2.12 -import QmlBench 1.0 -import QtQuick.Controls 2.12 +import QtQuick +import QmlBench +import QtQuick.Controls CreationBenchmark { id: root diff --git a/tests/benchmarks/qmlbench/creation/delegates_toolseparator.qml b/tests/benchmarks/qmlbench/creation/delegates_toolseparator.qml index e3db91f8..48cdd352 100644 --- a/tests/benchmarks/qmlbench/creation/delegates_toolseparator.qml +++ b/tests/benchmarks/qmlbench/creation/delegates_toolseparator.qml @@ -1,6 +1,6 @@ -import QtQuick 2.12 -import QmlBench 1.0 -import QtQuick.Controls 2.12 +import QtQuick +import QmlBench +import QtQuick.Controls CreationBenchmark { id: root diff --git a/tests/benchmarks/qmlbench/creation/delegates_tooltip.qml b/tests/benchmarks/qmlbench/creation/delegates_tooltip.qml index f8e7a283..85e86494 100644 --- a/tests/benchmarks/qmlbench/creation/delegates_tooltip.qml +++ b/tests/benchmarks/qmlbench/creation/delegates_tooltip.qml @@ -1,6 +1,6 @@ -import QtQuick 2.12 -import QmlBench 1.0 -import QtQuick.Controls 2.12 +import QtQuick +import QmlBench +import QtQuick.Controls CreationBenchmark { id: root diff --git a/tests/benchmarks/qmlbench/creation/delegates_tumbler.qml b/tests/benchmarks/qmlbench/creation/delegates_tumbler.qml index 4af07b7f..da747e23 100644 --- a/tests/benchmarks/qmlbench/creation/delegates_tumbler.qml +++ b/tests/benchmarks/qmlbench/creation/delegates_tumbler.qml @@ -1,6 +1,6 @@ -import QtQuick 2.12 -import QmlBench 1.0 -import QtQuick.Controls 2.12 +import QtQuick +import QmlBench +import QtQuick.Controls CreationBenchmark { id: root |