From c9d84ead801960601870240e36478468c2a28b82 Mon Sep 17 00:00:00 2001 From: Ville Voutilainen Date: Wed, 1 Dec 2021 13:14:20 +0200 Subject: Use a resource file for benchmarks, and add some Android goodies and fixes Task-number: QTBUG-94148 Change-Id: I7cc0b1ade676c4f7f963915315c00e317582e56f Reviewed-by: Daniel Smith --- README.md | 25 ++ benchmarks/auto/animations/comparison/README.md | 17 -- .../comparison/moving-images-animations.qml | 28 -- .../comparison/moving-images-animators.qml | 28 -- .../animations/comparison/moving-images-script.qml | 30 -- .../animations/comparison/moving-images-simple.qml | 29 -- benchmarks/auto/bindings/compositesingleton.qml | 15 - benchmarks/auto/canvas/canvas_text_simple.qml | 29 -- benchmarks/auto/changes/README.md | 5 - benchmarks/auto/changes/changing_over_isolated.qml | 50 ---- .../changes/changing_over_isolated_with_clip.qml | 49 ---- .../changing_over_isolated_with_clip_rotated.qml | 57 ---- .../auto/changes/changing_text_oneofmany.qml | 22 -- benchmarks/auto/changes/changing_texts.qml | 22 -- benchmarks/auto/creation/README.md | 14 - .../auto/creation/layouts/delegates_column.qml | 38 --- .../creation/layouts/delegates_columnlayout.qml | 39 --- .../auto/creation/layouts/delegates_flow.qml | 38 --- .../auto/creation/layouts/delegates_grid.qml | 38 --- .../auto/creation/layouts/delegates_gridlayout.qml | 40 --- benchmarks/auto/creation/layouts/delegates_row.qml | 38 --- .../auto/creation/layouts/delegates_rowlayout.qml | 39 --- .../qml.basictypes/delegates_basictype_bool.qml | 13 - .../qml.basictypes/delegates_basictype_double.qml | 13 - .../qml.basictypes/delegates_basictype_int.qml | 13 - .../qml.basictypes/delegates_basictype_real.qml | 13 - .../qml.basictypes/delegates_basictype_string.qml | 13 - .../qml.basictypes/delegates_basictype_url.qml | 13 - .../delegates_basictype_var_array.qml | 13 - .../delegates_basictype_var_bool.qml | 13 - .../qml.basictypes/delegates_basictype_var_int.qml | 13 - .../delegates_basictype_var_object.qml | 13 - .../delegates_basictype_var_string.qml | 13 - .../delegates_basictype_variant_array.qml | 14 - .../delegates_basictype_variant_bool.qml | 14 - .../delegates_basictype_variant_int.qml | 14 - .../delegates_basictype_variant_object.qml | 14 - .../delegates_basictype_variant_string.qml | 14 - .../creation/qml.modelaccess/modelaccess_bool.qml | 24 -- .../qml.modelaccess/modelaccess_bytearray.qml | 24 -- .../creation/qml.modelaccess/modelaccess_color.qml | 24 -- .../qml.modelaccess/modelaccess_datetime.qml | 24 -- .../creation/qml.modelaccess/modelaccess_int.qml | 24 -- .../qml.modelaccess/modelaccess_jsvalue.qml | 24 -- .../creation/qml.modelaccess/modelaccess_point.qml | 24 -- .../creation/qml.modelaccess/modelaccess_real.qml | 24 -- .../creation/qml.modelaccess/modelaccess_rect.qml | 24 -- .../creation/qml.modelaccess/modelaccess_size.qml | 24 -- .../qml.modelaccess/modelaccess_string.qml | 24 -- .../creation/qml.modelaccess/modelaccess_url.qml | 24 -- .../qtgraphicaleffects/delegates_dropshadow.qml | 47 --- .../delegates_lineargradient.qml | 22 -- .../quick.basictypes/delegates_basictype_color.qml | 13 - .../delegates_basictype_color_argb.qml | 13 - .../delegates_basictype_color_name.qml | 13 - .../quick.basictypes/delegates_basictype_date.qml | 13 - .../delegates_basictype_date_object.qml | 13 - .../delegates_basictype_matrix4x4.qml | 13 - .../quick.basictypes/delegates_basictype_point.qml | 13 - .../delegates_basictype_quaternion.qml | 13 - .../quick.basictypes/delegates_basictype_rect.qml | 13 - .../quick.basictypes/delegates_basictype_size.qml | 13 - .../delegates_basictype_var_size.qml | 14 - .../delegates_basictype_variant_size.qml | 15 - .../delegates_basictype_vector2d.qml | 13 - .../delegates_basictype_vector3d.qml | 13 - .../delegates_basictype_vector4d.qml | 13 - .../delegates_canvas_fbo_cooperative.qml | 20 -- .../delegates_canvas_fbo_immediate.qml | 20 -- .../quick.canvas/delegates_canvas_fbo_threaded.qml | 19 -- .../delegates_canvas_image_cooperative.qml | 20 -- .../delegates_canvas_image_immediate.qml | 19 -- .../delegates_canvas_image_threaded.qml | 19 -- .../quick.controls2/delegates_busyindicator.qml | 15 - .../creation/quick.controls2/delegates_button.qml | 16 - .../quick.controls2/delegates_checkbox.qml | 16 - .../quick.controls2/delegates_combobox.qml | 16 - .../creation/quick.controls2/delegates_dial.qml | 15 - .../quick.controls2/delegates_itemdelegate.qml | 16 - .../creation/quick.controls2/delegates_label.qml | 15 - .../quick.controls2/delegates_menu_custom.qml | 47 --- .../quick.controls2/delegates_menuitem.qml | 18 -- .../quick.controls2/delegates_progressbar.qml | 15 - .../quick.controls2/delegates_radiobutton.qml | 17 -- .../quick.controls2/delegates_scrollbar.qml | 18 -- .../quick.controls2/delegates_scrollview.qml | 24 -- .../creation/quick.controls2/delegates_slider.qml | 15 - .../creation/quick.controls2/delegates_spinbox.qml | 15 - .../creation/quick.controls2/delegates_switch.qml | 16 - .../creation/quick.controls2/delegates_tabbar.qml | 24 -- .../quick.controls2/delegates_textarea.qml | 15 - .../quick.controls2/delegates_textfield.qml | 15 - .../creation/quick.controls2/delegates_tumbler.qml | 16 - .../auto/creation/quick.image/delegates_image.qml | 23 -- .../creation/quick.image/delegates_image_alpha.qml | 18 -- .../quick.image/delegates_image_antialiased.qml | 25 -- .../creation/quick.image/delegates_image_async.qml | 25 -- .../creation/quick.image/delegates_image_solid.qml | 18 -- .../auto/creation/quick.item/delegates_item.qml | 17 -- .../quick.item/delegates_item_bindings.qml | 18 -- .../quick.item/delegates_item_childrenRect.qml | 22 -- .../creation/quick.item/delegates_item_empty.qml | 12 - .../quick.item/delegates_item_empty_jscreation.qml | 34 --- .../creation/quick.item/delegates_item_script.qml | 19 -- .../creation/quick.item/delegates_item_states.qml | 29 -- .../auto/creation/quick.item/delegates_item_z.qml | 18 -- .../auto/creation/quick.item/item_anchors.qml | 19 -- benchmarks/auto/creation/quick.item/item_size.qml | 21 -- .../creation/quick.rectangle/delegates_rect.qml | 17 -- .../quick.rectangle/delegates_rect_blended.qml | 18 -- .../quick.rectangle/delegates_rect_border.qml | 20 -- .../quick.rectangle/delegates_rect_gradient.qml | 20 -- .../quick.rectangle/delegates_rect_radius.qml | 19 -- .../quick.text/comparison/delegates_kerning.qml | 17 -- .../quick.text/comparison/delegates_nokerning.qml | 18 -- .../quick.text/comparison/delegates_noshaping.qml | 18 -- .../creation/quick.text/delegates_longtext.qml | 17 -- .../quick.text/delegates_longtext_arabic.qml | 18 -- .../quick.text/delegates_longtext_chinese.qml | 19 -- .../quick.text/delegates_longtext_hindi.qml | 20 -- .../auto/creation/quick.text/delegates_text.qml | 15 - .../creation/quick.text/delegates_text_arabic.qml | 16 - .../creation/quick.text/delegates_text_chinese.qml | 16 - .../quick.text/delegates_text_decoration_bold.qml | 18 -- .../delegates_text_decoration_italic.qml | 18 -- .../delegates_text_decoration_strikeout.qml | 18 -- .../delegates_text_decoration_underline.qml | 18 -- .../creation/quick.text/delegates_text_elide.qml | 17 -- .../creation/quick.text/delegates_text_hindi.qml | 17 -- .../quick.text/delegates_text_nativerendering.qml | 16 - .../creation/quick.text/delegates_text_plain.qml | 16 - .../quick.text/delegates_text_richtext.qml | 16 - .../creation/quick.text/delegates_text_styled.qml | 16 - .../creation/quick.text/delegates_textedit.qml | 15 - .../creation/quick.text/delegates_textinput.qml | 15 - .../quick.transforms/delegates_item_rotated.qml | 18 -- .../delegates_item_rotated_transform.qml | 21 -- .../quick.transforms/delegates_item_scaled.qml | 19 -- .../delegates_item_scaled_transform.qml | 23 -- .../quick.transforms/delegates_item_translated.qml | 23 -- .../quick.validators/delegates_doublevalidator.qml | 17 -- .../quick.validators/delegates_intvalidator.qml | 16 - .../quick.validators/delegates_regexpvalidator.qml | 15 - benchmarks/auto/creation/quick/compile.bat | 1 - .../auto/creation/quick/delegates_flickable.qml | 15 - .../auto/creation/quick/delegates_flipable.qml | 15 - .../auto/creation/quick/delegates_focusscope.qml | 16 - .../auto/creation/quick/delegates_fontloader.qml | 27 -- .../auto/creation/quick/delegates_fontmetrics.qml | 27 -- .../auto/creation/quick/delegates_gridview.qml | 16 - .../auto/creation/quick/delegates_listview.qml | 17 -- .../auto/creation/quick/delegates_loader.qml | 23 -- .../auto/creation/quick/delegates_mousearea.qml | 17 -- .../quick/delegates_multipointtoucharea.qml | 17 -- .../auto/creation/quick/delegates_pathview.qml | 18 -- .../auto/creation/quick/delegates_pincharea.qml | 19 -- .../auto/creation/quick/delegates_qobject.qml | 27 -- .../quick/delegates_qobject_large_array.qml | 36 --- .../auto/creation/quick/delegates_shadereffect.qml | 18 -- .../quick/delegates_shadereffect_props.qml | 26 -- .../quick/delegates_shadereffectsource.qml | 24 -- .../auto/creation/quick/delegates_textmetrics.qml | 29 -- benchmarks/auto/creation/quick/red.frag | 8 - benchmarks/auto/creation/quick/red.frag.qsb | Bin 613 -> 0 bytes benchmarks/auto/js/date_getYear.qml | 13 - benchmarks/auto/js/fib10.qml | 19 -- benchmarks/auto/js/sum10k.qml | 25 -- benchmarks/auto/js/sum10k_fixed.qml | 20 -- benchmarks/auto/layouts/gridlayout_large.qml | 36 --- benchmarks/auto/quick3d/lights.qml | 325 --------------------- benchmarks/auto/quick3d/multiview.qml | 213 -------------- .../principledmaterial/PrincipledMaterial.qml | 158 ---------- .../maps/OpenfootageNET_garage-1024.hdr | Bin 1675239 -> 0 bytes .../principledmaterial/maps/metallic/basecolor.jpg | Bin 724020 -> 0 bytes .../principledmaterial/maps/metallic/metallic.jpg | Bin 625742 -> 0 bytes .../principledmaterial/maps/metallic/normal.jpg | Bin 332333 -> 0 bytes .../principledmaterial/maps/metallic/roughness.jpg | Bin 600706 -> 0 bytes .../auto/quick3d/shapespawner/WeirdShape.qml | 79 ----- .../auto/quick3d/shapespawner/shapespawner.qml | 110 ------- .../auto/quick3d/shapespawner/weirdShape.mesh | Bin 228360 -> 0 bytes benchmarks/benchmarks.md | 124 -------- benchmarks/manual/gputhroughput/README.md | 16 - benchmarks/manual/gputhroughput/blendedrect.qml | 18 -- benchmarks/manual/gputhroughput/blendedtexture.qml | 20 -- benchmarks/manual/gputhroughput/drawcalls.qml | 44 --- benchmarks/manual/gputhroughput/gaussblur.qml | 39 --- benchmarks/manual/gputhroughput/grapes.jpg | Bin 304492 -> 0 bytes benchmarks/manual/gputhroughput/opaquerect.qml | 19 -- benchmarks/manual/gputhroughput/opaquetexture.qml | 27 -- benchmarks/manual/v8bench/README.md | 10 - benchmarks/manual/v8bench/v8-Crypto.qml | 10 - benchmarks/manual/v8bench/v8-DeltaBlue.qml | 10 - benchmarks/manual/v8bench/v8-EarleyBoyer.qml | 10 - benchmarks/manual/v8bench/v8-RayTrace.qml | 10 - benchmarks/manual/v8bench/v8-RegExp.qml | 10 - benchmarks/manual/v8bench/v8-Richards.qml | 10 - benchmarks/manual/v8bench/v8-Splay.qml | 10 - shared/Globals.qml | 10 - shared/alpha.png | Bin 2422 -> 0 bytes shared/butterfly-collapsed.png | Bin 1966 -> 0 bytes shared/butterfly-half.png | Bin 2730 -> 0 bytes shared/butterfly-wide.png | Bin 4151 -> 0 bytes shared/qmldir | 1 - shared/solid.png | Bin 607 -> 0 bytes src/CMakeLists.txt | 184 ++++++++++++ .../auto/animations/comparison/README.md | 17 ++ .../comparison/moving-images-animations.qml | 28 ++ .../comparison/moving-images-animators.qml | 28 ++ .../animations/comparison/moving-images-script.qml | 30 ++ .../animations/comparison/moving-images-simple.qml | 29 ++ .../auto/bindings/compositesingleton.qml | 15 + src/benchmarks/auto/canvas/canvas_text_simple.qml | 29 ++ src/benchmarks/auto/changes/README.md | 5 + .../auto/changes/changing_over_isolated.qml | 50 ++++ .../changes/changing_over_isolated_with_clip.qml | 49 ++++ .../changing_over_isolated_with_clip_rotated.qml | 57 ++++ .../auto/changes/changing_text_oneofmany.qml | 22 ++ src/benchmarks/auto/changes/changing_texts.qml | 22 ++ src/benchmarks/auto/creation/README.md | 14 + .../auto/creation/layouts/delegates_column.qml | 38 +++ .../creation/layouts/delegates_columnlayout.qml | 39 +++ .../auto/creation/layouts/delegates_flow.qml | 38 +++ .../auto/creation/layouts/delegates_grid.qml | 38 +++ .../auto/creation/layouts/delegates_gridlayout.qml | 40 +++ .../auto/creation/layouts/delegates_row.qml | 38 +++ .../auto/creation/layouts/delegates_rowlayout.qml | 39 +++ .../qml.basictypes/delegates_basictype_bool.qml | 13 + .../qml.basictypes/delegates_basictype_double.qml | 13 + .../qml.basictypes/delegates_basictype_int.qml | 13 + .../qml.basictypes/delegates_basictype_real.qml | 13 + .../qml.basictypes/delegates_basictype_string.qml | 13 + .../qml.basictypes/delegates_basictype_url.qml | 13 + .../delegates_basictype_var_array.qml | 13 + .../delegates_basictype_var_bool.qml | 13 + .../qml.basictypes/delegates_basictype_var_int.qml | 13 + .../delegates_basictype_var_object.qml | 13 + .../delegates_basictype_var_string.qml | 13 + .../delegates_basictype_variant_array.qml | 14 + .../delegates_basictype_variant_bool.qml | 14 + .../delegates_basictype_variant_int.qml | 14 + .../delegates_basictype_variant_object.qml | 14 + .../delegates_basictype_variant_string.qml | 14 + .../creation/qml.modelaccess/modelaccess_bool.qml | 24 ++ .../qml.modelaccess/modelaccess_bytearray.qml | 24 ++ .../creation/qml.modelaccess/modelaccess_color.qml | 24 ++ .../qml.modelaccess/modelaccess_datetime.qml | 24 ++ .../creation/qml.modelaccess/modelaccess_int.qml | 24 ++ .../qml.modelaccess/modelaccess_jsvalue.qml | 24 ++ .../creation/qml.modelaccess/modelaccess_point.qml | 24 ++ .../creation/qml.modelaccess/modelaccess_real.qml | 24 ++ .../creation/qml.modelaccess/modelaccess_rect.qml | 24 ++ .../creation/qml.modelaccess/modelaccess_size.qml | 24 ++ .../qml.modelaccess/modelaccess_string.qml | 24 ++ .../creation/qml.modelaccess/modelaccess_url.qml | 24 ++ .../qtgraphicaleffects/delegates_dropshadow.qml | 47 +++ .../delegates_lineargradient.qml | 22 ++ .../quick.basictypes/delegates_basictype_color.qml | 13 + .../delegates_basictype_color_argb.qml | 13 + .../delegates_basictype_color_name.qml | 13 + .../quick.basictypes/delegates_basictype_date.qml | 13 + .../delegates_basictype_date_object.qml | 13 + .../delegates_basictype_matrix4x4.qml | 13 + .../quick.basictypes/delegates_basictype_point.qml | 13 + .../delegates_basictype_quaternion.qml | 13 + .../quick.basictypes/delegates_basictype_rect.qml | 13 + .../quick.basictypes/delegates_basictype_size.qml | 13 + .../delegates_basictype_var_size.qml | 14 + .../delegates_basictype_variant_size.qml | 15 + .../delegates_basictype_vector2d.qml | 13 + .../delegates_basictype_vector3d.qml | 13 + .../delegates_basictype_vector4d.qml | 13 + .../delegates_canvas_fbo_cooperative.qml | 20 ++ .../delegates_canvas_fbo_immediate.qml | 20 ++ .../quick.canvas/delegates_canvas_fbo_threaded.qml | 19 ++ .../delegates_canvas_image_cooperative.qml | 20 ++ .../delegates_canvas_image_immediate.qml | 19 ++ .../delegates_canvas_image_threaded.qml | 19 ++ .../quick.controls2/delegates_busyindicator.qml | 15 + .../creation/quick.controls2/delegates_button.qml | 16 + .../quick.controls2/delegates_checkbox.qml | 16 + .../quick.controls2/delegates_combobox.qml | 16 + .../creation/quick.controls2/delegates_dial.qml | 15 + .../quick.controls2/delegates_itemdelegate.qml | 16 + .../creation/quick.controls2/delegates_label.qml | 15 + .../quick.controls2/delegates_menu_custom.qml | 47 +++ .../quick.controls2/delegates_menuitem.qml | 18 ++ .../quick.controls2/delegates_progressbar.qml | 15 + .../quick.controls2/delegates_radiobutton.qml | 17 ++ .../quick.controls2/delegates_scrollbar.qml | 18 ++ .../quick.controls2/delegates_scrollview.qml | 24 ++ .../creation/quick.controls2/delegates_slider.qml | 15 + .../creation/quick.controls2/delegates_spinbox.qml | 15 + .../creation/quick.controls2/delegates_switch.qml | 16 + .../creation/quick.controls2/delegates_tabbar.qml | 24 ++ .../quick.controls2/delegates_textarea.qml | 15 + .../quick.controls2/delegates_textfield.qml | 15 + .../creation/quick.controls2/delegates_tumbler.qml | 16 + .../auto/creation/quick.image/delegates_image.qml | 23 ++ .../creation/quick.image/delegates_image_alpha.qml | 18 ++ .../quick.image/delegates_image_antialiased.qml | 25 ++ .../creation/quick.image/delegates_image_async.qml | 25 ++ .../creation/quick.image/delegates_image_solid.qml | 18 ++ .../auto/creation/quick.item/delegates_item.qml | 17 ++ .../quick.item/delegates_item_bindings.qml | 18 ++ .../quick.item/delegates_item_childrenRect.qml | 22 ++ .../creation/quick.item/delegates_item_empty.qml | 12 + .../quick.item/delegates_item_empty_jscreation.qml | 34 +++ .../creation/quick.item/delegates_item_script.qml | 19 ++ .../creation/quick.item/delegates_item_states.qml | 29 ++ .../auto/creation/quick.item/delegates_item_z.qml | 18 ++ .../auto/creation/quick.item/item_anchors.qml | 19 ++ .../auto/creation/quick.item/item_size.qml | 21 ++ .../creation/quick.rectangle/delegates_rect.qml | 17 ++ .../quick.rectangle/delegates_rect_blended.qml | 18 ++ .../quick.rectangle/delegates_rect_border.qml | 20 ++ .../quick.rectangle/delegates_rect_gradient.qml | 20 ++ .../quick.rectangle/delegates_rect_radius.qml | 19 ++ .../quick.text/comparison/delegates_kerning.qml | 17 ++ .../quick.text/comparison/delegates_nokerning.qml | 18 ++ .../quick.text/comparison/delegates_noshaping.qml | 18 ++ .../creation/quick.text/delegates_longtext.qml | 17 ++ .../quick.text/delegates_longtext_arabic.qml | 18 ++ .../quick.text/delegates_longtext_chinese.qml | 19 ++ .../quick.text/delegates_longtext_hindi.qml | 20 ++ .../auto/creation/quick.text/delegates_text.qml | 15 + .../creation/quick.text/delegates_text_arabic.qml | 16 + .../creation/quick.text/delegates_text_chinese.qml | 16 + .../quick.text/delegates_text_decoration_bold.qml | 18 ++ .../delegates_text_decoration_italic.qml | 18 ++ .../delegates_text_decoration_strikeout.qml | 18 ++ .../delegates_text_decoration_underline.qml | 18 ++ .../creation/quick.text/delegates_text_elide.qml | 17 ++ .../creation/quick.text/delegates_text_hindi.qml | 17 ++ .../quick.text/delegates_text_nativerendering.qml | 16 + .../creation/quick.text/delegates_text_plain.qml | 16 + .../quick.text/delegates_text_richtext.qml | 16 + .../creation/quick.text/delegates_text_styled.qml | 16 + .../creation/quick.text/delegates_textedit.qml | 15 + .../creation/quick.text/delegates_textinput.qml | 15 + .../quick.transforms/delegates_item_rotated.qml | 18 ++ .../delegates_item_rotated_transform.qml | 21 ++ .../quick.transforms/delegates_item_scaled.qml | 19 ++ .../delegates_item_scaled_transform.qml | 23 ++ .../quick.transforms/delegates_item_translated.qml | 23 ++ .../quick.validators/delegates_doublevalidator.qml | 17 ++ .../quick.validators/delegates_intvalidator.qml | 16 + .../quick.validators/delegates_regexpvalidator.qml | 15 + src/benchmarks/auto/creation/quick/compile.bat | 1 + .../auto/creation/quick/delegates_flickable.qml | 15 + .../auto/creation/quick/delegates_flipable.qml | 15 + .../auto/creation/quick/delegates_focusscope.qml | 16 + .../auto/creation/quick/delegates_fontloader.qml | 27 ++ .../auto/creation/quick/delegates_fontmetrics.qml | 27 ++ .../auto/creation/quick/delegates_gridview.qml | 16 + .../auto/creation/quick/delegates_listview.qml | 17 ++ .../auto/creation/quick/delegates_loader.qml | 23 ++ .../auto/creation/quick/delegates_mousearea.qml | 17 ++ .../quick/delegates_multipointtoucharea.qml | 17 ++ .../auto/creation/quick/delegates_pathview.qml | 18 ++ .../auto/creation/quick/delegates_pincharea.qml | 19 ++ .../auto/creation/quick/delegates_qobject.qml | 27 ++ .../quick/delegates_qobject_large_array.qml | 36 +++ .../auto/creation/quick/delegates_shadereffect.qml | 18 ++ .../quick/delegates_shadereffect_props.qml | 26 ++ .../quick/delegates_shadereffectsource.qml | 24 ++ .../auto/creation/quick/delegates_textmetrics.qml | 29 ++ src/benchmarks/auto/creation/quick/red.frag | 8 + src/benchmarks/auto/creation/quick/red.frag.qsb | Bin 0 -> 613 bytes src/benchmarks/auto/js/date_getYear.qml | 13 + src/benchmarks/auto/js/fib10.qml | 19 ++ src/benchmarks/auto/js/sum10k.qml | 25 ++ src/benchmarks/auto/js/sum10k_fixed.qml | 20 ++ src/benchmarks/auto/layouts/gridlayout_large.qml | 36 +++ src/benchmarks/auto/quick3d/lights.qml | 325 +++++++++++++++++++++ src/benchmarks/auto/quick3d/multiview.qml | 213 ++++++++++++++ .../principledmaterial/PrincipledMaterial.qml | 158 ++++++++++ .../maps/OpenfootageNET_garage-1024.hdr | Bin 0 -> 1675239 bytes .../principledmaterial/maps/metallic/basecolor.jpg | Bin 0 -> 724020 bytes .../principledmaterial/maps/metallic/metallic.jpg | Bin 0 -> 625742 bytes .../principledmaterial/maps/metallic/normal.jpg | Bin 0 -> 332333 bytes .../principledmaterial/maps/metallic/roughness.jpg | Bin 0 -> 600706 bytes .../auto/quick3d/shapespawner/WeirdShape.qml | 79 +++++ .../auto/quick3d/shapespawner/shapespawner.qml | 110 +++++++ .../auto/quick3d/shapespawner/weirdShape.mesh | Bin 0 -> 228360 bytes src/benchmarks/benchmarks.md | 124 ++++++++ src/benchmarks/manual/gputhroughput/README.md | 16 + .../manual/gputhroughput/blendedrect.qml | 18 ++ .../manual/gputhroughput/blendedtexture.qml | 20 ++ src/benchmarks/manual/gputhroughput/drawcalls.qml | 44 +++ src/benchmarks/manual/gputhroughput/gaussblur.qml | 39 +++ src/benchmarks/manual/gputhroughput/grapes.jpg | Bin 0 -> 304492 bytes src/benchmarks/manual/gputhroughput/opaquerect.qml | 19 ++ .../manual/gputhroughput/opaquetexture.qml | 27 ++ src/benchmarks/manual/v8bench/README.md | 10 + src/benchmarks/manual/v8bench/v8-Crypto.qml | 10 + src/benchmarks/manual/v8bench/v8-DeltaBlue.qml | 10 + src/benchmarks/manual/v8bench/v8-EarleyBoyer.qml | 10 + src/benchmarks/manual/v8bench/v8-RayTrace.qml | 10 + src/benchmarks/manual/v8bench/v8-RegExp.qml | 10 + src/benchmarks/manual/v8bench/v8-Richards.qml | 10 + src/benchmarks/manual/v8bench/v8-Splay.qml | 10 + src/main.cpp | 17 ++ src/options.h | 4 + src/resultrecorder.cpp | 15 + src/shared/Globals.qml | 10 + src/shared/alpha.png | Bin 0 -> 2422 bytes src/shared/butterfly-collapsed.png | Bin 0 -> 1966 bytes src/shared/butterfly-half.png | Bin 0 -> 2730 bytes src/shared/butterfly-wide.png | Bin 0 -> 4151 bytes src/shared/qmldir | 1 + src/shared/solid.png | Bin 0 -> 607 bytes 411 files changed, 4889 insertions(+), 4644 deletions(-) delete mode 100644 benchmarks/auto/animations/comparison/README.md delete mode 100644 benchmarks/auto/animations/comparison/moving-images-animations.qml delete mode 100644 benchmarks/auto/animations/comparison/moving-images-animators.qml delete mode 100644 benchmarks/auto/animations/comparison/moving-images-script.qml delete mode 100644 benchmarks/auto/animations/comparison/moving-images-simple.qml delete mode 100644 benchmarks/auto/bindings/compositesingleton.qml delete mode 100644 benchmarks/auto/canvas/canvas_text_simple.qml delete mode 100644 benchmarks/auto/changes/README.md delete mode 100644 benchmarks/auto/changes/changing_over_isolated.qml delete mode 100644 benchmarks/auto/changes/changing_over_isolated_with_clip.qml delete mode 100644 benchmarks/auto/changes/changing_over_isolated_with_clip_rotated.qml delete mode 100644 benchmarks/auto/changes/changing_text_oneofmany.qml delete mode 100644 benchmarks/auto/changes/changing_texts.qml delete mode 100644 benchmarks/auto/creation/README.md delete mode 100644 benchmarks/auto/creation/layouts/delegates_column.qml delete mode 100644 benchmarks/auto/creation/layouts/delegates_columnlayout.qml delete mode 100644 benchmarks/auto/creation/layouts/delegates_flow.qml delete mode 100644 benchmarks/auto/creation/layouts/delegates_grid.qml delete mode 100644 benchmarks/auto/creation/layouts/delegates_gridlayout.qml delete mode 100644 benchmarks/auto/creation/layouts/delegates_row.qml delete mode 100644 benchmarks/auto/creation/layouts/delegates_rowlayout.qml delete mode 100644 benchmarks/auto/creation/qml.basictypes/delegates_basictype_bool.qml delete mode 100644 benchmarks/auto/creation/qml.basictypes/delegates_basictype_double.qml delete mode 100644 benchmarks/auto/creation/qml.basictypes/delegates_basictype_int.qml delete mode 100644 benchmarks/auto/creation/qml.basictypes/delegates_basictype_real.qml delete mode 100644 benchmarks/auto/creation/qml.basictypes/delegates_basictype_string.qml delete mode 100644 benchmarks/auto/creation/qml.basictypes/delegates_basictype_url.qml delete mode 100644 benchmarks/auto/creation/qml.basictypes/delegates_basictype_var_array.qml delete mode 100644 benchmarks/auto/creation/qml.basictypes/delegates_basictype_var_bool.qml delete mode 100644 benchmarks/auto/creation/qml.basictypes/delegates_basictype_var_int.qml delete mode 100644 benchmarks/auto/creation/qml.basictypes/delegates_basictype_var_object.qml delete mode 100644 benchmarks/auto/creation/qml.basictypes/delegates_basictype_var_string.qml delete mode 100644 benchmarks/auto/creation/qml.basictypes/delegates_basictype_variant_array.qml delete mode 100644 benchmarks/auto/creation/qml.basictypes/delegates_basictype_variant_bool.qml delete mode 100644 benchmarks/auto/creation/qml.basictypes/delegates_basictype_variant_int.qml delete mode 100644 benchmarks/auto/creation/qml.basictypes/delegates_basictype_variant_object.qml delete mode 100644 benchmarks/auto/creation/qml.basictypes/delegates_basictype_variant_string.qml delete mode 100644 benchmarks/auto/creation/qml.modelaccess/modelaccess_bool.qml delete mode 100644 benchmarks/auto/creation/qml.modelaccess/modelaccess_bytearray.qml delete mode 100644 benchmarks/auto/creation/qml.modelaccess/modelaccess_color.qml delete mode 100644 benchmarks/auto/creation/qml.modelaccess/modelaccess_datetime.qml delete mode 100644 benchmarks/auto/creation/qml.modelaccess/modelaccess_int.qml delete mode 100644 benchmarks/auto/creation/qml.modelaccess/modelaccess_jsvalue.qml delete mode 100644 benchmarks/auto/creation/qml.modelaccess/modelaccess_point.qml delete mode 100644 benchmarks/auto/creation/qml.modelaccess/modelaccess_real.qml delete mode 100644 benchmarks/auto/creation/qml.modelaccess/modelaccess_rect.qml delete mode 100644 benchmarks/auto/creation/qml.modelaccess/modelaccess_size.qml delete mode 100644 benchmarks/auto/creation/qml.modelaccess/modelaccess_string.qml delete mode 100644 benchmarks/auto/creation/qml.modelaccess/modelaccess_url.qml delete mode 100644 benchmarks/auto/creation/qtgraphicaleffects/delegates_dropshadow.qml delete mode 100644 benchmarks/auto/creation/qtgraphicaleffects/delegates_lineargradient.qml delete mode 100644 benchmarks/auto/creation/quick.basictypes/delegates_basictype_color.qml delete mode 100644 benchmarks/auto/creation/quick.basictypes/delegates_basictype_color_argb.qml delete mode 100644 benchmarks/auto/creation/quick.basictypes/delegates_basictype_color_name.qml delete mode 100644 benchmarks/auto/creation/quick.basictypes/delegates_basictype_date.qml delete mode 100644 benchmarks/auto/creation/quick.basictypes/delegates_basictype_date_object.qml delete mode 100644 benchmarks/auto/creation/quick.basictypes/delegates_basictype_matrix4x4.qml delete mode 100644 benchmarks/auto/creation/quick.basictypes/delegates_basictype_point.qml delete mode 100644 benchmarks/auto/creation/quick.basictypes/delegates_basictype_quaternion.qml delete mode 100644 benchmarks/auto/creation/quick.basictypes/delegates_basictype_rect.qml delete mode 100644 benchmarks/auto/creation/quick.basictypes/delegates_basictype_size.qml delete mode 100644 benchmarks/auto/creation/quick.basictypes/delegates_basictype_var_size.qml delete mode 100644 benchmarks/auto/creation/quick.basictypes/delegates_basictype_variant_size.qml delete mode 100644 benchmarks/auto/creation/quick.basictypes/delegates_basictype_vector2d.qml delete mode 100644 benchmarks/auto/creation/quick.basictypes/delegates_basictype_vector3d.qml delete mode 100644 benchmarks/auto/creation/quick.basictypes/delegates_basictype_vector4d.qml delete mode 100644 benchmarks/auto/creation/quick.canvas/delegates_canvas_fbo_cooperative.qml delete mode 100644 benchmarks/auto/creation/quick.canvas/delegates_canvas_fbo_immediate.qml delete mode 100644 benchmarks/auto/creation/quick.canvas/delegates_canvas_fbo_threaded.qml delete mode 100644 benchmarks/auto/creation/quick.canvas/delegates_canvas_image_cooperative.qml delete mode 100644 benchmarks/auto/creation/quick.canvas/delegates_canvas_image_immediate.qml delete mode 100644 benchmarks/auto/creation/quick.canvas/delegates_canvas_image_threaded.qml delete mode 100644 benchmarks/auto/creation/quick.controls2/delegates_busyindicator.qml delete mode 100644 benchmarks/auto/creation/quick.controls2/delegates_button.qml delete mode 100644 benchmarks/auto/creation/quick.controls2/delegates_checkbox.qml delete mode 100644 benchmarks/auto/creation/quick.controls2/delegates_combobox.qml delete mode 100644 benchmarks/auto/creation/quick.controls2/delegates_dial.qml delete mode 100644 benchmarks/auto/creation/quick.controls2/delegates_itemdelegate.qml delete mode 100644 benchmarks/auto/creation/quick.controls2/delegates_label.qml delete mode 100644 benchmarks/auto/creation/quick.controls2/delegates_menu_custom.qml delete mode 100644 benchmarks/auto/creation/quick.controls2/delegates_menuitem.qml delete mode 100644 benchmarks/auto/creation/quick.controls2/delegates_progressbar.qml delete mode 100644 benchmarks/auto/creation/quick.controls2/delegates_radiobutton.qml delete mode 100644 benchmarks/auto/creation/quick.controls2/delegates_scrollbar.qml delete mode 100644 benchmarks/auto/creation/quick.controls2/delegates_scrollview.qml delete mode 100644 benchmarks/auto/creation/quick.controls2/delegates_slider.qml delete mode 100644 benchmarks/auto/creation/quick.controls2/delegates_spinbox.qml delete mode 100644 benchmarks/auto/creation/quick.controls2/delegates_switch.qml delete mode 100644 benchmarks/auto/creation/quick.controls2/delegates_tabbar.qml delete mode 100644 benchmarks/auto/creation/quick.controls2/delegates_textarea.qml delete mode 100644 benchmarks/auto/creation/quick.controls2/delegates_textfield.qml delete mode 100644 benchmarks/auto/creation/quick.controls2/delegates_tumbler.qml delete mode 100644 benchmarks/auto/creation/quick.image/delegates_image.qml delete mode 100644 benchmarks/auto/creation/quick.image/delegates_image_alpha.qml delete mode 100644 benchmarks/auto/creation/quick.image/delegates_image_antialiased.qml delete mode 100644 benchmarks/auto/creation/quick.image/delegates_image_async.qml delete mode 100644 benchmarks/auto/creation/quick.image/delegates_image_solid.qml delete mode 100644 benchmarks/auto/creation/quick.item/delegates_item.qml delete mode 100644 benchmarks/auto/creation/quick.item/delegates_item_bindings.qml delete mode 100644 benchmarks/auto/creation/quick.item/delegates_item_childrenRect.qml delete mode 100644 benchmarks/auto/creation/quick.item/delegates_item_empty.qml delete mode 100644 benchmarks/auto/creation/quick.item/delegates_item_empty_jscreation.qml delete mode 100644 benchmarks/auto/creation/quick.item/delegates_item_script.qml delete mode 100644 benchmarks/auto/creation/quick.item/delegates_item_states.qml delete mode 100644 benchmarks/auto/creation/quick.item/delegates_item_z.qml delete mode 100644 benchmarks/auto/creation/quick.item/item_anchors.qml delete mode 100644 benchmarks/auto/creation/quick.item/item_size.qml delete mode 100644 benchmarks/auto/creation/quick.rectangle/delegates_rect.qml delete mode 100644 benchmarks/auto/creation/quick.rectangle/delegates_rect_blended.qml delete mode 100644 benchmarks/auto/creation/quick.rectangle/delegates_rect_border.qml delete mode 100644 benchmarks/auto/creation/quick.rectangle/delegates_rect_gradient.qml delete mode 100644 benchmarks/auto/creation/quick.rectangle/delegates_rect_radius.qml delete mode 100644 benchmarks/auto/creation/quick.text/comparison/delegates_kerning.qml delete mode 100644 benchmarks/auto/creation/quick.text/comparison/delegates_nokerning.qml delete mode 100644 benchmarks/auto/creation/quick.text/comparison/delegates_noshaping.qml delete mode 100644 benchmarks/auto/creation/quick.text/delegates_longtext.qml delete mode 100644 benchmarks/auto/creation/quick.text/delegates_longtext_arabic.qml delete mode 100644 benchmarks/auto/creation/quick.text/delegates_longtext_chinese.qml delete mode 100644 benchmarks/auto/creation/quick.text/delegates_longtext_hindi.qml delete mode 100644 benchmarks/auto/creation/quick.text/delegates_text.qml delete mode 100644 benchmarks/auto/creation/quick.text/delegates_text_arabic.qml delete mode 100644 benchmarks/auto/creation/quick.text/delegates_text_chinese.qml delete mode 100644 benchmarks/auto/creation/quick.text/delegates_text_decoration_bold.qml delete mode 100644 benchmarks/auto/creation/quick.text/delegates_text_decoration_italic.qml delete mode 100644 benchmarks/auto/creation/quick.text/delegates_text_decoration_strikeout.qml delete mode 100644 benchmarks/auto/creation/quick.text/delegates_text_decoration_underline.qml delete mode 100644 benchmarks/auto/creation/quick.text/delegates_text_elide.qml delete mode 100644 benchmarks/auto/creation/quick.text/delegates_text_hindi.qml delete mode 100644 benchmarks/auto/creation/quick.text/delegates_text_nativerendering.qml delete mode 100644 benchmarks/auto/creation/quick.text/delegates_text_plain.qml delete mode 100644 benchmarks/auto/creation/quick.text/delegates_text_richtext.qml delete mode 100644 benchmarks/auto/creation/quick.text/delegates_text_styled.qml delete mode 100644 benchmarks/auto/creation/quick.text/delegates_textedit.qml delete mode 100644 benchmarks/auto/creation/quick.text/delegates_textinput.qml delete mode 100644 benchmarks/auto/creation/quick.transforms/delegates_item_rotated.qml delete mode 100644 benchmarks/auto/creation/quick.transforms/delegates_item_rotated_transform.qml delete mode 100644 benchmarks/auto/creation/quick.transforms/delegates_item_scaled.qml delete mode 100644 benchmarks/auto/creation/quick.transforms/delegates_item_scaled_transform.qml delete mode 100644 benchmarks/auto/creation/quick.transforms/delegates_item_translated.qml delete mode 100644 benchmarks/auto/creation/quick.validators/delegates_doublevalidator.qml delete mode 100644 benchmarks/auto/creation/quick.validators/delegates_intvalidator.qml delete mode 100644 benchmarks/auto/creation/quick.validators/delegates_regexpvalidator.qml delete mode 100644 benchmarks/auto/creation/quick/compile.bat delete mode 100644 benchmarks/auto/creation/quick/delegates_flickable.qml delete mode 100644 benchmarks/auto/creation/quick/delegates_flipable.qml delete mode 100644 benchmarks/auto/creation/quick/delegates_focusscope.qml delete mode 100644 benchmarks/auto/creation/quick/delegates_fontloader.qml delete mode 100644 benchmarks/auto/creation/quick/delegates_fontmetrics.qml delete mode 100644 benchmarks/auto/creation/quick/delegates_gridview.qml delete mode 100644 benchmarks/auto/creation/quick/delegates_listview.qml delete mode 100644 benchmarks/auto/creation/quick/delegates_loader.qml delete mode 100644 benchmarks/auto/creation/quick/delegates_mousearea.qml delete mode 100644 benchmarks/auto/creation/quick/delegates_multipointtoucharea.qml delete mode 100644 benchmarks/auto/creation/quick/delegates_pathview.qml delete mode 100644 benchmarks/auto/creation/quick/delegates_pincharea.qml delete mode 100644 benchmarks/auto/creation/quick/delegates_qobject.qml delete mode 100644 benchmarks/auto/creation/quick/delegates_qobject_large_array.qml delete mode 100644 benchmarks/auto/creation/quick/delegates_shadereffect.qml delete mode 100644 benchmarks/auto/creation/quick/delegates_shadereffect_props.qml delete mode 100644 benchmarks/auto/creation/quick/delegates_shadereffectsource.qml delete mode 100644 benchmarks/auto/creation/quick/delegates_textmetrics.qml delete mode 100644 benchmarks/auto/creation/quick/red.frag delete mode 100644 benchmarks/auto/creation/quick/red.frag.qsb delete mode 100644 benchmarks/auto/js/date_getYear.qml delete mode 100644 benchmarks/auto/js/fib10.qml delete mode 100644 benchmarks/auto/js/sum10k.qml delete mode 100644 benchmarks/auto/js/sum10k_fixed.qml delete mode 100644 benchmarks/auto/layouts/gridlayout_large.qml delete mode 100644 benchmarks/auto/quick3d/lights.qml delete mode 100644 benchmarks/auto/quick3d/multiview.qml delete mode 100644 benchmarks/auto/quick3d/principledmaterial/PrincipledMaterial.qml delete mode 100644 benchmarks/auto/quick3d/principledmaterial/maps/OpenfootageNET_garage-1024.hdr delete mode 100644 benchmarks/auto/quick3d/principledmaterial/maps/metallic/basecolor.jpg delete mode 100644 benchmarks/auto/quick3d/principledmaterial/maps/metallic/metallic.jpg delete mode 100644 benchmarks/auto/quick3d/principledmaterial/maps/metallic/normal.jpg delete mode 100644 benchmarks/auto/quick3d/principledmaterial/maps/metallic/roughness.jpg delete mode 100644 benchmarks/auto/quick3d/shapespawner/WeirdShape.qml delete mode 100644 benchmarks/auto/quick3d/shapespawner/shapespawner.qml delete mode 100644 benchmarks/auto/quick3d/shapespawner/weirdShape.mesh delete mode 100644 benchmarks/benchmarks.md delete mode 100644 benchmarks/manual/gputhroughput/README.md delete mode 100644 benchmarks/manual/gputhroughput/blendedrect.qml delete mode 100644 benchmarks/manual/gputhroughput/blendedtexture.qml delete mode 100644 benchmarks/manual/gputhroughput/drawcalls.qml delete mode 100644 benchmarks/manual/gputhroughput/gaussblur.qml delete mode 100755 benchmarks/manual/gputhroughput/grapes.jpg delete mode 100644 benchmarks/manual/gputhroughput/opaquerect.qml delete mode 100644 benchmarks/manual/gputhroughput/opaquetexture.qml delete mode 100644 benchmarks/manual/v8bench/README.md delete mode 100644 benchmarks/manual/v8bench/v8-Crypto.qml delete mode 100644 benchmarks/manual/v8bench/v8-DeltaBlue.qml delete mode 100644 benchmarks/manual/v8bench/v8-EarleyBoyer.qml delete mode 100644 benchmarks/manual/v8bench/v8-RayTrace.qml delete mode 100644 benchmarks/manual/v8bench/v8-RegExp.qml delete mode 100644 benchmarks/manual/v8bench/v8-Richards.qml delete mode 100644 benchmarks/manual/v8bench/v8-Splay.qml delete mode 100644 shared/Globals.qml delete mode 100644 shared/alpha.png delete mode 100644 shared/butterfly-collapsed.png delete mode 100644 shared/butterfly-half.png delete mode 100644 shared/butterfly-wide.png delete mode 100644 shared/qmldir delete mode 100644 shared/solid.png create mode 100644 src/benchmarks/auto/animations/comparison/README.md create mode 100644 src/benchmarks/auto/animations/comparison/moving-images-animations.qml create mode 100644 src/benchmarks/auto/animations/comparison/moving-images-animators.qml create mode 100644 src/benchmarks/auto/animations/comparison/moving-images-script.qml create mode 100644 src/benchmarks/auto/animations/comparison/moving-images-simple.qml create mode 100644 src/benchmarks/auto/bindings/compositesingleton.qml create mode 100644 src/benchmarks/auto/canvas/canvas_text_simple.qml create mode 100644 src/benchmarks/auto/changes/README.md create mode 100644 src/benchmarks/auto/changes/changing_over_isolated.qml create mode 100644 src/benchmarks/auto/changes/changing_over_isolated_with_clip.qml create mode 100644 src/benchmarks/auto/changes/changing_over_isolated_with_clip_rotated.qml create mode 100644 src/benchmarks/auto/changes/changing_text_oneofmany.qml create mode 100644 src/benchmarks/auto/changes/changing_texts.qml create mode 100644 src/benchmarks/auto/creation/README.md create mode 100644 src/benchmarks/auto/creation/layouts/delegates_column.qml create mode 100644 src/benchmarks/auto/creation/layouts/delegates_columnlayout.qml create mode 100644 src/benchmarks/auto/creation/layouts/delegates_flow.qml create mode 100644 src/benchmarks/auto/creation/layouts/delegates_grid.qml create mode 100644 src/benchmarks/auto/creation/layouts/delegates_gridlayout.qml create mode 100644 src/benchmarks/auto/creation/layouts/delegates_row.qml create mode 100644 src/benchmarks/auto/creation/layouts/delegates_rowlayout.qml create mode 100644 src/benchmarks/auto/creation/qml.basictypes/delegates_basictype_bool.qml create mode 100644 src/benchmarks/auto/creation/qml.basictypes/delegates_basictype_double.qml create mode 100644 src/benchmarks/auto/creation/qml.basictypes/delegates_basictype_int.qml create mode 100644 src/benchmarks/auto/creation/qml.basictypes/delegates_basictype_real.qml create mode 100644 src/benchmarks/auto/creation/qml.basictypes/delegates_basictype_string.qml create mode 100644 src/benchmarks/auto/creation/qml.basictypes/delegates_basictype_url.qml create mode 100644 src/benchmarks/auto/creation/qml.basictypes/delegates_basictype_var_array.qml create mode 100644 src/benchmarks/auto/creation/qml.basictypes/delegates_basictype_var_bool.qml create mode 100644 src/benchmarks/auto/creation/qml.basictypes/delegates_basictype_var_int.qml create mode 100644 src/benchmarks/auto/creation/qml.basictypes/delegates_basictype_var_object.qml create mode 100644 src/benchmarks/auto/creation/qml.basictypes/delegates_basictype_var_string.qml create mode 100644 src/benchmarks/auto/creation/qml.basictypes/delegates_basictype_variant_array.qml create mode 100644 src/benchmarks/auto/creation/qml.basictypes/delegates_basictype_variant_bool.qml create mode 100644 src/benchmarks/auto/creation/qml.basictypes/delegates_basictype_variant_int.qml create mode 100644 src/benchmarks/auto/creation/qml.basictypes/delegates_basictype_variant_object.qml create mode 100644 src/benchmarks/auto/creation/qml.basictypes/delegates_basictype_variant_string.qml create mode 100644 src/benchmarks/auto/creation/qml.modelaccess/modelaccess_bool.qml create mode 100644 src/benchmarks/auto/creation/qml.modelaccess/modelaccess_bytearray.qml create mode 100644 src/benchmarks/auto/creation/qml.modelaccess/modelaccess_color.qml create mode 100644 src/benchmarks/auto/creation/qml.modelaccess/modelaccess_datetime.qml create mode 100644 src/benchmarks/auto/creation/qml.modelaccess/modelaccess_int.qml create mode 100644 src/benchmarks/auto/creation/qml.modelaccess/modelaccess_jsvalue.qml create mode 100644 src/benchmarks/auto/creation/qml.modelaccess/modelaccess_point.qml create mode 100644 src/benchmarks/auto/creation/qml.modelaccess/modelaccess_real.qml create mode 100644 src/benchmarks/auto/creation/qml.modelaccess/modelaccess_rect.qml create mode 100644 src/benchmarks/auto/creation/qml.modelaccess/modelaccess_size.qml create mode 100644 src/benchmarks/auto/creation/qml.modelaccess/modelaccess_string.qml create mode 100644 src/benchmarks/auto/creation/qml.modelaccess/modelaccess_url.qml create mode 100644 src/benchmarks/auto/creation/qtgraphicaleffects/delegates_dropshadow.qml create mode 100644 src/benchmarks/auto/creation/qtgraphicaleffects/delegates_lineargradient.qml create mode 100644 src/benchmarks/auto/creation/quick.basictypes/delegates_basictype_color.qml create mode 100644 src/benchmarks/auto/creation/quick.basictypes/delegates_basictype_color_argb.qml create mode 100644 src/benchmarks/auto/creation/quick.basictypes/delegates_basictype_color_name.qml create mode 100644 src/benchmarks/auto/creation/quick.basictypes/delegates_basictype_date.qml create mode 100644 src/benchmarks/auto/creation/quick.basictypes/delegates_basictype_date_object.qml create mode 100644 src/benchmarks/auto/creation/quick.basictypes/delegates_basictype_matrix4x4.qml create mode 100644 src/benchmarks/auto/creation/quick.basictypes/delegates_basictype_point.qml create mode 100644 src/benchmarks/auto/creation/quick.basictypes/delegates_basictype_quaternion.qml create mode 100644 src/benchmarks/auto/creation/quick.basictypes/delegates_basictype_rect.qml create mode 100644 src/benchmarks/auto/creation/quick.basictypes/delegates_basictype_size.qml create mode 100644 src/benchmarks/auto/creation/quick.basictypes/delegates_basictype_var_size.qml create mode 100644 src/benchmarks/auto/creation/quick.basictypes/delegates_basictype_variant_size.qml create mode 100644 src/benchmarks/auto/creation/quick.basictypes/delegates_basictype_vector2d.qml create mode 100644 src/benchmarks/auto/creation/quick.basictypes/delegates_basictype_vector3d.qml create mode 100644 src/benchmarks/auto/creation/quick.basictypes/delegates_basictype_vector4d.qml create mode 100644 src/benchmarks/auto/creation/quick.canvas/delegates_canvas_fbo_cooperative.qml create mode 100644 src/benchmarks/auto/creation/quick.canvas/delegates_canvas_fbo_immediate.qml create mode 100644 src/benchmarks/auto/creation/quick.canvas/delegates_canvas_fbo_threaded.qml create mode 100644 src/benchmarks/auto/creation/quick.canvas/delegates_canvas_image_cooperative.qml create mode 100644 src/benchmarks/auto/creation/quick.canvas/delegates_canvas_image_immediate.qml create mode 100644 src/benchmarks/auto/creation/quick.canvas/delegates_canvas_image_threaded.qml create mode 100644 src/benchmarks/auto/creation/quick.controls2/delegates_busyindicator.qml create mode 100644 src/benchmarks/auto/creation/quick.controls2/delegates_button.qml create mode 100644 src/benchmarks/auto/creation/quick.controls2/delegates_checkbox.qml create mode 100644 src/benchmarks/auto/creation/quick.controls2/delegates_combobox.qml create mode 100644 src/benchmarks/auto/creation/quick.controls2/delegates_dial.qml create mode 100644 src/benchmarks/auto/creation/quick.controls2/delegates_itemdelegate.qml create mode 100644 src/benchmarks/auto/creation/quick.controls2/delegates_label.qml create mode 100644 src/benchmarks/auto/creation/quick.controls2/delegates_menu_custom.qml create mode 100644 src/benchmarks/auto/creation/quick.controls2/delegates_menuitem.qml create mode 100644 src/benchmarks/auto/creation/quick.controls2/delegates_progressbar.qml create mode 100644 src/benchmarks/auto/creation/quick.controls2/delegates_radiobutton.qml create mode 100644 src/benchmarks/auto/creation/quick.controls2/delegates_scrollbar.qml create mode 100644 src/benchmarks/auto/creation/quick.controls2/delegates_scrollview.qml create mode 100644 src/benchmarks/auto/creation/quick.controls2/delegates_slider.qml create mode 100644 src/benchmarks/auto/creation/quick.controls2/delegates_spinbox.qml create mode 100644 src/benchmarks/auto/creation/quick.controls2/delegates_switch.qml create mode 100644 src/benchmarks/auto/creation/quick.controls2/delegates_tabbar.qml create mode 100644 src/benchmarks/auto/creation/quick.controls2/delegates_textarea.qml create mode 100644 src/benchmarks/auto/creation/quick.controls2/delegates_textfield.qml create mode 100644 src/benchmarks/auto/creation/quick.controls2/delegates_tumbler.qml create mode 100644 src/benchmarks/auto/creation/quick.image/delegates_image.qml create mode 100644 src/benchmarks/auto/creation/quick.image/delegates_image_alpha.qml create mode 100644 src/benchmarks/auto/creation/quick.image/delegates_image_antialiased.qml create mode 100644 src/benchmarks/auto/creation/quick.image/delegates_image_async.qml create mode 100644 src/benchmarks/auto/creation/quick.image/delegates_image_solid.qml create mode 100644 src/benchmarks/auto/creation/quick.item/delegates_item.qml create mode 100644 src/benchmarks/auto/creation/quick.item/delegates_item_bindings.qml create mode 100644 src/benchmarks/auto/creation/quick.item/delegates_item_childrenRect.qml create mode 100644 src/benchmarks/auto/creation/quick.item/delegates_item_empty.qml create mode 100644 src/benchmarks/auto/creation/quick.item/delegates_item_empty_jscreation.qml create mode 100644 src/benchmarks/auto/creation/quick.item/delegates_item_script.qml create mode 100644 src/benchmarks/auto/creation/quick.item/delegates_item_states.qml create mode 100644 src/benchmarks/auto/creation/quick.item/delegates_item_z.qml create mode 100644 src/benchmarks/auto/creation/quick.item/item_anchors.qml create mode 100644 src/benchmarks/auto/creation/quick.item/item_size.qml create mode 100644 src/benchmarks/auto/creation/quick.rectangle/delegates_rect.qml create mode 100644 src/benchmarks/auto/creation/quick.rectangle/delegates_rect_blended.qml create mode 100644 src/benchmarks/auto/creation/quick.rectangle/delegates_rect_border.qml create mode 100644 src/benchmarks/auto/creation/quick.rectangle/delegates_rect_gradient.qml create mode 100644 src/benchmarks/auto/creation/quick.rectangle/delegates_rect_radius.qml create mode 100644 src/benchmarks/auto/creation/quick.text/comparison/delegates_kerning.qml create mode 100644 src/benchmarks/auto/creation/quick.text/comparison/delegates_nokerning.qml create mode 100644 src/benchmarks/auto/creation/quick.text/comparison/delegates_noshaping.qml create mode 100644 src/benchmarks/auto/creation/quick.text/delegates_longtext.qml create mode 100644 src/benchmarks/auto/creation/quick.text/delegates_longtext_arabic.qml create mode 100644 src/benchmarks/auto/creation/quick.text/delegates_longtext_chinese.qml create mode 100644 src/benchmarks/auto/creation/quick.text/delegates_longtext_hindi.qml create mode 100644 src/benchmarks/auto/creation/quick.text/delegates_text.qml create mode 100644 src/benchmarks/auto/creation/quick.text/delegates_text_arabic.qml create mode 100644 src/benchmarks/auto/creation/quick.text/delegates_text_chinese.qml create mode 100644 src/benchmarks/auto/creation/quick.text/delegates_text_decoration_bold.qml create mode 100644 src/benchmarks/auto/creation/quick.text/delegates_text_decoration_italic.qml create mode 100644 src/benchmarks/auto/creation/quick.text/delegates_text_decoration_strikeout.qml create mode 100644 src/benchmarks/auto/creation/quick.text/delegates_text_decoration_underline.qml create mode 100644 src/benchmarks/auto/creation/quick.text/delegates_text_elide.qml create mode 100644 src/benchmarks/auto/creation/quick.text/delegates_text_hindi.qml create mode 100644 src/benchmarks/auto/creation/quick.text/delegates_text_nativerendering.qml create mode 100644 src/benchmarks/auto/creation/quick.text/delegates_text_plain.qml create mode 100644 src/benchmarks/auto/creation/quick.text/delegates_text_richtext.qml create mode 100644 src/benchmarks/auto/creation/quick.text/delegates_text_styled.qml create mode 100644 src/benchmarks/auto/creation/quick.text/delegates_textedit.qml create mode 100644 src/benchmarks/auto/creation/quick.text/delegates_textinput.qml create mode 100644 src/benchmarks/auto/creation/quick.transforms/delegates_item_rotated.qml create mode 100644 src/benchmarks/auto/creation/quick.transforms/delegates_item_rotated_transform.qml create mode 100644 src/benchmarks/auto/creation/quick.transforms/delegates_item_scaled.qml create mode 100644 src/benchmarks/auto/creation/quick.transforms/delegates_item_scaled_transform.qml create mode 100644 src/benchmarks/auto/creation/quick.transforms/delegates_item_translated.qml create mode 100644 src/benchmarks/auto/creation/quick.validators/delegates_doublevalidator.qml create mode 100644 src/benchmarks/auto/creation/quick.validators/delegates_intvalidator.qml create mode 100644 src/benchmarks/auto/creation/quick.validators/delegates_regexpvalidator.qml create mode 100644 src/benchmarks/auto/creation/quick/compile.bat create mode 100644 src/benchmarks/auto/creation/quick/delegates_flickable.qml create mode 100644 src/benchmarks/auto/creation/quick/delegates_flipable.qml create mode 100644 src/benchmarks/auto/creation/quick/delegates_focusscope.qml create mode 100644 src/benchmarks/auto/creation/quick/delegates_fontloader.qml create mode 100644 src/benchmarks/auto/creation/quick/delegates_fontmetrics.qml create mode 100644 src/benchmarks/auto/creation/quick/delegates_gridview.qml create mode 100644 src/benchmarks/auto/creation/quick/delegates_listview.qml create mode 100644 src/benchmarks/auto/creation/quick/delegates_loader.qml create mode 100644 src/benchmarks/auto/creation/quick/delegates_mousearea.qml create mode 100644 src/benchmarks/auto/creation/quick/delegates_multipointtoucharea.qml create mode 100644 src/benchmarks/auto/creation/quick/delegates_pathview.qml create mode 100644 src/benchmarks/auto/creation/quick/delegates_pincharea.qml create mode 100644 src/benchmarks/auto/creation/quick/delegates_qobject.qml create mode 100644 src/benchmarks/auto/creation/quick/delegates_qobject_large_array.qml create mode 100644 src/benchmarks/auto/creation/quick/delegates_shadereffect.qml create mode 100644 src/benchmarks/auto/creation/quick/delegates_shadereffect_props.qml create mode 100644 src/benchmarks/auto/creation/quick/delegates_shadereffectsource.qml create mode 100644 src/benchmarks/auto/creation/quick/delegates_textmetrics.qml create mode 100644 src/benchmarks/auto/creation/quick/red.frag create mode 100644 src/benchmarks/auto/creation/quick/red.frag.qsb create mode 100644 src/benchmarks/auto/js/date_getYear.qml create mode 100644 src/benchmarks/auto/js/fib10.qml create mode 100644 src/benchmarks/auto/js/sum10k.qml create mode 100644 src/benchmarks/auto/js/sum10k_fixed.qml create mode 100644 src/benchmarks/auto/layouts/gridlayout_large.qml create mode 100644 src/benchmarks/auto/quick3d/lights.qml create mode 100644 src/benchmarks/auto/quick3d/multiview.qml create mode 100644 src/benchmarks/auto/quick3d/principledmaterial/PrincipledMaterial.qml create mode 100644 src/benchmarks/auto/quick3d/principledmaterial/maps/OpenfootageNET_garage-1024.hdr create mode 100644 src/benchmarks/auto/quick3d/principledmaterial/maps/metallic/basecolor.jpg create mode 100644 src/benchmarks/auto/quick3d/principledmaterial/maps/metallic/metallic.jpg create mode 100644 src/benchmarks/auto/quick3d/principledmaterial/maps/metallic/normal.jpg create mode 100644 src/benchmarks/auto/quick3d/principledmaterial/maps/metallic/roughness.jpg create mode 100644 src/benchmarks/auto/quick3d/shapespawner/WeirdShape.qml create mode 100644 src/benchmarks/auto/quick3d/shapespawner/shapespawner.qml create mode 100644 src/benchmarks/auto/quick3d/shapespawner/weirdShape.mesh create mode 100644 src/benchmarks/benchmarks.md create mode 100644 src/benchmarks/manual/gputhroughput/README.md create mode 100644 src/benchmarks/manual/gputhroughput/blendedrect.qml create mode 100644 src/benchmarks/manual/gputhroughput/blendedtexture.qml create mode 100644 src/benchmarks/manual/gputhroughput/drawcalls.qml create mode 100644 src/benchmarks/manual/gputhroughput/gaussblur.qml create mode 100755 src/benchmarks/manual/gputhroughput/grapes.jpg create mode 100644 src/benchmarks/manual/gputhroughput/opaquerect.qml create mode 100644 src/benchmarks/manual/gputhroughput/opaquetexture.qml create mode 100644 src/benchmarks/manual/v8bench/README.md create mode 100644 src/benchmarks/manual/v8bench/v8-Crypto.qml create mode 100644 src/benchmarks/manual/v8bench/v8-DeltaBlue.qml create mode 100644 src/benchmarks/manual/v8bench/v8-EarleyBoyer.qml create mode 100644 src/benchmarks/manual/v8bench/v8-RayTrace.qml create mode 100644 src/benchmarks/manual/v8bench/v8-RegExp.qml create mode 100644 src/benchmarks/manual/v8bench/v8-Richards.qml create mode 100644 src/benchmarks/manual/v8bench/v8-Splay.qml create mode 100644 src/shared/Globals.qml create mode 100644 src/shared/alpha.png create mode 100644 src/shared/butterfly-collapsed.png create mode 100644 src/shared/butterfly-half.png create mode 100644 src/shared/butterfly-wide.png create mode 100644 src/shared/qmldir create mode 100644 src/shared/solid.png diff --git a/README.md b/README.md index 547c02b..cafc089 100644 --- a/README.md +++ b/README.md @@ -148,6 +148,31 @@ The test was repeated 5 times, and for each run, the frames are printed. For the - "StdDev=0.83666" - the [standard deviation](https://en.wikipedia.org/wiki/Standard_deviation). The lower the better. - "CoV=0.00546123" - the [coefficient of variation](https://en.wikipedia.org/wiki/Coefficient_of_variation). The lower the better; a general guide is to aim for less than 5% CoV. +## Running tests on Android + +To run qmlbench on Android, you need to use the subprocess mode. To +pass arguments to the Android app, they need to be base64-encoded. +Here's an example: + + ~/Android/Sdk/platform-tools/adb shell am start -n org.qtproject.example.qmlbench/org.qtproject.qt.android.bindings.QtActivity -e extraappparams `echo -n "--subprocess-mode --json-file :benchmarks/auto/creation/quick.text/delegates_longtext_arabic.qml" | base64 -w 0` + +So, what we're doing here is + +- launch the right app with the right activity: + -n org.qtproject.example.qmlbench/org.qtproject.qt.android.bindings.QtActivity +- pass it the parameters, \-\-subprocess-mode \-\-json-file +- the command line is created with echo \-n so that we don't insert a superfluous newline into the data +- and then we encode with base64 \-w 0 to disable base64 line wrapping, so that that doesn't insert superfluous newlines either. + +Since we're passing \-\-json-file, that tells qmlbench to output the benchmark +result into a file in JSON format. The file is qmlbench.txt in the application's +data directory, so the usual incantation to get it out from a phone is + + ~/Android/Sdk/platform-tools/adb pull sdcard/Android/data/org.qtproject.example.qmlbench/files/Documents/qmlbench.txt + +The benchmark app will not recreate the file, it always appends to it. +If you need to start from a clean slate, just adb rm that same file. + ## Creating benchmarks See [Benchmarks/benchmarks.md](./benchmarks/benchmarks.md) 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 #include #include #include @@ -33,6 +34,7 @@ #include #include #include +#include #include #include @@ -189,6 +191,19 @@ void ResultRecorder::finish() QJsonDocument results = QJsonDocument::fromVariant(m_results); std::cout << results.toJson().constData(); } + if (Options::instance.printJsonToStdoutWithQWarning) { + QJsonDocument results = QJsonDocument::fromVariant(m_results); + qWarning() << results.toJson().constData(); + } + if (Options::instance.printJsonToFile) { + QJsonDocument results = QJsonDocument::fromVariant(m_results); + QString outputFilePath = QStandardPaths::writableLocation(QStandardPaths::DocumentsLocation) + QLatin1String("/qmlbench.txt"); + QFile outputFile(outputFilePath); + outputFile.open(QIODevice::WriteOnly | QIODevice::Append); + QTextStream stream(&outputFile); + stream << results.toJson().constData(); + stream.flush(); + } m_results.clear(); } diff --git a/src/shared/Globals.qml b/src/shared/Globals.qml new file mode 100644 index 0000000..6531a1e --- /dev/null +++ b/src/shared/Globals.qml @@ -0,0 +1,10 @@ +pragma Singleton +import QtQuick 2.0 + +QtObject { + readonly property string stringProp: "stringValue" + readonly property int intProp: 10 + readonly property real realProp: 4.5 + readonly property color colorProp: "green" + readonly property bool boolProp: true +} diff --git a/src/shared/alpha.png b/src/shared/alpha.png new file mode 100644 index 0000000..e465b25 Binary files /dev/null and b/src/shared/alpha.png differ diff --git a/src/shared/butterfly-collapsed.png b/src/shared/butterfly-collapsed.png new file mode 100644 index 0000000..93f8933 Binary files /dev/null and b/src/shared/butterfly-collapsed.png differ diff --git a/src/shared/butterfly-half.png b/src/shared/butterfly-half.png new file mode 100644 index 0000000..d601f17 Binary files /dev/null and b/src/shared/butterfly-half.png differ diff --git a/src/shared/butterfly-wide.png b/src/shared/butterfly-wide.png new file mode 100644 index 0000000..0899407 Binary files /dev/null and b/src/shared/butterfly-wide.png differ diff --git a/src/shared/qmldir b/src/shared/qmldir new file mode 100644 index 0000000..45b3b68 --- /dev/null +++ b/src/shared/qmldir @@ -0,0 +1 @@ +singleton Globals Globals.qml diff --git a/src/shared/solid.png b/src/shared/solid.png new file mode 100644 index 0000000..371e9c1 Binary files /dev/null and b/src/shared/solid.png differ -- cgit v1.2.3