From 809339d1484cf556512534367b8170bc26baf072 Mon Sep 17 00:00:00 2001 From: Mitch Curtis Date: Thu, 12 Aug 2021 14:39:51 +0200 Subject: Remove qtquickcontrols2 sources and explain where they went Now that qtquickcontrols2 has been merged into qtdeclarative, we should make it obvious that this repo should no longer be used, by preventing it from being built. Task-number: QTBUG-95173 Pick-to: 6.2 Change-Id: I95bd6a214f3d75a865ab163ee0a1f9ffbeb7a051 Reviewed-by: Alexandru Croitor Reviewed-by: Volker Hilsheimer --- tests/benchmarks/CMakeLists.txt | 1 - tests/benchmarks/quickcontrols2/CMakeLists.txt | 4 - tests/benchmarks/quickcontrols2/benchmarks.pro | 4 - .../quickcontrols2/creationtime/CMakeLists.txt | 43 ------ .../quickcontrols2/creationtime/creationtime.pro | 11 -- .../creationtime/data/dependencies.qml | 8 - .../creationtime/tst_creationtime.cpp | 167 --------------------- .../quickcontrols2/objectcount/CMakeLists.txt | 43 ------ .../objectcount/data/dependencies.qml | 8 - .../quickcontrols2/objectcount/objectcount.pro | 11 -- .../quickcontrols2/objectcount/tst_objectcount.cpp | 154 ------------------- .../qmlbench/creation/delegates_abstractbutton.qml | 16 -- .../qmlbench/creation/delegates_busyindicator.qml | 14 -- .../qmlbench/creation/delegates_button.qml | 15 -- .../qmlbench/creation/delegates_checkbox.qml | 15 -- .../qmlbench/creation/delegates_checkdelegate.qml | 16 -- .../qmlbench/creation/delegates_combobox.qml | 15 -- .../qmlbench/creation/delegates_container.qml | 15 -- .../qmlbench/creation/delegates_control.qml | 15 -- .../qmlbench/creation/delegates_delaybutton.qml | 15 -- .../qmlbench/creation/delegates_dial.qml | 14 -- .../qmlbench/creation/delegates_dialog.qml | 28 ---- .../creation/delegates_dialogbuttonbox.qml | 14 -- .../qmlbench/creation/delegates_drawer.qml | 21 --- .../qmlbench/creation/delegates_frame.qml | 17 --- .../qmlbench/creation/delegates_groupbox.qml | 18 --- .../qmlbench/creation/delegates_itemdelegate.qml | 15 -- .../qmlbench/creation/delegates_label.qml | 14 -- .../qmlbench/creation/delegates_menu.qml | 22 --- .../qmlbench/creation/delegates_menuitem.qml | 17 --- .../qmlbench/creation/delegates_menuseparator.qml | 13 -- .../qmlbench/creation/delegates_page.qml | 18 --- .../qmlbench/creation/delegates_pageindicator.qml | 15 -- .../qmlbench/creation/delegates_pane.qml | 17 --- .../qmlbench/creation/delegates_popup.qml | 26 ---- .../qmlbench/creation/delegates_progressbar.qml | 14 -- .../qmlbench/creation/delegates_radiobutton.qml | 16 -- .../qmlbench/creation/delegates_radiodelegate.qml | 17 --- .../qmlbench/creation/delegates_rangeslider.qml | 15 -- .../qmlbench/creation/delegates_roundbutton.qml | 15 -- .../qmlbench/creation/delegates_scrollbar.qml | 17 --- .../creation/delegates_scrollindicator.qml | 16 -- .../qmlbench/creation/delegates_scrollview.qml | 23 --- .../qmlbench/creation/delegates_slider.qml | 14 -- .../qmlbench/creation/delegates_spinbox.qml | 14 -- .../qmlbench/creation/delegates_stackview.qml | 18 --- .../qmlbench/creation/delegates_swipedelegate.qml | 15 -- .../qmlbench/creation/delegates_swipeview.qml | 24 --- .../qmlbench/creation/delegates_switch.qml | 15 -- .../qmlbench/creation/delegates_switchdelegate.qml | 16 -- .../qmlbench/creation/delegates_tabbar.qml | 23 --- .../qmlbench/creation/delegates_tabbutton.qml | 16 -- .../qmlbench/creation/delegates_textarea.qml | 14 -- .../qmlbench/creation/delegates_textfield.qml | 14 -- .../qmlbench/creation/delegates_toolbutton.qml | 15 -- .../qmlbench/creation/delegates_toolseparator.qml | 13 -- .../qmlbench/creation/delegates_tooltip.qml | 20 --- .../qmlbench/creation/delegates_tumbler.qml | 15 -- 58 files changed, 1238 deletions(-) delete mode 100644 tests/benchmarks/CMakeLists.txt delete mode 100644 tests/benchmarks/quickcontrols2/CMakeLists.txt delete mode 100644 tests/benchmarks/quickcontrols2/benchmarks.pro delete mode 100644 tests/benchmarks/quickcontrols2/creationtime/CMakeLists.txt delete mode 100644 tests/benchmarks/quickcontrols2/creationtime/creationtime.pro delete mode 100644 tests/benchmarks/quickcontrols2/creationtime/data/dependencies.qml delete mode 100644 tests/benchmarks/quickcontrols2/creationtime/tst_creationtime.cpp delete mode 100644 tests/benchmarks/quickcontrols2/objectcount/CMakeLists.txt delete mode 100644 tests/benchmarks/quickcontrols2/objectcount/data/dependencies.qml delete mode 100644 tests/benchmarks/quickcontrols2/objectcount/objectcount.pro delete mode 100644 tests/benchmarks/quickcontrols2/objectcount/tst_objectcount.cpp delete mode 100644 tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_abstractbutton.qml delete mode 100644 tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_busyindicator.qml delete mode 100644 tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_button.qml delete mode 100644 tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_checkbox.qml delete mode 100644 tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_checkdelegate.qml delete mode 100644 tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_combobox.qml delete mode 100644 tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_container.qml delete mode 100644 tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_control.qml delete mode 100644 tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_delaybutton.qml delete mode 100644 tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_dial.qml delete mode 100644 tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_dialog.qml delete mode 100644 tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_dialogbuttonbox.qml delete mode 100644 tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_drawer.qml delete mode 100644 tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_frame.qml delete mode 100644 tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_groupbox.qml delete mode 100644 tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_itemdelegate.qml delete mode 100644 tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_label.qml delete mode 100644 tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_menu.qml delete mode 100644 tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_menuitem.qml delete mode 100644 tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_menuseparator.qml delete mode 100644 tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_page.qml delete mode 100644 tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_pageindicator.qml delete mode 100644 tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_pane.qml delete mode 100644 tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_popup.qml delete mode 100644 tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_progressbar.qml delete mode 100644 tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_radiobutton.qml delete mode 100644 tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_radiodelegate.qml delete mode 100644 tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_rangeslider.qml delete mode 100644 tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_roundbutton.qml delete mode 100644 tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_scrollbar.qml delete mode 100644 tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_scrollindicator.qml delete mode 100644 tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_scrollview.qml delete mode 100644 tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_slider.qml delete mode 100644 tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_spinbox.qml delete mode 100644 tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_stackview.qml delete mode 100644 tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_swipedelegate.qml delete mode 100644 tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_swipeview.qml delete mode 100644 tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_switch.qml delete mode 100644 tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_switchdelegate.qml delete mode 100644 tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_tabbar.qml delete mode 100644 tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_tabbutton.qml delete mode 100644 tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_textarea.qml delete mode 100644 tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_textfield.qml delete mode 100644 tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_toolbutton.qml delete mode 100644 tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_toolseparator.qml delete mode 100644 tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_tooltip.qml delete mode 100644 tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_tumbler.qml (limited to 'tests/benchmarks') diff --git a/tests/benchmarks/CMakeLists.txt b/tests/benchmarks/CMakeLists.txt deleted file mode 100644 index b0df947d..00000000 --- a/tests/benchmarks/CMakeLists.txt +++ /dev/null @@ -1 +0,0 @@ -add_subdirectory(quickcontrols2) diff --git a/tests/benchmarks/quickcontrols2/CMakeLists.txt b/tests/benchmarks/quickcontrols2/CMakeLists.txt deleted file mode 100644 index 3f2bf2f9..00000000 --- a/tests/benchmarks/quickcontrols2/CMakeLists.txt +++ /dev/null @@ -1,4 +0,0 @@ -# Generated from benchmarks.pro. - -add_subdirectory(creationtime) -add_subdirectory(objectcount) diff --git a/tests/benchmarks/quickcontrols2/benchmarks.pro b/tests/benchmarks/quickcontrols2/benchmarks.pro deleted file mode 100644 index 7c4ca224..00000000 --- a/tests/benchmarks/quickcontrols2/benchmarks.pro +++ /dev/null @@ -1,4 +0,0 @@ -TEMPLATE = subdirs -SUBDIRS += \ - creationtime \ - objectcount diff --git a/tests/benchmarks/quickcontrols2/creationtime/CMakeLists.txt b/tests/benchmarks/quickcontrols2/creationtime/CMakeLists.txt deleted file mode 100644 index d7dcb3da..00000000 --- a/tests/benchmarks/quickcontrols2/creationtime/CMakeLists.txt +++ /dev/null @@ -1,43 +0,0 @@ -# Generated from creationtime.pro. - -##################################################################### -## tst_creationtime Test: -##################################################################### - -qt_internal_add_test(tst_creationtime - SOURCES - ../../../auto/quickcontrols2/shared/qtest_quickcontrols.h - ../../../auto/quickcontrols2/shared/util.cpp ../../../auto/quickcontrols2/shared/util.h - ../../../auto/quickcontrols2/shared/visualtestutil.cpp ../../../auto/quickcontrols2/shared/visualtestutil.h - tst_creationtime.cpp - DEFINES - QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/quickcontrols2\\\" - PUBLIC_LIBRARIES - Qt::CorePrivate - Qt::Gui - Qt::GuiPrivate - Qt::Qml - Qt::QmlPrivate - Qt::QuickControls2 - Qt::QuickControls2Private - Qt::QuickPrivate - Qt::QuickTemplates2Private - Qt::QuickTest - Qt::TestPrivate -) - -#### Keys ignored in scope 1:.:.:creationtime.pro:: -# TEMPLATE = "app" - -## Scopes: -##################################################################### - -qt_internal_extend_target(tst_creationtime CONDITION ANDROID OR IOS - DEFINES - QT_QMLTEST_DATADIR=\\\":/data\\\" -) - -qt_internal_extend_target(tst_creationtime CONDITION NOT ANDROID AND NOT IOS - DEFINES - QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" -) diff --git a/tests/benchmarks/quickcontrols2/creationtime/creationtime.pro b/tests/benchmarks/quickcontrols2/creationtime/creationtime.pro deleted file mode 100644 index 7d15ebd4..00000000 --- a/tests/benchmarks/quickcontrols2/creationtime/creationtime.pro +++ /dev/null @@ -1,11 +0,0 @@ -TEMPLATE = app -TARGET = tst_creationtime - -QT += qml testlib quickcontrols2 -CONFIG += testcase -macos:CONFIG -= app_bundle - -include(../../../auto/shared/util.pri) - -SOURCES += \ - tst_creationtime.cpp diff --git a/tests/benchmarks/quickcontrols2/creationtime/data/dependencies.qml b/tests/benchmarks/quickcontrols2/creationtime/data/dependencies.qml deleted file mode 100644 index 3b847617..00000000 --- a/tests/benchmarks/quickcontrols2/creationtime/data/dependencies.qml +++ /dev/null @@ -1,8 +0,0 @@ -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/quickcontrols2/creationtime/tst_creationtime.cpp b/tests/benchmarks/quickcontrols2/creationtime/tst_creationtime.cpp deleted file mode 100644 index 55779662..00000000 --- a/tests/benchmarks/quickcontrols2/creationtime/tst_creationtime.cpp +++ /dev/null @@ -1,167 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the test suite of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include -#include -#include -#include - -#include "../../../auto/quickcontrols2/shared/visualtestutil.h" - -using namespace QQuickVisualTestUtil; - -class tst_CreationTime : public QObject -{ - Q_OBJECT - -private slots: - void initTestCase(); - void init(); - - void basicStyle(); - void basicStyle_data(); - - void fusion(); - void fusion_data(); - - void imagine(); - void imagine_data(); - - void material(); - void material_data(); - - void universal(); - void universal_data(); - -private: - QQuickStyleHelper styleHelper; -}; - -void tst_CreationTime::initTestCase() -{ - styleHelper.engine.reset(new QQmlEngine); -} - -void tst_CreationTime::init() -{ - styleHelper.engine->clearComponentCache(); -} - -static void doBenchmark(QQuickStyleHelper &styleHelper, const QUrl &url) -{ - 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; - objects.reserve(4096); - QBENCHMARK { - QObject *object = component.create(); - QVERIFY2(object, qPrintable(component.errorString())); - objects += object; - } - qDeleteAll(objects); -} - -void tst_CreationTime::basicStyle() -{ - QFETCH(QUrl, url); - doBenchmark(styleHelper, url); -} - -void tst_CreationTime::basicStyle_data() -{ - QTest::addColumn("url"); - addTestRowForEachControl(styleHelper.engine.data(), "basic", "QtQuick/Controls/Basic", QStringList() << "ApplicationWindow"); -} - -void tst_CreationTime::fusion() -{ - QFETCH(QUrl, url); - doBenchmark(styleHelper, url); -} - -void tst_CreationTime::fusion_data() -{ - QTest::addColumn("url"); - addTestRowForEachControl(styleHelper.engine.data(), "fusion", "QtQuick/Controls/Fusion", QStringList() << "ApplicationWindow" << "ButtonPanel" << "CheckIndicator" << "RadioIndicator" << "SliderGroove" << "SliderHandle" << "SwitchIndicator"); -} - -void tst_CreationTime::imagine() -{ - QFETCH(QUrl, url); - doBenchmark(styleHelper, url); -} - -void tst_CreationTime::imagine_data() -{ - QTest::addColumn("url"); - addTestRowForEachControl(styleHelper.engine.data(), "imagine", "QtQuick/Controls/Imagine", QStringList() << "ApplicationWindow"); -} - -void tst_CreationTime::material() -{ - QFETCH(QUrl, url); - doBenchmark(styleHelper, url); -} - -void tst_CreationTime::material_data() -{ - QTest::addColumn("url"); - addTestRowForEachControl(styleHelper.engine.data(), "material", "QtQuick/Controls/Material", QStringList() << "ApplicationWindow" << "Ripple" << "SliderHandle" << "CheckIndicator" << "RadioIndicator" << "SwitchIndicator" << "BoxShadow" << "ElevationEffect" << "CursorDelegate"); -} - -void tst_CreationTime::universal() -{ - QFETCH(QUrl, url); - doBenchmark(styleHelper, url); -} - -void tst_CreationTime::universal_data() -{ - QTest::addColumn("url"); - addTestRowForEachControl(styleHelper.engine.data(), "universal", "QtQuick/Controls/Universal", QStringList() << "ApplicationWindow" << "CheckIndicator" << "RadioIndicator" << "SwitchIndicator"); -} - -QTEST_MAIN(tst_CreationTime) - -#include "tst_creationtime.moc" diff --git a/tests/benchmarks/quickcontrols2/objectcount/CMakeLists.txt b/tests/benchmarks/quickcontrols2/objectcount/CMakeLists.txt deleted file mode 100644 index 1d685fc7..00000000 --- a/tests/benchmarks/quickcontrols2/objectcount/CMakeLists.txt +++ /dev/null @@ -1,43 +0,0 @@ -# Generated from objectcount.pro. - -##################################################################### -## tst_objectcount Test: -##################################################################### - -qt_internal_add_test(tst_objectcount - SOURCES - ../../../auto/quickcontrols2/shared/qtest_quickcontrols.h - ../../../auto/quickcontrols2/shared/util.cpp ../../../auto/quickcontrols2/shared/util.h - ../../../auto/quickcontrols2/shared/visualtestutil.cpp ../../../auto/quickcontrols2/shared/visualtestutil.h - tst_objectcount.cpp - DEFINES - QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/quickcontrols2\\\" - PUBLIC_LIBRARIES - Qt::CorePrivate - Qt::Gui - Qt::GuiPrivate - Qt::QmlPrivate - Qt::Quick - Qt::QuickControls2 - Qt::QuickControls2Private - Qt::QuickPrivate - Qt::QuickTemplates2Private - Qt::QuickTest - Qt::TestPrivate -) - -#### Keys ignored in scope 1:.:.:objectcount.pro:: -# TEMPLATE = "app" - -## Scopes: -##################################################################### - -qt_internal_extend_target(tst_objectcount CONDITION ANDROID OR IOS - DEFINES - QT_QMLTEST_DATADIR=\\\":/data\\\" -) - -qt_internal_extend_target(tst_objectcount CONDITION NOT ANDROID AND NOT IOS - DEFINES - QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" -) diff --git a/tests/benchmarks/quickcontrols2/objectcount/data/dependencies.qml b/tests/benchmarks/quickcontrols2/objectcount/data/dependencies.qml deleted file mode 100644 index 3b847617..00000000 --- a/tests/benchmarks/quickcontrols2/objectcount/data/dependencies.qml +++ /dev/null @@ -1,8 +0,0 @@ -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/quickcontrols2/objectcount/objectcount.pro b/tests/benchmarks/quickcontrols2/objectcount/objectcount.pro deleted file mode 100644 index f2f2879a..00000000 --- a/tests/benchmarks/quickcontrols2/objectcount/objectcount.pro +++ /dev/null @@ -1,11 +0,0 @@ -TEMPLATE = app -TARGET = tst_objectcount - -QT += quick testlib core-private -CONFIG += testcase -macos:CONFIG -= app_bundle - -include(../../../auto/shared/util.pri) - -SOURCES += \ - tst_objectcount.cpp diff --git a/tests/benchmarks/quickcontrols2/objectcount/tst_objectcount.cpp b/tests/benchmarks/quickcontrols2/objectcount/tst_objectcount.cpp deleted file mode 100644 index bbcb24ca..00000000 --- a/tests/benchmarks/quickcontrols2/objectcount/tst_objectcount.cpp +++ /dev/null @@ -1,154 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the test suite of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include -#include -#include -#include -#include "../../../auto/quickcontrols2/shared/visualtestutil.h" - -using namespace QQuickVisualTestUtil; - -static int qt_verbose = qgetenv("VERBOSE").toInt() != 0; - -Q_GLOBAL_STATIC(QObjectList, qt_qobjects) - -extern "C" Q_DECL_EXPORT void qt_addQObject(QObject *object) -{ - qt_qobjects->append(object); -} - -extern "C" Q_DECL_EXPORT void qt_removeQObject(QObject *object) -{ - qt_qobjects->removeAll(object); -} - -class tst_ObjectCount : public QObject -{ - Q_OBJECT - -private slots: - void init(); - void cleanup(); - - void qobjects(); - void qobjects_data(); - - void qquickitems(); - void qquickitems_data(); - -private: - QQmlEngine engine; -}; - -void tst_ObjectCount::init() -{ - qtHookData[QHooks::AddQObject] = reinterpret_cast(&qt_addQObject); - qtHookData[QHooks::RemoveQObject] = reinterpret_cast(&qt_removeQObject); - - // warmup - QQmlComponent component(&engine); - component.setData("import QtQuick; import QtQuick.Controls; Item { Button {} }", QUrl()); - delete component.create(); -} - -void tst_ObjectCount::cleanup() -{ - qtHookData[QHooks::AddQObject] = 0; - qtHookData[QHooks::RemoveQObject] = 0; -} - -static void initTestRows(QQmlEngine *engine) -{ - addTestRowForEachControl(engine, "basic", "QtQuick/Controls/Basic"); - addTestRowForEachControl(engine, "fusion", "QtQuick/Controls/Fusion", QStringList() << "ButtonPanel" << "CheckIndicator" << "RadioIndicator" << "SliderGroove" << "SliderHandle" << "SwitchIndicator"); - addTestRowForEachControl(engine, "imagine", "QtQuick/Controls/Imagine"); - addTestRowForEachControl(engine, "material", "QtQuick/Controls/Material", QStringList() << "Ripple" << "SliderHandle" << "CheckIndicator" << "RadioIndicator" << "SwitchIndicator" << "BoxShadow" << "ElevationEffect" << "CursorDelegate"); - addTestRowForEachControl(engine, "universal", "QtQuick/Controls/Universal", QStringList() << "CheckIndicator" << "RadioIndicator" << "SwitchIndicator"); -} - -template -static void doBenchmark(QQmlEngine *engine, const QUrl &url) -{ - QQmlComponent component(engine); - - qt_qobjects->clear(); - - component.loadUrl(url); - QScopedPointer object(component.create()); - QVERIFY2(object.data(), qPrintable(component.errorString())); - - QObjectList objects; - for (QObject *object : qAsConst(*qt_qobjects())) { - if (qobject_cast(object)) - objects += object; - } - - if (qt_verbose) { - for (QObject *object : objects) - qInfo() << "\t" << object; - } - - QTest::setBenchmarkResult(objects.count(), QTest::Events); -} - -void tst_ObjectCount::qobjects() -{ - QFETCH(QUrl, url); - doBenchmark(&engine, url); -} - -void tst_ObjectCount::qobjects_data() -{ - QTest::addColumn("url"); - initTestRows(&engine); -} - -void tst_ObjectCount::qquickitems() -{ - QFETCH(QUrl, url); - doBenchmark(&engine, url); -} - -void tst_ObjectCount::qquickitems_data() -{ - QTest::addColumn("url"); - initTestRows(&engine); -} - -QTEST_MAIN(tst_ObjectCount) - -#include "tst_objectcount.moc" diff --git a/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_abstractbutton.qml b/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_abstractbutton.qml deleted file mode 100644 index 87b137fb..00000000 --- a/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_abstractbutton.qml +++ /dev/null @@ -1,16 +0,0 @@ -import QtQuick -import QmlBench -import QtQuick.Controls - -CreationBenchmark { - id: root - count: 20 - staticCount: 2000 - delegate: AbstractButton { - x: QmlBench.getRandom() * root.width - width - y: QmlBench.getRandom() * root.height - height - checkable: index % 2 - checked: index % 2 - down: index % 3 - } -} diff --git a/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_busyindicator.qml b/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_busyindicator.qml deleted file mode 100644 index bc0be402..00000000 --- a/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_busyindicator.qml +++ /dev/null @@ -1,14 +0,0 @@ -import QtQuick -import QmlBench -import QtQuick.Controls - -CreationBenchmark { - id: root - count: 20 - staticCount: 1000 - delegate: BusyIndicator { - x: QmlBench.getRandom() * root.width - width - y: QmlBench.getRandom() * root.height - height - running: index % 2 - } -} diff --git a/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_button.qml b/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_button.qml deleted file mode 100644 index 9505ebf0..00000000 --- a/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_button.qml +++ /dev/null @@ -1,15 +0,0 @@ -import QtQuick -import QmlBench -import QtQuick.Controls - -CreationBenchmark { - id: root - count: 20 - staticCount: 1000 - delegate: Button { - x: QmlBench.getRandom() * root.width - width - y: QmlBench.getRandom() * root.height - height - text: "Button" - down: index % 2 - } -} diff --git a/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_checkbox.qml b/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_checkbox.qml deleted file mode 100644 index 67d9e382..00000000 --- a/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_checkbox.qml +++ /dev/null @@ -1,15 +0,0 @@ -import QtQuick -import QmlBench -import QtQuick.Controls - -CreationBenchmark { - id: root - count: 20 - staticCount: 1000 - delegate: CheckBox { - x: QmlBench.getRandom() * root.width - width - y: QmlBench.getRandom() * root.height - height - text: "CheckBox" - checked: index % 2 - } -} diff --git a/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_checkdelegate.qml b/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_checkdelegate.qml deleted file mode 100644 index bd7b64cc..00000000 --- a/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_checkdelegate.qml +++ /dev/null @@ -1,16 +0,0 @@ -import QtQuick -import QmlBench -import QtQuick.Controls - -CreationBenchmark { - id: root - count: 20 - staticCount: 1000 - delegate: CheckDelegate { - x: QmlBench.getRandom() * root.width - width - y: QmlBench.getRandom() * root.height - height - text: "CheckDelegate" - checked: index % 2 - down: index % 3 - } -} diff --git a/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_combobox.qml b/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_combobox.qml deleted file mode 100644 index f8552b74..00000000 --- a/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_combobox.qml +++ /dev/null @@ -1,15 +0,0 @@ -import QtQuick -import QmlBench -import QtQuick.Controls - -CreationBenchmark { - id: root - count: 20 - staticCount: 250 - delegate: ComboBox { - x: QmlBench.getRandom() * root.width - width - y: QmlBench.getRandom() * root.height - height - model: 5 - currentIndex: index % count - } -} diff --git a/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_container.qml b/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_container.qml deleted file mode 100644 index 238e95e3..00000000 --- a/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_container.qml +++ /dev/null @@ -1,15 +0,0 @@ -import QtQuick -import QmlBench -import QtQuick.Controls - -CreationBenchmark { - id: root - count: 20 - staticCount: 2000 - delegate: Container { - x: QmlBench.getRandom() * root.width - width - y: QmlBench.getRandom() * root.height - height - width: 100 - height: 100 - } -} diff --git a/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_control.qml b/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_control.qml deleted file mode 100644 index 20f09477..00000000 --- a/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_control.qml +++ /dev/null @@ -1,15 +0,0 @@ -import QtQuick -import QmlBench -import QtQuick.Controls - -CreationBenchmark { - id: root - count: 20 - staticCount: 2000 - delegate: Control { - x: QmlBench.getRandom() * root.width - width - y: QmlBench.getRandom() * root.height - height - width: 100 - height: 100 - } -} diff --git a/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_delaybutton.qml b/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_delaybutton.qml deleted file mode 100644 index 05ec8748..00000000 --- a/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_delaybutton.qml +++ /dev/null @@ -1,15 +0,0 @@ -import QtQuick -import QmlBench -import QtQuick.Controls - -CreationBenchmark { - id: root - count: 20 - staticCount: 1000 - delegate: DelayButton { - x: QmlBench.getRandom() * root.width - width - y: QmlBench.getRandom() * root.height - height - text: "DelayButton" - down: index % 2 - } -} diff --git a/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_dial.qml b/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_dial.qml deleted file mode 100644 index de742c7b..00000000 --- a/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_dial.qml +++ /dev/null @@ -1,14 +0,0 @@ -import QtQuick -import QmlBench -import QtQuick.Controls - -CreationBenchmark { - id: root - count: 20 - staticCount: 500 - delegate: Dial { - x: QmlBench.getRandom() * root.width - width - y: QmlBench.getRandom() * root.height - height - value: index / root.staticCount - } -} diff --git a/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_dialog.qml b/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_dialog.qml deleted file mode 100644 index 686149f7..00000000 --- a/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_dialog.qml +++ /dev/null @@ -1,28 +0,0 @@ -import QtQuick -import QmlBench -import QtQuick.Controls - -CreationBenchmark { - id: root - count: 20 - staticCount: 200 - delegate: Item { - x: QmlBench.getRandom() * root.width - width - y: QmlBench.getRandom() * root.height - height - width: dialog.width - height: dialog.height - Dialog { - id: dialog - visible: true - title: "Dialog" - modal: (index % 100) === 0 - width: parent.width - height: parent.height - standardButtons: Dialog.Ok | Dialog.Cancel - Item { - implicitWidth: 200 - implicitHeight: 200 - } - } - } -} diff --git a/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_dialogbuttonbox.qml b/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_dialogbuttonbox.qml deleted file mode 100644 index f13d65c5..00000000 --- a/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_dialogbuttonbox.qml +++ /dev/null @@ -1,14 +0,0 @@ -import QtQuick -import QmlBench -import QtQuick.Controls - -CreationBenchmark { - id: root - count: 20 - staticCount: 1000 - delegate: DialogButtonBox { - x: QmlBench.getRandom() * root.width - width - y: QmlBench.getRandom() * root.height - height - standardButtons: DialogButtonBox.Ok | DialogButtonBox.Cancel - } -} diff --git a/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_drawer.qml b/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_drawer.qml deleted file mode 100644 index 3f7290a4..00000000 --- a/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_drawer.qml +++ /dev/null @@ -1,21 +0,0 @@ -import QtQuick -import QmlBench -import QtQuick.Controls - -CreationBenchmark { - id: root - count: 20 - staticCount: 250 - delegate: Item { - width: root.width - height: root.height - Drawer { - id: drawer - visible: true - position: 1.0 - edge: index % 2 ? Qt.LeftEdge : Qt.RightEdge - width: root.width / 3 - height: parent.height - } - } -} diff --git a/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_frame.qml b/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_frame.qml deleted file mode 100644 index 2d3c9a66..00000000 --- a/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_frame.qml +++ /dev/null @@ -1,17 +0,0 @@ -import QtQuick -import QmlBench -import QtQuick.Controls - -CreationBenchmark { - id: root - count: 20 - staticCount: 2000 - delegate: Frame { - x: QmlBench.getRandom() * root.width - width - y: QmlBench.getRandom() * root.height - height - Item { - implicitWidth: 100 - implicitHeight: 100 - } - } -} diff --git a/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_groupbox.qml b/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_groupbox.qml deleted file mode 100644 index 3696f847..00000000 --- a/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_groupbox.qml +++ /dev/null @@ -1,18 +0,0 @@ -import QtQuick -import QmlBench -import QtQuick.Controls - -CreationBenchmark { - id: root - count: 20 - staticCount: 1000 - delegate: GroupBox { - x: QmlBench.getRandom() * root.width - width - y: QmlBench.getRandom() * root.height - height - title: "GroupBox" - Item { - implicitWidth: 100 - implicitHeight: 100 - } - } -} diff --git a/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_itemdelegate.qml b/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_itemdelegate.qml deleted file mode 100644 index 07128da1..00000000 --- a/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_itemdelegate.qml +++ /dev/null @@ -1,15 +0,0 @@ -import QtQuick -import QmlBench -import QtQuick.Controls - -CreationBenchmark { - id: root - count: 20 - staticCount: 1000 - delegate: ItemDelegate { - x: QmlBench.getRandom() * root.width - width - y: QmlBench.getRandom() * root.height - height - text: "ItemDelegate" - down: index % 2 - } -} diff --git a/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_label.qml b/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_label.qml deleted file mode 100644 index 788006a4..00000000 --- a/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_label.qml +++ /dev/null @@ -1,14 +0,0 @@ -import QtQuick -import QmlBench -import QtQuick.Controls - -CreationBenchmark { - id: root - count: 20 - staticCount: 1000 - delegate: Label { - x: QmlBench.getRandom() * root.width - width - y: QmlBench.getRandom() * root.height - height - text: "Label" - } -} diff --git a/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_menu.qml b/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_menu.qml deleted file mode 100644 index fd8e53b4..00000000 --- a/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_menu.qml +++ /dev/null @@ -1,22 +0,0 @@ -import QtQuick -import QmlBench -import QtQuick.Controls - -CreationBenchmark { - id: root - count: 20 - staticCount: 200 - delegate: Item { - x: QmlBench.getRandom() * root.width - width - y: QmlBench.getRandom() * root.height - height - width: menu.width - height: menu.height - Menu { - id: menu - visible: true - MenuItem { text: "MenuItem1" } - MenuItem { text: "MenuItem2" } - MenuItem { text: "MenuItem3" } - } - } -} diff --git a/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_menuitem.qml b/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_menuitem.qml deleted file mode 100644 index 6732bc18..00000000 --- a/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_menuitem.qml +++ /dev/null @@ -1,17 +0,0 @@ -import QtQuick -import QmlBench -import QtQuick.Controls - -CreationBenchmark { - id: root - count: 20 - staticCount: 1000 - delegate: MenuItem { - x: QmlBench.getRandom() * root.width - width - y: QmlBench.getRandom() * root.height - height - text: "MenuItem" - checkable: index % 2 - checked: index % 2 - down: index % 3 - } -} diff --git a/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_menuseparator.qml b/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_menuseparator.qml deleted file mode 100644 index 8effa173..00000000 --- a/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_menuseparator.qml +++ /dev/null @@ -1,13 +0,0 @@ -import QtQuick -import QmlBench -import QtQuick.Controls - -CreationBenchmark { - id: root - count: 20 - staticCount: 2000 - delegate: MenuSeparator { - x: QmlBench.getRandom() * root.width - width - y: QmlBench.getRandom() * root.height - height - } -} diff --git a/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_page.qml b/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_page.qml deleted file mode 100644 index f9d06b38..00000000 --- a/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_page.qml +++ /dev/null @@ -1,18 +0,0 @@ -import QtQuick -import QmlBench -import QtQuick.Controls - -CreationBenchmark { - id: root - count: 20 - staticCount: 2000 - delegate: Page { - x: QmlBench.getRandom() * root.width - width - y: QmlBench.getRandom() * root.height - height - width: 100 - height: 100 - header: Item { } - footer: Item { } - Item { } - } -} diff --git a/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_pageindicator.qml b/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_pageindicator.qml deleted file mode 100644 index 9b5a6918..00000000 --- a/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_pageindicator.qml +++ /dev/null @@ -1,15 +0,0 @@ -import QtQuick -import QmlBench -import QtQuick.Controls - -CreationBenchmark { - id: root - count: 20 - staticCount: 1000 - delegate: PageIndicator { - x: QmlBench.getRandom() * root.width - width - y: QmlBench.getRandom() * root.height - height - count: 5 - currentIndex: index % 5 - } -} diff --git a/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_pane.qml b/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_pane.qml deleted file mode 100644 index a391f695..00000000 --- a/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_pane.qml +++ /dev/null @@ -1,17 +0,0 @@ -import QtQuick -import QmlBench -import QtQuick.Controls - -CreationBenchmark { - id: root - count: 20 - staticCount: 2000 - delegate: Pane { - x: QmlBench.getRandom() * root.width - width - y: QmlBench.getRandom() * root.height - height - Item { - implicitWidth: 100 - implicitHeight: 100 - } - } -} diff --git a/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_popup.qml b/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_popup.qml deleted file mode 100644 index c2cdaab5..00000000 --- a/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_popup.qml +++ /dev/null @@ -1,26 +0,0 @@ -import QtQuick -import QmlBench -import QtQuick.Controls - -CreationBenchmark { - id: root - count: 20 - staticCount: 500 - delegate: Item { - x: QmlBench.getRandom() * root.width - width - y: QmlBench.getRandom() * root.height - height - width: popup.width - height: popup.height - Popup { - id: popup - visible: true - modal: (index % 100) === 0 - width: parent.width - height: parent.height - Item { - implicitWidth: 100 - implicitHeight: 100 - } - } - } -} diff --git a/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_progressbar.qml b/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_progressbar.qml deleted file mode 100644 index d50d9d26..00000000 --- a/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_progressbar.qml +++ /dev/null @@ -1,14 +0,0 @@ -import QtQuick -import QmlBench -import QtQuick.Controls - -CreationBenchmark { - id: root - count: 20 - staticCount: 1000 - delegate: ProgressBar { - x: QmlBench.getRandom() * root.width - width - y: QmlBench.getRandom() * root.height - height - value: index / root.staticCount - } -} diff --git a/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_radiobutton.qml b/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_radiobutton.qml deleted file mode 100644 index f596e852..00000000 --- a/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_radiobutton.qml +++ /dev/null @@ -1,16 +0,0 @@ -import QtQuick -import QmlBench -import QtQuick.Controls - -CreationBenchmark { - id: root - count: 20 - staticCount: 1000 - delegate: RadioButton { - x: QmlBench.getRandom() * root.width - width - y: QmlBench.getRandom() * root.height - height - text: "RadioButton" - autoExclusive: false - checked: index % 2 - } -} diff --git a/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_radiodelegate.qml b/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_radiodelegate.qml deleted file mode 100644 index 7f573466..00000000 --- a/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_radiodelegate.qml +++ /dev/null @@ -1,17 +0,0 @@ -import QtQuick -import QmlBench -import QtQuick.Controls - -CreationBenchmark { - id: root - count: 20 - staticCount: 1000 - delegate: RadioDelegate { - x: QmlBench.getRandom() * root.width - width - y: QmlBench.getRandom() * root.height - height - text: "RadioDelegate" - autoExclusive: false - checked: index % 2 - down: index % 3 - } -} diff --git a/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_rangeslider.qml b/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_rangeslider.qml deleted file mode 100644 index 725cab29..00000000 --- a/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_rangeslider.qml +++ /dev/null @@ -1,15 +0,0 @@ -import QtQuick -import QmlBench -import QtQuick.Controls - -CreationBenchmark { - id: root - count: 20 - staticCount: 1000 - delegate: RangeSlider { - x: QmlBench.getRandom() * root.width - width - y: QmlBench.getRandom() * root.height - height - first.value: (index / root.staticCount) * 0.5 - second.value: 0.5 + (index / root.staticCount) * 0.5 - } -} diff --git a/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_roundbutton.qml b/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_roundbutton.qml deleted file mode 100644 index 0337a66d..00000000 --- a/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_roundbutton.qml +++ /dev/null @@ -1,15 +0,0 @@ -import QtQuick -import QmlBench -import QtQuick.Controls - -CreationBenchmark { - id: root - count: 20 - staticCount: 1000 - delegate: RoundButton { - x: QmlBench.getRandom() * root.width - width - y: QmlBench.getRandom() * root.height - height - text: "X" - down: index % 2 - } -} diff --git a/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_scrollbar.qml b/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_scrollbar.qml deleted file mode 100644 index 2635240f..00000000 --- a/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_scrollbar.qml +++ /dev/null @@ -1,17 +0,0 @@ -import QtQuick -import QmlBench -import QtQuick.Controls - -CreationBenchmark { - id: root - count: 20 - staticCount: 1000 - delegate: ScrollBar { - x: QmlBench.getRandom() * root.width - width - y: QmlBench.getRandom() * root.height - height - height: 100 - size: index / root.staticCount - pressed: index % 2 - active: true - } -} diff --git a/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_scrollindicator.qml b/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_scrollindicator.qml deleted file mode 100644 index 4e2b90a3..00000000 --- a/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_scrollindicator.qml +++ /dev/null @@ -1,16 +0,0 @@ -import QtQuick -import QmlBench -import QtQuick.Controls - -CreationBenchmark { - id: root - count: 20 - staticCount: 1000 - delegate: ScrollIndicator { - x: QmlBench.getRandom() * root.width - width - y: QmlBench.getRandom() * root.height - height - height: 100 - size: index / root.staticCount - active: true - } -} diff --git a/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_scrollview.qml b/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_scrollview.qml deleted file mode 100644 index b5f155cb..00000000 --- a/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_scrollview.qml +++ /dev/null @@ -1,23 +0,0 @@ -import QtQuick -import QmlBench -import QtQuick.Controls - -CreationBenchmark { - id: root - count: 20 - staticCount: 250 - delegate: ScrollView { - x: QmlBench.getRandom() * root.width - width - y: QmlBench.getRandom() * root.height - height - width: 100 - height: 100 - Item { - implicitWidth: 200 - implicitHeight: 200 - } - ScrollBar.vertical.active: true - ScrollBar.vertical.pressed: index % 3 === 1 - ScrollBar.horizontal.active: true - ScrollBar.horizontal.pressed: index % 3 === 2 - } -} diff --git a/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_slider.qml b/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_slider.qml deleted file mode 100644 index 0ef3b3fa..00000000 --- a/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_slider.qml +++ /dev/null @@ -1,14 +0,0 @@ -import QtQuick -import QmlBench -import QtQuick.Controls - -CreationBenchmark { - id: root - count: 20 - staticCount: 1000 - delegate: Slider { - x: QmlBench.getRandom() * root.width - width - y: QmlBench.getRandom() * root.height - height - value: index / root.staticCount - } -} diff --git a/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_spinbox.qml b/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_spinbox.qml deleted file mode 100644 index 9120a921..00000000 --- a/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_spinbox.qml +++ /dev/null @@ -1,14 +0,0 @@ -import QtQuick -import QmlBench -import QtQuick.Controls - -CreationBenchmark { - id: root - count: 20 - staticCount: 250 - delegate: SpinBox { - x: QmlBench.getRandom() * root.width - width - y: QmlBench.getRandom() * root.height - height - value: index / root.staticCount * to - } -} diff --git a/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_stackview.qml b/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_stackview.qml deleted file mode 100644 index cb6cee10..00000000 --- a/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_stackview.qml +++ /dev/null @@ -1,18 +0,0 @@ -import QtQuick -import QmlBench -import QtQuick.Controls - -CreationBenchmark { - id: root - count: 20 - staticCount: 2000 - delegate: StackView { - x: QmlBench.getRandom() * root.width - width - y: QmlBench.getRandom() * root.height - height - width: 100 - height: 100 - initialItem: Item { - focus: StackView.status === StackView.Active - } - } -} diff --git a/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_swipedelegate.qml b/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_swipedelegate.qml deleted file mode 100644 index 5147bbb6..00000000 --- a/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_swipedelegate.qml +++ /dev/null @@ -1,15 +0,0 @@ -import QtQuick -import QmlBench -import QtQuick.Controls - -CreationBenchmark { - id: root - count: 20 - staticCount: 1000 - delegate: SwitchDelegate { - x: QmlBench.getRandom() * root.width - width - y: QmlBench.getRandom() * root.height - height - text: "SwipeDelegate" - down: index % 2 - } -} diff --git a/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_swipeview.qml b/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_swipeview.qml deleted file mode 100644 index b263e620..00000000 --- a/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_swipeview.qml +++ /dev/null @@ -1,24 +0,0 @@ -import QtQuick -import QmlBench -import QtQuick.Controls - -CreationBenchmark { - id: root - count: 20 - staticCount: 1000 - delegate: SwipeView { - x: QmlBench.getRandom() * root.width - width - y: QmlBench.getRandom() * root.height - height - width: 100 - height: 100 - Item { - focus: SwipeView.isCurrentItem - } - Item { - focus: SwipeView.isCurrentItem - } - Item { - focus: SwipeView.isCurrentItem - } - } -} diff --git a/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_switch.qml b/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_switch.qml deleted file mode 100644 index 79cc48e3..00000000 --- a/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_switch.qml +++ /dev/null @@ -1,15 +0,0 @@ -import QtQuick -import QmlBench -import QtQuick.Controls - -CreationBenchmark { - id: root - count: 20 - staticCount: 1000 - delegate: Switch { - x: QmlBench.getRandom() * root.width - width - y: QmlBench.getRandom() * root.height - height - text: "Switch" - checked: index % 2 - } -} diff --git a/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_switchdelegate.qml b/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_switchdelegate.qml deleted file mode 100644 index f6f8a7df..00000000 --- a/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_switchdelegate.qml +++ /dev/null @@ -1,16 +0,0 @@ -import QtQuick -import QmlBench -import QtQuick.Controls - -CreationBenchmark { - id: root - count: 20 - staticCount: 1000 - delegate: SwitchDelegate { - x: QmlBench.getRandom() * root.width - width - y: QmlBench.getRandom() * root.height - height - text: "SwitchDelegate" - checked: index % 2 - down: index % 3 - } -} diff --git a/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_tabbar.qml b/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_tabbar.qml deleted file mode 100644 index 37f6a463..00000000 --- a/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_tabbar.qml +++ /dev/null @@ -1,23 +0,0 @@ -import QtQuick -import QmlBench -import QtQuick.Controls - -CreationBenchmark { - id: root - count: 20 - staticCount: 250 - delegate: TabBar { - x: QmlBench.getRandom() * root.width - width - y: QmlBench.getRandom() * root.height - height - currentIndex: index / root.staticCount * count - TabButton { - text: "Tab1" - } - TabButton { - text: "Tab2" - } - TabButton { - text: "Tab3" - } - } -} diff --git a/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_tabbutton.qml b/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_tabbutton.qml deleted file mode 100644 index 27442a7d..00000000 --- a/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_tabbutton.qml +++ /dev/null @@ -1,16 +0,0 @@ -import QtQuick -import QmlBench -import QtQuick.Controls - -CreationBenchmark { - id: root - count: 20 - staticCount: 1000 - delegate: TabButton { - x: QmlBench.getRandom() * root.width - width - y: QmlBench.getRandom() * root.height - height - text: "TabButton" - checked: index % 2 - down: index % 3 - } -} diff --git a/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_textarea.qml b/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_textarea.qml deleted file mode 100644 index 88454c0b..00000000 --- a/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_textarea.qml +++ /dev/null @@ -1,14 +0,0 @@ -import QtQuick -import QmlBench -import QtQuick.Controls - -CreationBenchmark { - id: root - count: 20 - staticCount: 500 - delegate: TextArea { - x: QmlBench.getRandom() * root.width - width - y: QmlBench.getRandom() * root.height - height - text: "Text\nArea" - } -} diff --git a/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_textfield.qml b/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_textfield.qml deleted file mode 100644 index eb279724..00000000 --- a/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_textfield.qml +++ /dev/null @@ -1,14 +0,0 @@ -import QtQuick -import QmlBench -import QtQuick.Controls - -CreationBenchmark { - id: root - count: 20 - staticCount: 1000 - delegate: TextField { - x: QmlBench.getRandom() * root.width - width - y: QmlBench.getRandom() * root.height - height - text: "TextField" - } -} diff --git a/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_toolbutton.qml b/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_toolbutton.qml deleted file mode 100644 index 7dcd85a3..00000000 --- a/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_toolbutton.qml +++ /dev/null @@ -1,15 +0,0 @@ -import QtQuick -import QmlBench -import QtQuick.Controls - -CreationBenchmark { - id: root - count: 20 - staticCount: 1000 - delegate: ToolButton { - x: QmlBench.getRandom() * root.width - width - y: QmlBench.getRandom() * root.height - height - text: "ToolButton" - down: index % 2 - } -} diff --git a/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_toolseparator.qml b/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_toolseparator.qml deleted file mode 100644 index 48cdd352..00000000 --- a/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_toolseparator.qml +++ /dev/null @@ -1,13 +0,0 @@ -import QtQuick -import QmlBench -import QtQuick.Controls - -CreationBenchmark { - id: root - count: 20 - staticCount: 2000 - delegate: ToolSeparator { - x: QmlBench.getRandom() * root.width - width - y: QmlBench.getRandom() * root.height - height - } -} diff --git a/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_tooltip.qml b/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_tooltip.qml deleted file mode 100644 index 85e86494..00000000 --- a/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_tooltip.qml +++ /dev/null @@ -1,20 +0,0 @@ -import QtQuick -import QmlBench -import QtQuick.Controls - -CreationBenchmark { - id: root - count: 20 - staticCount: 500 - delegate: Item { - x: QmlBench.getRandom() * root.width - width - y: QmlBench.getRandom() * root.height - height - width: tooltip.width - height: tooltip.height - ToolTip { - id: tooltip - visible: true - text: "ToolTip" - } - } -} diff --git a/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_tumbler.qml b/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_tumbler.qml deleted file mode 100644 index da747e23..00000000 --- a/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_tumbler.qml +++ /dev/null @@ -1,15 +0,0 @@ -import QtQuick -import QmlBench -import QtQuick.Controls - -CreationBenchmark { - id: root - count: 20 - staticCount: 250 - delegate: Tumbler { - x: QmlBench.getRandom() * root.width - width - y: QmlBench.getRandom() * root.height - height - model: 5 - currentIndex: index % count - } -} -- cgit v1.2.3