diff options
| author | Ville Voutilainen <ville.voutilainen@qt.io> | 2021-12-01 13:14:20 +0200 |
|---|---|---|
| committer | Ville Voutilainen <ville.voutilainen@qt.io> | 2022-01-04 11:12:11 +0000 |
| commit | c9d84ead801960601870240e36478468c2a28b82 (patch) | |
| tree | fbd2c6ae0466ecfce032e5eebca10d02dcae7bf3 /benchmarks | |
| parent | 6d298da7cda85b35aa22c68aac55fdb6513e68eb (diff) | |
Use a resource file for benchmarks, and add some Android goodies and fixes
Task-number: QTBUG-94148
Change-Id: I7cc0b1ade676c4f7f963915315c00e317582e56f
Reviewed-by: Daniel Smith <Daniel.Smith@qt.io>
Diffstat (limited to 'benchmarks')
196 files changed, 0 insertions, 4633 deletions
diff --git a/benchmarks/auto/animations/comparison/README.md b/benchmarks/auto/animations/comparison/README.md deleted file mode 100644 index a5c441d..0000000 --- a/benchmarks/auto/animations/comparison/README.md +++ /dev/null @@ -1,17 +0,0 @@ -# comparison - -These benchmarks compare a number of different ways of moving images around, and -are help validate the casual gaming idea which should be very viable with QML. - -The benchmarks give an indication of how many animated items can run -simultaneously in the UI. It should be in the thousands. - -One quirk if you run these is that on a threaded renderloop, the animation one -runs faster than animators. This is because the work is broken into two major -chunks. One is doing the animation while the other is doing the batching in the -renderer and scheduling the rendering. If those happen on separate threads, we -get better parallelization so 'animation' comes out better. - -However, if you try again with QSG_RENDER_LOOP=windows in the environment, -you'll see that if it all happens on the same thread, then animators are a bit -cheaper (because they are simpler). diff --git a/benchmarks/auto/animations/comparison/moving-images-animations.qml b/benchmarks/auto/animations/comparison/moving-images-animations.qml deleted file mode 100644 index b9ecb61..0000000 --- a/benchmarks/auto/animations/comparison/moving-images-animations.qml +++ /dev/null @@ -1,28 +0,0 @@ -import QtQuick 2.2 -import QmlBench 1.0 - -// Move images around using Animation types, to be compared with a number of -// other similar ways to move them around. -Benchmark { - id: root; - - count: 500 - staticCount: 20000 - - Repeater { - model: root.count - Image { - source: "../../../../shared/butterfly-wide.png" - x: QmlBench.getRandom() * (root.width - width) - y: QmlBench.getRandom() * (root.height - height) - width: 40 - height: 40 - - SequentialAnimation on rotation { - NumberAnimation { from: -10; to: 10; duration: 500; easing.type: Easing.InOutCubic } - NumberAnimation { from: 10; to: -10; duration: 500; easing.type: Easing.InOutCubic } - loops: Animation.Infinite - } - } - } -} diff --git a/benchmarks/auto/animations/comparison/moving-images-animators.qml b/benchmarks/auto/animations/comparison/moving-images-animators.qml deleted file mode 100644 index 132c61b..0000000 --- a/benchmarks/auto/animations/comparison/moving-images-animators.qml +++ /dev/null @@ -1,28 +0,0 @@ -import QtQuick 2.2 -import QmlBench 1.0 - -// Move images around using Animator types, to be compared with a number of -// other similar ways to move them around. -Benchmark { - id: root; - - count: 500 - staticCount: 20000 - - Repeater { - model: root.count - Image { - source: "../../../../shared/butterfly-wide.png" - x: QmlBench.getRandom() * (root.width - width) - y: QmlBench.getRandom() * (root.height - height) - width: 40 - height: 40 - - SequentialAnimation on rotation { - RotationAnimator { from: -10; to: 10; duration: 500; easing.type: Easing.InOutCubic } - RotationAnimator { from: 10; to: -10; duration: 500; easing.type: Easing.InOutCubic } - loops: Animation.Infinite - } - } - } -} diff --git a/benchmarks/auto/animations/comparison/moving-images-script.qml b/benchmarks/auto/animations/comparison/moving-images-script.qml deleted file mode 100644 index d2a2fcf..0000000 --- a/benchmarks/auto/animations/comparison/moving-images-script.qml +++ /dev/null @@ -1,30 +0,0 @@ -import QtQuick 2.2 -import QmlBench 1.0 - -// Move images around using a property binding, to be compared with a number of -// other similar ways to move them around. -Benchmark { - id: root; - - count: 500 - staticCount: 20000 - - Repeater { - model: root.count - Image { - source: "../../../../shared/butterfly-wide.png" - x: QmlBench.getRandom() * (root.width - width) - y: QmlBench.getRandom() * (root.height - height) - width: 40 - height: 40 - - property real t; - rotation: 10 * Math.sin(t * Math.PI * 2 + Math.PI); - - SequentialAnimation on t { - NumberAnimation { from: 0; to: 1; duration: 1000; } - loops: Animation.Infinite - } - } - } -} diff --git a/benchmarks/auto/animations/comparison/moving-images-simple.qml b/benchmarks/auto/animations/comparison/moving-images-simple.qml deleted file mode 100644 index 1db6c6a..0000000 --- a/benchmarks/auto/animations/comparison/moving-images-simple.qml +++ /dev/null @@ -1,29 +0,0 @@ -import QtQuick 2.2 -import QmlBench 1.0 - -// Move images around using a global property binding, to be compared with a -// number of other similar ways to move them around. -Benchmark { - id: root; - - count: 500 - staticCount: 20000 - - property int frameCount - onTChanged: { - frameCount++ - } - - Repeater { - model: root.count - Image { - source: "../../../../shared/butterfly-wide.png" - x: QmlBench.getRandom() * (root.width - width) - y: QmlBench.getRandom() * (root.height - height) - width: 40 - height: 40 - rotation: index + frameCount - } - } -} - diff --git a/benchmarks/auto/bindings/compositesingleton.qml b/benchmarks/auto/bindings/compositesingleton.qml deleted file mode 100644 index aad80cc..0000000 --- a/benchmarks/auto/bindings/compositesingleton.qml +++ /dev/null @@ -1,15 +0,0 @@ -import QtQuick 2.0 -import QmlBench 1.0 -import "../../../shared" - -// Tests the creation of Items bound to a QML-defined singleton -CreationBenchmark { - id: root; - count: 50; - staticCount: 2500; - delegate: Item { - x: Globals.realProp - y: Globals.intProp - smooth: Globals.boolProp - } -} diff --git a/benchmarks/auto/canvas/canvas_text_simple.qml b/benchmarks/auto/canvas/canvas_text_simple.qml deleted file mode 100644 index 7668a42..0000000 --- a/benchmarks/auto/canvas/canvas_text_simple.qml +++ /dev/null @@ -1,29 +0,0 @@ -import QtQuick 2.0 -import QmlBench 1.0 - -// Testing the performance of canvas-based text rendering -Item { - id: root; - property int count: 100; - property int staticCount: 1000; - - property real t; - NumberAnimation on t { from: 0; to: 1; duration: 2347; loops: Animation.Infinite } - - Canvas { - anchors.fill: parent - - property real t: root.t; - onTChanged: requestPaint(); - - onPaint: { - var ctx = getContext("2d"); - ctx.clearRect(0, 0, width, height); - var str = "" + Math.floor( t * 1000 ) / 1000; - - for (var i = 0; i < root.count; ++i) { - ctx.fillText(str, QmlBench.getRandom() * root.width, QmlBench.getRandom() * root.height); - } - } - } -} diff --git a/benchmarks/auto/changes/README.md b/benchmarks/auto/changes/README.md deleted file mode 100644 index 9e5a905..0000000 --- a/benchmarks/auto/changes/README.md +++ /dev/null @@ -1,5 +0,0 @@ -# changes - -These benchmarks help measure the impact of various types of changes in a scene -(for instance, changing one text item out of many, changing all text items at -once). diff --git a/benchmarks/auto/changes/changing_over_isolated.qml b/benchmarks/auto/changes/changing_over_isolated.qml deleted file mode 100644 index 72f9f1a..0000000 --- a/benchmarks/auto/changes/changing_over_isolated.qml +++ /dev/null @@ -1,50 +0,0 @@ -import QtQuick 2.0 -import QmlBench 1.0 - -// This benchmark determines if clipping two subtrees isolates them, -// such that one changing subtree won't affect performance because -// of the other. -CreationBenchmark { - id: root; - count: 1000; - staticCount: 2000 - - // Boolean because: isolating via clip either keeps performance good, or - // performance is awful if we break it. - isBooleanResult: true; - - // Create a static subtree of items. This tree does not change. - Item { - anchors.fill: parent - clip: true - Repeater { - id: repeater - model: root.count - - Rectangle { - color: Qt.hsla(QmlBench.getRandom(), 0.9, 0.4) - width: 20 - height: 20 - x: QmlBench.getRandom() * root.width - y: QmlBench.getRandom() * root.height - - Text { - color: "white" - text: "X" - anchors.centerIn: parent - font.pixelSize: 10 - } - } - } - } - - // Create a subtree containing a single item. This tree does change. - Item { - anchors.fill: parent - clip: true - Text { - anchors.centerIn: parent - text: "test: " + root.t; - } - } -} diff --git a/benchmarks/auto/changes/changing_over_isolated_with_clip.qml b/benchmarks/auto/changes/changing_over_isolated_with_clip.qml deleted file mode 100644 index 487ed21..0000000 --- a/benchmarks/auto/changes/changing_over_isolated_with_clip.qml +++ /dev/null @@ -1,49 +0,0 @@ -import QtQuick 2.0 -import QmlBench 1.0 - -// Tests that a single item changing in one subtree, and many items in another -// tree, do not have bad performance when both subtrees are isolated with -// "clip: true". -Item { - id: root; - property int count: 100; - property int staticCount: 2000 - - property real t; - NumberAnimation on t { from: 0; to: 1; duration: 2347; loops: Animation.Infinite } - - Item { - anchors.fill: parent - clip: true - Repeater { - id: repeater - model: root.count - - Rectangle { - color: Qt.hsla(QmlBench.getRandom(), 0.9, 0.4) - width: 20 - height: 20 - x: QmlBench.getRandom() * root.width - y: QmlBench.getRandom() * root.height - clip: true - - Text { - color: "white" - text: "X" - anchors.centerIn: parent - font.pixelSize: 10 - } - } - } - } - - Item { - anchors.fill: parent - clip: true - Text { - anchors.centerIn: parent - text: "test: " + root.t; - } - } - -} diff --git a/benchmarks/auto/changes/changing_over_isolated_with_clip_rotated.qml b/benchmarks/auto/changes/changing_over_isolated_with_clip_rotated.qml deleted file mode 100644 index 48dae1d..0000000 --- a/benchmarks/auto/changes/changing_over_isolated_with_clip_rotated.qml +++ /dev/null @@ -1,57 +0,0 @@ -import QtQuick 2.0 -import QmlBench 1.0 - -// Tests that a single item changing in one subtree, and many items in another -// tree, do not have bad performance when both subtrees are isolated with -// "clip: true". -// -// Different from changing_over_isolated_with_clip, we also rotate, as this -// can't just be clipped with scissoring. -// -// TODO: consider whether it makes sense to test this as a specific render -// test, changing_over_isolated_with_clip covers the clipping part well enough -// that perhaps we don't need this approach. Useful for now, though. -Item { - id: root; - property int count: 1000; - property int staticCount: 2000 - - property real t; - NumberAnimation on t { from: 0; to: 1; duration: 2347; loops: Animation.Infinite } - - Item { - anchors.fill: parent - clip: true - Repeater { - id: repeater - model: root.count - - Rectangle { - color: Qt.hsla(QmlBench.getRandom(), 0.9, 0.4) - width: 20 - height: 20 - x: QmlBench.getRandom() * root.width - y: QmlBench.getRandom() * root.height - clip: true - rotation: 10 - - Text { - color: "white" - text: "X" - anchors.centerIn: parent - font.pixelSize: 10 - } - } - } - } - - Item { - anchors.fill: parent - clip: true - Text { - anchors.centerIn: parent - text: "test: " + root.t; - } - } - -} diff --git a/benchmarks/auto/changes/changing_text_oneofmany.qml b/benchmarks/auto/changes/changing_text_oneofmany.qml deleted file mode 100644 index 879b99b..0000000 --- a/benchmarks/auto/changes/changing_text_oneofmany.qml +++ /dev/null @@ -1,22 +0,0 @@ -import QtQuick 2.0 -import QmlBench 1.0 - -// Testing the performance of changing 1 Text in a scene vs all (changing_texts) -Item { - id: root; - property int count: 100 - property int staticCount: 1000; - - property real t; - NumberAnimation on t { from: 0; to: 1000; duration: 1000; loops: Animation.Infinite } - - Repeater { - id: repeater - model: root.count - Text { - x: QmlBench.getRandom() * root.width - y: QmlBench.getRandom() * root.height - text: index == 0 ? Math.round(t) : index; - } - } -} diff --git a/benchmarks/auto/changes/changing_texts.qml b/benchmarks/auto/changes/changing_texts.qml deleted file mode 100644 index 2715482..0000000 --- a/benchmarks/auto/changes/changing_texts.qml +++ /dev/null @@ -1,22 +0,0 @@ -import QtQuick 2.0 -import QmlBench 1.0 - -// Testing the performance of changing all texts in a scene vs 1 (text_oneofmany) -Item { - id: root; - property int count: 100; - property int staticCount: 1000; - - property real t; - NumberAnimation on t { from: 0; to: 1; duration: 2347; loops: Animation.Infinite } - - Repeater { - id: repeater - model: root.count - Text { - x: QmlBench.getRandom() * root.width - y: QmlBench.getRandom() * root.height - text: Math.floor( root.t * 1000 ) / 1000; - } - } -} diff --git a/benchmarks/auto/creation/README.md b/benchmarks/auto/creation/README.md deleted file mode 100644 index f0303d9..0000000 --- a/benchmarks/auto/creation/README.md +++ /dev/null @@ -1,14 +0,0 @@ -# creation - -This is a suite of tests to find out how good we are with creation, rendering -and destruction of objects. Some of the tests are also written in such a way -that they can be compared between each other -- these are usually noted in the -descriptive comment at the top of the test. - -Creation is an important factor: our items should be light, as creating a dialog -or page of UI can often creating a few hundred different items (especially Text, -Item, Rectangle, etc). In addition to this, there's code outside of our control -on the application end: JS logic, model interaction, database or file I/O all -comes in addition - so we need to leave plenty of performance left over for the -end user. - diff --git a/benchmarks/auto/creation/layouts/delegates_column.qml b/benchmarks/auto/creation/layouts/delegates_column.qml deleted file mode 100644 index 55be106..0000000 --- a/benchmarks/auto/creation/layouts/delegates_column.qml +++ /dev/null @@ -1,38 +0,0 @@ -import QtQuick 2.0 -import QmlBench 1.0 - -// Tests the creation of a Column, to be compared with ColumnLayout. -CreationBenchmark { - id: root; - count: 20; - staticCount: 1000; - delegate: Column { - x: QmlBench.getRandom() * (root.width - width) - y: QmlBench.getRandom() * (root.height - height) - Rectangle { - width: 50 - height: 10 - color: "red" - } - Rectangle { - width: 50 - height: 10 - color: "red" - } - Rectangle { - width: 50 - height: 10 - color: "red" - } - Rectangle { - width: 50 - height: 10 - color: "red" - } - Rectangle { - width: 50 - height: 10 - color: "red" - } - } -} diff --git a/benchmarks/auto/creation/layouts/delegates_columnlayout.qml b/benchmarks/auto/creation/layouts/delegates_columnlayout.qml deleted file mode 100644 index bbb3b44..0000000 --- a/benchmarks/auto/creation/layouts/delegates_columnlayout.qml +++ /dev/null @@ -1,39 +0,0 @@ -import QtQuick 2.0 -import QmlBench 1.0 -import QtQuick.Layouts 1.0 - -// Tests the creation of a ColumnLayout, to be compared with Column. -CreationBenchmark { - id: root; - count: 20; - staticCount: 1000; - delegate: ColumnLayout { - x: QmlBench.getRandom() * (root.width - width) - y: QmlBench.getRandom() * (root.height - height) - Rectangle { - width: 50 - height: 10 - color: "red" - } - Rectangle { - width: 50 - height: 10 - color: "red" - } - Rectangle { - width: 50 - height: 10 - color: "red" - } - Rectangle { - width: 50 - height: 10 - color: "red" - } - Rectangle { - width: 50 - height: 10 - color: "red" - } - } -} diff --git a/benchmarks/auto/creation/layouts/delegates_flow.qml b/benchmarks/auto/creation/layouts/delegates_flow.qml deleted file mode 100644 index e7e1ad0..0000000 --- a/benchmarks/auto/creation/layouts/delegates_flow.qml +++ /dev/null @@ -1,38 +0,0 @@ -import QtQuick 2.0 -import QmlBench 1.0 - -// Tests the creation of a Flow layout -CreationBenchmark { - id: root; - count: 20; - staticCount: 1000; - delegate: Flow { - x: QmlBench.getRandom() * (root.width - width) - y: QmlBench.getRandom() * (root.height - height) - Rectangle { - width: 50 - height: 10 - color: "red" - } - Rectangle { - width: 50 - height: 10 - color: "red" - } - Rectangle { - width: 50 - height: 10 - color: "red" - } - Rectangle { - width: 50 - height: 10 - color: "red" - } - Rectangle { - width: 50 - height: 10 - color: "red" - } - } -} diff --git a/benchmarks/auto/creation/layouts/delegates_grid.qml b/benchmarks/auto/creation/layouts/delegates_grid.qml deleted file mode 100644 index a5c7f5f..0000000 --- a/benchmarks/auto/creation/layouts/delegates_grid.qml +++ /dev/null @@ -1,38 +0,0 @@ -import QtQuick 2.0 -import QmlBench 1.0 - -// Tests the creation of a Grid, to be compared with GridLayout -CreationBenchmark { - id: root; - count: 20; - staticCount: 1000; - delegate: Grid { - x: QmlBench.getRandom() * (root.width - width) - y: QmlBench.getRandom() * (root.height - height) - Rectangle { - width: 50 - height: 10 - color: "red" - } - Rectangle { - width: 50 - height: 10 - color: "red" - } - Rectangle { - width: 50 - height: 10 - color: "red" - } - Rectangle { - width: 50 - height: 10 - color: "red" - } - Rectangle { - width: 50 - height: 10 - color: "red" - } - } -} diff --git a/benchmarks/auto/creation/layouts/delegates_gridlayout.qml b/benchmarks/auto/creation/layouts/delegates_gridlayout.qml deleted file mode 100644 index 0d152c8..0000000 --- a/benchmarks/auto/creation/layouts/delegates_gridlayout.qml +++ /dev/null @@ -1,40 +0,0 @@ -import QtQuick 2.0 -import QmlBench 1.0 -import QtQuick.Layouts 1.0 - -// Tests the creation of GridLayout, to be compared with Grid -CreationBenchmark { - id: root; - count: 20; - staticCount: 1000; - delegate: GridLayout { - x: QmlBench.getRandom() * (root.width - width) - y: QmlBench.getRandom() * (root.height - height) - columns: 2 - Rectangle { - width: 50 - height: 10 - color: "red" - } - Rectangle { - width: 50 - height: 10 - color: "red" - } - Rectangle { - width: 50 - height: 10 - color: "red" - } - Rectangle { - width: 50 - height: 10 - color: "red" - } - Rectangle { - width: 50 - height: 10 - color: "red" - } - } -} diff --git a/benchmarks/auto/creation/layouts/delegates_row.qml b/benchmarks/auto/creation/layouts/delegates_row.qml deleted file mode 100644 index 8f3f8ae..0000000 --- a/benchmarks/auto/creation/layouts/delegates_row.qml +++ /dev/null @@ -1,38 +0,0 @@ -import QtQuick 2.0 -import QmlBench 1.0 - -// Tests the creation of Row, to be compared with RowLayout -CreationBenchmark { - id: root; - count: 20; - staticCount: 1000; - delegate: Row { - x: QmlBench.getRandom() * (root.width - width) - y: QmlBench.getRandom() * (root.height - height) - Rectangle { - width: 50 - height: 10 - color: "red" - } - Rectangle { - width: 50 - height: 10 - color: "red" - } - Rectangle { - width: 50 - height: 10 - color: "red" - } - Rectangle { - width: 50 - height: 10 - color: "red" - } - Rectangle { - width: 50 - height: 10 - color: "red" - } - } -} diff --git a/benchmarks/auto/creation/layouts/delegates_rowlayout.qml b/benchmarks/auto/creation/layouts/delegates_rowlayout.qml deleted file mode 100644 index 4e001ea..0000000 --- a/benchmarks/auto/creation/layouts/delegates_rowlayout.qml +++ /dev/null @@ -1,39 +0,0 @@ -import QtQuick 2.0 -import QmlBench 1.0 -import QtQuick.Layouts 1.0 - -// Tests the creation of RowLayout, to be compared with Row -CreationBenchmark { - id: root; - count: 20; - staticCount: 1000; - delegate: RowLayout { - x: QmlBench.getRandom() * (root.width - width) - y: QmlBench.getRandom() * (root.height - height) - Rectangle { - width: 50 - height: 10 - color: "red" - } - Rectangle { - width: 50 - height: 10 - color: "red" - } - Rectangle { - width: 50 - height: 10 - color: "red" - } - Rectangle { - width: 50 - height: 10 - color: "red" - } - Rectangle { - width: 50 - height: 10 - color: "red" - } - } -} diff --git a/benchmarks/auto/creation/qml.basictypes/delegates_basictype_bool.qml b/benchmarks/auto/creation/qml.basictypes/delegates_basictype_bool.qml deleted file mode 100644 index 7baf491..0000000 --- a/benchmarks/auto/creation/qml.basictypes/delegates_basictype_bool.qml +++ /dev/null @@ -1,13 +0,0 @@ -import QtQuick 2.0 -import QmlBench 1.0 - -// Tests the creation of the JS bool type as a property. -CreationBenchmark { - id: root; - count: 50 - staticCount: 2500 - delegate: Item { - property bool value: true - } -} - diff --git a/benchmarks/auto/creation/qml.basictypes/delegates_basictype_double.qml b/benchmarks/auto/creation/qml.basictypes/delegates_basictype_double.qml deleted file mode 100644 index cbeafa8..0000000 --- a/benchmarks/auto/creation/qml.basictypes/delegates_basictype_double.qml +++ /dev/null @@ -1,13 +0,0 @@ -import QtQuick 2.0 -import QmlBench 1.0 - -// Tests the creation of the JS double type as a property. -CreationBenchmark { - id: root; - count: 50 - staticCount: 2500 - delegate: Item { - property double value: 42.0 - } -} - diff --git a/benchmarks/auto/creation/qml.basictypes/delegates_basictype_int.qml b/benchmarks/auto/creation/qml.basictypes/delegates_basictype_int.qml deleted file mode 100644 index 8ed7952..0000000 --- a/benchmarks/auto/creation/qml.basictypes/delegates_basictype_int.qml +++ /dev/null @@ -1,13 +0,0 @@ -import QtQuick 2.0 -import QmlBench 1.0 - -// Tests the creation of the JS int type as a property. -CreationBenchmark { - id: root; - count: 50 - staticCount: 2500 - delegate: Item { - property int value: 42 - } -} - diff --git a/benchmarks/auto/creation/qml.basictypes/delegates_basictype_real.qml b/benchmarks/auto/creation/qml.basictypes/delegates_basictype_real.qml deleted file mode 100644 index 576841f..0000000 --- a/benchmarks/auto/creation/qml.basictypes/delegates_basictype_real.qml +++ /dev/null @@ -1,13 +0,0 @@ -import QtQuick 2.0 -import QmlBench 1.0 - -// Tests the creation of the JS real type as a property. -CreationBenchmark { - id: root; - count: 50 - staticCount: 2500 - delegate: Item { - property real value: 42.0 - } -} - diff --git a/benchmarks/auto/creation/qml.basictypes/delegates_basictype_string.qml b/benchmarks/auto/creation/qml.basictypes/delegates_basictype_string.qml deleted file mode 100644 index efa5cf4..0000000 --- a/benchmarks/auto/creation/qml.basictypes/delegates_basictype_string.qml +++ /dev/null @@ -1,13 +0,0 @@ -import QtQuick 2.0 -import QmlBench 1.0 - -// Tests the creation of the JS string type as a property. -CreationBenchmark { - id: root; - count: 50 - staticCount: 2500 - delegate: Item { - property string value: "42" - } -} - diff --git a/benchmarks/auto/creation/qml.basictypes/delegates_basictype_url.qml b/benchmarks/auto/creation/qml.basictypes/delegates_basictype_url.qml deleted file mode 100644 index f8953e8..0000000 --- a/benchmarks/auto/creation/qml.basictypes/delegates_basictype_url.qml +++ /dev/null @@ -1,13 +0,0 @@ -import QtQuick 2.0 -import QmlBench 1.0 - -// Tests the creation of the JS url type as a property. -CreationBenchmark { - id: root; - count: 50 - staticCount: 2500 - delegate: Item { - property url value: "some.url/some.resource" - } -} - diff --git a/benchmarks/auto/creation/qml.basictypes/delegates_basictype_var_array.qml b/benchmarks/auto/creation/qml.basictypes/delegates_basictype_var_array.qml deleted file mode 100644 index c9436b3..0000000 --- a/benchmarks/auto/creation/qml.basictypes/delegates_basictype_var_array.qml +++ /dev/null @@ -1,13 +0,0 @@ -import QtQuick 2.0 -import QmlBench 1.0 - -// Tests the creation of the JS var type as a property. -CreationBenchmark { - id: root; - count: 50 - staticCount: 2500 - delegate: Item { - property var value: [42] - } -} - diff --git a/benchmarks/auto/creation/qml.basictypes/delegates_basictype_var_bool.qml b/benchmarks/auto/creation/qml.basictypes/delegates_basictype_var_bool.qml deleted file mode 100644 index e514b6d..0000000 --- a/benchmarks/auto/creation/qml.basictypes/delegates_basictype_var_bool.qml +++ /dev/null @@ -1,13 +0,0 @@ -import QtQuick 2.0 -import QmlBench 1.0 - -// Tests the creation of the JS var type as a property. -CreationBenchmark { - id: root; - count: 50 - staticCount: 2500 - delegate: Item { - property var value: true - } -} - diff --git a/benchmarks/auto/creation/qml.basictypes/delegates_basictype_var_int.qml b/benchmarks/auto/creation/qml.basictypes/delegates_basictype_var_int.qml deleted file mode 100644 index 9b87f70..0000000 --- a/benchmarks/auto/creation/qml.basictypes/delegates_basictype_var_int.qml +++ /dev/null @@ -1,13 +0,0 @@ -import QtQuick 2.0 -import QmlBench 1.0 - -// Tests the creation of the JS var type as a property. -CreationBenchmark { - id: root; - count: 50 - staticCount: 2500 - delegate: Item { - property var value: 42 - } -} - diff --git a/benchmarks/auto/creation/qml.basictypes/delegates_basictype_var_object.qml b/benchmarks/auto/creation/qml.basictypes/delegates_basictype_var_object.qml deleted file mode 100644 index 1fc5fd2..0000000 --- a/benchmarks/auto/creation/qml.basictypes/delegates_basictype_var_object.qml +++ /dev/null @@ -1,13 +0,0 @@ -import QtQuick 2.0 -import QmlBench 1.0 - -// Tests the creation of the JS var type as a property. -CreationBenchmark { - id: root; - count: 50 - staticCount: 2500 - delegate: Item { - property var value: { 42: true } - } -} - diff --git a/benchmarks/auto/creation/qml.basictypes/delegates_basictype_var_string.qml b/benchmarks/auto/creation/qml.basictypes/delegates_basictype_var_string.qml deleted file mode 100644 index cc61b6d..0000000 --- a/benchmarks/auto/creation/qml.basictypes/delegates_basictype_var_string.qml +++ /dev/null @@ -1,13 +0,0 @@ -import QtQuick 2.0 -import QmlBench 1.0 - -// Tests the creation of the JS var type as a property. -CreationBenchmark { - id: root; - count: 50 - staticCount: 2500 - delegate: Item { - property var value: "42" - } -} - diff --git a/benchmarks/auto/creation/qml.basictypes/delegates_basictype_variant_array.qml b/benchmarks/auto/creation/qml.basictypes/delegates_basictype_variant_array.qml deleted file mode 100644 index e220943..0000000 --- a/benchmarks/auto/creation/qml.basictypes/delegates_basictype_variant_array.qml +++ /dev/null @@ -1,14 +0,0 @@ -import QtQuick 2.0 -import QmlBench 1.0 - -// Tests the creation of the JS variant type as a property. -CreationBenchmark { - id: root; - count: 50 - staticCount: 2500 - delegate: Item { - property var value: [42] - } -} - - diff --git a/benchmarks/auto/creation/qml.basictypes/delegates_basictype_variant_bool.qml b/benchmarks/auto/creation/qml.basictypes/delegates_basictype_variant_bool.qml deleted file mode 100644 index 478bfb4..0000000 --- a/benchmarks/auto/creation/qml.basictypes/delegates_basictype_variant_bool.qml +++ /dev/null @@ -1,14 +0,0 @@ -import QtQuick 2.0 -import QmlBench 1.0 - -// Tests the creation of the JS variant type as a property. -CreationBenchmark { - id: root; - count: 50 - staticCount: 2500 - delegate: Item { - property variant value: true - } -} - - diff --git a/benchmarks/auto/creation/qml.basictypes/delegates_basictype_variant_int.qml b/benchmarks/auto/creation/qml.basictypes/delegates_basictype_variant_int.qml deleted file mode 100644 index da3a5f9..0000000 --- a/benchmarks/auto/creation/qml.basictypes/delegates_basictype_variant_int.qml +++ /dev/null @@ -1,14 +0,0 @@ -import QtQuick 2.0 -import QmlBench 1.0 - -// Tests the creation of the JS variant type as a property. -CreationBenchmark { - id: root; - count: 50 - staticCount: 2500 - delegate: Item { - property variant value: 42 - } -} - - diff --git a/benchmarks/auto/creation/qml.basictypes/delegates_basictype_variant_object.qml b/benchmarks/auto/creation/qml.basictypes/delegates_basictype_variant_object.qml deleted file mode 100644 index 4b2a863..0000000 --- a/benchmarks/auto/creation/qml.basictypes/delegates_basictype_variant_object.qml +++ /dev/null @@ -1,14 +0,0 @@ -import QtQuick 2.0 -import QmlBench 1.0 - -// Tests the creation of the JS variant type as a property. -CreationBenchmark { - id: root; - count: 50 - staticCount: 2500 - delegate: Item { - property variant value: { 42: true } - } -} - - diff --git a/benchmarks/auto/creation/qml.basictypes/delegates_basictype_variant_string.qml b/benchmarks/auto/creation/qml.basictypes/delegates_basictype_variant_string.qml deleted file mode 100644 index d8175f2..0000000 --- a/benchmarks/auto/creation/qml.basictypes/delegates_basictype_variant_string.qml +++ /dev/null @@ -1,14 +0,0 @@ -import QtQuick 2.0 -import QmlBench 1.0 - -// Tests the creation of the JS variant type as a property. -CreationBenchmark { - id: root; - count: 50 - staticCount: 2500 - delegate: Item { - property variant value: "42" - } -} - - diff --git a/benchmarks/auto/creation/qml.modelaccess/modelaccess_bool.qml b/benchmarks/auto/creation/qml.modelaccess/modelaccess_bool.qml deleted file mode 100644 index 54f86f4..0000000 --- a/benchmarks/auto/creation/qml.modelaccess/modelaccess_bool.qml +++ /dev/null @@ -1,24 +0,0 @@ -import QtQuick 2.0 -import QmlBench 1.0 - -// Tests access of bool properties from a C++ model -Benchmark { - id: root; - count: 50 - staticCount: 2500 - - onTChanged: { - testModel.rowNumber = 0 - testModel.rowNumber = root.count - } - - Repeater { - model: TestModel { - id: testModel - } - delegate: Item { - property bool value: model.boolRole - } - } -} - diff --git a/benchmarks/auto/creation/qml.modelaccess/modelaccess_bytearray.qml b/benchmarks/auto/creation/qml.modelaccess/modelaccess_bytearray.qml deleted file mode 100644 index 1bd73e6..0000000 --- a/benchmarks/auto/creation/qml.modelaccess/modelaccess_bytearray.qml +++ /dev/null @@ -1,24 +0,0 @@ -import QtQuick 2.0 -import QmlBench 1.0 - -// Tests access of bytearray properties from a C++ model -Benchmark { - id: root; - count: 50 - staticCount: 2500 - - onTChanged: { - testModel.rowNumber = 0 - testModel.rowNumber = root.count - } - - Repeater { - model: TestModel { - id: testModel - } - delegate: Item { - property var value: model.byteArrayRole - } - } -} - diff --git a/benchmarks/auto/creation/qml.modelaccess/modelaccess_color.qml b/benchmarks/auto/creation/qml.modelaccess/modelaccess_color.qml deleted file mode 100644 index 65cdd4f..0000000 --- a/benchmarks/auto/creation/qml.modelaccess/modelaccess_color.qml +++ /dev/null @@ -1,24 +0,0 @@ -import QtQuick 2.0 -import QmlBench 1.0 - -// Tests access of color properties from a C++ model -Benchmark { - id: root; - count: 50 - staticCount: 2500 - - onTChanged: { - testModel.rowNumber = 0 - testModel.rowNumber = root.count - } - - Repeater { - model: TestModel { - id: testModel - } - delegate: Item { - property color value: model.colorRole - } - } -} - diff --git a/benchmarks/auto/creation/qml.modelaccess/modelaccess_datetime.qml b/benchmarks/auto/creation/qml.modelaccess/modelaccess_datetime.qml deleted file mode 100644 index 91205e9..0000000 --- a/benchmarks/auto/creation/qml.modelaccess/modelaccess_datetime.qml +++ /dev/null @@ -1,24 +0,0 @@ -import QtQuick 2.0 -import QmlBench 1.0 - -// Tests access of datetime properties from a C++ model -Benchmark { - id: root; - count: 50 - staticCount: 2500 - - onTChanged: { - testModel.rowNumber = 0 - testModel.rowNumber = root.count - } - - Repeater { - model: TestModel { - id: testModel - } - delegate: Item { - property date value: model.dateTimeRole - } - } -} - diff --git a/benchmarks/auto/creation/qml.modelaccess/modelaccess_int.qml b/benchmarks/auto/creation/qml.modelaccess/modelaccess_int.qml deleted file mode 100644 index 5eb06bf..0000000 --- a/benchmarks/auto/creation/qml.modelaccess/modelaccess_int.qml +++ /dev/null @@ -1,24 +0,0 @@ -import QtQuick 2.0 -import QmlBench 1.0 - -// Tests access of int properties from a C++ model -Benchmark { - id: root; - count: 50 - staticCount: 2500 - - onTChanged: { - testModel.rowNumber = 0 - testModel.rowNumber = root.count - } - - Repeater { - model: TestModel { - id: testModel - } - delegate: Item { - property int value: model.intRole - } - } -} - diff --git a/benchmarks/auto/creation/qml.modelaccess/modelaccess_jsvalue.qml b/benchmarks/auto/creation/qml.modelaccess/modelaccess_jsvalue.qml deleted file mode 100644 index 8e5d0fc..0000000 --- a/benchmarks/auto/creation/qml.modelaccess/modelaccess_jsvalue.qml +++ /dev/null @@ -1,24 +0,0 @@ -import QtQuick 2.0 -import QmlBench 1.0 - -// Tests access of jsvalue properties from a C++ model -Benchmark { - id: root; - count: 50 - staticCount: 2500 - - onTChanged: { - testModel.rowNumber = 0 - testModel.rowNumber = root.count - } - - Repeater { - model: TestModel { - id: testModel - } - delegate: Item { - property var value: model.jsValueRole - } - } -} - diff --git a/benchmarks/auto/creation/qml.modelaccess/modelaccess_point.qml b/benchmarks/auto/creation/qml.modelaccess/modelaccess_point.qml deleted file mode 100644 index d107e3b..0000000 --- a/benchmarks/auto/creation/qml.modelaccess/modelaccess_point.qml +++ /dev/null @@ -1,24 +0,0 @@ -import QtQuick 2.0 -import QmlBench 1.0 - -// Tests access of point properties from a C++ model -Benchmark { - id: root; - count: 50 - staticCount: 2500 - - onTChanged: { - testModel.rowNumber = 0 - testModel.rowNumber = root.count - } - - Repeater { - model: TestModel { - id: testModel - } - delegate: Item { - property point value: model.pointRole - } - } -} - diff --git a/benchmarks/auto/creation/qml.modelaccess/modelaccess_real.qml b/benchmarks/auto/creation/qml.modelaccess/modelaccess_real.qml deleted file mode 100644 index 2d66c38..0000000 --- a/benchmarks/auto/creation/qml.modelaccess/modelaccess_real.qml +++ /dev/null @@ -1,24 +0,0 @@ -import QtQuick 2.0 -import QmlBench 1.0 - -// Tests access of real properties from a C++ model -Benchmark { - id: root; - count: 50 - staticCount: 2500 - - onTChanged: { - testModel.rowNumber = 0 - testModel.rowNumber = root.count - } - - Repeater { - model: TestModel { - id: testModel - } - delegate: Item { - property real value: model.realRole - } - } -} - diff --git a/benchmarks/auto/creation/qml.modelaccess/modelaccess_rect.qml b/benchmarks/auto/creation/qml.modelaccess/modelaccess_rect.qml deleted file mode 100644 index 9caad53..0000000 --- a/benchmarks/auto/creation/qml.modelaccess/modelaccess_rect.qml +++ /dev/null @@ -1,24 +0,0 @@ -import QtQuick 2.0 -import QmlBench 1.0 - -// Tests access of rect properties from a C++ model -Benchmark { - id: root; - count: 50 - staticCount: 2500 - - onTChanged: { - testModel.rowNumber = 0 - testModel.rowNumber = root.count - } - - Repeater { - model: TestModel { - id: testModel - } - delegate: Item { - property rect value: model.rectRole - } - } -} - diff --git a/benchmarks/auto/creation/qml.modelaccess/modelaccess_size.qml b/benchmarks/auto/creation/qml.modelaccess/modelaccess_size.qml deleted file mode 100644 index be8d0ce..0000000 --- a/benchmarks/auto/creation/qml.modelaccess/modelaccess_size.qml +++ /dev/null @@ -1,24 +0,0 @@ -import QtQuick 2.0 -import QmlBench 1.0 - -// Tests access of size properties from a C++ model -Benchmark { - id: root; - count: 50 - staticCount: 2500 - - onTChanged: { - testModel.rowNumber = 0 - testModel.rowNumber = root.count - } - - Repeater { - model: TestModel { - id: testModel - } - delegate: Item { - property size value: model.sizeRole - } - } -} - diff --git a/benchmarks/auto/creation/qml.modelaccess/modelaccess_string.qml b/benchmarks/auto/creation/qml.modelaccess/modelaccess_string.qml deleted file mode 100644 index 5217816..0000000 --- a/benchmarks/auto/creation/qml.modelaccess/modelaccess_string.qml +++ /dev/null @@ -1,24 +0,0 @@ -import QtQuick 2.0 -import QmlBench 1.0 - -// Tests access of string properties from a C++ model -Benchmark { - id: root; - count: 50 - staticCount: 2500 - - onTChanged: { - testModel.rowNumber = 0 - testModel.rowNumber = root.count - } - - Repeater { - model: TestModel { - id: testModel - } - delegate: Item { - property string value: model.stringRole - } - } -} - diff --git a/benchmarks/auto/creation/qml.modelaccess/modelaccess_url.qml b/benchmarks/auto/creation/qml.modelaccess/modelaccess_url.qml deleted file mode 100644 index eb314bb..0000000 --- a/benchmarks/auto/creation/qml.modelaccess/modelaccess_url.qml +++ /dev/null @@ -1,24 +0,0 @@ -import QtQuick 2.0 -import QmlBench 1.0 - -// Tests access of url properties from a C++ model -Benchmark { - id: root; - count: 50 - staticCount: 2500 - - onTChanged: { - testModel.rowNumber = 0 - testModel.rowNumber = root.count - } - - Repeater { - model: TestModel { - id: testModel - } - delegate: Item { - property url value: model.urlRole - } - } -} - diff --git a/benchmarks/auto/creation/qtgraphicaleffects/delegates_dropshadow.qml b/benchmarks/auto/creation/qtgraphicaleffects/delegates_dropshadow.qml deleted file mode 100644 index 075d74d..0000000 --- a/benchmarks/auto/creation/qtgraphicaleffects/delegates_dropshadow.qml +++ /dev/null @@ -1,47 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2019 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the qmlbench tool. -** -** $QT_BEGIN_LICENSE:GPL-EXCEPT$ -** 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 https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 as published by the Free Software -** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.0 -import QtGraphicalEffects 1.0 -import QmlBench 1.0 - -CreationBenchmark { - id: root - count: 50 - staticCount: 100 - delegate: Rectangle { - x: QmlBench.getRandom() * (root.width - width) - y: QmlBench.getRandom() * (root.height - height) - width: 30 - height: 15 - layer.enabled: true - layer.effect: DropShadow { - } - } -} - diff --git a/benchmarks/auto/creation/qtgraphicaleffects/delegates_lineargradient.qml b/benchmarks/auto/creation/qtgraphicaleffects/delegates_lineargradient.qml deleted file mode 100644 index 2904bdc..0000000 --- a/benchmarks/auto/creation/qtgraphicaleffects/delegates_lineargradient.qml +++ /dev/null @@ -1,22 +0,0 @@ -import QtQuick 2.0 -import QtGraphicalEffects 1.0 -import QmlBench 1.0 - -// Tests the creation of LinearGradient. -// The values chosen match those in delegates_rect_gradient, so performance can be directly compared -CreationBenchmark { - id: root; - count: 50; - staticCount: 2500; - delegate: LinearGradient { - x: QmlBench.getRandom() * (root.width - width) - y: QmlBench.getRandom() * (root.height - height) - width: 30 - height: 15 - gradient: Gradient { - GradientStop { position: 0.0; color: "#ff0000" } - GradientStop { position: 1.0; color: "#0000ff" } - } - } -} - diff --git a/benchmarks/auto/creation/quick.basictypes/delegates_basictype_color.qml b/benchmarks/auto/creation/quick.basictypes/delegates_basictype_color.qml deleted file mode 100644 index f777a8e..0000000 --- a/benchmarks/auto/creation/quick.basictypes/delegates_basictype_color.qml +++ /dev/null @@ -1,13 +0,0 @@ -import QtQuick 2.0 -import QmlBench 1.0 - -// Tests the creation of the JS color type as a property. -CreationBenchmark { - id: root; - count: 50 - staticCount: 2500 - delegate: Item { - property color value: "#ff0000" - } -} - diff --git a/benchmarks/auto/creation/quick.basictypes/delegates_basictype_color_argb.qml b/benchmarks/auto/creation/quick.basictypes/delegates_basictype_color_argb.qml deleted file mode 100644 index 24582cb..0000000 --- a/benchmarks/auto/creation/quick.basictypes/delegates_basictype_color_argb.qml +++ /dev/null @@ -1,13 +0,0 @@ -import QtQuick 2.0 -import QmlBench 1.0 - -// Tests the creation of the JS color type as a property. -CreationBenchmark { - id: root; - count: 50 - staticCount: 2500 - delegate: Item { - property color value: "#ffff0000" - } -} - diff --git a/benchmarks/auto/creation/quick.basictypes/delegates_basictype_color_name.qml b/benchmarks/auto/creation/quick.basictypes/delegates_basictype_color_name.qml deleted file mode 100644 index 2815fc9..0000000 --- a/benchmarks/auto/creation/quick.basictypes/delegates_basictype_color_name.qml +++ /dev/null @@ -1,13 +0,0 @@ -import QtQuick 2.0 -import QmlBench 1.0 - -// Tests the creation of the JS color type as a property. -CreationBenchmark { - id: root; - count: 50 - staticCount: 2500 - delegate: Item { - property color value: "red" - } -} - diff --git a/benchmarks/auto/creation/quick.basictypes/delegates_basictype_date.qml b/benchmarks/auto/creation/quick.basictypes/delegates_basictype_date.qml deleted file mode 100644 index ea93f0e..0000000 --- a/benchmarks/auto/creation/quick.basictypes/delegates_basictype_date.qml +++ /dev/null @@ -1,13 +0,0 @@ -import QtQuick 2.0 -import QmlBench 1.0 - -// Tests the creation of the JS Date type as a property. -CreationBenchmark { - id: root; - count: 50 - staticCount: 2500 - delegate: Item { - property date value: "2000-01-01" - } -} - diff --git a/benchmarks/auto/creation/quick.basictypes/delegates_basictype_date_object.qml b/benchmarks/auto/creation/quick.basictypes/delegates_basictype_date_object.qml deleted file mode 100644 index 59c1655..0000000 --- a/benchmarks/auto/creation/quick.basictypes/delegates_basictype_date_object.qml +++ /dev/null @@ -1,13 +0,0 @@ -import QtQuick 2.0 -import QmlBench 1.0 - -// Tests the creation of the JS Date type as a property. -CreationBenchmark { - id: root; - count: 50 - staticCount: 2500 - delegate: Item { - property date value: new Date() - } -} - diff --git a/benchmarks/auto/creation/quick.basictypes/delegates_basictype_matrix4x4.qml b/benchmarks/auto/creation/quick.basictypes/delegates_basictype_matrix4x4.qml deleted file mode 100644 index b7112da..0000000 --- a/benchmarks/auto/creation/quick.basictypes/delegates_basictype_matrix4x4.qml +++ /dev/null @@ -1,13 +0,0 @@ -import QtQuick 2.0 -import QmlBench 1.0 - -// Tests the creation of the JS matrix4x4 type as a property. -CreationBenchmark { - id: root; - count: 50 - staticCount: 2500 - delegate: Item { - property matrix4x4 value: Qt.matrix4x4(1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16); - } -} - diff --git a/benchmarks/auto/creation/quick.basictypes/delegates_basictype_point.qml b/benchmarks/auto/creation/quick.basictypes/delegates_basictype_point.qml deleted file mode 100644 index 9b29234..0000000 --- a/benchmarks/auto/creation/quick.basictypes/delegates_basictype_point.qml +++ /dev/null @@ -1,13 +0,0 @@ -import QtQuick 2.0 -import QmlBench 1.0 - -// Tests the creation of the JS point type as a property. -CreationBenchmark { - id: root; - count: 50 - staticCount: 2500 - delegate: Item { - property point value: Qt.point(0, 20) - } -} - diff --git a/benchmarks/auto/creation/quick.basictypes/delegates_basictype_quaternion.qml b/benchmarks/auto/creation/quick.basictypes/delegates_basictype_quaternion.qml deleted file mode 100644 index 304b373..0000000 --- a/benchmarks/auto/creation/quick.basictypes/delegates_basictype_quaternion.qml +++ /dev/null @@ -1,13 +0,0 @@ -import QtQuick 2.0 -import QmlBench 1.0 - -// Tests the creation of the JS quaternion type as a property. -CreationBenchmark { - id: root; - count: 50 - staticCount: 2500 - delegate: Item { - property quaternion value: Qt.quaternion(2, 17, 0.9, 0.6) - } -} - diff --git a/benchmarks/auto/creation/quick.basictypes/delegates_basictype_rect.qml b/benchmarks/auto/creation/quick.basictypes/delegates_basictype_rect.qml deleted file mode 100644 index 297ec4c..0000000 --- a/benchmarks/auto/creation/quick.basictypes/delegates_basictype_rect.qml +++ /dev/null @@ -1,13 +0,0 @@ -import QtQuick 2.0 -import QmlBench 1.0 - -// Tests the creation of the JS rect type as a property. -CreationBenchmark { - id: root; - count: 50 - staticCount: 2500 - delegate: Item { - property rect value: Qt.rect(0, 0, 10, 10) - } -} - diff --git a/benchmarks/auto/creation/quick.basictypes/delegates_basictype_size.qml b/benchmarks/auto/creation/quick.basictypes/delegates_basictype_size.qml deleted file mode 100644 index e947cc1..0000000 --- a/benchmarks/auto/creation/quick.basictypes/delegates_basictype_size.qml +++ /dev/null @@ -1,13 +0,0 @@ -import QtQuick 2.0 -import QmlBench 1.0 - -// Tests the creation of the JS size type as a property. -CreationBenchmark { - id: root; - count: 50 - staticCount: 2500 - delegate: Item { - property size value: Qt.size(0, 150) - } -} - diff --git a/benchmarks/auto/creation/quick.basictypes/delegates_basictype_var_size.qml b/benchmarks/auto/creation/quick.basictypes/delegates_basictype_var_size.qml deleted file mode 100644 index b8edd7c..0000000 --- a/benchmarks/auto/creation/quick.basictypes/delegates_basictype_var_size.qml +++ /dev/null @@ -1,14 +0,0 @@ -import QtQuick 2.0 -import QmlBench 1.0 - -// Tests the creation of the JS var type as a property. -CreationBenchmark { - id: root; - count: 50 - staticCount: 2500 - delegate: Item { - property var value: Qt.size(0, 150) - } -} - - diff --git a/benchmarks/auto/creation/quick.basictypes/delegates_basictype_variant_size.qml b/benchmarks/auto/creation/quick.basictypes/delegates_basictype_variant_size.qml deleted file mode 100644 index 112df7f..0000000 --- a/benchmarks/auto/creation/quick.basictypes/delegates_basictype_variant_size.qml +++ /dev/null @@ -1,15 +0,0 @@ -import QtQuick 2.0 -import QmlBench 1.0 - -// Tests the creation of the JS variant type as a property. -CreationBenchmark { - id: root; - count: 50 - staticCount: 2500 - delegate: Item { - property variant value: Qt.size(0, 150) - } -} - - - diff --git a/benchmarks/auto/creation/quick.basictypes/delegates_basictype_vector2d.qml b/benchmarks/auto/creation/quick.basictypes/delegates_basictype_vector2d.qml deleted file mode 100644 index 09d13ac..0000000 --- a/benchmarks/auto/creation/quick.basictypes/delegates_basictype_vector2d.qml +++ /dev/null @@ -1,13 +0,0 @@ -import QtQuick 2.0 -import QmlBench 1.0 - -// Tests the creation of the JS vector2d type as a property. -CreationBenchmark { - id: root; - count: 50 - staticCount: 2500 - delegate: Item { - property vector2d value: Qt.vector2d(1, 2) - } -} - diff --git a/benchmarks/auto/creation/quick.basictypes/delegates_basictype_vector3d.qml b/benchmarks/auto/creation/quick.basictypes/delegates_basictype_vector3d.qml deleted file mode 100644 index 29f9669..0000000 --- a/benchmarks/auto/creation/quick.basictypes/delegates_basictype_vector3d.qml +++ /dev/null @@ -1,13 +0,0 @@ -import QtQuick 2.0 -import QmlBench 1.0 - -// Tests the creation of the JS vector3d type as a property. -CreationBenchmark { - id: root; - count: 50 - staticCount: 2500 - delegate: Item { - property vector3d value: Qt.vector3d(1, 2, 0) - } -} - diff --git a/benchmarks/auto/creation/quick.basictypes/delegates_basictype_vector4d.qml b/benchmarks/auto/creation/quick.basictypes/delegates_basictype_vector4d.qml deleted file mode 100644 index 3db91fc..0000000 --- a/benchmarks/auto/creation/quick.basictypes/delegates_basictype_vector4d.qml +++ /dev/null @@ -1,13 +0,0 @@ -import QtQuick 2.0 -import QmlBench 1.0 - -// Tests the creation of the JS vector4d type as a property. -CreationBenchmark { - id: root; - count: 50 - staticCount: 2500 - delegate: Item { - property vector4d value: Qt.vector4d(1, 2, 3, 4) - } -} - diff --git a/benchmarks/auto/creation/quick.canvas/delegates_canvas_fbo_cooperative.qml b/benchmarks/auto/creation/quick.canvas/delegates_canvas_fbo_cooperative.qml deleted file mode 100644 index e9f7e49..0000000 --- a/benchmarks/auto/creation/quick.canvas/delegates_canvas_fbo_cooperative.qml +++ /dev/null @@ -1,20 +0,0 @@ -import QtQuick 2.0 -import QmlBench 1.0 - -// Testing the performance of creating a canvas -CreationBenchmark { - id: root; - count: 50; - staticCount: 2500; - delegate: Canvas { - x: QmlBench.getRandom() * (root.width - width) - y: QmlBench.getRandom() * (root.height - height) - width: 30 - height: 15 - renderTarget: Canvas.FramebufferObject - renderStrategy: Canvas.Cooperative - // *just* measuring canvas creation. nothing else. - } -} - - diff --git a/benchmarks/auto/creation/quick.canvas/delegates_canvas_fbo_immediate.qml b/benchmarks/auto/creation/quick.canvas/delegates_canvas_fbo_immediate.qml deleted file mode 100644 index f9f55b3..0000000 --- a/benchmarks/auto/creation/quick.canvas/delegates_canvas_fbo_immediate.qml +++ /dev/null @@ -1,20 +0,0 @@ -import QtQuick 2.0 -import QmlBench 1.0 - -// Testing the performance of creating a canvas -CreationBenchmark { - id: root; - count: 50; - staticCount: 2500; - delegate: Canvas { - x: QmlBench.getRandom() * (root.width - width) - y: QmlBench.getRandom() * (root.height - height) - width: 30 - height: 15 - renderTarget: Canvas.FramebufferObject - renderStrategy: Canvas.Immediate - // *just* measuring canvas creation. nothing else. - } -} - - diff --git a/benchmarks/auto/creation/quick.canvas/delegates_canvas_fbo_threaded.qml b/benchmarks/auto/creation/quick.canvas/delegates_canvas_fbo_threaded.qml deleted file mode 100644 index dd351f9..0000000 --- a/benchmarks/auto/creation/quick.canvas/delegates_canvas_fbo_threaded.qml +++ /dev/null @@ -1,19 +0,0 @@ -import QtQuick 2.0 -import QmlBench 1.0 - -// Testing the performance of creating a canvas -CreationBenchmark { - id: root; - count: 50; - staticCount: 2500; - delegate: Canvas { - x: QmlBench.getRandom() * (root.width - width) - y: QmlBench.getRandom() * (root.height - height) - width: 30 - height: 15 - renderTarget: Canvas.FramebufferObject - renderStrategy: Canvas.Threaded - // *just* measuring canvas creation. nothing else. - } -} - diff --git a/benchmarks/auto/creation/quick.canvas/delegates_canvas_image_cooperative.qml b/benchmarks/auto/creation/quick.canvas/delegates_canvas_image_cooperative.qml deleted file mode 100644 index 1c2be52..0000000 --- a/benchmarks/auto/creation/quick.canvas/delegates_canvas_image_cooperative.qml +++ /dev/null @@ -1,20 +0,0 @@ -import QtQuick 2.0 -import QmlBench 1.0 - -// Testing the performance of creating a canvas -CreationBenchmark { - id: root; - count: 50; - staticCount: 2500; - delegate: Canvas { - x: QmlBench.getRandom() * (root.width - width) - y: QmlBench.getRandom() * (root.height - height) - width: 30 - height: 15 - renderTarget: Canvas.Image - renderStrategy: Canvas.Cooperative - // *just* measuring canvas creation. nothing else. - } -} - - diff --git a/benchmarks/auto/creation/quick.canvas/delegates_canvas_image_immediate.qml b/benchmarks/auto/creation/quick.canvas/delegates_canvas_image_immediate.qml deleted file mode 100644 index 3deb640..0000000 --- a/benchmarks/auto/creation/quick.canvas/delegates_canvas_image_immediate.qml +++ /dev/null @@ -1,19 +0,0 @@ -import QtQuick 2.0 -import QmlBench 1.0 - -// Testing the performance of creating a canvas -CreationBenchmark { - id: root; - count: 50; - staticCount: 2500; - delegate: Canvas { - x: QmlBench.getRandom() * (root.width - width) - y: QmlBench.getRandom() * (root.height - height) - width: 30 - height: 15 - renderTarget: Canvas.Image - renderStrategy: Canvas.Immediate - // *just* measuring canvas creation. nothing else. - } -} - diff --git a/benchmarks/auto/creation/quick.canvas/delegates_canvas_image_threaded.qml b/benchmarks/auto/creation/quick.canvas/delegates_canvas_image_threaded.qml deleted file mode 100644 index 49d2587..0000000 --- a/benchmarks/auto/creation/quick.canvas/delegates_canvas_image_threaded.qml +++ /dev/null @@ -1,19 +0,0 @@ -import QtQuick 2.0 -import QmlBench 1.0 - -// Testing the performance of creating a canvas -CreationBenchmark { - id: root; - count: 50; - staticCount: 2500; - delegate: Canvas { - x: QmlBench.getRandom() * (root.width - width) - y: QmlBench.getRandom() * (root.height - height) - width: 30 - height: 15 - renderTarget: Canvas.Image - renderStrategy: Canvas.Threaded - // *just* measuring canvas creation. nothing else. - } -} - diff --git a/benchmarks/auto/creation/quick.controls2/delegates_busyindicator.qml b/benchmarks/auto/creation/quick.controls2/delegates_busyindicator.qml deleted file mode 100644 index 6706d51..0000000 --- a/benchmarks/auto/creation/quick.controls2/delegates_busyindicator.qml +++ /dev/null @@ -1,15 +0,0 @@ -import QtQuick 2.0 -import QmlBench 1.0 -import QtQuick.Controls 2.0 - -// Tests the creation of QQC2's BusyIndicator type. -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/benchmarks/auto/creation/quick.controls2/delegates_button.qml b/benchmarks/auto/creation/quick.controls2/delegates_button.qml deleted file mode 100644 index ab9b939..0000000 --- a/benchmarks/auto/creation/quick.controls2/delegates_button.qml +++ /dev/null @@ -1,16 +0,0 @@ -import QtQuick 2.0 -import QmlBench 1.0 -import QtQuick.Controls 2.0 - -// Tests the creation of QQC2's Button type. -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/benchmarks/auto/creation/quick.controls2/delegates_checkbox.qml b/benchmarks/auto/creation/quick.controls2/delegates_checkbox.qml deleted file mode 100644 index 4603acb..0000000 --- a/benchmarks/auto/creation/quick.controls2/delegates_checkbox.qml +++ /dev/null @@ -1,16 +0,0 @@ -import QtQuick 2.0 -import QmlBench 1.0 -import QtQuick.Controls 2.0 - -// Tests the creation of QQC2's CheckBox type. -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/benchmarks/auto/creation/quick.controls2/delegates_combobox.qml b/benchmarks/auto/creation/quick.controls2/delegates_combobox.qml deleted file mode 100644 index 7eef93a..0000000 --- a/benchmarks/auto/creation/quick.controls2/delegates_combobox.qml +++ /dev/null @@ -1,16 +0,0 @@ -import QtQuick 2.0 -import QmlBench 1.0 -import QtQuick.Controls 2.0 - -// Tests the creation of QQC2's ComboBox type. -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/benchmarks/auto/creation/quick.controls2/delegates_dial.qml b/benchmarks/auto/creation/quick.controls2/delegates_dial.qml deleted file mode 100644 index a245f2c..0000000 --- a/benchmarks/auto/creation/quick.controls2/delegates_dial.qml +++ /dev/null @@ -1,15 +0,0 @@ -import QtQuick 2.0 -import QmlBench 1.0 -import QtQuick.Controls 2.0 - -// Tests the creation of QQC2's Dial type. -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/benchmarks/auto/creation/quick.controls2/delegates_itemdelegate.qml b/benchmarks/auto/creation/quick.controls2/delegates_itemdelegate.qml deleted file mode 100644 index 61f7c64..0000000 --- a/benchmarks/auto/creation/quick.controls2/delegates_itemdelegate.qml +++ /dev/null @@ -1,16 +0,0 @@ -import QtQuick 2.0 -import QmlBench 1.0 -import QtQuick.Controls 2.0 - -// Tests the creation of QQC2's ItemDelegate type. -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/benchmarks/auto/creation/quick.controls2/delegates_label.qml b/benchmarks/auto/creation/quick.controls2/delegates_label.qml deleted file mode 100644 index 7624e90..0000000 --- a/benchmarks/auto/creation/quick.controls2/delegates_label.qml +++ /dev/null @@ -1,15 +0,0 @@ -import QtQuick 2.0 -import QmlBench 1.0 -import QtQuick.Controls 2.0 - -// Tests the creation of QQC2's Label type. -CreationBenchmark { - id: root - count: 20 - staticCount: 1000 - delegate: Label { - x: QmlBench.getRandom() * root.width - width - y: QmlBench.getRandom() * root.height - height - text: "Qt Quick!" - } -} diff --git a/benchmarks/auto/creation/quick.controls2/delegates_menu_custom.qml b/benchmarks/auto/creation/quick.controls2/delegates_menu_custom.qml deleted file mode 100644 index 71a5b98..0000000 --- a/benchmarks/auto/creation/quick.controls2/delegates_menu_custom.qml +++ /dev/null @@ -1,47 +0,0 @@ -import QmlBench 1.0 -import QtQuick 2.10 -import QtQuick.Controls 2.3 - -CreationBenchmark { - id: root - count: 2 - staticCount: 25 - - Component { - id: menuItemComponent - - MenuItem { - contentItem: Text { - text: parent.text - color: "navajowhite" - } - background: Rectangle { - color: "steelblue" - } - } - } - - delegate: Item { - Menu { - id: menu - title: "Root Menu" - delegate: menuItemComponent - visible: true - - Menu { - title: "Sub-menu 1" - delegate: menuItemComponent - - Menu { - title: "Sub-sub-menu" - delegate: menuItemComponent - } - } - - Menu { title: "Sub-menu 2" } - Action { text: "Action 3" } - Action { text: "Action 4" } - Action { text: "Action 5" } - } - } -} diff --git a/benchmarks/auto/creation/quick.controls2/delegates_menuitem.qml b/benchmarks/auto/creation/quick.controls2/delegates_menuitem.qml deleted file mode 100644 index adefbc7..0000000 --- a/benchmarks/auto/creation/quick.controls2/delegates_menuitem.qml +++ /dev/null @@ -1,18 +0,0 @@ -import QtQuick 2.0 -import QmlBench 1.0 -import QtQuick.Controls 2.0 - -// Tests the creation of QQC2's MenuItem type. -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/benchmarks/auto/creation/quick.controls2/delegates_progressbar.qml b/benchmarks/auto/creation/quick.controls2/delegates_progressbar.qml deleted file mode 100644 index 6c2475d..0000000 --- a/benchmarks/auto/creation/quick.controls2/delegates_progressbar.qml +++ /dev/null @@ -1,15 +0,0 @@ -import QtQuick 2.0 -import QmlBench 1.0 -import QtQuick.Controls 2.0 - -// Tests the creation of QQC2's ProgressBar type. -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/benchmarks/auto/creation/quick.controls2/delegates_radiobutton.qml b/benchmarks/auto/creation/quick.controls2/delegates_radiobutton.qml deleted file mode 100644 index 86847cf..0000000 --- a/benchmarks/auto/creation/quick.controls2/delegates_radiobutton.qml +++ /dev/null @@ -1,17 +0,0 @@ -import QtQuick 2.0 -import QmlBench 1.0 -import QtQuick.Controls 2.0 - -// Tests the creation of QQC2's RadioButton type. -CreationBenchmark { - id: root - count: 20 - staticCount: 1000 - delegate: RadioButton { - x: QmlBench.getRandom() * root.width - width - y: QmlBench.getRandom() * root.height - height - text: "CheckBox" - autoExclusive: false - checked: index % 2 - } -} diff --git a/benchmarks/auto/creation/quick.controls2/delegates_scrollbar.qml b/benchmarks/auto/creation/quick.controls2/delegates_scrollbar.qml deleted file mode 100644 index 8e73e9d..0000000 --- a/benchmarks/auto/creation/quick.controls2/delegates_scrollbar.qml +++ /dev/null @@ -1,18 +0,0 @@ -import QtQuick 2.0 -import QmlBench 1.0 -import QtQuick.Controls 2.0 - -// Tests the creation of QQC2's ScrollBar type. -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/benchmarks/auto/creation/quick.controls2/delegates_scrollview.qml b/benchmarks/auto/creation/quick.controls2/delegates_scrollview.qml deleted file mode 100644 index eea7e34..0000000 --- a/benchmarks/auto/creation/quick.controls2/delegates_scrollview.qml +++ /dev/null @@ -1,24 +0,0 @@ -import QtQuick 2.0 -import QmlBench 1.0 -import QtQuick.Controls 2.2 - -// Tests the creation of QQC2's ScrollView type. -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/benchmarks/auto/creation/quick.controls2/delegates_slider.qml b/benchmarks/auto/creation/quick.controls2/delegates_slider.qml deleted file mode 100644 index bf6df75..0000000 --- a/benchmarks/auto/creation/quick.controls2/delegates_slider.qml +++ /dev/null @@ -1,15 +0,0 @@ -import QtQuick 2.0 -import QmlBench 1.0 -import QtQuick.Controls 2.0 - -// Tests the creation of QQC2's Slider type. -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/benchmarks/auto/creation/quick.controls2/delegates_spinbox.qml b/benchmarks/auto/creation/quick.controls2/delegates_spinbox.qml deleted file mode 100644 index 4ac4a95..0000000 --- a/benchmarks/auto/creation/quick.controls2/delegates_spinbox.qml +++ /dev/null @@ -1,15 +0,0 @@ -import QtQuick 2.0 -import QmlBench 1.0 -import QtQuick.Controls 2.0 - -// Tests the creation of QQC2's SpinBox type. -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/benchmarks/auto/creation/quick.controls2/delegates_switch.qml b/benchmarks/auto/creation/quick.controls2/delegates_switch.qml deleted file mode 100644 index d780bd1..0000000 --- a/benchmarks/auto/creation/quick.controls2/delegates_switch.qml +++ /dev/null @@ -1,16 +0,0 @@ -import QtQuick 2.0 -import QmlBench 1.0 -import QtQuick.Controls 2.0 - -// Tests the creation of QQC2's Switch type. -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/benchmarks/auto/creation/quick.controls2/delegates_tabbar.qml b/benchmarks/auto/creation/quick.controls2/delegates_tabbar.qml deleted file mode 100644 index 418deb5..0000000 --- a/benchmarks/auto/creation/quick.controls2/delegates_tabbar.qml +++ /dev/null @@ -1,24 +0,0 @@ -import QtQuick 2.0 -import QmlBench 1.0 -import QtQuick.Controls 2.0 - -// Tests the creation of QQC2's TabBar type. -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/benchmarks/auto/creation/quick.controls2/delegates_textarea.qml b/benchmarks/auto/creation/quick.controls2/delegates_textarea.qml deleted file mode 100644 index 28d1fb0..0000000 --- a/benchmarks/auto/creation/quick.controls2/delegates_textarea.qml +++ /dev/null @@ -1,15 +0,0 @@ -import QtQuick 2.0 -import QmlBench 1.0 -import QtQuick.Controls 2.0 - -// Tests the creation of QQC2's TextArea type. -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/benchmarks/auto/creation/quick.controls2/delegates_textfield.qml b/benchmarks/auto/creation/quick.controls2/delegates_textfield.qml deleted file mode 100644 index 6f03459..0000000 --- a/benchmarks/auto/creation/quick.controls2/delegates_textfield.qml +++ /dev/null @@ -1,15 +0,0 @@ -import QtQuick 2.0 -import QmlBench 1.0 -import QtQuick.Controls 2.0 - -// Tests the creation of QQC2's TextField type. -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/benchmarks/auto/creation/quick.controls2/delegates_tumbler.qml b/benchmarks/auto/creation/quick.controls2/delegates_tumbler.qml deleted file mode 100644 index 9d80215..0000000 --- a/benchmarks/auto/creation/quick.controls2/delegates_tumbler.qml +++ /dev/null @@ -1,16 +0,0 @@ -import QtQuick 2.0 -import QmlBench 1.0 -import QtQuick.Controls 2.0 - -// Tests the creation of QQC2's Tumbler type. -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 - } -} diff --git a/benchmarks/auto/creation/quick.image/delegates_image.qml b/benchmarks/auto/creation/quick.image/delegates_image.qml deleted file mode 100644 index 6d692c1..0000000 --- a/benchmarks/auto/creation/quick.image/delegates_image.qml +++ /dev/null @@ -1,23 +0,0 @@ -import QtQuick 2.0 -import QmlBench 1.0 - -// Test the creation of an Image with fairly stock settings (synchronous, no AA) -CreationBenchmark { - id: root; - count: 50; - staticCount: 2500; - - property var names: [ - "butterfly-wide.png", - "butterfly-half.png", - "butterfly-collapsed.png" - ]; - - delegate: Image { - x: QmlBench.getRandom() * (root.width - width) - y: QmlBench.getRandom() * (root.height - height) - source: "../../../../shared/" + root.names[index % 3]; - width: 20 - height: 20 - } -} diff --git a/benchmarks/auto/creation/quick.image/delegates_image_alpha.qml b/benchmarks/auto/creation/quick.image/delegates_image_alpha.qml deleted file mode 100644 index e9649f2..0000000 --- a/benchmarks/auto/creation/quick.image/delegates_image_alpha.qml +++ /dev/null @@ -1,18 +0,0 @@ -import QtQuick 2.0 -import QmlBench 1.0 - -// Test the creation of an Image with an ARGB PNG -// Compare with delegates_image_solid -CreationBenchmark { - id: root; - count: 50; - staticCount: 2500; - - delegate: Image { - x: QmlBench.getRandom() * (root.width - width) - y: QmlBench.getRandom() * (root.height - height) - source: "../../../../shared/alpha.png" - width: 20 - height: 20 - } -} diff --git a/benchmarks/auto/creation/quick.image/delegates_image_antialiased.qml b/benchmarks/auto/creation/quick.image/delegates_image_antialiased.qml deleted file mode 100644 index e22aa85..0000000 --- a/benchmarks/auto/creation/quick.image/delegates_image_antialiased.qml +++ /dev/null @@ -1,25 +0,0 @@ -import QtQuick 2.0 -import QmlBench 1.0 - -// Test the creation of an antialiased image. -CreationBenchmark { - id: root; - count: 50; - staticCount: 2500; - - property var names: [ - "butterfly-wide.png", - "butterfly-half.png", - "butterfly-collapsed.png" - ]; - - delegate: Image { - x: QmlBench.getRandom() * (root.width - width) - y: QmlBench.getRandom() * (root.height - height) - source: "../../../../shared/" + root.names[index % 3]; - width: 20 - height: 20 - antialiasing: true - } -} - diff --git a/benchmarks/auto/creation/quick.image/delegates_image_async.qml b/benchmarks/auto/creation/quick.image/delegates_image_async.qml deleted file mode 100644 index 5c27029..0000000 --- a/benchmarks/auto/creation/quick.image/delegates_image_async.qml +++ /dev/null @@ -1,25 +0,0 @@ -import QtQuick 2.0 -import QmlBench 1.0 - -// Test the creation of an asynchronously loaded image. -CreationBenchmark { - id: root; - count: 50; - staticCount: 2500; - - property var names: [ - "butterfly-wide.png", - "butterfly-half.png", - "butterfly-collapsed.png" - ]; - - delegate: Image { - x: QmlBench.getRandom() * (root.width - width) - y: QmlBench.getRandom() * (root.height - height) - source: "../../../../shared/" + root.names[index % 3]; - width: 20 - height: 20 - asynchronous: true - } -} - diff --git a/benchmarks/auto/creation/quick.image/delegates_image_solid.qml b/benchmarks/auto/creation/quick.image/delegates_image_solid.qml deleted file mode 100644 index 3f05d71..0000000 --- a/benchmarks/auto/creation/quick.image/delegates_image_solid.qml +++ /dev/null @@ -1,18 +0,0 @@ -import QtQuick 2.0 -import QmlBench 1.0 - -// Test the creation of an Image with an RGB PNG -// Compare with delegates_image_alpha -CreationBenchmark { - id: root; - count: 50; - staticCount: 2500; - - delegate: Image { - x: QmlBench.getRandom() * (root.width - width) - y: QmlBench.getRandom() * (root.height - height) - source: "../../../../shared/solid.png" - width: 20 - height: 20 - } -} diff --git a/benchmarks/auto/creation/quick.item/delegates_item.qml b/benchmarks/auto/creation/quick.item/delegates_item.qml deleted file mode 100644 index 8d150f9..0000000 --- a/benchmarks/auto/creation/quick.item/delegates_item.qml +++ /dev/null @@ -1,17 +0,0 @@ -import QtQuick 2.0 -import QmlBench 1.0 - -// Tests the creation of Item with a few simple props. -// Compare with delegates_item_empty, and delegates_item_empty_jscreation. -// Compare with delegates_item_script. -CreationBenchmark { - id: root; - count: 50 - staticCount: 5000 - delegate: Item { - x: QmlBench.getRandom() * (root.width - width) - y: QmlBench.getRandom() * (root.height - height) - width: 30 - height: 15 - } -} diff --git a/benchmarks/auto/creation/quick.item/delegates_item_bindings.qml b/benchmarks/auto/creation/quick.item/delegates_item_bindings.qml deleted file mode 100644 index 3dbcb13..0000000 --- a/benchmarks/auto/creation/quick.item/delegates_item_bindings.qml +++ /dev/null @@ -1,18 +0,0 @@ -import QtQuick 2.0 -import QmlBench 1.0 - -// Compare with delegates_item_states -CreationBenchmark { - id: root; - count: 50 - staticCount: 5000 - delegate: Item { - id: itemInstance - x: QmlBench.getRandom() * (root.width - width) - y: QmlBench.getRandom() * (root.height - height) - width: 30 - height: 15 - visible: 1 == 1 ? true : false - } -} - diff --git a/benchmarks/auto/creation/quick.item/delegates_item_childrenRect.qml b/benchmarks/auto/creation/quick.item/delegates_item_childrenRect.qml deleted file mode 100644 index d445f05..0000000 --- a/benchmarks/auto/creation/quick.item/delegates_item_childrenRect.qml +++ /dev/null @@ -1,22 +0,0 @@ -import QtQuick 2.0 -import QmlBench 1.0 - -// Tests the creation involving Item's childrenRect property. -// This is an unusually expensive property. -CreationBenchmark { - id: root; - count: 50 - staticCount: 5000 - delegate: Item { - x: QmlBench.getRandom() * (root.width - width) - y: QmlBench.getRandom() * (root.height - height) - width: childrenRect.width - height: childrenRect.height - - Item { - width: 30 - height: 15 - } - } -} - diff --git a/benchmarks/auto/creation/quick.item/delegates_item_empty.qml b/benchmarks/auto/creation/quick.item/delegates_item_empty.qml deleted file mode 100644 index f635909..0000000 --- a/benchmarks/auto/creation/quick.item/delegates_item_empty.qml +++ /dev/null @@ -1,12 +0,0 @@ -import QtQuick 2.0 -import QmlBench 1.0 - -// Tests the creation of an empty Item. -// Compare with delegates_item_empty_jscreation -CreationBenchmark { - id: root - count: 50; - staticCount: 5000; - delegate: Item { - } -} diff --git a/benchmarks/auto/creation/quick.item/delegates_item_empty_jscreation.qml b/benchmarks/auto/creation/quick.item/delegates_item_empty_jscreation.qml deleted file mode 100644 index 89cded0..0000000 --- a/benchmarks/auto/creation/quick.item/delegates_item_empty_jscreation.qml +++ /dev/null @@ -1,34 +0,0 @@ -import QtQuick 2.0 -import QmlBench 1.0 - -// Test allocation of Item, with no Repeater or anything. -// Compare with delegates_qobject & delegates_item_empty. -Benchmark { - id: root; - count: 50; - staticCount: 5000; - - property var items; - onTChanged: { - allocate(); - } - - Component { - id: component; - Item { - } - } - - function allocate() { - if (items && items.length) { - for (var i=0; i<items.length; ++i) - items[i].destroy(); - } - items = []; - - for (var i=0; i<root.count; ++i) { - var object = component.createObject(root); - items.push(object); - } - } -} diff --git a/benchmarks/auto/creation/quick.item/delegates_item_script.qml b/benchmarks/auto/creation/quick.item/delegates_item_script.qml deleted file mode 100644 index 37fbb54..0000000 --- a/benchmarks/auto/creation/quick.item/delegates_item_script.qml +++ /dev/null @@ -1,19 +0,0 @@ -import QtQuick 2.0 -import QmlBench 1.0 - -// Tests the creation of Item with a few simple props (*not* bindings!) -// Compare with delegates_item. -CreationBenchmark { - id: root; - count: 50 - staticCount: 5000 - delegate: Item { - Component.onCompleted: { - x = QmlBench.getRandom() * (root.width - width) - y = QmlBench.getRandom() * (root.height - height) - width = 30 - height = 15 - } - } -} - diff --git a/benchmarks/auto/creation/quick.item/delegates_item_states.qml b/benchmarks/auto/creation/quick.item/delegates_item_states.qml deleted file mode 100644 index 2163d61..0000000 --- a/benchmarks/auto/creation/quick.item/delegates_item_states.qml +++ /dev/null @@ -1,29 +0,0 @@ -import QtQuick 2.0 -import QmlBench 1.0 - -// Compare with delegates_item_bindings -CreationBenchmark { - id: root; - count: 50 - staticCount: 5000 - delegate: Item { - id: itemInstance - x: QmlBench.getRandom() * (root.width - width) - y: QmlBench.getRandom() * (root.height - height) - width: 30 - height: 15 - states: [ - State { - name: "visible" - when: 1 == 1 - PropertyChanges { target: itemInstance; visible: true } - }, - State { - name: "invisible" - when: 0 == 1 - PropertyChanges { target: itemInstance; visible: false } - } - ] - } -} - diff --git a/benchmarks/auto/creation/quick.item/delegates_item_z.qml b/benchmarks/auto/creation/quick.item/delegates_item_z.qml deleted file mode 100644 index 791bcab..0000000 --- a/benchmarks/auto/creation/quick.item/delegates_item_z.qml +++ /dev/null @@ -1,18 +0,0 @@ -import QtQuick 2.0 -import QmlBench 1.0 - -// Tests the creation of Item with a non-zero z. -// This is an unusually expensive property. -CreationBenchmark { - id: root; - count: 50 - staticCount: 5000 - delegate: Item { - x: QmlBench.getRandom() * (root.width - width) - y: QmlBench.getRandom() * (root.height - height) - z: index - width: 30 - height: 15 - } -} - diff --git a/benchmarks/auto/creation/quick.item/item_anchors.qml b/benchmarks/auto/creation/quick.item/item_anchors.qml deleted file mode 100644 index 1e0e8cc..0000000 --- a/benchmarks/auto/creation/quick.item/item_anchors.qml +++ /dev/null @@ -1,19 +0,0 @@ -import QtQuick 2.0 -import QmlBench 1.0 - -// Testing the performance of anchors against w/h bindings (item_size). -CreationBenchmark { - id: root; - count: 50; - staticCount: 2500; - delegate: Item { - x: QmlBench.getRandom() * (root.width - width) - y: QmlBench.getRandom() * (root.height - height) - width: 30 - height: 15 - - Item { - anchors.fill: parent - } - } -} diff --git a/benchmarks/auto/creation/quick.item/item_size.qml b/benchmarks/auto/creation/quick.item/item_size.qml deleted file mode 100644 index cc02942..0000000 --- a/benchmarks/auto/creation/quick.item/item_size.qml +++ /dev/null @@ -1,21 +0,0 @@ -import QtQuick 2.0 -import QmlBench 1.0 - -// Testing the performance of w/h bindings against anchors (item_anchors). -CreationBenchmark { - id: root; - count: 50; - staticCount: 2500; - delegate: Item { - x: QmlBench.getRandom() * (root.width - width) - y: QmlBench.getRandom() * (root.height - height) - width: 30 - height: 15 - - Item { - width: parent.width - height: parent.height - } - } -} - diff --git a/benchmarks/auto/creation/quick.rectangle/delegates_rect.qml b/benchmarks/auto/creation/quick.rectangle/delegates_rect.qml deleted file mode 100644 index a840b1c..0000000 --- a/benchmarks/auto/creation/quick.rectangle/delegates_rect.qml +++ /dev/null @@ -1,17 +0,0 @@ -import QtQuick 2.0 -import QmlBench 1.0 - -// Tests the creation of rectangles with *NO* alpha channel. -// Compare with delegates_rect_blended & delegates_rect_radius -CreationBenchmark { - id: root; - count: 50; - staticCount: 2500; - delegate: Rectangle { - x: QmlBench.getRandom() * (root.width - width) - y: QmlBench.getRandom() * (root.height - height) - width: 30 - height: 15 - color: "steelblue" - } -} diff --git a/benchmarks/auto/creation/quick.rectangle/delegates_rect_blended.qml b/benchmarks/auto/creation/quick.rectangle/delegates_rect_blended.qml deleted file mode 100644 index 5baa902..0000000 --- a/benchmarks/auto/creation/quick.rectangle/delegates_rect_blended.qml +++ /dev/null @@ -1,18 +0,0 @@ -import QtQuick 2.0 -import QmlBench 1.0 - -// Tests the creation of rectangles with an alpha channel. -// Compare with delegates_rect & delegates_rect_radius -CreationBenchmark { - id: root; - count: 50 - staticCount: 2500 - delegate: Rectangle { - x: QmlBench.getRandom() * (root.width - width) - y: QmlBench.getRandom() * (root.height - height) - width: 30 - height: 15 - color: Qt.hsla(0.7, 0.3, 0.6, 0.5); - } -} - diff --git a/benchmarks/auto/creation/quick.rectangle/delegates_rect_border.qml b/benchmarks/auto/creation/quick.rectangle/delegates_rect_border.qml deleted file mode 100644 index 86a47c2..0000000 --- a/benchmarks/auto/creation/quick.rectangle/delegates_rect_border.qml +++ /dev/null @@ -1,20 +0,0 @@ -import QtQuick 2.0 -import QmlBench 1.0 - -// Tests the creation of rectangles with a border -// Compare with delegates_rect -CreationBenchmark { - id: root; - count: 50; - staticCount: 2500; - delegate: Rectangle { - x: QmlBench.getRandom() * (root.width - width) - y: QmlBench.getRandom() * (root.height - height) - width: 30 - height: 15 - color: "steelblue" - border.width: 5 - border.color: "#000000" - } -} - diff --git a/benchmarks/auto/creation/quick.rectangle/delegates_rect_gradient.qml b/benchmarks/auto/creation/quick.rectangle/delegates_rect_gradient.qml deleted file mode 100644 index 85c3158..0000000 --- a/benchmarks/auto/creation/quick.rectangle/delegates_rect_gradient.qml +++ /dev/null @@ -1,20 +0,0 @@ -import QtQuick 2.0 -import QmlBench 1.0 - -// Tests the creation of rectangles with a gradient -CreationBenchmark { - id: root; - count: 50; - staticCount: 2500; - delegate: Rectangle { - x: QmlBench.getRandom() * (root.width - width) - y: QmlBench.getRandom() * (root.height - height) - width: 30 - height: 15 - gradient: Gradient { - GradientStop { position: 0.0; color: "#ff0000" } - GradientStop { position: 1.0; color: "#0000ff" } - } - } -} - diff --git a/benchmarks/auto/creation/quick.rectangle/delegates_rect_radius.qml b/benchmarks/auto/creation/quick.rectangle/delegates_rect_radius.qml deleted file mode 100644 index 693ede4..0000000 --- a/benchmarks/auto/creation/quick.rectangle/delegates_rect_radius.qml +++ /dev/null @@ -1,19 +0,0 @@ -import QtQuick 2.0 -import QmlBench 1.0 - -// Tests the creation of rectangles with rounded corners. -// Compare with delegates_rect_blended & delegates_rect -CreationBenchmark { - id: root; - count: 50; - staticCount: 2500; - delegate: Rectangle { - x: QmlBench.getRandom() * (root.width - width) - y: QmlBench.getRandom() * (root.height - height) - width: 30 - height: 15 - color: "steelblue" - radius: 10 - } -} - diff --git a/benchmarks/auto/creation/quick.text/comparison/delegates_kerning.qml b/benchmarks/auto/creation/quick.text/comparison/delegates_kerning.qml deleted file mode 100644 index 0782c4a..0000000 --- a/benchmarks/auto/creation/quick.text/comparison/delegates_kerning.qml +++ /dev/null @@ -1,17 +0,0 @@ -import QtQuick 2.0 -import QmlBench 1.0 - -// Tests the creation of Text with no special flags set. -// Used as baseline for delegates_nokerning and delegates_shaping -CreationBenchmark { - id: root; - count: 50; - staticCount: 1000; - delegate: Text { - x: QmlBench.getRandom() * (root.width - width) - y: QmlBench.getRandom() * (root.height - height) - text: "OATS FLAVOUR WAY" - font.family: "Times New Roman" - font.pixelSize: 10 - } -} diff --git a/benchmarks/auto/creation/quick.text/comparison/delegates_nokerning.qml b/benchmarks/auto/creation/quick.text/comparison/delegates_nokerning.qml deleted file mode 100644 index 9b9cbac..0000000 --- a/benchmarks/auto/creation/quick.text/comparison/delegates_nokerning.qml +++ /dev/null @@ -1,18 +0,0 @@ -import QtQuick 2.0 -import QmlBench 1.0 - -// Tests the creation of Text with kerning disabled. -CreationBenchmark { - id: root; - count: 50; - staticCount: 1000; - - delegate: Text { - x: QmlBench.getRandom() * (root.width - width) - y: QmlBench.getRandom() * (root.height - height) - text: "OATS FLAVOUR WAY" - font.family: "Times New Roman" - font.kerning: false - font.pixelSize: 10 - } -} diff --git a/benchmarks/auto/creation/quick.text/comparison/delegates_noshaping.qml b/benchmarks/auto/creation/quick.text/comparison/delegates_noshaping.qml deleted file mode 100644 index 5a29ff2..0000000 --- a/benchmarks/auto/creation/quick.text/comparison/delegates_noshaping.qml +++ /dev/null @@ -1,18 +0,0 @@ -import QtQuick 2.0 -import QmlBench 1.0 - -// Tests the creation of Text with shaping disabled. -CreationBenchmark { - id: root; - count: 50; - staticCount: 1000; - - delegate: Text { - x: QmlBench.getRandom() * (root.width - width) - y: QmlBench.getRandom() * (root.height - height) - text: "OATS FLAVOUR WAY" - font.family: "Times New Roman" - font.preferShaping: false - font.pixelSize: 10 - } -} diff --git a/benchmarks/auto/creation/quick.text/delegates_longtext.qml b/benchmarks/auto/creation/quick.text/delegates_longtext.qml deleted file mode 100644 index 806d996..0000000 --- a/benchmarks/auto/creation/quick.text/delegates_longtext.qml +++ /dev/null @@ -1,17 +0,0 @@ -import QtQuick 2.0 -import QmlBench 1.0 - -// Tests the creation of Text with a long string of latin1 text. -CreationBenchmark { - id: root; - count: 20; - staticCount: 500; - delegate: Text { - x: QmlBench.getRandom() * (root.width - width) - y: QmlBench.getRandom() * (root.height - height) - width: root.width * 0.33 - wrapMode: Text.WordWrap - font.pixelSize: 10 - text: "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nunc in volutpat nibh, ut convallis neque. Nam placerat tellus et ante feugiat condimentum. Nulla facilisi. Sed in lobortis magna. Duis eu mattis ante. Donec pulvinar ante est, ac ultricies elit commodo vitae. Sed ut luctus odio, quis aliquet metus. Curabitur quis lacus fringilla, luctus justo id, volutpat dui. Aliquam id nunc gravida, pharetra augue ac, tristique nibh." - } -} diff --git a/benchmarks/auto/creation/quick.text/delegates_longtext_arabic.qml b/benchmarks/auto/creation/quick.text/delegates_longtext_arabic.qml deleted file mode 100644 index fd3434c..0000000 --- a/benchmarks/auto/creation/quick.text/delegates_longtext_arabic.qml +++ /dev/null @@ -1,18 +0,0 @@ -import QtQuick 2.0 -import QmlBench 1.0 - -// Tests the creation of Text with a long string of arabic text. -CreationBenchmark { - id: root; - count: 20; - staticCount: 500; - delegate: Text { - x: QmlBench.getRandom() * (root.width - width) - y: QmlBench.getRandom() * (root.height - height) - width: root.width * 0.33 - wrapMode: Text.WordWrap - font.pixelSize: 10 - text: "عل الدمج والمانيا حين. تحت سقوط انذار ان. ودول الخارجية و كلّ. جمعت والتي الساحل في ومن. أن لها أدوات مهمّات الأبرياء. شاسعة المحيط الساحلية ومن قد, فعل إختار العصبة التخطيط ان, هو فسقط موالية ولم. عرض و ببعض كردة إعلان, بين ثم سكان واستمرت المؤلّفة. لم مكن ألمّ اتفاق نتيجة, هُزم الجديدة، إيو بـ, به، عن انذار المارق الآلاف. اتفاق وإعلان بريطانيا، ان بحث, بعد ٣٠ قبضتهم الغالي الجنود. فصل تم وقام جسيمة, يعبأ وبدون الموسوعة ان تعد. ٢٠٠٤ وتتحمّل التخطيط وفي عل." - } -} - diff --git a/benchmarks/auto/creation/quick.text/delegates_longtext_chinese.qml b/benchmarks/auto/creation/quick.text/delegates_longtext_chinese.qml deleted file mode 100644 index 95526ec..0000000 --- a/benchmarks/auto/creation/quick.text/delegates_longtext_chinese.qml +++ /dev/null @@ -1,19 +0,0 @@ -import QtQuick 2.0 -import QmlBench 1.0 - -// Tests the creation of Text with a long string of chinese text. -// This is similar to longtext.qml, but it has a lot more glyphs. -CreationBenchmark { - id: root; - count: 20; - staticCount: 500; - delegate: Text { - x: QmlBench.getRandom() * (root.width - width) - y: QmlBench.getRandom() * (root.height - height) - width: root.width * 0.33 - wrapMode: Text.WordWrap - font.pixelSize: 10 - text: "天地玄黄，宇宙洪荒。日月盈昃，辰宿列张。寒来暑往，秋收冬藏。闰余成岁，律吕调阳。云腾致雨，露结为霜。金生丽水，玉出崑冈。剑号巨阙，珠称夜光。果珍李柰，菜重芥姜。海咸河淡，鳞潜羽翔。龙师火帝，鸟官人皇。始制文字，乃服衣裳。推位让国，有虞陶唐。弔民伐罪，周发商汤。坐朝问道，垂拱平章。爱育黎首，臣伏戎羌。遐迩壹体，率宾归王。鸣凤在竹，白驹食场。化被草木，赖及万方。盖此身发，四大五常。恭惟鞠养，岂敢毁伤。女慕贞洁，男效才良。知过必改，得能莫忘。罔谈彼短，靡恃己长。信使可覆，器欲难量。墨悲丝染，诗讚羔羊。景行维贤，克念作圣。德建名立，形端表正。空谷传声，虚堂习听。祸因恶积，福缘善庆。尺璧非宝，寸阴是竞。资父事君，曰严与敬。孝当竭力，忠则尽命。临深履薄，夙兴温清。似兰斯馨，如松之盛。川流不息，渊澄取映。容止若思，言辞安定。笃初诚美，慎终宜令。荣业所基，籍甚无竟。学优登仕，摄职从政。存以甘棠，去而益咏。乐殊贵贱，礼别尊卑。上和下睦，夫唱妇随。外受傅训，入奉母仪。诸姑伯叔，犹子比儿。孔怀兄弟，同气连枝。交友投分，切磨箴规。仁慈隐恻，造次弗离。节义廉退，颠沛匪亏。性静情逸，心动神疲。守真志满，逐物意移。坚持雅操，好爵自縻。都邑华夏，东西二京。背邙面洛，浮渭据泾。宫殿盘郁，楼观飞惊。图写禽兽，画彩仙灵。丙舍傍启，甲帐对楹。肆筵设席，鼓瑟吹笙。升阶纳陛，弁转疑星。右通广内，左达承明。既集坟典，亦聚群英。杜稿钟隶，漆书壁经。府罗将相，路侠槐卿。户封八县，家给千兵。高冠陪辇，驱毂振缨。世禄侈富，车驾肥轻。策功茂实，勒碑刻铭。磻溪伊尹，佐时阿衡。奄宅曲阜，微旦孰营。桓公匡合，济弱扶倾。绮迥汉惠，说感武丁。俊乂密勿，多士寔宁。晋楚更霸，赵魏困横。假途灭虢，践土会盟。何遵约法，韩弊烦刑。起翦颇牧，用军最精。宣威沙漠，驰誉丹青。九州禹迹，百郡秦并。嶽宗泰岱，禅主云亭。雁门紫塞，鸡田赤城。昆池碣石，钜野洞庭。旷远绵邈，巖岫杳冥。治本于农，务兹稼穑。俶载南亩，我蓺黍稷。税熟贡新，劝赏黜陟。孟轲敦素，史鱼秉直。庶几中庸，劳谦谨敕。聆音察理，鉴貌辨色。贻厥嘉猷，勉其祇植。省躬讥诫，宠增抗极。殆辱近耻，林皋幸即。两疏见机，解组谁逼。索居閒处，沉默寂寥。求古寻论，散虑逍遥。欣奏累遣，戚谢欢招。渠荷的历，园莽抽条。枇杷晚翠，梧桐早凋。陈根委翳，落叶飘飖。游鲲独运，凌摩绛霄。耽读翫市，寓目囊箱。易輶攸畏，属耳垣墙。具膳餐饭，适口充肠。饱饫烹宰，饥厌糟糠。亲戚故旧，老少异粮。妾御织纺，侍巾帷房。纨扇圆絜，银烛炜煌。昼眠夕寐，蓝笋象床。弦歌酒䜩，接杯举觞。矫手顿足，悦豫且康。嫡后嗣续，祭祀蒸尝。稽颡再拜，悚惧恐惶。笺牒简要，顾答审详。骸垢想浴，执热愿凉。驴骡犊特，骇跃超骧。诛斩贼盗，捕获叛亡。布射辽丸，嵇琴阮啸。恬笔伦纸，钧巧任钓。释纷利俗，并皆佳妙。毛施淑姿，工颦妍笑。年矢每催，曦晖朗曜。璇玑悬斡，晦魄环照。指薪修祜，永绥吉劭。矩步引领，俯仰廊庙。束带矜庄，徘徊瞻眺。孤陋寡闻，愚蒙等诮。谓语助者，焉哉乎也。" - } -} - diff --git a/benchmarks/auto/creation/quick.text/delegates_longtext_hindi.qml b/benchmarks/auto/creation/quick.text/delegates_longtext_hindi.qml deleted file mode 100644 index 5f7aca0..0000000 --- a/benchmarks/auto/creation/quick.text/delegates_longtext_hindi.qml +++ /dev/null @@ -1,20 +0,0 @@ -import QtQuick 2.0 -import QmlBench 1.0 - -// Tests the creation of Text with a long string of hindi text. -CreationBenchmark { - id: root; - count: 20; - staticCount: 500; - delegate: Text { - x: QmlBench.getRandom() * (root.width - width) - y: QmlBench.getRandom() * (root.height - height) - width: root.width * 0.33 - wrapMode: Text.WordWrap - font.pixelSize: 10 - text: "गोपनीयता लाभान्वित अमितकुमार विभाग बहुत जानते बदले गटकउसि भोगोलिक बीसबतेबोध यायेका वर्तमान दस्तावेज अपने नवंबर परस्पर विस्तरणक्षमता मुक्त मेमत समजते लगती क्षमता खरिदने तकनिकल बाजार भोगोलिक सम्पर्क जिवन ध्येय विश्वास पहोचाना उपलब्धता सकता विश्व ब्रौशर एसेएवं सुचनाचलचित्र सहित वेबजाल आवश्यकत कार्यसिधान्तो विशेष किके कार्य बाधा ऎसाजीस समस्याए निर्माता पुर्णता बीसबतेबोध भाति चुनने उपेक्ष विकसित विश्लेषण नीचे दौरान आपको मुख्यतह विचारशिलता कराना कार्य लगती वातावरण सार्वजनिक जोवे व्यवहार मार्गदर्शन विशेष आजपर पहोच। पुर्णता विचरविमर्श विकासक्षमता शीघ्र पुस्तक आशाआपस कार्यकर्ता वहहर नाकर असक्षम प्राप्त आंतरजाल विवरन जाता जिसकी सभीकुछ परिभाषित शीघ्र निर्देश मुख्यतह बिना" - - } -} - - diff --git a/benchmarks/auto/creation/quick.text/delegates_text.qml b/benchmarks/auto/creation/quick.text/delegates_text.qml deleted file mode 100644 index 95a72a4..0000000 --- a/benchmarks/auto/creation/quick.text/delegates_text.qml +++ /dev/null @@ -1,15 +0,0 @@ -import QtQuick 2.0 -import QmlBench 1.0 - -// Tests the creation of Text with a short string of text -CreationBenchmark { - id: root; - count: 50; - staticCount: 1000; - delegate: Text { - x: QmlBench.getRandom() * (root.width - width) - y: QmlBench.getRandom() * (root.height - height) - text: "Qt Quick!" - font.pixelSize: 10 - } -} diff --git a/benchmarks/auto/creation/quick.text/delegates_text_arabic.qml b/benchmarks/auto/creation/quick.text/delegates_text_arabic.qml deleted file mode 100644 index b209113..0000000 --- a/benchmarks/auto/creation/quick.text/delegates_text_arabic.qml +++ /dev/null @@ -1,16 +0,0 @@ -import QtQuick 2.0 -import QmlBench 1.0 - -// Tests the creation of Text with a short string of arabic text -CreationBenchmark { - id: root; - count: 50; - staticCount: 1000; - delegate: Text { - x: QmlBench.getRandom() * (root.width - width) - y: QmlBench.getRandom() * (root.height - height) - text: "مع مئات" - font.pixelSize: 10 - } -} - diff --git a/benchmarks/auto/creation/quick.text/delegates_text_chinese.qml b/benchmarks/auto/creation/quick.text/delegates_text_chinese.qml deleted file mode 100644 index 1be0b0c..0000000 --- a/benchmarks/auto/creation/quick.text/delegates_text_chinese.qml +++ /dev/null @@ -1,16 +0,0 @@ -import QtQuick 2.0 -import QmlBench 1.0 - -// Tests the creation of Text with a short string of chinese text -// This is similar to delegates_text, except with more glyphs -CreationBenchmark { - id: root; - count: 50; - staticCount: 1000; - delegate: Text { - x: QmlBench.getRandom() * (root.width - width) - y: QmlBench.getRandom() * (root.height - height) - font.pixelSize: 10 - text: "天地玄黄，宇宙洪荒。日月盈昃，辰宿列张。寒来暑往，秋收冬藏。闰余成岁，律吕调阳。云腾致雨，露结为霜。金生丽水，玉出崑冈。剑号巨阙，珠称夜光。果珍李柰，菜重芥姜。海咸河淡，鳞潜羽翔。龙师火帝，鸟官人皇。始制文字，乃服衣裳。推位让国，有虞陶唐。弔民伐罪，周发商汤。坐朝问道，垂拱平章。爱育黎首，臣伏戎羌。" - } -} diff --git a/benchmarks/auto/creation/quick.text/delegates_text_decoration_bold.qml b/benchmarks/auto/creation/quick.text/delegates_text_decoration_bold.qml deleted file mode 100644 index 8af788e..0000000 --- a/benchmarks/auto/creation/quick.text/delegates_text_decoration_bold.qml +++ /dev/null @@ -1,18 +0,0 @@ -import QtQuick 2.0 -import QmlBench 1.0 - -// Tests the creation of Text with bold decoration -CreationBenchmark { - id: root; - count: 50; - staticCount: 1000; - delegate: Text { - x: QmlBench.getRandom() * (root.width - width) - y: QmlBench.getRandom() * (root.height - height) - text: "Qt Quick!" - font.pixelSize: 10 - font.bold: true - textFormat: Text.PlainText - } -} - diff --git a/benchmarks/auto/creation/quick.text/delegates_text_decoration_italic.qml b/benchmarks/auto/creation/quick.text/delegates_text_decoration_italic.qml deleted file mode 100644 index c4b4f32..0000000 --- a/benchmarks/auto/creation/quick.text/delegates_text_decoration_italic.qml +++ /dev/null @@ -1,18 +0,0 @@ -import QtQuick 2.0 -import QmlBench 1.0 - -// Tests the creation of Text with italic decoration -CreationBenchmark { - id: root; - count: 50; - staticCount: 1000; - delegate: Text { - x: QmlBench.getRandom() * (root.width - width) - y: QmlBench.getRandom() * (root.height - height) - text: "Qt Quick!" - font.pixelSize: 10 - font.italic: true - textFormat: Text.PlainText - } -} - diff --git a/benchmarks/auto/creation/quick.text/delegates_text_decoration_strikeout.qml b/benchmarks/auto/creation/quick.text/delegates_text_decoration_strikeout.qml deleted file mode 100644 index e634a73..0000000 --- a/benchmarks/auto/creation/quick.text/delegates_text_decoration_strikeout.qml +++ /dev/null @@ -1,18 +0,0 @@ -import QtQuick 2.0 -import QmlBench 1.0 - -// Tests the creation of Text with strikeout decoration -CreationBenchmark { - id: root; - count: 50; - staticCount: 1000; - delegate: Text { - x: QmlBench.getRandom() * (root.width - width) - y: QmlBench.getRandom() * (root.height - height) - text: "Qt Quick!" - font.pixelSize: 10 - font.strikeout: true - textFormat: Text.PlainText - } -} - diff --git a/benchmarks/auto/creation/quick.text/delegates_text_decoration_underline.qml b/benchmarks/auto/creation/quick.text/delegates_text_decoration_underline.qml deleted file mode 100644 index e61efe1..0000000 --- a/benchmarks/auto/creation/quick.text/delegates_text_decoration_underline.qml +++ /dev/null @@ -1,18 +0,0 @@ -import QtQuick 2.0 -import QmlBench 1.0 - -// Tests the creation of Text with underline decoration -CreationBenchmark { - id: root; - count: 50; - staticCount: 1000; - delegate: Text { - x: QmlBench.getRandom() * (root.width - width) - y: QmlBench.getRandom() * (root.height - height) - text: "Qt Quick!" - font.pixelSize: 10 - font.underline: true - textFormat: Text.PlainText - } -} - diff --git a/benchmarks/auto/creation/quick.text/delegates_text_elide.qml b/benchmarks/auto/creation/quick.text/delegates_text_elide.qml deleted file mode 100644 index a0743eb..0000000 --- a/benchmarks/auto/creation/quick.text/delegates_text_elide.qml +++ /dev/null @@ -1,17 +0,0 @@ -import QtQuick 2.0 -import QmlBench 1.0 - -// Tests the creation of Text with a long string of text that is elided on the right -CreationBenchmark { - id: root - count: 50 - staticCount: 1000 - delegate: Text { - x: QmlBench.getRandom() * (root.width - width) - y: QmlBench.getRandom() * (root.height - height) - width: 40 - text: "Some very very very long text" - font.pixelSize: 10 - elide: Text.ElideRight - } -} diff --git a/benchmarks/auto/creation/quick.text/delegates_text_hindi.qml b/benchmarks/auto/creation/quick.text/delegates_text_hindi.qml deleted file mode 100644 index 2fecb49..0000000 --- a/benchmarks/auto/creation/quick.text/delegates_text_hindi.qml +++ /dev/null @@ -1,17 +0,0 @@ -import QtQuick 2.0 -import QmlBench 1.0 - -// Tests the creation of Text with a short piece of hindi text -CreationBenchmark { - id: root; - count: 50; - staticCount: 1000; - delegate: Text { - x: QmlBench.getRandom() * (root.width - width) - y: QmlBench.getRandom() * (root.height - height) - text: "गोपनीयता लाभान्वित" - font.pixelSize: 10 - } -} - - diff --git a/benchmarks/auto/creation/quick.text/delegates_text_nativerendering.qml b/benchmarks/auto/creation/quick.text/delegates_text_nativerendering.qml deleted file mode 100644 index 2927c48..0000000 --- a/benchmarks/auto/creation/quick.text/delegates_text_nativerendering.qml +++ /dev/null @@ -1,16 +0,0 @@ -import QtQuick 2.0 -import QmlBench 1.0 - -// Tests the creation of Text with native rendering enabled -CreationBenchmark { - id: root; - count: 50; - staticCount: 1000; - delegate: Text { - x: QmlBench.getRandom() * (root.width - width) - y: QmlBench.getRandom() * (root.height - height) - text: "Qt Quick!" - font.pixelSize: 10 - renderType: Text.NativeRendering - } -} diff --git a/benchmarks/auto/creation/quick.text/delegates_text_plain.qml b/benchmarks/auto/creation/quick.text/delegates_text_plain.qml deleted file mode 100644 index a060e9d..0000000 --- a/benchmarks/auto/creation/quick.text/delegates_text_plain.qml +++ /dev/null @@ -1,16 +0,0 @@ -import QtQuick 2.0 -import QmlBench 1.0 - -// Tests the creation of Text with plain formatting forced -CreationBenchmark { - id: root; - count: 50; - staticCount: 1000; - delegate: Text { - x: QmlBench.getRandom() * (root.width - width) - y: QmlBench.getRandom() * (root.height - height) - text: "Qt Quick!" - font.pixelSize: 10 - textFormat: Text.PlainText - } -} diff --git a/benchmarks/auto/creation/quick.text/delegates_text_richtext.qml b/benchmarks/auto/creation/quick.text/delegates_text_richtext.qml deleted file mode 100644 index 99aaa71..0000000 --- a/benchmarks/auto/creation/quick.text/delegates_text_richtext.qml +++ /dev/null @@ -1,16 +0,0 @@ -import QtQuick 2.0 -import QmlBench 1.0 - -// Tests the creation of Text with rich formatting forced -CreationBenchmark { - id: root; - count: 50; - staticCount: 1000; - delegate: Text { - x: QmlBench.getRandom() * (root.width - width) - y: QmlBench.getRandom() * (root.height - height) - text: "Qt Quick!" - font.pixelSize: 10 - textFormat: Text.RichText - } -} diff --git a/benchmarks/auto/creation/quick.text/delegates_text_styled.qml b/benchmarks/auto/creation/quick.text/delegates_text_styled.qml deleted file mode 100644 index c89d22d..0000000 --- a/benchmarks/auto/creation/quick.text/delegates_text_styled.qml +++ /dev/null @@ -1,16 +0,0 @@ -import QtQuick 2.0 -import QmlBench 1.0 - -// Tests the creation of Text with styled formatting forced -CreationBenchmark { - id: root; - count: 50; - staticCount: 1000; - delegate: Text { - x: QmlBench.getRandom() * (root.width - width) - y: QmlBench.getRandom() * (root.height - height) - text: "Qt Quick!" - font.pixelSize: 10 - textFormat: Text.StyledText - } -} diff --git a/benchmarks/auto/creation/quick.text/delegates_textedit.qml b/benchmarks/auto/creation/quick.text/delegates_textedit.qml deleted file mode 100644 index cf7921b..0000000 --- a/benchmarks/auto/creation/quick.text/delegates_textedit.qml +++ /dev/null @@ -1,15 +0,0 @@ -import QtQuick 2.0 -import QmlBench 1.0 - -// Tests the creation of TextEdit -CreationBenchmark { - id: root; - count: 20; - staticCount: 1000; - delegate: TextEdit { - x: QmlBench.getRandom() * (root.width - width) - y: QmlBench.getRandom() * (root.height - height) - text: "Qt Quick!" - font.pixelSize: 10 - } -} diff --git a/benchmarks/auto/creation/quick.text/delegates_textinput.qml b/benchmarks/auto/creation/quick.text/delegates_textinput.qml deleted file mode 100644 index 727c9ea..0000000 --- a/benchmarks/auto/creation/quick.text/delegates_textinput.qml +++ /dev/null @@ -1,15 +0,0 @@ -import QtQuick 2.0 -import QmlBench 1.0 - -// Tests the creation of TextInput -CreationBenchmark { - id: root; - count: 20; - staticCount: 1000; - delegate: TextInput { - x: QmlBench.getRandom() * (root.width - width) - y: QmlBench.getRandom() * (root.height - height) - text: "Qt Quick!" - font.pixelSize: 10 - } -} diff --git a/benchmarks/auto/creation/quick.transforms/delegates_item_rotated.qml b/benchmarks/auto/creation/quick.transforms/delegates_item_rotated.qml deleted file mode 100644 index f7b9ed2..0000000 --- a/benchmarks/auto/creation/quick.transforms/delegates_item_rotated.qml +++ /dev/null @@ -1,18 +0,0 @@ -import QtQuick 2.0 -import QmlBench 1.0 - -// Rotate an Item. -// Compare with delegates_item_rotated_transform. -CreationBenchmark { - id: root; - count: 50; - staticCount: 2500; - delegate: Item { - x: QmlBench.getRandom() * (root.width - width) - y: QmlBench.getRandom() * (root.height - height) - width: 30 - height: 15 - rotation: 45 - } -} - diff --git a/benchmarks/auto/creation/quick.transforms/delegates_item_rotated_transform.qml b/benchmarks/auto/creation/quick.transforms/delegates_item_rotated_transform.qml deleted file mode 100644 index f1a2e8f..0000000 --- a/benchmarks/auto/creation/quick.transforms/delegates_item_rotated_transform.qml +++ /dev/null @@ -1,21 +0,0 @@ -import QtQuick 2.0 -import QmlBench 1.0 - -// Rotate an Item. -// Compare with delegates_item_rotated_transform. -CreationBenchmark { - id: root; - count: 50; - staticCount: 2500; - delegate: Item { - x: QmlBench.getRandom() * (root.width - width) - y: QmlBench.getRandom() * (root.height - height) - width: 30 - height: 15 - transform: Rotation { - angle: 45 - } - } -} - - diff --git a/benchmarks/auto/creation/quick.transforms/delegates_item_scaled.qml b/benchmarks/auto/creation/quick.transforms/delegates_item_scaled.qml deleted file mode 100644 index d8c0c74..0000000 --- a/benchmarks/auto/creation/quick.transforms/delegates_item_scaled.qml +++ /dev/null @@ -1,19 +0,0 @@ -import QtQuick 2.0 -import QmlBench 1.0 - -// Scale an Item. -// Compare with delegates_item_scaled_transform. -CreationBenchmark { - id: root; - count: 50; - staticCount: 2500; - delegate: Item { - x: QmlBench.getRandom() * (root.width - width) - y: QmlBench.getRandom() * (root.height - height) - width: 30 - height: 15 - scale: 10 - } -} - - diff --git a/benchmarks/auto/creation/quick.transforms/delegates_item_scaled_transform.qml b/benchmarks/auto/creation/quick.transforms/delegates_item_scaled_transform.qml deleted file mode 100644 index 851fcb8..0000000 --- a/benchmarks/auto/creation/quick.transforms/delegates_item_scaled_transform.qml +++ /dev/null @@ -1,23 +0,0 @@ -import QtQuick 2.0 -import QmlBench 1.0 - -// Scale an Item. -// Compare with delegates_item_scaled. -CreationBenchmark { - id: root; - count: 50; - staticCount: 2500; - delegate: Item { - x: QmlBench.getRandom() * (root.width - width) - y: QmlBench.getRandom() * (root.height - height) - width: 30 - height: 15 - transform: Scale { - xScale: 10 - yScale: 10 - } - } -} - - - diff --git a/benchmarks/auto/creation/quick.transforms/delegates_item_translated.qml b/benchmarks/auto/creation/quick.transforms/delegates_item_translated.qml deleted file mode 100644 index 8669e29..0000000 --- a/benchmarks/auto/creation/quick.transforms/delegates_item_translated.qml +++ /dev/null @@ -1,23 +0,0 @@ -import QtQuick 2.0 -import QmlBench 1.0 - -// Translate an item. -CreationBenchmark { - id: root; - count: 50; - staticCount: 2500; - delegate: Item { - x: QmlBench.getRandom() * (root.width - width) - y: QmlBench.getRandom() * (root.height - height) - width: 30 - height: 15 - transform: Translate { - x: 10 - y: 10 - } - } -} - - - - diff --git a/benchmarks/auto/creation/quick.validators/delegates_doublevalidator.qml b/benchmarks/auto/creation/quick.validators/delegates_doublevalidator.qml deleted file mode 100644 index 4fb6f30..0000000 --- a/benchmarks/auto/creation/quick.validators/delegates_doublevalidator.qml +++ /dev/null @@ -1,17 +0,0 @@ -import QtQuick 2.0 -import QmlBench 1.0 - -// Tests the creation of DoubleValidator -CreationBenchmark { - id: root; - count: 50; - staticCount: 2500; - delegate: Item { - property DoubleValidator validator: DoubleValidator { - top: 100 - bottom: 0 - decimals: 2 - } - } -} - diff --git a/benchmarks/auto/creation/quick.validators/delegates_intvalidator.qml b/benchmarks/auto/creation/quick.validators/delegates_intvalidator.qml deleted file mode 100644 index f99040b..0000000 --- a/benchmarks/auto/creation/quick.validators/delegates_intvalidator.qml +++ /dev/null @@ -1,16 +0,0 @@ -import QtQuick 2.0 -import QmlBench 1.0 - -// Tests the creation of IntValidator -CreationBenchmark { - id: root; - count: 50; - staticCount: 2500; - delegate: Item { - property IntValidator validator: IntValidator { - top: 100 - bottom: 0 - } - } -} - diff --git a/benchmarks/auto/creation/quick.validators/delegates_regexpvalidator.qml b/benchmarks/auto/creation/quick.validators/delegates_regexpvalidator.qml deleted file mode 100644 index b3b8d38..0000000 --- a/benchmarks/auto/creation/quick.validators/delegates_regexpvalidator.qml +++ /dev/null @@ -1,15 +0,0 @@ -import QtQuick 2.0 -import QmlBench 1.0 - -// Tests the creation of RegExpValidator -CreationBenchmark { - id: root; - count: 50; - staticCount: 2500; - delegate: Item { - property RegExpValidator validator: RegExpValidator { - regExp: /.*/ - } - } -} - diff --git a/benchmarks/auto/creation/quick/compile.bat b/benchmarks/auto/creation/quick/compile.bat deleted file mode 100644 index e0eeb95..0000000 --- a/benchmarks/auto/creation/quick/compile.bat +++ /dev/null @@ -1 +0,0 @@ -qsb --glsl "100 es,120,150" --hlsl 50 --msl 12 -o red.frag.qsb red.frag diff --git a/benchmarks/auto/creation/quick/delegates_flickable.qml b/benchmarks/auto/creation/quick/delegates_flickable.qml deleted file mode 100644 index 303570e..0000000 --- a/benchmarks/auto/creation/quick/delegates_flickable.qml +++ /dev/null @@ -1,15 +0,0 @@ -import QtQuick 2.0 -import QmlBench 1.0 - -// Tests the creation of Flickable with a few simple props. -CreationBenchmark { - id: root; - count: 50 - staticCount: 2500 - delegate: Flickable { - x: QmlBench.getRandom() * (root.width - width) - y: QmlBench.getRandom() * (root.height - height) - width: 30 - height: 15 - } -} diff --git a/benchmarks/auto/creation/quick/delegates_flipable.qml b/benchmarks/auto/creation/quick/delegates_flipable.qml deleted file mode 100644 index 15a29b3..0000000 --- a/benchmarks/auto/creation/quick/delegates_flipable.qml +++ /dev/null @@ -1,15 +0,0 @@ -import QtQuick 2.0 -import QmlBench 1.0 - -// Tests the creation of Flipable with a few simple props. -CreationBenchmark { - id: root; - count: 50 - staticCount: 2500 - delegate: Flipable { - x: QmlBench.getRandom() * (root.width - width) - y: QmlBench.getRandom() * (root.height - height) - width: 30 - height: 15 - } -} diff --git a/benchmarks/auto/creation/quick/delegates_focusscope.qml b/benchmarks/auto/creation/quick/delegates_focusscope.qml deleted file mode 100644 index 059ae2f..0000000 --- a/benchmarks/auto/creation/quick/delegates_focusscope.qml +++ /dev/null @@ -1,16 +0,0 @@ -import QtQuick 2.0 -import QmlBench 1.0 - -// Tests the creation of FocusScope with a few simple props. -CreationBenchmark { - id: root; - count: 50 - staticCount: 2500 - delegate: FocusScope { - x: QmlBench.getRandom() * (root.width - width) - y: QmlBench.getRandom() * (root.height - height) - width: 30 - height: 15 - } -} - diff --git a/benchmarks/auto/creation/quick/delegates_fontloader.qml b/benchmarks/auto/creation/quick/delegates_fontloader.qml deleted file mode 100644 index 354552b..0000000 --- a/benchmarks/auto/creation/quick/delegates_fontloader.qml +++ /dev/null @@ -1,27 +0,0 @@ -import QtQuick 2.0 -import QmlBench 1.0 - -// Tests the creation of FontLoader with some simple props -// ### add a test for FontLoader from TTF? -CreationBenchmark { - id: root; - count: 50; - staticCount: 2500; - - property string fontName: { - if (Qt.platform.os == "osx") { - return "Helvetica" - } else if (Qt.platform.os == "linux") { - return "Open Sans" - } else if (Qt.platform.os == "windows") { - return "Arial" - } - } - - delegate: Item { - FontLoader { - name: root.fontName - } - } -} - diff --git a/benchmarks/auto/creation/quick/delegates_fontmetrics.qml b/benchmarks/auto/creation/quick/delegates_fontmetrics.qml deleted file mode 100644 index 849dc0b..0000000 --- a/benchmarks/auto/creation/quick/delegates_fontmetrics.qml +++ /dev/null @@ -1,27 +0,0 @@ -import QtQuick 2.4 -import QmlBench 1.0 - -// Tests the creation of FontMetrics with some simple props -CreationBenchmark { - id: root; - count: 50; - staticCount: 2500; - - property string fontName: { - if (Qt.platform.os == "osx") { - return "Helvetica" - } else if (Qt.platform.os == "linux") { - return "Open Sans" - } else if (Qt.platform.os == "windows") { - return "Arial" - } - } - - delegate: Item { - FontMetrics { - font.family: root.fontName - } - } -} - - diff --git a/benchmarks/auto/creation/quick/delegates_gridview.qml b/benchmarks/auto/creation/quick/delegates_gridview.qml deleted file mode 100644 index 386d865..0000000 --- a/benchmarks/auto/creation/quick/delegates_gridview.qml +++ /dev/null @@ -1,16 +0,0 @@ -import QtQuick 2.0 -import QmlBench 1.0 - -// Tests the creation of GridView with a few simple props. -CreationBenchmark { - id: root; - count: 50 - staticCount: 2500 - delegate: GridView { - x: QmlBench.getRandom() * (root.width - width) - y: QmlBench.getRandom() * (root.height - height) - width: 30 - height: 15 - } -} - diff --git a/benchmarks/auto/creation/quick/delegates_listview.qml b/benchmarks/auto/creation/quick/delegates_listview.qml deleted file mode 100644 index 413bbb2..0000000 --- a/benchmarks/auto/creation/quick/delegates_listview.qml +++ /dev/null @@ -1,17 +0,0 @@ -import QtQuick 2.0 -import QmlBench 1.0 - -// Tests the creation of ListView with a few simple props. -CreationBenchmark { - id: root; - count: 50 - staticCount: 2500 - delegate: ListView { - x: QmlBench.getRandom() * (root.width - width) - y: QmlBench.getRandom() * (root.height - height) - width: 30 - height: 15 - } -} - - diff --git a/benchmarks/auto/creation/quick/delegates_loader.qml b/benchmarks/auto/creation/quick/delegates_loader.qml deleted file mode 100644 index 7271f15..0000000 --- a/benchmarks/auto/creation/quick/delegates_loader.qml +++ /dev/null @@ -1,23 +0,0 @@ -import QtQuick 2.0 -import QmlBench 1.0 - -// Tests the creation of Loader with a few simple props. -CreationBenchmark { - id: root; - count: 50 - staticCount: 2500 - delegate: Loader { - x: QmlBench.getRandom() * (root.width - width) - y: QmlBench.getRandom() * (root.height - height) - width: 30 - height: 15 - sourceComponent: anItemComponent - } - - Component { - id: anItemComponent - Item { - } - } -} - diff --git a/benchmarks/auto/creation/quick/delegates_mousearea.qml b/benchmarks/auto/creation/quick/delegates_mousearea.qml deleted file mode 100644 index eaf3ad0..0000000 --- a/benchmarks/auto/creation/quick/delegates_mousearea.qml +++ /dev/null @@ -1,17 +0,0 @@ -import QtQuick 2.0 -import QmlBench 1.0 - -// Tests the creation of MouseArea with a few simple props. -CreationBenchmark { - id: root; - count: 50 - staticCount: 2500 - delegate: MouseArea { - x: QmlBench.getRandom() * (root.width - width) - y: QmlBench.getRandom() * (root.height - height) - hoverEnabled: true - width: 30 - height: 15 - } -} - diff --git a/benchmarks/auto/creation/quick/delegates_multipointtoucharea.qml b/benchmarks/auto/creation/quick/delegates_multipointtoucharea.qml deleted file mode 100644 index 68b4976..0000000 --- a/benchmarks/auto/creation/quick/delegates_multipointtoucharea.qml +++ /dev/null @@ -1,17 +0,0 @@ -import QtQuick 2.0 -import QmlBench 1.0 - -// Tests the creation of MultiPointTouchArea with a few simple props. -CreationBenchmark { - id: root; - count: 50 - staticCount: 2500 - delegate: MultiPointTouchArea { - x: QmlBench.getRandom() * (root.width - width) - y: QmlBench.getRandom() * (root.height - height) - width: 30 - height: 15 - } -} - - diff --git a/benchmarks/auto/creation/quick/delegates_pathview.qml b/benchmarks/auto/creation/quick/delegates_pathview.qml deleted file mode 100644 index f370e3b..0000000 --- a/benchmarks/auto/creation/quick/delegates_pathview.qml +++ /dev/null @@ -1,18 +0,0 @@ -import QtQuick 2.0 -import QmlBench 1.0 - -// Tests the creation of PathView with a few simple props. -CreationBenchmark { - id: root; - count: 50 - staticCount: 2500 - delegate: PathView { - x: QmlBench.getRandom() * (root.width - width) - y: QmlBench.getRandom() * (root.height - height) - width: 30 - height: 15 - } -} - - - diff --git a/benchmarks/auto/creation/quick/delegates_pincharea.qml b/benchmarks/auto/creation/quick/delegates_pincharea.qml deleted file mode 100644 index b89efc6..0000000 --- a/benchmarks/auto/creation/quick/delegates_pincharea.qml +++ /dev/null @@ -1,19 +0,0 @@ -import QtQuick 2.0 -import QmlBench 1.0 - -// Tests the creation of PinchArea with a few simple props. -CreationBenchmark { - id: root; - count: 50 - staticCount: 2500 - delegate: PinchArea { - x: QmlBench.getRandom() * (root.width - width) - y: QmlBench.getRandom() * (root.height - height) - width: 30 - height: 15 - } -} - - - - diff --git a/benchmarks/auto/creation/quick/delegates_qobject.qml b/benchmarks/auto/creation/quick/delegates_qobject.qml deleted file mode 100644 index 2bd8d52..0000000 --- a/benchmarks/auto/creation/quick/delegates_qobject.qml +++ /dev/null @@ -1,27 +0,0 @@ -import QtQuick 2.0 -import QmlBench 1.0 - -// Test allocation of QObject, with no Repeater or anything. -// Compare with delegates_qobject. -Benchmark { - id: root; - count: 50; - staticCount: 10000; - - onTChanged: { - allocate(); - } - - Component { - id: component; - QtObject { - } - } - - function allocate() { - for (var i=0; i<root.count; ++i) { - var object = component.createObject(); - object.destroy(); - } - } -} diff --git a/benchmarks/auto/creation/quick/delegates_qobject_large_array.qml b/benchmarks/auto/creation/quick/delegates_qobject_large_array.qml deleted file mode 100644 index 01fc3cf..0000000 --- a/benchmarks/auto/creation/quick/delegates_qobject_large_array.qml +++ /dev/null @@ -1,36 +0,0 @@ -import QtQuick 2.0 -import QmlBench 1.0 - -// Test allocation of QObject, with no Repeater or anything, stored in a JS -// array. The array is interesting as it's a large GC'd allocation. -// Compare with delegates_qobject. -Benchmark { - id: root; - count: 50; - staticCount: 10000; - - property var items; - onTChanged: { - allocate(); - } - - Component { - id: component; - QtObject { - } - } - - function allocate() { - if (items && items.length) { - for (var i=0; i<items.length; ++i) - items[i].destroy(); - } - items = []; - - for (var i=0; i<root.count; ++i) { - var object = component.createObject(); - items.push(object); - } - } -} - diff --git a/benchmarks/auto/creation/quick/delegates_shadereffect.qml b/benchmarks/auto/creation/quick/delegates_shadereffect.qml deleted file mode 100644 index b81ba5c..0000000 --- a/benchmarks/auto/creation/quick/delegates_shadereffect.qml +++ /dev/null @@ -1,18 +0,0 @@ -import QtQuick 2.0 -import QmlBench 1.0 - -// Tests the creation of ShaderEffect -CreationBenchmark { - id: root; - count: 50; - staticCount: 2500; - delegate: ShaderEffect { - x: QmlBench.getRandom() * (root.width - width) - y: QmlBench.getRandom() * (root.height - height) - width: 30 - height: 15 - fragmentShader: "red.frag.qsb" - } -} - - diff --git a/benchmarks/auto/creation/quick/delegates_shadereffect_props.qml b/benchmarks/auto/creation/quick/delegates_shadereffect_props.qml deleted file mode 100644 index bf52e81..0000000 --- a/benchmarks/auto/creation/quick/delegates_shadereffect_props.qml +++ /dev/null @@ -1,26 +0,0 @@ -import QtQuick 2.4 -import QmlBench 1.0 - -// Tests the creation of ShaderEffect with custom properties, -// as these add additional cost -CreationBenchmark { - id: root; - count: 50; - staticCount: 2500; - - Image { - id: sourceImage - source: "../../../../shared/butterfly-wide.png" - } - - delegate: ShaderEffect { - x: QmlBench.getRandom() * (root.width - width) - y: QmlBench.getRandom() * (root.height - height) - width: sourceImage.width - height: sourceImage.height - supportsAtlasTextures: true - property var source: sourceImage - } -} - - diff --git a/benchmarks/auto/creation/quick/delegates_shadereffectsource.qml b/benchmarks/auto/creation/quick/delegates_shadereffectsource.qml deleted file mode 100644 index 4e021a6..0000000 --- a/benchmarks/auto/creation/quick/delegates_shadereffectsource.qml +++ /dev/null @@ -1,24 +0,0 @@ -import QtQuick 2.0 -import QmlBench 1.0 - -// Tests the creation of ShaderEffectSource with a few simple props. -CreationBenchmark { - id: root; - count: 50 - staticCount: 500 - delegate: ShaderEffectSource { - x: QmlBench.getRandom() * (root.width - width) - y: QmlBench.getRandom() * (root.height - height) - width: 30 - height: 15 - sourceItem: sourceRectItem - } - - Rectangle { - id: sourceRectItem - color: "#ff0000" - width: 30 - height: 15 - } -} - diff --git a/benchmarks/auto/creation/quick/delegates_textmetrics.qml b/benchmarks/auto/creation/quick/delegates_textmetrics.qml deleted file mode 100644 index 33a9506..0000000 --- a/benchmarks/auto/creation/quick/delegates_textmetrics.qml +++ /dev/null @@ -1,29 +0,0 @@ -import QtQuick 2.4 -import QmlBench 1.0 - -// Tests the creation of TextMetrics with some simple props -CreationBenchmark { - id: root; - count: 50; - staticCount: 2500; - - property string fontName: { - if (Qt.platform.os == "osx") { - return "Helvetica" - } else if (Qt.platform.os == "linux") { - return "Open Sans" - } else if (Qt.platform.os == "windows") { - return "Arial" - } - } - - delegate: Item { - TextMetrics { - font.family: root.fontName - text: "Hello world" - } - } -} - - - diff --git a/benchmarks/auto/creation/quick/red.frag b/benchmarks/auto/creation/quick/red.frag deleted file mode 100644 index 2aa500e..0000000 --- a/benchmarks/auto/creation/quick/red.frag +++ /dev/null @@ -1,8 +0,0 @@ -#version 440 - -layout(location = 0) out vec4 fragColor; - -void main() -{ - fragColor = vec4(1.0, 0.0, 0.0, 1.0); -} diff --git a/benchmarks/auto/creation/quick/red.frag.qsb b/benchmarks/auto/creation/quick/red.frag.qsb Binary files differdeleted file mode 100644 index 5bae5c1..0000000 --- a/benchmarks/auto/creation/quick/red.frag.qsb +++ /dev/null diff --git a/benchmarks/auto/js/date_getYear.qml b/benchmarks/auto/js/date_getYear.qml deleted file mode 100644 index 2e2639a..0000000 --- a/benchmarks/auto/js/date_getYear.qml +++ /dev/null @@ -1,13 +0,0 @@ -import QtQuick 2.0 -import QmlBench 1.0 - -// Tests the performance of getting the year out of a Date object -CreationBenchmark { - id: root; - count: 50; - staticCount: 1500; - property date dt: new Date() - delegate: Item { - property int year: root.dt.getYear() - } -} diff --git a/benchmarks/auto/js/fib10.qml b/benchmarks/auto/js/fib10.qml deleted file mode 100644 index 7e0df4f..0000000 --- a/benchmarks/auto/js/fib10.qml +++ /dev/null @@ -1,19 +0,0 @@ -import QtQuick 2.0 -import QmlBench 1.0 - -// Tests the creation of Items with a recursive function binding -CreationBenchmark { - id: root; - count: 50; - staticCount: 1000; - delegate: Item { - x: fib(10); - } - - function fib(n) { - if (n < 2) - return Math.max(0, n); - else - return fib(n-1) + fib(n-2); - } -} diff --git a/benchmarks/auto/js/sum10k.qml b/benchmarks/auto/js/sum10k.qml deleted file mode 100644 index ed9850f..0000000 --- a/benchmarks/auto/js/sum10k.qml +++ /dev/null @@ -1,25 +0,0 @@ -import QtQuick 2.0 -import QmlBench 1.0 - -// Tests the creation of items with a non-recursive function binding -// Note: Through an unfortunate oversight, this benchmark is mildly broken. -// The loop never updates the 'x' value. However, this benchmark has already -// given some insights, and changing it (as any other benchmark) would -// invalidate past data causing confusion, so it has not been altered. -// -// See sum10k_fixed for a working version. -CreationBenchmark { - id: root; - count: 50; - staticCount: 1000; - delegate: Item { - x: sum(10000); - } - - function sum(n) { - var x = 0; - for (var i=0; i<n; ++i) - x = x + x; - return x; - } -} diff --git a/benchmarks/auto/js/sum10k_fixed.qml b/benchmarks/auto/js/sum10k_fixed.qml deleted file mode 100644 index b638a94..0000000 --- a/benchmarks/auto/js/sum10k_fixed.qml +++ /dev/null @@ -1,20 +0,0 @@ -import QtQuick 2.0 -import QmlBench 1.0 - -// Tests the creation of items with a non-recursive function binding -CreationBenchmark { - id: root; - count: 50; - staticCount: 1000; - delegate: Item { - x: sum(10000); - } - - function sum(n) { - var x = 0; - for (var i=0; i<n; ++i) - x = x + 1; - return x; - } -} - diff --git a/benchmarks/auto/layouts/gridlayout_large.qml b/benchmarks/auto/layouts/gridlayout_large.qml deleted file mode 100644 index 340a468..0000000 --- a/benchmarks/auto/layouts/gridlayout_large.qml +++ /dev/null @@ -1,36 +0,0 @@ -import QtQuick 2.2 -import QmlBench 1.0 -import QtQuick.Layouts 1.3 - -Benchmark { - id: root; - count: 50; - staticCount: 1000; - - // For each frame, change each child item of the layout: - // * Layout.rowSpan - // * Layout.columnSpan - - property int frameCounter : 0 - onTChanged: { - frameCounter++ - } - GridLayout { - columns: 100 - Repeater { - id: repeater - model: root.count - Rectangle { - color: Qt.hsla((index / 50) % 1, 1.0, 0.8) - Layout.columnSpan: (index * 3) % 17 + 1 + frameCounter % 10 - Layout.rowSpan: (index * 5) % 17 + 1 + frameCounter % 10 - implicitWidth: 0 - implicitHeight: 0 - Layout.fillWidth: true - Layout.fillHeight: true - } - } - } -} - - diff --git a/benchmarks/auto/quick3d/lights.qml b/benchmarks/auto/quick3d/lights.qml deleted file mode 100644 index 07439c1..0000000 --- a/benchmarks/auto/quick3d/lights.qml +++ /dev/null @@ -1,325 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2021 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the test suite of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** 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 https://www.qt.io/terms-conditions. For further -** information use the contact form at https://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.LGPL3 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-3.0.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 (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick -import QtQuick3D -import QmlBench - -Benchmark { - id: root; - count: 1; // Unused - staticCount: 1; // Unused - - width: 1280 - height: 720 - visible: true - - View3D { - anchors.fill: parent - - environment: SceneEnvironment { - clearColor: "#808080" - backgroundMode: SceneEnvironment.Color - antialiasingMode: SceneEnvironment.MSAA - antialiasingQuality: SceneEnvironment.High - } - - PerspectiveCamera { - position: Qt.vector3d(0, 400, 600) - eulerRotation.x: -30 - clipFar: 2000 - } - - DirectionalLight { - id: light1 - color: Qt.rgba(1.0, 0.1, 0.1, 1.0) - ambientColor: Qt.rgba(0.1, 0.1, 0.1, 1.0) - position: Qt.vector3d(0, 200, 0) - rotation: Quaternion.fromEulerAngles(-135, -90, 0) - shadowMapQuality: Light.ShadowMapQualityHigh - visible: true - castsShadow: true - brightness: 0.5 - SequentialAnimation on rotation { - loops: Animation.Infinite - QuaternionAnimation { - to: Quaternion.fromEulerAngles(-45, -90, 0) - duration: 2000 - easing.type: Easing.InOutQuad - } - QuaternionAnimation { - to: Quaternion.fromEulerAngles(-135, -90, 0) - duration: 2000 - easing.type: Easing.InOutQuad - } - } - } - - PointLight { - id: light2 - color: Qt.rgba(0.1, 1.0, 0.1, 1.0) - ambientColor: Qt.rgba(0.1, 0.1, 0.1, 1.0) - position: Qt.vector3d(0, 300, 0) - shadowMapFar: 2000 - shadowMapQuality: Light.ShadowMapQualityHigh - visible: true - castsShadow: true - brightness: 0.5 - SequentialAnimation on x { - loops: Animation.Infinite - NumberAnimation { - to: 400 - duration: 2000 - easing.type: Easing.InOutQuad - } - NumberAnimation { - to: 0 - duration: 2000 - easing.type: Easing.InOutQuad - } - } - } - - PointLight { - id: light3 - color: Qt.rgba(0.1, 1.0, 0.1, 1.0) - ambientColor: Qt.rgba(0.1, 0.1, 0.1, 1.0) - position: Qt.vector3d(0, 300, 0) - shadowMapFar: 2000 - shadowMapQuality: Light.ShadowMapQualityHigh - visible: true - castsShadow: true - brightness: 0.5 - SequentialAnimation on x { - loops: Animation.Infinite - NumberAnimation { - to: -400 - duration: 2000 - easing.type: Easing.InOutQuad - } - NumberAnimation { - to: 0 - duration: 2000 - easing.type: Easing.InOutQuad - } - } - } - - PointLight { - id: light2b - color: Qt.rgba(0.1, 1.0, 0.1, 1.0) - ambientColor: Qt.rgba(0.1, 0.1, 0.1, 1.0) - position: Qt.vector3d(0, 300, 0) - shadowMapFar: 2000 - shadowMapQuality: Light.ShadowMapQualityHigh - visible: true - castsShadow: true - brightness: 0.5 - SequentialAnimation on z { - loops: Animation.Infinite - NumberAnimation { - to: 400 - duration: 2000 - easing.type: Easing.InOutQuad - } - NumberAnimation { - to: 0 - duration: 2000 - easing.type: Easing.InOutQuad - } - } - } - - PointLight { - id: light3b - color: Qt.rgba(0.1, 1.0, 0.1, 1.0) - ambientColor: Qt.rgba(0.1, 0.1, 0.1, 1.0) - position: Qt.vector3d(0, 300, 0) - shadowMapFar: 2000 - shadowMapQuality: Light.ShadowMapQualityHigh - visible: true - castsShadow: true - brightness: 0.5 - SequentialAnimation on z { - loops: Animation.Infinite - NumberAnimation { - to: -400 - duration: 2000 - easing.type: Easing.InOutQuad - } - NumberAnimation { - to: 0 - duration: 2000 - easing.type: Easing.InOutQuad - } - } - } - SpotLight { - id: light4 - color: Qt.rgba(1.0, 0.9, 0.7, 1.0) - ambientColor: Qt.rgba(0.0, 0.0, 0.0, 0.0) - position: Qt.vector3d(0, 250, 0) - eulerRotation.x: -45 - shadowMapFar: 2000 - shadowMapQuality: Light.ShadowMapQualityHigh - visible: true - castsShadow: true - brightness: 0.5 - coneAngle: 50 - innerConeAngle: 30 - PropertyAnimation on eulerRotation.y { - loops: Animation.Infinite - from: 0 - to: -360 - duration: 10000 - } - } - - Model { - source: "#Rectangle" - y: -200 - scale: Qt.vector3d(15, 15, 15) - eulerRotation.x: -90 - materials: [ - DefaultMaterial { - diffuseColor: Qt.rgba(0.8, 0.6, 0.4, 1.0) - } - ] - } - Model { - source: "#Rectangle" - z: -400 - scale: Qt.vector3d(15, 15, 15) - materials: [ - DefaultMaterial { - diffuseColor: Qt.rgba(0.8, 0.8, 0.9, 1.0) - } - ] - } - - Model { - source: "#Sphere" - scale: Qt.vector3d(3, 3, 3) - materials: [ - DefaultMaterial { - diffuseColor: Qt.rgba(0.9, 0.9, 0.9, 1.0) - } - ] - } - - Model { - source: "#Cube" - position: light1.position - rotation: light1.rotation - property real size: 0.2 - scale: Qt.vector3d(size, size, size) - materials: [ - DefaultMaterial { - diffuseColor: light1.color - opacity: 0.4 - } - ] - } - Model { - source: "#Cube" - position: light2.position - rotation: light2.rotation - property real size: 0.2 - scale: Qt.vector3d(size, size, size) - materials: [ - DefaultMaterial { - diffuseColor: light2.color - opacity: 0.4 - } - ] - } - Model { - source: "#Cube" - position: light3.position - rotation: light3.rotation - property real size: 0.2 - scale: Qt.vector3d(size, size, size) - materials: [ - DefaultMaterial { - diffuseColor: light3.color - opacity: 0.4 - } - ] - } - Model { - source: "#Cube" - position: light2b.position - rotation: light2b.rotation - property real size: 0.2 - scale: Qt.vector3d(size, size, size) - materials: [ - DefaultMaterial { - diffuseColor: light2b.color - opacity: 0.4 - } - ] - } - Model { - source: "#Cube" - position: light3b.position - rotation: light3b.rotation - property real size: 0.2 - scale: Qt.vector3d(size, size, size) - materials: [ - DefaultMaterial { - diffuseColor: light3b.color - opacity: 0.4 - } - ] - } - Model { - source: "#Cube" - position: light4.position - rotation: light4.rotation - property real size: 0.2 - scale: Qt.vector3d(size, size, size) - materials: [ - DefaultMaterial { - diffuseColor: light4.color - opacity: 0.4 - } - ] - } - } -} diff --git a/benchmarks/auto/quick3d/multiview.qml b/benchmarks/auto/quick3d/multiview.qml deleted file mode 100644 index 5b1077b..0000000 --- a/benchmarks/auto/quick3d/multiview.qml +++ /dev/null @@ -1,213 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2021 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the test suite of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** 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 https://www.qt.io/terms-conditions. For further -** information use the contact form at https://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.LGPL3 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-3.0.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 (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick -import QtQuick3D -import QmlBench - -CreationBenchmark { - id: root - count: 25*25 - staticCount: 25*25 - - width: 800 - height: 600 - visible: true - - // The root scene - Node { - id: standAloneScene - DirectionalLight { - ambientColor: Qt.rgba(0.5, 0.5, 0.5, 1.0) - brightness: 1.0 - eulerRotation.x: -25 - } - - Model { - source: "#Cube" - y: -104 - scale: Qt.vector3d(3, 3, 0.1) - eulerRotation.x: -90 - materials: [ - DefaultMaterial { - diffuseColor: Qt.rgba(0.8, 0.8, 0.8, 1.0) - } - ] - } - - Model { - source: "#Sphere" - scale: Qt.vector3d(1, 1, 1) - materials: [ - PrincipledMaterial { - baseColor: "#41cd52" - metalness: 0.0 - roughness: 0.1 - opacity: 1.0 - } - ] - PropertyAnimation on eulerRotation.y { - loops: Animation.Infinite - duration: 5000 - to: 0 - from: -360 - } - } - - // The predefined cameras. They have to be part of the scene, i.e. inside the root node. - // Animated perspective camera - Node { - PerspectiveCamera { - id: cam1 - z: 600 - } - PropertyAnimation on eulerRotation.x { - loops: Animation.Infinite - duration: 5000 - to: -360 - from: 0 - } - } - - // Stationary perspective camera - PerspectiveCamera { - id: cam2 - z: 600 - } - - // Second animated perspective camera - Node { - PerspectiveCamera { - id: cam3 - x: 500 - eulerRotation.y: 90 - } - PropertyAnimation on eulerRotation.y { - loops: Animation.Infinite - duration: 5000 - to: 0 - from: -360 - } - } - - PerspectiveCamera { - id: cam4 - y: 600 - eulerRotation.x: -90 - } - - PerspectiveCamera { - id: cam5 - x: -600 - eulerRotation.y: -90 - } - - Node { - id: shapeSpawner - property var instances: [] - property int count - - function addShapes() - { - let rows = Math.ceil(Math.sqrt(count)); - let strideX = root.width/rows; - let strideY = root.height/rows; - let cameraNames = ["cam1", "cam2", "cam3", "cam4", "cam5"] - var numAdded = 0; - - for (var i = 0; i < rows; i++) { - for (var j = 0; j < rows; j++) { - if (numAdded == count) - break; - - let xPos = i * strideX; - let yPos = j * strideY; - - let idx = numAdded % 5; - let cameraName = cameraNames[idx]; - - var qmlStr = - [" import QtQuick ", - " import QtQuick3D ", - " ", - " Rectangle { ", - " width: " + strideX, - " height: " + strideY, - " x: " + xPos, - " y: " + yPos, - " color: \"#848895\" ", - " View3D { ", - " anchors.fill: parent ", - " importScene: standAloneScene ", - " camera: " + cameraName, - " } ", - " } "].join('\n'); - - var instance = Qt.createQmlObject(qmlStr, root, "View3D_" + idx); - - instances.push(instance); - numAdded += 1; - } - } - } - - function removeShapes() - { - for (var i = 0; i < instances.length; i++) { - instances[i].destroy(); - } - instances = []; - } - - Connections { - target: root - function onCountChanged() { - shapeSpawner.count = root.count; - shapeSpawner.removeShapes(); - shapeSpawner.addShapes(); - } - } - } - - Component.onCompleted: { - shapeSpawner.count = count; - shapeSpawner.addShapes(); - } - } -} diff --git a/benchmarks/auto/quick3d/principledmaterial/PrincipledMaterial.qml b/benchmarks/auto/quick3d/principledmaterial/PrincipledMaterial.qml deleted file mode 100644 index 205b3b1..0000000 --- a/benchmarks/auto/quick3d/principledmaterial/PrincipledMaterial.qml +++ /dev/null @@ -1,158 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2021 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** 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 https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** BSD License Usage -** Alternatively, you may use this file under the terms of the BSD license -** as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of The Qt Company Ltd nor the names of its -** contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick -import QtQuick.Window -import QtQuick3D -import QmlBench - - -Benchmark { - id: root; - count: 1; // Unused - staticCount: 1; // Unused - - width: 1280 - height: 720 - - property real metalness: 1.0 - property real roughness: 0.2 - property real specular: 0.0 - property real specularTint: 0.0 - property real opacityValue: 1.0 - - View3D { - anchors.fill: parent - camera: camera - renderMode: View3D.Underlay - - //! [rotating light] - // Rotate the light direction - DirectionalLight { - eulerRotation.y: -100 - SequentialAnimation on eulerRotation.y { - loops: Animation.Infinite - PropertyAnimation { - duration: 5000 - to: 360 - from: 0 - } - } - } - //! [rotating light] - - //! [environment] - environment: SceneEnvironment { - probeExposure: 2.5 - clearColor: "#848895" - - backgroundMode: SceneEnvironment.SkyBox - lightProbe: Texture { - source: "maps/OpenfootageNET_garage-1024.hdr" - } - } - //! [environment] - - PerspectiveCamera { - id: camera - position: Qt.vector3d(0, 0, 600) - } - - //! [basic principled] - Model { - position: Qt.vector3d(-250, -30, 0) - scale: Qt.vector3d(4, 4, 4) - source: "#Sphere" - materials: [ PrincipledMaterial { - baseColor: "#41cd52" - metalness: root.metalness - roughness: root.roughness - specularAmount: root.specular - specularTint: root.specularTint - opacity: root.opacityValue - } - ] - } - //! [basic principled] - - //! [textured principled] - Model { - position: Qt.vector3d(250, -30, 0) - scale: Qt.vector3d(4, 4, 4) - source: "#Sphere" - materials: [ PrincipledMaterial { - metalness: root.metalness - roughness: root.roughness - specularAmount: root.specular - opacity: root.opacityValue - - baseColorMap: Texture { source: "maps/metallic/basecolor.jpg" } - metalnessMap: Texture { source: "maps/metallic/metallic.jpg" } - roughnessMap: Texture { source: "maps/metallic/roughness.jpg" } - normalMap: Texture { source: "maps/metallic/normal.jpg" } - - metalnessChannel: Material.R - roughnessChannel: Material.R - } - ] - - //! [textured principled] - - SequentialAnimation on eulerRotation { - loops: Animation.Infinite - PropertyAnimation { - duration: 5000 - from: Qt.vector3d(0, 0, 0) - to: Qt.vector3d(360, 360, 360) - } - } - } - } -} diff --git a/benchmarks/auto/quick3d/principledmaterial/maps/OpenfootageNET_garage-1024.hdr b/benchmarks/auto/quick3d/principledmaterial/maps/OpenfootageNET_garage-1024.hdr Binary files differdeleted file mode 100644 index 01e9e38..0000000 --- a/benchmarks/auto/quick3d/principledmaterial/maps/OpenfootageNET_garage-1024.hdr +++ /dev/null diff --git a/benchmarks/auto/quick3d/principledmaterial/maps/metallic/basecolor.jpg b/benchmarks/auto/quick3d/principledmaterial/maps/metallic/basecolor.jpg Binary files differdeleted file mode 100644 index 4401827..0000000 --- a/benchmarks/auto/quick3d/principledmaterial/maps/metallic/basecolor.jpg +++ /dev/null diff --git a/benchmarks/auto/quick3d/principledmaterial/maps/metallic/metallic.jpg b/benchmarks/auto/quick3d/principledmaterial/maps/metallic/metallic.jpg Binary files differdeleted file mode 100644 index 6fe7b17..0000000 --- a/benchmarks/auto/quick3d/principledmaterial/maps/metallic/metallic.jpg +++ /dev/null diff --git a/benchmarks/auto/quick3d/principledmaterial/maps/metallic/normal.jpg b/benchmarks/auto/quick3d/principledmaterial/maps/metallic/normal.jpg Binary files differdeleted file mode 100644 index c8d1a59..0000000 --- a/benchmarks/auto/quick3d/principledmaterial/maps/metallic/normal.jpg +++ /dev/null diff --git a/benchmarks/auto/quick3d/principledmaterial/maps/metallic/roughness.jpg b/benchmarks/auto/quick3d/principledmaterial/maps/metallic/roughness.jpg Binary files differdeleted file mode 100644 index f200e33..0000000 --- a/benchmarks/auto/quick3d/principledmaterial/maps/metallic/roughness.jpg +++ /dev/null diff --git a/benchmarks/auto/quick3d/shapespawner/WeirdShape.qml b/benchmarks/auto/quick3d/shapespawner/WeirdShape.qml deleted file mode 100644 index 9bd820b..0000000 --- a/benchmarks/auto/quick3d/shapespawner/WeirdShape.qml +++ /dev/null @@ -1,79 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2019 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** 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 https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** BSD License Usage -** Alternatively, you may use this file under the terms of the BSD license -** as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of The Qt Company Ltd nor the names of its -** contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick -import QtQuick3D - -Node { - id: weirdShape - - property real xRotation: Math.random() * (360 - (-360)) + -360 - property real yRotation: Math.random() * (360 - (-360)) + -360 - property real zRotation: Math.random() * (360 - (-360)) + -360 - - property real hue: Math.random() - - Model { - source: "weirdShape.mesh" - scale: Qt.vector3d(150, 150, 150) - eulerRotation.x: 90 - - SequentialAnimation on eulerRotation { - loops: Animation.Infinite - PropertyAnimation { - duration: Math.random() * (10000 - 1000) + 1000 - to: Qt.vector3d(xRotation - 360, yRotation - 360, zRotation - 360) - from: Qt.vector3d(xRotation, yRotation, zRotation) - } - } - - materials: [ DefaultMaterial { diffuseColor: Qt.hsva(hue, 1.0, 1.0, 1.0) } ] - } -} diff --git a/benchmarks/auto/quick3d/shapespawner/shapespawner.qml b/benchmarks/auto/quick3d/shapespawner/shapespawner.qml deleted file mode 100644 index c3a9e05..0000000 --- a/benchmarks/auto/quick3d/shapespawner/shapespawner.qml +++ /dev/null @@ -1,110 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2021 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the test suite of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** 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 https://www.qt.io/terms-conditions. For further -** information use the contact form at https://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.LGPL3 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-3.0.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 (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick -import QtQuick3D -import QmlBench - -CreationBenchmark { - id: root; - count: 4000; - staticCount: 4000; - - View3D { - id: view - anchors.fill: parent - - environment: SceneEnvironment { - clearColor: "skyblue" - backgroundMode: SceneEnvironment.Color - } - - PerspectiveCamera { - position: Qt.vector3d(0, 200, 300) - eulerRotation.x: -30 - } - - DirectionalLight { - eulerRotation.x: -30 - eulerRotation.y: -70 - } - - Node { - id: shapeSpawner - property real range: 300 - property var instances: [] - property int count - - function addShapes() - { - for (var i = 0; i < count; i++) { - var xPos = (2 * Math.random() * range) - range; - var yPos = (2 * Math.random() * range) - range; - var zPos = (2 * Math.random() * range) - range; - var shapeComponent = Qt.createComponent("WeirdShape.qml"); - let instance = shapeComponent.createObject(shapeSpawner, - { "x": xPos, "y": yPos, "z": zPos, "scale": Qt.vector3d(0.05, 0.05, 0.05)}); - instances.push(instance); - } - } - - function removeShapes() - { - for (var i = 0; i < instances.length; i++) { - instances[i].destroy(); - } - instances = []; - } - - Connections { - target: root - function onCountChanged() { - shapeSpawner.count = root.count; - shapeSpawner.removeShapes(); - shapeSpawner.addShapes(); - } - } - } - - Component.onCompleted: { - shapeSpawner.count = count; - shapeSpawner.addShapes(); - } - } -} diff --git a/benchmarks/auto/quick3d/shapespawner/weirdShape.mesh b/benchmarks/auto/quick3d/shapespawner/weirdShape.mesh Binary files differdeleted file mode 100644 index 2e4d6fa..0000000 --- a/benchmarks/auto/quick3d/shapespawner/weirdShape.mesh +++ /dev/null diff --git a/benchmarks/benchmarks.md b/benchmarks/benchmarks.md deleted file mode 100644 index f8884b9..0000000 --- a/benchmarks/benchmarks.md +++ /dev/null @@ -1,124 +0,0 @@ -[<-- Back to README.md](../README.md) - -# Creating custom benchmarks -Sometimes an existing test doesn't cover your hacks to qt, or maybe you're adding new functionality, -either way, creating new benchmarks is easy. ~Here's how!~ - -## The fundamentals of QMLBench -When running qmlbench in `frame-count shell` (default mode), a static count of operations is -performed for each frame rendered. QMLbench renders as quickly as possible over a 20 second -(default) period counting the total frames rendered during that period. This is the 'score'. -In this way, a benchmark should be defined to perform as many operations as possible without -hanging qmlbench, typically managing to run at a few frames-per-second on mid-grade hardware. -If this rule is observed, a benchmark should be able to run on low-grade embedded hardware without -timing out and hanging, as well as on high-end hardware without acheiving 60fps -(the typical soft cap if vsync cannot be disabled). - - -## A sample file - - import QtQuick 2.0 - import QmlBench 1.0 - - // Tests the creation of rectangles with *NO* alpha channel. - // Compare with delegates_rect_blended & delegates_rect_radius - CreationBenchmark { - id: root; - count: 50; - staticCount: 2500; - delegate: Rectangle { - x: QmlBench.getRandom() * (root.width - width) - y: QmlBench.getRandom() * (root.height - height) - width: 30 - height: 15 - color: "steelblue" - } - } - - -## The root level declarations -In the example above, we're testing the creation speed of the `Rectangle` delegate, so we're using `CreationBenchmark`. - -There are three types of root level declarations allowed: -- Benchmark - - The basic QMLBench type. - - Good for testing performance of operations with fixed durations, such as animations. - - Provides the `count` and `staticCount` properties. - - Provides a tick property `t` from 0 to 1, lasting 1000ms that benchmarks can access. -- CreationBenchmark - - Inherits Benchmark - - Creates `count` instances of an object before displaying the rendered frame. - - Destroys all items and recreates them each frame. -- Item (Inherited from QtBase) - - must declare the following manually - ``` - id: root; - property int count: your_count_here; - property int staticCount: your_static_count_here; - - property real t; - NumberAnimation on t { from: 0; to: 1; duration: your_ticker_duration_in_ms; loops: Animation.Infinite } - ``` - - -## Count and StaticCount -In general, it is good practice to set both values so the benchmark can be used with any shell type. - -### count -Used in `sustained-fps shell` mode. The benchmark will alter this value trying to achieve 60fps -(or rather, the screen's refresh rate). Set this value to as a starting point for the benchmark to -try first. - -### staticCount -Used in all `static` shell types. This is the count of objects to create on startup. -- If using CreationBenchmark root type, this is the count of objects to create each frame. -- If using Benchmark, this is the count of objects to create at the start of the benchmark run. - - -## Item delegates (Creation Benchmarks) -In the code sample above, the `delegate` (a property of CreationBenchmark) is defined as a -Rectangle with a fixed size and random position, shaded a single color with no transparency. -- This `delegate` will be repeated in the render window in accordance with the properties `count` -or `staticCount`, for a given shell type. -- The delegates will be destroyed and regenerated for each frame rendered. - - -## Repeaters (Non-creation benchmarks) -Let's take a look at a new code sample. For this benchmark, we're repeating an operation `count` -times using `Repeater` at the benchmark outset, and continuing to render for the duration of the test. - - import QtQuick 2.2 - import QmlBench 1.0 - - // Move images around using Animation types, to be compared with a number of - // other similar ways to move them around. - Benchmark { - id: root; - - count: 500 - staticCount: 20000 - - Repeater { - model: root.count - Image { - source: "../../../../shared/butterfly-wide.png" - x: QmlBench.getRandom() * (root.width - width) - y: QmlBench.getRandom() * (root.height - height) - width: 40 - height: 40 - - SequentialAnimation on rotation { - NumberAnimation { from: -10; to: 10; duration: 500; easing.type: Easing.InOutCubic } - NumberAnimation { from: 10; to: -10; duration: 500; easing.type: Easing.InOutCubic } - loops: Animation.Infinite - } - } - } - } - -In this case, the image `butterfly-wide.png` is being randomly placed in the render window, and has -an animation applied on `rotation`, looping infinitely. The image and animation will be repeated 500 -times, resulting in 500 randomly placed, rotating images for the duration of the benchmark run. - -- Multiple `Repeaters` can be added if necessary, though it's recommended to test the smallest -possible operation specific to your change. diff --git a/benchmarks/manual/gputhroughput/README.md b/benchmarks/manual/gputhroughput/README.md deleted file mode 100644 index 28800bb..0000000 --- a/benchmarks/manual/gputhroughput/README.md +++ /dev/null @@ -1,16 +0,0 @@ -# gputhroughput - -These benchmarks test your GPU for the most part. The QML part is mostly there -to set things up and the benchmark will fill the graphics pipeline with enough -stuff to make it suffer. - -**Note**! These tests are only designed to be used with the sustained-fps shell. - -The purpose of these benchmarks is to give an indication how how much one can -expect to put on screen, and to decide how big the screen can actually be. -Especially in the embedded space where a low end chip may have to drive an HD -display, these tests can help to illustrate if the GPU is up to the task or not. - -Run them in --fullscreen to get the right numbers. 1 means your in trouble. 2 means -you can manage with a lot of work. 4 and above and you should be good shape, GPU-wise. - diff --git a/benchmarks/manual/gputhroughput/blendedrect.qml b/benchmarks/manual/gputhroughput/blendedrect.qml deleted file mode 100644 index cd0d2c6..0000000 --- a/benchmarks/manual/gputhroughput/blendedrect.qml +++ /dev/null @@ -1,18 +0,0 @@ -import QtQuick 2.0 - -// Stacks x number of alphablended rectangles on top of each other. -// Rough test of fillrate. -Item { - id: root; - property int count: 10 - property int staticCount: 0 - - Repeater { - model: root.count; - Rectangle { - width: root.width - height: root.height - color: Qt.hsla((index * .271) % 1.0, 0.5, 0.5, 0.5); - } - } -} diff --git a/benchmarks/manual/gputhroughput/blendedtexture.qml b/benchmarks/manual/gputhroughput/blendedtexture.qml deleted file mode 100644 index 51f067e..0000000 --- a/benchmarks/manual/gputhroughput/blendedtexture.qml +++ /dev/null @@ -1,20 +0,0 @@ -import QtQuick 2.0 - -// Stacks x number of alphablended textures on top of each other. -// Rouch test of fill and texel rate. -Item { - id: root; - property int count: 8; - property int staticCount: 0 - - Repeater { - model: root.count; - Rectangle { - width: root.width - height: root.height - color: Qt.hsla((index * .271) % 1.0, 0.5, 0.5, 0.5); - layer.enabled: true - layer.format: ShaderEffectSource.RGBA - } - } -} diff --git a/benchmarks/manual/gputhroughput/drawcalls.qml b/benchmarks/manual/gputhroughput/drawcalls.qml deleted file mode 100644 index bdd6289..0000000 --- a/benchmarks/manual/gputhroughput/drawcalls.qml +++ /dev/null @@ -1,44 +0,0 @@ -import QtQuick 2.0 - -// Take this one with a grain of salt. Graphics drivers have a -// lot of overhead in how drawing is set up, and seeing an individual GL call take -// up to a millisecond (yes, a millisecond) is not uncommon. This test is a highly -// constructed case to try to get a rough ballpart of how many discrete draw calls -// the GL stack is capable of. -// -// This is mostly important if you end up with an application that fails to do -// batching in the scene graph renderer, but as this situation will typically -// have many other performance problems, this may not be a useful benchmark for -// the most part. -Item { - id: root; - - property real cellSize: Math.floor(Math.sqrt(width * height / (count / 2))) - property int count: 250 - property int staticCount: 0 - - Grid { - width: root.width - height: root.height - columns: Math.ceil(root.width / root.cellSize); - rows: Math.ceil(root.height / root.cellSize); - Repeater { - model: root.count / 2 - Rectangle { - opacity: 0.9 - width: root.cellSize - height: root.cellSize - color: Qt.hsla(index / count, 0.5, 0.5); - Image { - // partially overlap the next cells to provoke separate draw calls. - x: parent.width / 2 - y: parent.height / 2 - width: x + 2 - height: y + 2 - sourceSize: Qt.size(width, height); - source: "../../../shared/butterfly-wide.png" - } - } - } - } -} diff --git a/benchmarks/manual/gputhroughput/gaussblur.qml b/benchmarks/manual/gputhroughput/gaussblur.qml deleted file mode 100644 index 8c8860e..0000000 --- a/benchmarks/manual/gputhroughput/gaussblur.qml +++ /dev/null @@ -1,39 +0,0 @@ -import QtQuick 2.2 -import QtGraphicalEffects 1.0 - -// This benchmark is added to test how feasible live blurring -// is. Live blurring is an extreme fillrate test and is only something that -// should be considered on gaming and industrial hardware. And then you still -// probably want to cheat :p -Item { - id: root; - property int count: 8 - property int maxCount: 32; - property int staticCount: 0 - - width: 600 - height: 600 - - Image { - id: contentRoot - anchors.fill: parent - fillMode: Image.PreserveAspectCrop - source: "grapes.jpg" - Rectangle { - color: "palegreen" - border.color: "black" - width: parent.width / 3 - height: parent.width / 3 - RotationAnimator on rotation { from: 0; to: 360; duration: 10000; loops: Animation.Infinite } - anchors.centerIn: parent - antialiasing: true - } - - layer.enabled: true - layer.effect: GaussianBlur { - samples: root.count - radius: root.count - deviation: Math.sqrt(root.count) - } - } -} diff --git a/benchmarks/manual/gputhroughput/grapes.jpg b/benchmarks/manual/gputhroughput/grapes.jpg Binary files differdeleted file mode 100755 index a6c2213..0000000 --- a/benchmarks/manual/gputhroughput/grapes.jpg +++ /dev/null diff --git a/benchmarks/manual/gputhroughput/opaquerect.qml b/benchmarks/manual/gputhroughput/opaquerect.qml deleted file mode 100644 index dd1a07b..0000000 --- a/benchmarks/manual/gputhroughput/opaquerect.qml +++ /dev/null @@ -1,19 +0,0 @@ -import QtQuick 2.0 - -// Stacks x number of opaque rectangles on top of each other. -// Will go a lot higher than blendedrect if the target hardware supprts -// [early-z](https://en.wikipedia.org/?title=Z-buffering) -Item { - id: root; - property int count: 16; - property int staticCount: 0 - - Repeater { - model: root.count; - Rectangle { - width: root.width - height: root.height - color: Qt.hsla((index * .271) % 1.0, 0.5, 0.5); - } - } -} diff --git a/benchmarks/manual/gputhroughput/opaquetexture.qml b/benchmarks/manual/gputhroughput/opaquetexture.qml deleted file mode 100644 index 07762e0..0000000 --- a/benchmarks/manual/gputhroughput/opaquetexture.qml +++ /dev/null @@ -1,27 +0,0 @@ -import QtQuick 2.0 - -// Stacks x number of opaque textures on top of each other. -// Will go a lot higher than blendedtexture if target hardware supports -// [early-z](https://en.wikipedia.org/?title=Z-buffering) -Item { - id: root; - - property int count; - property int staticCount: 0 - - Repeater { - model: root.count; - Rectangle { - width: root.width - height: root.height - color: Qt.hsla((index * .271) % 1.0, 0.5, 0.5); - z: index - layer.enabled: true - layer.effect: ShaderEffect { - blending: false - } - } - } - - -} diff --git a/benchmarks/manual/v8bench/README.md b/benchmarks/manual/v8bench/README.md deleted file mode 100644 index 5515a69..0000000 --- a/benchmarks/manual/v8bench/README.md +++ /dev/null @@ -1,10 +0,0 @@ -# v8bench - -This is a set of simple wrapper tests that invoke a particular test suite from -the well known v8-bench test suite, that test different aspects of JavaScript -performance. - -This uses qmlbench (rather than v8-bench.js) as the test harness in order to -integrate with the rest of the tests, and perhaps also to give a more stable -result (by running for a longer duration, and running repeatedly, as all -qmlbench tests do). diff --git a/benchmarks/manual/v8bench/v8-Crypto.qml b/benchmarks/manual/v8bench/v8-Crypto.qml deleted file mode 100644 index 122e6c1..0000000 --- a/benchmarks/manual/v8bench/v8-Crypto.qml +++ /dev/null @@ -1,10 +0,0 @@ -import QtQuick 2.0 -import QmlBench 1.0 - -V8Benchmark { - id: root - count: 10 - staticCount: 10 - suiteName: "Crypto" -} - diff --git a/benchmarks/manual/v8bench/v8-DeltaBlue.qml b/benchmarks/manual/v8bench/v8-DeltaBlue.qml deleted file mode 100644 index d5c8384..0000000 --- a/benchmarks/manual/v8bench/v8-DeltaBlue.qml +++ /dev/null @@ -1,10 +0,0 @@ -import QtQuick 2.0 -import QmlBench 1.0 - -V8Benchmark { - id: root - count: 10 - staticCount: 10 - suiteName: "DeltaBlue" -} - diff --git a/benchmarks/manual/v8bench/v8-EarleyBoyer.qml b/benchmarks/manual/v8bench/v8-EarleyBoyer.qml deleted file mode 100644 index e3ee075..0000000 --- a/benchmarks/manual/v8bench/v8-EarleyBoyer.qml +++ /dev/null @@ -1,10 +0,0 @@ -import QtQuick 2.0 -import QmlBench 1.0 - -V8Benchmark { - id: root - count: 10 - staticCount: 10 - suiteName: "EarleyBoyer" -} - diff --git a/benchmarks/manual/v8bench/v8-RayTrace.qml b/benchmarks/manual/v8bench/v8-RayTrace.qml deleted file mode 100644 index e7dafa0..0000000 --- a/benchmarks/manual/v8bench/v8-RayTrace.qml +++ /dev/null @@ -1,10 +0,0 @@ -import QtQuick 2.0 -import QmlBench 1.0 - -V8Benchmark { - id: root - count: 10 - staticCount: 10 - suiteName: "RayTrace" -} - diff --git a/benchmarks/manual/v8bench/v8-RegExp.qml b/benchmarks/manual/v8bench/v8-RegExp.qml deleted file mode 100644 index 28afc50..0000000 --- a/benchmarks/manual/v8bench/v8-RegExp.qml +++ /dev/null @@ -1,10 +0,0 @@ -import QtQuick 2.0 -import QmlBench 1.0 - -V8Benchmark { - id: root - count: 10 - staticCount: 10 - suiteName: "RegExp" -} - diff --git a/benchmarks/manual/v8bench/v8-Richards.qml b/benchmarks/manual/v8bench/v8-Richards.qml deleted file mode 100644 index 4b644b2..0000000 --- a/benchmarks/manual/v8bench/v8-Richards.qml +++ /dev/null @@ -1,10 +0,0 @@ -import QtQuick 2.0 -import QmlBench 1.0 - -V8Benchmark { - id: root - count: 10 - staticCount: 10 - suiteName: "Richards" -} - diff --git a/benchmarks/manual/v8bench/v8-Splay.qml b/benchmarks/manual/v8bench/v8-Splay.qml deleted file mode 100644 index d4040b8..0000000 --- a/benchmarks/manual/v8bench/v8-Splay.qml +++ /dev/null @@ -1,10 +0,0 @@ -import QtQuick 2.0 -import QmlBench 1.0 - -V8Benchmark { - id: root - count: 10 - staticCount: 10 - suiteName: "Splay" -} - |
