diff options
author | Ville Voutilainen <ville.voutilainen@qt.io> | 2021-12-01 13:14:20 +0200 |
---|---|---|
committer | Ville Voutilainen <ville.voutilainen@qt.io> | 2022-01-04 11:12:11 +0000 |
commit | c9d84ead801960601870240e36478468c2a28b82 (patch) | |
tree | fbd2c6ae0466ecfce032e5eebca10d02dcae7bf3 | |
parent | 6d298da7cda85b35aa22c68aac55fdb6513e68eb (diff) |
Use a resource file for benchmarks, and add some Android goodies and fixes
Task-number: QTBUG-94148
Change-Id: I7cc0b1ade676c4f7f963915315c00e317582e56f
Reviewed-by: Daniel Smith <Daniel.Smith@qt.io>
-rw-r--r-- | README.md | 25 | ||||
-rw-r--r-- | src/CMakeLists.txt | 184 | ||||
-rw-r--r-- | src/benchmarks/auto/animations/comparison/README.md (renamed from benchmarks/auto/animations/comparison/README.md) | 0 | ||||
-rw-r--r-- | src/benchmarks/auto/animations/comparison/moving-images-animations.qml (renamed from benchmarks/auto/animations/comparison/moving-images-animations.qml) | 2 | ||||
-rw-r--r-- | src/benchmarks/auto/animations/comparison/moving-images-animators.qml (renamed from benchmarks/auto/animations/comparison/moving-images-animators.qml) | 2 | ||||
-rw-r--r-- | src/benchmarks/auto/animations/comparison/moving-images-script.qml (renamed from benchmarks/auto/animations/comparison/moving-images-script.qml) | 2 | ||||
-rw-r--r-- | src/benchmarks/auto/animations/comparison/moving-images-simple.qml (renamed from benchmarks/auto/animations/comparison/moving-images-simple.qml) | 2 | ||||
-rw-r--r-- | src/benchmarks/auto/bindings/compositesingleton.qml (renamed from benchmarks/auto/bindings/compositesingleton.qml) | 2 | ||||
-rw-r--r-- | src/benchmarks/auto/canvas/canvas_text_simple.qml (renamed from benchmarks/auto/canvas/canvas_text_simple.qml) | 0 | ||||
-rw-r--r-- | src/benchmarks/auto/changes/README.md (renamed from benchmarks/auto/changes/README.md) | 0 | ||||
-rw-r--r-- | src/benchmarks/auto/changes/changing_over_isolated.qml (renamed from benchmarks/auto/changes/changing_over_isolated.qml) | 0 | ||||
-rw-r--r-- | src/benchmarks/auto/changes/changing_over_isolated_with_clip.qml (renamed from benchmarks/auto/changes/changing_over_isolated_with_clip.qml) | 0 | ||||
-rw-r--r-- | src/benchmarks/auto/changes/changing_over_isolated_with_clip_rotated.qml (renamed from benchmarks/auto/changes/changing_over_isolated_with_clip_rotated.qml) | 0 | ||||
-rw-r--r-- | src/benchmarks/auto/changes/changing_text_oneofmany.qml (renamed from benchmarks/auto/changes/changing_text_oneofmany.qml) | 0 | ||||
-rw-r--r-- | src/benchmarks/auto/changes/changing_texts.qml (renamed from benchmarks/auto/changes/changing_texts.qml) | 0 | ||||
-rw-r--r-- | src/benchmarks/auto/creation/README.md (renamed from benchmarks/auto/creation/README.md) | 0 | ||||
-rw-r--r-- | src/benchmarks/auto/creation/layouts/delegates_column.qml (renamed from benchmarks/auto/creation/layouts/delegates_column.qml) | 0 | ||||
-rw-r--r-- | src/benchmarks/auto/creation/layouts/delegates_columnlayout.qml (renamed from benchmarks/auto/creation/layouts/delegates_columnlayout.qml) | 0 | ||||
-rw-r--r-- | src/benchmarks/auto/creation/layouts/delegates_flow.qml (renamed from benchmarks/auto/creation/layouts/delegates_flow.qml) | 0 | ||||
-rw-r--r-- | src/benchmarks/auto/creation/layouts/delegates_grid.qml (renamed from benchmarks/auto/creation/layouts/delegates_grid.qml) | 0 | ||||
-rw-r--r-- | src/benchmarks/auto/creation/layouts/delegates_gridlayout.qml (renamed from benchmarks/auto/creation/layouts/delegates_gridlayout.qml) | 0 | ||||
-rw-r--r-- | src/benchmarks/auto/creation/layouts/delegates_row.qml (renamed from benchmarks/auto/creation/layouts/delegates_row.qml) | 0 | ||||
-rw-r--r-- | src/benchmarks/auto/creation/layouts/delegates_rowlayout.qml (renamed from benchmarks/auto/creation/layouts/delegates_rowlayout.qml) | 0 | ||||
-rw-r--r-- | src/benchmarks/auto/creation/qml.basictypes/delegates_basictype_bool.qml (renamed from benchmarks/auto/creation/qml.basictypes/delegates_basictype_bool.qml) | 0 | ||||
-rw-r--r-- | src/benchmarks/auto/creation/qml.basictypes/delegates_basictype_double.qml (renamed from benchmarks/auto/creation/qml.basictypes/delegates_basictype_double.qml) | 0 | ||||
-rw-r--r-- | src/benchmarks/auto/creation/qml.basictypes/delegates_basictype_int.qml (renamed from benchmarks/auto/creation/qml.basictypes/delegates_basictype_int.qml) | 0 | ||||
-rw-r--r-- | src/benchmarks/auto/creation/qml.basictypes/delegates_basictype_real.qml (renamed from benchmarks/auto/creation/qml.basictypes/delegates_basictype_real.qml) | 0 | ||||
-rw-r--r-- | src/benchmarks/auto/creation/qml.basictypes/delegates_basictype_string.qml (renamed from benchmarks/auto/creation/qml.basictypes/delegates_basictype_string.qml) | 0 | ||||
-rw-r--r-- | src/benchmarks/auto/creation/qml.basictypes/delegates_basictype_url.qml (renamed from benchmarks/auto/creation/qml.basictypes/delegates_basictype_url.qml) | 0 | ||||
-rw-r--r-- | src/benchmarks/auto/creation/qml.basictypes/delegates_basictype_var_array.qml (renamed from benchmarks/auto/creation/qml.basictypes/delegates_basictype_var_array.qml) | 0 | ||||
-rw-r--r-- | src/benchmarks/auto/creation/qml.basictypes/delegates_basictype_var_bool.qml (renamed from benchmarks/auto/creation/qml.basictypes/delegates_basictype_var_bool.qml) | 0 | ||||
-rw-r--r-- | src/benchmarks/auto/creation/qml.basictypes/delegates_basictype_var_int.qml (renamed from benchmarks/auto/creation/qml.basictypes/delegates_basictype_var_int.qml) | 0 | ||||
-rw-r--r-- | src/benchmarks/auto/creation/qml.basictypes/delegates_basictype_var_object.qml (renamed from benchmarks/auto/creation/qml.basictypes/delegates_basictype_var_object.qml) | 0 | ||||
-rw-r--r-- | src/benchmarks/auto/creation/qml.basictypes/delegates_basictype_var_string.qml (renamed from benchmarks/auto/creation/qml.basictypes/delegates_basictype_var_string.qml) | 0 | ||||
-rw-r--r-- | src/benchmarks/auto/creation/qml.basictypes/delegates_basictype_variant_array.qml (renamed from benchmarks/auto/creation/qml.basictypes/delegates_basictype_variant_array.qml) | 0 | ||||
-rw-r--r-- | src/benchmarks/auto/creation/qml.basictypes/delegates_basictype_variant_bool.qml (renamed from benchmarks/auto/creation/qml.basictypes/delegates_basictype_variant_bool.qml) | 0 | ||||
-rw-r--r-- | src/benchmarks/auto/creation/qml.basictypes/delegates_basictype_variant_int.qml (renamed from benchmarks/auto/creation/qml.basictypes/delegates_basictype_variant_int.qml) | 0 | ||||
-rw-r--r-- | src/benchmarks/auto/creation/qml.basictypes/delegates_basictype_variant_object.qml (renamed from benchmarks/auto/creation/qml.basictypes/delegates_basictype_variant_object.qml) | 0 | ||||
-rw-r--r-- | src/benchmarks/auto/creation/qml.basictypes/delegates_basictype_variant_string.qml (renamed from benchmarks/auto/creation/qml.basictypes/delegates_basictype_variant_string.qml) | 0 | ||||
-rw-r--r-- | src/benchmarks/auto/creation/qml.modelaccess/modelaccess_bool.qml (renamed from benchmarks/auto/creation/qml.modelaccess/modelaccess_bool.qml) | 0 | ||||
-rw-r--r-- | src/benchmarks/auto/creation/qml.modelaccess/modelaccess_bytearray.qml (renamed from benchmarks/auto/creation/qml.modelaccess/modelaccess_bytearray.qml) | 0 | ||||
-rw-r--r-- | src/benchmarks/auto/creation/qml.modelaccess/modelaccess_color.qml (renamed from benchmarks/auto/creation/qml.modelaccess/modelaccess_color.qml) | 0 | ||||
-rw-r--r-- | src/benchmarks/auto/creation/qml.modelaccess/modelaccess_datetime.qml (renamed from benchmarks/auto/creation/qml.modelaccess/modelaccess_datetime.qml) | 0 | ||||
-rw-r--r-- | src/benchmarks/auto/creation/qml.modelaccess/modelaccess_int.qml (renamed from benchmarks/auto/creation/qml.modelaccess/modelaccess_int.qml) | 0 | ||||
-rw-r--r-- | src/benchmarks/auto/creation/qml.modelaccess/modelaccess_jsvalue.qml (renamed from benchmarks/auto/creation/qml.modelaccess/modelaccess_jsvalue.qml) | 0 | ||||
-rw-r--r-- | src/benchmarks/auto/creation/qml.modelaccess/modelaccess_point.qml (renamed from benchmarks/auto/creation/qml.modelaccess/modelaccess_point.qml) | 0 | ||||
-rw-r--r-- | src/benchmarks/auto/creation/qml.modelaccess/modelaccess_real.qml (renamed from benchmarks/auto/creation/qml.modelaccess/modelaccess_real.qml) | 0 | ||||
-rw-r--r-- | src/benchmarks/auto/creation/qml.modelaccess/modelaccess_rect.qml (renamed from benchmarks/auto/creation/qml.modelaccess/modelaccess_rect.qml) | 0 | ||||
-rw-r--r-- | src/benchmarks/auto/creation/qml.modelaccess/modelaccess_size.qml (renamed from benchmarks/auto/creation/qml.modelaccess/modelaccess_size.qml) | 0 | ||||
-rw-r--r-- | src/benchmarks/auto/creation/qml.modelaccess/modelaccess_string.qml (renamed from benchmarks/auto/creation/qml.modelaccess/modelaccess_string.qml) | 0 | ||||
-rw-r--r-- | src/benchmarks/auto/creation/qml.modelaccess/modelaccess_url.qml (renamed from benchmarks/auto/creation/qml.modelaccess/modelaccess_url.qml) | 0 | ||||
-rw-r--r-- | src/benchmarks/auto/creation/qtgraphicaleffects/delegates_dropshadow.qml (renamed from benchmarks/auto/creation/qtgraphicaleffects/delegates_dropshadow.qml) | 0 | ||||
-rw-r--r-- | src/benchmarks/auto/creation/qtgraphicaleffects/delegates_lineargradient.qml (renamed from benchmarks/auto/creation/qtgraphicaleffects/delegates_lineargradient.qml) | 0 | ||||
-rw-r--r-- | src/benchmarks/auto/creation/quick.basictypes/delegates_basictype_color.qml (renamed from benchmarks/auto/creation/quick.basictypes/delegates_basictype_color.qml) | 0 | ||||
-rw-r--r-- | src/benchmarks/auto/creation/quick.basictypes/delegates_basictype_color_argb.qml (renamed from benchmarks/auto/creation/quick.basictypes/delegates_basictype_color_argb.qml) | 0 | ||||
-rw-r--r-- | src/benchmarks/auto/creation/quick.basictypes/delegates_basictype_color_name.qml (renamed from benchmarks/auto/creation/quick.basictypes/delegates_basictype_color_name.qml) | 0 | ||||
-rw-r--r-- | src/benchmarks/auto/creation/quick.basictypes/delegates_basictype_date.qml (renamed from benchmarks/auto/creation/quick.basictypes/delegates_basictype_date.qml) | 0 | ||||
-rw-r--r-- | src/benchmarks/auto/creation/quick.basictypes/delegates_basictype_date_object.qml (renamed from benchmarks/auto/creation/quick.basictypes/delegates_basictype_date_object.qml) | 0 | ||||
-rw-r--r-- | src/benchmarks/auto/creation/quick.basictypes/delegates_basictype_matrix4x4.qml (renamed from benchmarks/auto/creation/quick.basictypes/delegates_basictype_matrix4x4.qml) | 0 | ||||
-rw-r--r-- | src/benchmarks/auto/creation/quick.basictypes/delegates_basictype_point.qml (renamed from benchmarks/auto/creation/quick.basictypes/delegates_basictype_point.qml) | 0 | ||||
-rw-r--r-- | src/benchmarks/auto/creation/quick.basictypes/delegates_basictype_quaternion.qml (renamed from benchmarks/auto/creation/quick.basictypes/delegates_basictype_quaternion.qml) | 0 | ||||
-rw-r--r-- | src/benchmarks/auto/creation/quick.basictypes/delegates_basictype_rect.qml (renamed from benchmarks/auto/creation/quick.basictypes/delegates_basictype_rect.qml) | 0 | ||||
-rw-r--r-- | src/benchmarks/auto/creation/quick.basictypes/delegates_basictype_size.qml (renamed from benchmarks/auto/creation/quick.basictypes/delegates_basictype_size.qml) | 0 | ||||
-rw-r--r-- | src/benchmarks/auto/creation/quick.basictypes/delegates_basictype_var_size.qml (renamed from benchmarks/auto/creation/quick.basictypes/delegates_basictype_var_size.qml) | 0 | ||||
-rw-r--r-- | src/benchmarks/auto/creation/quick.basictypes/delegates_basictype_variant_size.qml (renamed from benchmarks/auto/creation/quick.basictypes/delegates_basictype_variant_size.qml) | 0 | ||||
-rw-r--r-- | src/benchmarks/auto/creation/quick.basictypes/delegates_basictype_vector2d.qml (renamed from benchmarks/auto/creation/quick.basictypes/delegates_basictype_vector2d.qml) | 0 | ||||
-rw-r--r-- | src/benchmarks/auto/creation/quick.basictypes/delegates_basictype_vector3d.qml (renamed from benchmarks/auto/creation/quick.basictypes/delegates_basictype_vector3d.qml) | 0 | ||||
-rw-r--r-- | src/benchmarks/auto/creation/quick.basictypes/delegates_basictype_vector4d.qml (renamed from benchmarks/auto/creation/quick.basictypes/delegates_basictype_vector4d.qml) | 0 | ||||
-rw-r--r-- | src/benchmarks/auto/creation/quick.canvas/delegates_canvas_fbo_cooperative.qml (renamed from benchmarks/auto/creation/quick.canvas/delegates_canvas_fbo_cooperative.qml) | 0 | ||||
-rw-r--r-- | src/benchmarks/auto/creation/quick.canvas/delegates_canvas_fbo_immediate.qml (renamed from benchmarks/auto/creation/quick.canvas/delegates_canvas_fbo_immediate.qml) | 0 | ||||
-rw-r--r-- | src/benchmarks/auto/creation/quick.canvas/delegates_canvas_fbo_threaded.qml (renamed from benchmarks/auto/creation/quick.canvas/delegates_canvas_fbo_threaded.qml) | 0 | ||||
-rw-r--r-- | src/benchmarks/auto/creation/quick.canvas/delegates_canvas_image_cooperative.qml (renamed from benchmarks/auto/creation/quick.canvas/delegates_canvas_image_cooperative.qml) | 0 | ||||
-rw-r--r-- | src/benchmarks/auto/creation/quick.canvas/delegates_canvas_image_immediate.qml (renamed from benchmarks/auto/creation/quick.canvas/delegates_canvas_image_immediate.qml) | 0 | ||||
-rw-r--r-- | src/benchmarks/auto/creation/quick.canvas/delegates_canvas_image_threaded.qml (renamed from benchmarks/auto/creation/quick.canvas/delegates_canvas_image_threaded.qml) | 0 | ||||
-rw-r--r-- | src/benchmarks/auto/creation/quick.controls2/delegates_busyindicator.qml (renamed from benchmarks/auto/creation/quick.controls2/delegates_busyindicator.qml) | 0 | ||||
-rw-r--r-- | src/benchmarks/auto/creation/quick.controls2/delegates_button.qml (renamed from benchmarks/auto/creation/quick.controls2/delegates_button.qml) | 0 | ||||
-rw-r--r-- | src/benchmarks/auto/creation/quick.controls2/delegates_checkbox.qml (renamed from benchmarks/auto/creation/quick.controls2/delegates_checkbox.qml) | 0 | ||||
-rw-r--r-- | src/benchmarks/auto/creation/quick.controls2/delegates_combobox.qml (renamed from benchmarks/auto/creation/quick.controls2/delegates_combobox.qml) | 0 | ||||
-rw-r--r-- | src/benchmarks/auto/creation/quick.controls2/delegates_dial.qml (renamed from benchmarks/auto/creation/quick.controls2/delegates_dial.qml) | 0 | ||||
-rw-r--r-- | src/benchmarks/auto/creation/quick.controls2/delegates_itemdelegate.qml (renamed from benchmarks/auto/creation/quick.controls2/delegates_itemdelegate.qml) | 0 | ||||
-rw-r--r-- | src/benchmarks/auto/creation/quick.controls2/delegates_label.qml (renamed from benchmarks/auto/creation/quick.controls2/delegates_label.qml) | 0 | ||||
-rw-r--r-- | src/benchmarks/auto/creation/quick.controls2/delegates_menu_custom.qml (renamed from benchmarks/auto/creation/quick.controls2/delegates_menu_custom.qml) | 0 | ||||
-rw-r--r-- | src/benchmarks/auto/creation/quick.controls2/delegates_menuitem.qml (renamed from benchmarks/auto/creation/quick.controls2/delegates_menuitem.qml) | 0 | ||||
-rw-r--r-- | src/benchmarks/auto/creation/quick.controls2/delegates_progressbar.qml (renamed from benchmarks/auto/creation/quick.controls2/delegates_progressbar.qml) | 0 | ||||
-rw-r--r-- | src/benchmarks/auto/creation/quick.controls2/delegates_radiobutton.qml (renamed from benchmarks/auto/creation/quick.controls2/delegates_radiobutton.qml) | 0 | ||||
-rw-r--r-- | src/benchmarks/auto/creation/quick.controls2/delegates_scrollbar.qml (renamed from benchmarks/auto/creation/quick.controls2/delegates_scrollbar.qml) | 0 | ||||
-rw-r--r-- | src/benchmarks/auto/creation/quick.controls2/delegates_scrollview.qml (renamed from benchmarks/auto/creation/quick.controls2/delegates_scrollview.qml) | 0 | ||||
-rw-r--r-- | src/benchmarks/auto/creation/quick.controls2/delegates_slider.qml (renamed from benchmarks/auto/creation/quick.controls2/delegates_slider.qml) | 0 | ||||
-rw-r--r-- | src/benchmarks/auto/creation/quick.controls2/delegates_spinbox.qml (renamed from benchmarks/auto/creation/quick.controls2/delegates_spinbox.qml) | 0 | ||||
-rw-r--r-- | src/benchmarks/auto/creation/quick.controls2/delegates_switch.qml (renamed from benchmarks/auto/creation/quick.controls2/delegates_switch.qml) | 0 | ||||
-rw-r--r-- | src/benchmarks/auto/creation/quick.controls2/delegates_tabbar.qml (renamed from benchmarks/auto/creation/quick.controls2/delegates_tabbar.qml) | 0 | ||||
-rw-r--r-- | src/benchmarks/auto/creation/quick.controls2/delegates_textarea.qml (renamed from benchmarks/auto/creation/quick.controls2/delegates_textarea.qml) | 0 | ||||
-rw-r--r-- | src/benchmarks/auto/creation/quick.controls2/delegates_textfield.qml (renamed from benchmarks/auto/creation/quick.controls2/delegates_textfield.qml) | 0 | ||||
-rw-r--r-- | src/benchmarks/auto/creation/quick.controls2/delegates_tumbler.qml (renamed from benchmarks/auto/creation/quick.controls2/delegates_tumbler.qml) | 0 | ||||
-rw-r--r-- | src/benchmarks/auto/creation/quick.image/delegates_image.qml (renamed from benchmarks/auto/creation/quick.image/delegates_image.qml) | 2 | ||||
-rw-r--r-- | src/benchmarks/auto/creation/quick.image/delegates_image_alpha.qml (renamed from benchmarks/auto/creation/quick.image/delegates_image_alpha.qml) | 2 | ||||
-rw-r--r-- | src/benchmarks/auto/creation/quick.image/delegates_image_antialiased.qml (renamed from benchmarks/auto/creation/quick.image/delegates_image_antialiased.qml) | 2 | ||||
-rw-r--r-- | src/benchmarks/auto/creation/quick.image/delegates_image_async.qml (renamed from benchmarks/auto/creation/quick.image/delegates_image_async.qml) | 2 | ||||
-rw-r--r-- | src/benchmarks/auto/creation/quick.image/delegates_image_solid.qml (renamed from benchmarks/auto/creation/quick.image/delegates_image_solid.qml) | 2 | ||||
-rw-r--r-- | src/benchmarks/auto/creation/quick.item/delegates_item.qml (renamed from benchmarks/auto/creation/quick.item/delegates_item.qml) | 0 | ||||
-rw-r--r-- | src/benchmarks/auto/creation/quick.item/delegates_item_bindings.qml (renamed from benchmarks/auto/creation/quick.item/delegates_item_bindings.qml) | 0 | ||||
-rw-r--r-- | src/benchmarks/auto/creation/quick.item/delegates_item_childrenRect.qml (renamed from benchmarks/auto/creation/quick.item/delegates_item_childrenRect.qml) | 0 | ||||
-rw-r--r-- | src/benchmarks/auto/creation/quick.item/delegates_item_empty.qml (renamed from benchmarks/auto/creation/quick.item/delegates_item_empty.qml) | 0 | ||||
-rw-r--r-- | src/benchmarks/auto/creation/quick.item/delegates_item_empty_jscreation.qml (renamed from benchmarks/auto/creation/quick.item/delegates_item_empty_jscreation.qml) | 0 | ||||
-rw-r--r-- | src/benchmarks/auto/creation/quick.item/delegates_item_script.qml (renamed from benchmarks/auto/creation/quick.item/delegates_item_script.qml) | 0 | ||||
-rw-r--r-- | src/benchmarks/auto/creation/quick.item/delegates_item_states.qml (renamed from benchmarks/auto/creation/quick.item/delegates_item_states.qml) | 0 | ||||
-rw-r--r-- | src/benchmarks/auto/creation/quick.item/delegates_item_z.qml (renamed from benchmarks/auto/creation/quick.item/delegates_item_z.qml) | 0 | ||||
-rw-r--r-- | src/benchmarks/auto/creation/quick.item/item_anchors.qml (renamed from benchmarks/auto/creation/quick.item/item_anchors.qml) | 0 | ||||
-rw-r--r-- | src/benchmarks/auto/creation/quick.item/item_size.qml (renamed from benchmarks/auto/creation/quick.item/item_size.qml) | 0 | ||||
-rw-r--r-- | src/benchmarks/auto/creation/quick.rectangle/delegates_rect.qml (renamed from benchmarks/auto/creation/quick.rectangle/delegates_rect.qml) | 0 | ||||
-rw-r--r-- | src/benchmarks/auto/creation/quick.rectangle/delegates_rect_blended.qml (renamed from benchmarks/auto/creation/quick.rectangle/delegates_rect_blended.qml) | 0 | ||||
-rw-r--r-- | src/benchmarks/auto/creation/quick.rectangle/delegates_rect_border.qml (renamed from benchmarks/auto/creation/quick.rectangle/delegates_rect_border.qml) | 0 | ||||
-rw-r--r-- | src/benchmarks/auto/creation/quick.rectangle/delegates_rect_gradient.qml (renamed from benchmarks/auto/creation/quick.rectangle/delegates_rect_gradient.qml) | 0 | ||||
-rw-r--r-- | src/benchmarks/auto/creation/quick.rectangle/delegates_rect_radius.qml (renamed from benchmarks/auto/creation/quick.rectangle/delegates_rect_radius.qml) | 0 | ||||
-rw-r--r-- | src/benchmarks/auto/creation/quick.text/comparison/delegates_kerning.qml (renamed from benchmarks/auto/creation/quick.text/comparison/delegates_kerning.qml) | 0 | ||||
-rw-r--r-- | src/benchmarks/auto/creation/quick.text/comparison/delegates_nokerning.qml (renamed from benchmarks/auto/creation/quick.text/comparison/delegates_nokerning.qml) | 0 | ||||
-rw-r--r-- | src/benchmarks/auto/creation/quick.text/comparison/delegates_noshaping.qml (renamed from benchmarks/auto/creation/quick.text/comparison/delegates_noshaping.qml) | 0 | ||||
-rw-r--r-- | src/benchmarks/auto/creation/quick.text/delegates_longtext.qml (renamed from benchmarks/auto/creation/quick.text/delegates_longtext.qml) | 0 | ||||
-rw-r--r-- | src/benchmarks/auto/creation/quick.text/delegates_longtext_arabic.qml (renamed from benchmarks/auto/creation/quick.text/delegates_longtext_arabic.qml) | 0 | ||||
-rw-r--r-- | src/benchmarks/auto/creation/quick.text/delegates_longtext_chinese.qml (renamed from benchmarks/auto/creation/quick.text/delegates_longtext_chinese.qml) | 0 | ||||
-rw-r--r-- | src/benchmarks/auto/creation/quick.text/delegates_longtext_hindi.qml (renamed from benchmarks/auto/creation/quick.text/delegates_longtext_hindi.qml) | 0 | ||||
-rw-r--r-- | src/benchmarks/auto/creation/quick.text/delegates_text.qml (renamed from benchmarks/auto/creation/quick.text/delegates_text.qml) | 0 | ||||
-rw-r--r-- | src/benchmarks/auto/creation/quick.text/delegates_text_arabic.qml (renamed from benchmarks/auto/creation/quick.text/delegates_text_arabic.qml) | 0 | ||||
-rw-r--r-- | src/benchmarks/auto/creation/quick.text/delegates_text_chinese.qml (renamed from benchmarks/auto/creation/quick.text/delegates_text_chinese.qml) | 0 | ||||
-rw-r--r-- | src/benchmarks/auto/creation/quick.text/delegates_text_decoration_bold.qml (renamed from benchmarks/auto/creation/quick.text/delegates_text_decoration_bold.qml) | 0 | ||||
-rw-r--r-- | src/benchmarks/auto/creation/quick.text/delegates_text_decoration_italic.qml (renamed from benchmarks/auto/creation/quick.text/delegates_text_decoration_italic.qml) | 0 | ||||
-rw-r--r-- | src/benchmarks/auto/creation/quick.text/delegates_text_decoration_strikeout.qml (renamed from benchmarks/auto/creation/quick.text/delegates_text_decoration_strikeout.qml) | 0 | ||||
-rw-r--r-- | src/benchmarks/auto/creation/quick.text/delegates_text_decoration_underline.qml (renamed from benchmarks/auto/creation/quick.text/delegates_text_decoration_underline.qml) | 0 | ||||
-rw-r--r-- | src/benchmarks/auto/creation/quick.text/delegates_text_elide.qml (renamed from benchmarks/auto/creation/quick.text/delegates_text_elide.qml) | 0 | ||||
-rw-r--r-- | src/benchmarks/auto/creation/quick.text/delegates_text_hindi.qml (renamed from benchmarks/auto/creation/quick.text/delegates_text_hindi.qml) | 0 | ||||
-rw-r--r-- | src/benchmarks/auto/creation/quick.text/delegates_text_nativerendering.qml (renamed from benchmarks/auto/creation/quick.text/delegates_text_nativerendering.qml) | 0 | ||||
-rw-r--r-- | src/benchmarks/auto/creation/quick.text/delegates_text_plain.qml (renamed from benchmarks/auto/creation/quick.text/delegates_text_plain.qml) | 0 | ||||
-rw-r--r-- | src/benchmarks/auto/creation/quick.text/delegates_text_richtext.qml (renamed from benchmarks/auto/creation/quick.text/delegates_text_richtext.qml) | 0 | ||||
-rw-r--r-- | src/benchmarks/auto/creation/quick.text/delegates_text_styled.qml (renamed from benchmarks/auto/creation/quick.text/delegates_text_styled.qml) | 0 | ||||
-rw-r--r-- | src/benchmarks/auto/creation/quick.text/delegates_textedit.qml (renamed from benchmarks/auto/creation/quick.text/delegates_textedit.qml) | 0 | ||||
-rw-r--r-- | src/benchmarks/auto/creation/quick.text/delegates_textinput.qml (renamed from benchmarks/auto/creation/quick.text/delegates_textinput.qml) | 0 | ||||
-rw-r--r-- | src/benchmarks/auto/creation/quick.transforms/delegates_item_rotated.qml (renamed from benchmarks/auto/creation/quick.transforms/delegates_item_rotated.qml) | 0 | ||||
-rw-r--r-- | src/benchmarks/auto/creation/quick.transforms/delegates_item_rotated_transform.qml (renamed from benchmarks/auto/creation/quick.transforms/delegates_item_rotated_transform.qml) | 0 | ||||
-rw-r--r-- | src/benchmarks/auto/creation/quick.transforms/delegates_item_scaled.qml (renamed from benchmarks/auto/creation/quick.transforms/delegates_item_scaled.qml) | 0 | ||||
-rw-r--r-- | src/benchmarks/auto/creation/quick.transforms/delegates_item_scaled_transform.qml (renamed from benchmarks/auto/creation/quick.transforms/delegates_item_scaled_transform.qml) | 0 | ||||
-rw-r--r-- | src/benchmarks/auto/creation/quick.transforms/delegates_item_translated.qml (renamed from benchmarks/auto/creation/quick.transforms/delegates_item_translated.qml) | 0 | ||||
-rw-r--r-- | src/benchmarks/auto/creation/quick.validators/delegates_doublevalidator.qml (renamed from benchmarks/auto/creation/quick.validators/delegates_doublevalidator.qml) | 0 | ||||
-rw-r--r-- | src/benchmarks/auto/creation/quick.validators/delegates_intvalidator.qml (renamed from benchmarks/auto/creation/quick.validators/delegates_intvalidator.qml) | 0 | ||||
-rw-r--r-- | src/benchmarks/auto/creation/quick.validators/delegates_regexpvalidator.qml (renamed from benchmarks/auto/creation/quick.validators/delegates_regexpvalidator.qml) | 0 | ||||
-rw-r--r-- | src/benchmarks/auto/creation/quick/compile.bat (renamed from benchmarks/auto/creation/quick/compile.bat) | 0 | ||||
-rw-r--r-- | src/benchmarks/auto/creation/quick/delegates_flickable.qml (renamed from benchmarks/auto/creation/quick/delegates_flickable.qml) | 0 | ||||
-rw-r--r-- | src/benchmarks/auto/creation/quick/delegates_flipable.qml (renamed from benchmarks/auto/creation/quick/delegates_flipable.qml) | 0 | ||||
-rw-r--r-- | src/benchmarks/auto/creation/quick/delegates_focusscope.qml (renamed from benchmarks/auto/creation/quick/delegates_focusscope.qml) | 0 | ||||
-rw-r--r-- | src/benchmarks/auto/creation/quick/delegates_fontloader.qml (renamed from benchmarks/auto/creation/quick/delegates_fontloader.qml) | 0 | ||||
-rw-r--r-- | src/benchmarks/auto/creation/quick/delegates_fontmetrics.qml (renamed from benchmarks/auto/creation/quick/delegates_fontmetrics.qml) | 0 | ||||
-rw-r--r-- | src/benchmarks/auto/creation/quick/delegates_gridview.qml (renamed from benchmarks/auto/creation/quick/delegates_gridview.qml) | 0 | ||||
-rw-r--r-- | src/benchmarks/auto/creation/quick/delegates_listview.qml (renamed from benchmarks/auto/creation/quick/delegates_listview.qml) | 0 | ||||
-rw-r--r-- | src/benchmarks/auto/creation/quick/delegates_loader.qml (renamed from benchmarks/auto/creation/quick/delegates_loader.qml) | 0 | ||||
-rw-r--r-- | src/benchmarks/auto/creation/quick/delegates_mousearea.qml (renamed from benchmarks/auto/creation/quick/delegates_mousearea.qml) | 0 | ||||
-rw-r--r-- | src/benchmarks/auto/creation/quick/delegates_multipointtoucharea.qml (renamed from benchmarks/auto/creation/quick/delegates_multipointtoucharea.qml) | 0 | ||||
-rw-r--r-- | src/benchmarks/auto/creation/quick/delegates_pathview.qml (renamed from benchmarks/auto/creation/quick/delegates_pathview.qml) | 0 | ||||
-rw-r--r-- | src/benchmarks/auto/creation/quick/delegates_pincharea.qml (renamed from benchmarks/auto/creation/quick/delegates_pincharea.qml) | 0 | ||||
-rw-r--r-- | src/benchmarks/auto/creation/quick/delegates_qobject.qml (renamed from benchmarks/auto/creation/quick/delegates_qobject.qml) | 0 | ||||
-rw-r--r-- | src/benchmarks/auto/creation/quick/delegates_qobject_large_array.qml (renamed from benchmarks/auto/creation/quick/delegates_qobject_large_array.qml) | 0 | ||||
-rw-r--r-- | src/benchmarks/auto/creation/quick/delegates_shadereffect.qml (renamed from benchmarks/auto/creation/quick/delegates_shadereffect.qml) | 0 | ||||
-rw-r--r-- | src/benchmarks/auto/creation/quick/delegates_shadereffect_props.qml (renamed from benchmarks/auto/creation/quick/delegates_shadereffect_props.qml) | 2 | ||||
-rw-r--r-- | src/benchmarks/auto/creation/quick/delegates_shadereffectsource.qml (renamed from benchmarks/auto/creation/quick/delegates_shadereffectsource.qml) | 0 | ||||
-rw-r--r-- | src/benchmarks/auto/creation/quick/delegates_textmetrics.qml (renamed from benchmarks/auto/creation/quick/delegates_textmetrics.qml) | 0 | ||||
-rw-r--r-- | src/benchmarks/auto/creation/quick/red.frag (renamed from benchmarks/auto/creation/quick/red.frag) | 0 | ||||
-rw-r--r-- | src/benchmarks/auto/creation/quick/red.frag.qsb (renamed from benchmarks/auto/creation/quick/red.frag.qsb) | bin | 613 -> 613 bytes | |||
-rw-r--r-- | src/benchmarks/auto/js/date_getYear.qml (renamed from benchmarks/auto/js/date_getYear.qml) | 0 | ||||
-rw-r--r-- | src/benchmarks/auto/js/fib10.qml (renamed from benchmarks/auto/js/fib10.qml) | 0 | ||||
-rw-r--r-- | src/benchmarks/auto/js/sum10k.qml (renamed from benchmarks/auto/js/sum10k.qml) | 0 | ||||
-rw-r--r-- | src/benchmarks/auto/js/sum10k_fixed.qml (renamed from benchmarks/auto/js/sum10k_fixed.qml) | 0 | ||||
-rw-r--r-- | src/benchmarks/auto/layouts/gridlayout_large.qml (renamed from benchmarks/auto/layouts/gridlayout_large.qml) | 0 | ||||
-rw-r--r-- | src/benchmarks/auto/quick3d/lights.qml (renamed from benchmarks/auto/quick3d/lights.qml) | 0 | ||||
-rw-r--r-- | src/benchmarks/auto/quick3d/multiview.qml (renamed from benchmarks/auto/quick3d/multiview.qml) | 0 | ||||
-rw-r--r-- | src/benchmarks/auto/quick3d/principledmaterial/PrincipledMaterial.qml (renamed from benchmarks/auto/quick3d/principledmaterial/PrincipledMaterial.qml) | 0 | ||||
-rw-r--r-- | src/benchmarks/auto/quick3d/principledmaterial/maps/OpenfootageNET_garage-1024.hdr (renamed from benchmarks/auto/quick3d/principledmaterial/maps/OpenfootageNET_garage-1024.hdr) | bin | 1675239 -> 1675239 bytes | |||
-rw-r--r-- | src/benchmarks/auto/quick3d/principledmaterial/maps/metallic/basecolor.jpg (renamed from benchmarks/auto/quick3d/principledmaterial/maps/metallic/basecolor.jpg) | bin | 724020 -> 724020 bytes | |||
-rw-r--r-- | src/benchmarks/auto/quick3d/principledmaterial/maps/metallic/metallic.jpg (renamed from benchmarks/auto/quick3d/principledmaterial/maps/metallic/metallic.jpg) | bin | 625742 -> 625742 bytes | |||
-rw-r--r-- | src/benchmarks/auto/quick3d/principledmaterial/maps/metallic/normal.jpg (renamed from benchmarks/auto/quick3d/principledmaterial/maps/metallic/normal.jpg) | bin | 332333 -> 332333 bytes | |||
-rw-r--r-- | src/benchmarks/auto/quick3d/principledmaterial/maps/metallic/roughness.jpg (renamed from benchmarks/auto/quick3d/principledmaterial/maps/metallic/roughness.jpg) | bin | 600706 -> 600706 bytes | |||
-rw-r--r-- | src/benchmarks/auto/quick3d/shapespawner/WeirdShape.qml (renamed from benchmarks/auto/quick3d/shapespawner/WeirdShape.qml) | 0 | ||||
-rw-r--r-- | src/benchmarks/auto/quick3d/shapespawner/shapespawner.qml (renamed from benchmarks/auto/quick3d/shapespawner/shapespawner.qml) | 0 | ||||
-rw-r--r-- | src/benchmarks/auto/quick3d/shapespawner/weirdShape.mesh (renamed from benchmarks/auto/quick3d/shapespawner/weirdShape.mesh) | bin | 228360 -> 228360 bytes | |||
-rw-r--r-- | src/benchmarks/benchmarks.md (renamed from benchmarks/benchmarks.md) | 0 | ||||
-rw-r--r-- | src/benchmarks/manual/gputhroughput/README.md (renamed from benchmarks/manual/gputhroughput/README.md) | 0 | ||||
-rw-r--r-- | src/benchmarks/manual/gputhroughput/blendedrect.qml (renamed from benchmarks/manual/gputhroughput/blendedrect.qml) | 0 | ||||
-rw-r--r-- | src/benchmarks/manual/gputhroughput/blendedtexture.qml (renamed from benchmarks/manual/gputhroughput/blendedtexture.qml) | 0 | ||||
-rw-r--r-- | src/benchmarks/manual/gputhroughput/drawcalls.qml (renamed from benchmarks/manual/gputhroughput/drawcalls.qml) | 2 | ||||
-rw-r--r-- | src/benchmarks/manual/gputhroughput/gaussblur.qml (renamed from benchmarks/manual/gputhroughput/gaussblur.qml) | 0 | ||||
-rwxr-xr-x | src/benchmarks/manual/gputhroughput/grapes.jpg (renamed from benchmarks/manual/gputhroughput/grapes.jpg) | bin | 304492 -> 304492 bytes | |||
-rw-r--r-- | src/benchmarks/manual/gputhroughput/opaquerect.qml (renamed from benchmarks/manual/gputhroughput/opaquerect.qml) | 0 | ||||
-rw-r--r-- | src/benchmarks/manual/gputhroughput/opaquetexture.qml (renamed from benchmarks/manual/gputhroughput/opaquetexture.qml) | 0 | ||||
-rw-r--r-- | src/benchmarks/manual/v8bench/README.md (renamed from benchmarks/manual/v8bench/README.md) | 0 | ||||
-rw-r--r-- | src/benchmarks/manual/v8bench/v8-Crypto.qml (renamed from benchmarks/manual/v8bench/v8-Crypto.qml) | 0 | ||||
-rw-r--r-- | src/benchmarks/manual/v8bench/v8-DeltaBlue.qml (renamed from benchmarks/manual/v8bench/v8-DeltaBlue.qml) | 0 | ||||
-rw-r--r-- | src/benchmarks/manual/v8bench/v8-EarleyBoyer.qml (renamed from benchmarks/manual/v8bench/v8-EarleyBoyer.qml) | 0 | ||||
-rw-r--r-- | src/benchmarks/manual/v8bench/v8-RayTrace.qml (renamed from benchmarks/manual/v8bench/v8-RayTrace.qml) | 0 | ||||
-rw-r--r-- | src/benchmarks/manual/v8bench/v8-RegExp.qml (renamed from benchmarks/manual/v8bench/v8-RegExp.qml) | 0 | ||||
-rw-r--r-- | src/benchmarks/manual/v8bench/v8-Richards.qml (renamed from benchmarks/manual/v8bench/v8-Richards.qml) | 0 | ||||
-rw-r--r-- | src/benchmarks/manual/v8bench/v8-Splay.qml (renamed from benchmarks/manual/v8bench/v8-Splay.qml) | 0 | ||||
-rw-r--r-- | src/main.cpp | 17 | ||||
-rw-r--r-- | src/options.h | 4 | ||||
-rw-r--r-- | src/resultrecorder.cpp | 15 | ||||
-rw-r--r-- | src/shared/Globals.qml (renamed from shared/Globals.qml) | 0 | ||||
-rw-r--r-- | src/shared/alpha.png (renamed from shared/alpha.png) | bin | 2422 -> 2422 bytes | |||
-rw-r--r-- | src/shared/butterfly-collapsed.png (renamed from shared/butterfly-collapsed.png) | bin | 1966 -> 1966 bytes | |||
-rw-r--r-- | src/shared/butterfly-half.png (renamed from shared/butterfly-half.png) | bin | 2730 -> 2730 bytes | |||
-rw-r--r-- | src/shared/butterfly-wide.png (renamed from shared/butterfly-wide.png) | bin | 4151 -> 4151 bytes | |||
-rw-r--r-- | src/shared/qmldir (renamed from shared/qmldir) | 0 | ||||
-rw-r--r-- | src/shared/solid.png (renamed from shared/solid.png) | bin | 607 -> 607 bytes |
208 files changed, 257 insertions, 12 deletions
@@ -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/src/CMakeLists.txt b/src/CMakeLists.txt index 0bbb260..f7a265e 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -27,6 +27,190 @@ set(qmlbench_resource_files "Shell_SustainedFpsWithStaticCount.qml" "Shell_TotalFramesWithStaticCount.qml" "V8Benchmark.qml" + "benchmarks/auto/animations/comparison/moving-images-animators.qml" + "benchmarks/auto/animations/comparison/moving-images-script.qml" + "benchmarks/auto/animations/comparison/moving-images-animations.qml" + "benchmarks/auto/animations/comparison/moving-images-simple.qml" + "benchmarks/auto/bindings/compositesingleton.qml" + "benchmarks/auto/canvas/canvas_text_simple.qml" + "benchmarks/auto/changes/changing_over_isolated.qml" + "benchmarks/auto/changes/changing_over_isolated_with_clip.qml" + "benchmarks/auto/changes/changing_over_isolated_with_clip_rotated.qml" + "benchmarks/auto/changes/changing_text_oneofmany.qml" + "benchmarks/auto/changes/changing_texts.qml" + "benchmarks/auto/creation/layouts/delegates_column.qml" + "benchmarks/auto/creation/layouts/delegates_columnlayout.qml" + "benchmarks/auto/creation/layouts/delegates_flow.qml" + "benchmarks/auto/creation/layouts/delegates_grid.qml" + "benchmarks/auto/creation/layouts/delegates_gridlayout.qml" + "benchmarks/auto/creation/layouts/delegates_row.qml" + "benchmarks/auto/creation/layouts/delegates_rowlayout.qml" + "benchmarks/auto/creation/qml.basictypes/delegates_basictype_bool.qml" + "benchmarks/auto/creation/qml.basictypes/delegates_basictype_double.qml" + "benchmarks/auto/creation/qml.basictypes/delegates_basictype_int.qml" + "benchmarks/auto/creation/qml.basictypes/delegates_basictype_real.qml" + "benchmarks/auto/creation/qml.basictypes/delegates_basictype_string.qml" + "benchmarks/auto/creation/qml.basictypes/delegates_basictype_url.qml" + "benchmarks/auto/creation/qml.basictypes/delegates_basictype_var_array.qml" + "benchmarks/auto/creation/qml.basictypes/delegates_basictype_var_bool.qml" + "benchmarks/auto/creation/qml.basictypes/delegates_basictype_var_int.qml" + "benchmarks/auto/creation/qml.basictypes/delegates_basictype_var_object.qml" + "benchmarks/auto/creation/qml.basictypes/delegates_basictype_var_string.qml" + "benchmarks/auto/creation/qml.basictypes/delegates_basictype_variant_array.qml" + "benchmarks/auto/creation/qml.basictypes/delegates_basictype_variant_bool.qml" + "benchmarks/auto/creation/qml.basictypes/delegates_basictype_variant_int.qml" + "benchmarks/auto/creation/qml.basictypes/delegates_basictype_variant_object.qml" + "benchmarks/auto/creation/qml.basictypes/delegates_basictype_variant_string.qml" + "benchmarks/auto/creation/qml.modelaccess/modelaccess_bool.qml" + "benchmarks/auto/creation/qml.modelaccess/modelaccess_bytearray.qml" + "benchmarks/auto/creation/qml.modelaccess/modelaccess_color.qml" + "benchmarks/auto/creation/qml.modelaccess/modelaccess_datetime.qml" + "benchmarks/auto/creation/qml.modelaccess/modelaccess_int.qml" + "benchmarks/auto/creation/qml.modelaccess/modelaccess_jsvalue.qml" + "benchmarks/auto/creation/qml.modelaccess/modelaccess_point.qml" + "benchmarks/auto/creation/qml.modelaccess/modelaccess_real.qml" + "benchmarks/auto/creation/qml.modelaccess/modelaccess_rect.qml" + "benchmarks/auto/creation/qml.modelaccess/modelaccess_size.qml" + "benchmarks/auto/creation/qml.modelaccess/modelaccess_string.qml" + "benchmarks/auto/creation/qml.modelaccess/modelaccess_url.qml" + "benchmarks/auto/creation/qtgraphicaleffects/delegates_dropshadow.qml" + "benchmarks/auto/creation/qtgraphicaleffects/delegates_lineargradient.qml" + "benchmarks/auto/creation/quick.basictypes/delegates_basictype_color.qml" + "benchmarks/auto/creation/quick.basictypes/delegates_basictype_color_argb.qml" + "benchmarks/auto/creation/quick.basictypes/delegates_basictype_color_name.qml" + "benchmarks/auto/creation/quick.basictypes/delegates_basictype_date.qml" + "benchmarks/auto/creation/quick.basictypes/delegates_basictype_date_object.qml" + "benchmarks/auto/creation/quick.basictypes/delegates_basictype_matrix4x4.qml" + "benchmarks/auto/creation/quick.basictypes/delegates_basictype_point.qml" + "benchmarks/auto/creation/quick.basictypes/delegates_basictype_quaternion.qml" + "benchmarks/auto/creation/quick.basictypes/delegates_basictype_rect.qml" + "benchmarks/auto/creation/quick.basictypes/delegates_basictype_size.qml" + "benchmarks/auto/creation/quick.basictypes/delegates_basictype_var_size.qml" + "benchmarks/auto/creation/quick.basictypes/delegates_basictype_variant_size.qml" + "benchmarks/auto/creation/quick.basictypes/delegates_basictype_vector2d.qml" + "benchmarks/auto/creation/quick.basictypes/delegates_basictype_vector3d.qml" + "benchmarks/auto/creation/quick.basictypes/delegates_basictype_vector4d.qml" + "benchmarks/auto/creation/quick.canvas/delegates_canvas_fbo_cooperative.qml" + "benchmarks/auto/creation/quick.canvas/delegates_canvas_fbo_immediate.qml" + "benchmarks/auto/creation/quick.canvas/delegates_canvas_fbo_threaded.qml" + "benchmarks/auto/creation/quick.canvas/delegates_canvas_image_cooperative.qml" + "benchmarks/auto/creation/quick.canvas/delegates_canvas_image_immediate.qml" + "benchmarks/auto/creation/quick.canvas/delegates_canvas_image_threaded.qml" + "benchmarks/auto/creation/quick.controls2/delegates_busyindicator.qml" + "benchmarks/auto/creation/quick.controls2/delegates_button.qml" + "benchmarks/auto/creation/quick.controls2/delegates_checkbox.qml" + "benchmarks/auto/creation/quick.controls2/delegates_combobox.qml" + "benchmarks/auto/creation/quick.controls2/delegates_dial.qml" + "benchmarks/auto/creation/quick.controls2/delegates_itemdelegate.qml" + "benchmarks/auto/creation/quick.controls2/delegates_label.qml" + "benchmarks/auto/creation/quick.controls2/delegates_menu_custom.qml" + "benchmarks/auto/creation/quick.controls2/delegates_menuitem.qml" + "benchmarks/auto/creation/quick.controls2/delegates_progressbar.qml" + "benchmarks/auto/creation/quick.controls2/delegates_radiobutton.qml" + "benchmarks/auto/creation/quick.controls2/delegates_scrollbar.qml" + "benchmarks/auto/creation/quick.controls2/delegates_scrollview.qml" + "benchmarks/auto/creation/quick.controls2/delegates_slider.qml" + "benchmarks/auto/creation/quick.controls2/delegates_spinbox.qml" + "benchmarks/auto/creation/quick.controls2/delegates_switch.qml" + "benchmarks/auto/creation/quick.controls2/delegates_tabbar.qml" + "benchmarks/auto/creation/quick.controls2/delegates_textarea.qml" + "benchmarks/auto/creation/quick.controls2/delegates_textfield.qml" + "benchmarks/auto/creation/quick.controls2/delegates_tumbler.qml" + "benchmarks/auto/creation/quick.image/delegates_image.qml" + "benchmarks/auto/creation/quick.image/delegates_image_alpha.qml" + "benchmarks/auto/creation/quick.image/delegates_image_antialiased.qml" + "benchmarks/auto/creation/quick.image/delegates_image_async.qml" + "benchmarks/auto/creation/quick.image/delegates_image_solid.qml" + "benchmarks/auto/creation/quick.item/delegates_item.qml" + "benchmarks/auto/creation/quick.item/delegates_item_bindings.qml" + "benchmarks/auto/creation/quick.item/delegates_item_childrenRect.qml" + "benchmarks/auto/creation/quick.item/delegates_item_empty.qml" + "benchmarks/auto/creation/quick.item/delegates_item_empty_jscreation.qml" + "benchmarks/auto/creation/quick.item/delegates_item_script.qml" + "benchmarks/auto/creation/quick.item/delegates_item_states.qml" + "benchmarks/auto/creation/quick.item/delegates_item_z.qml" + "benchmarks/auto/creation/quick.item/item_anchors.qml" + "benchmarks/auto/creation/quick.item/item_size.qml" + "benchmarks/auto/creation/quick.rectangle/delegates_rect.qml" + "benchmarks/auto/creation/quick.rectangle/delegates_rect_blended.qml" + "benchmarks/auto/creation/quick.rectangle/delegates_rect_border.qml" + "benchmarks/auto/creation/quick.rectangle/delegates_rect_gradient.qml" + "benchmarks/auto/creation/quick.rectangle/delegates_rect_radius.qml" + "benchmarks/auto/creation/quick.text/comparison/delegates_kerning.qml" + "benchmarks/auto/creation/quick.text/comparison/delegates_nokerning.qml" + "benchmarks/auto/creation/quick.text/comparison/delegates_noshaping.qml" + "benchmarks/auto/creation/quick.text/delegates_longtext.qml" + "benchmarks/auto/creation/quick.text/delegates_longtext_arabic.qml" + "benchmarks/auto/creation/quick.text/delegates_longtext_chinese.qml" + "benchmarks/auto/creation/quick.text/delegates_longtext_hindi.qml" + "benchmarks/auto/creation/quick.text/delegates_text.qml" + "benchmarks/auto/creation/quick.text/delegates_text_arabic.qml" + "benchmarks/auto/creation/quick.text/delegates_text_chinese.qml" + "benchmarks/auto/creation/quick.text/delegates_text_decoration_bold.qml" + "benchmarks/auto/creation/quick.text/delegates_text_decoration_italic.qml" + "benchmarks/auto/creation/quick.text/delegates_text_decoration_strikeout.qml" + "benchmarks/auto/creation/quick.text/delegates_text_decoration_underline.qml" + "benchmarks/auto/creation/quick.text/delegates_text_elide.qml" + "benchmarks/auto/creation/quick.text/delegates_text_hindi.qml" + "benchmarks/auto/creation/quick.text/delegates_text_nativerendering.qml" + "benchmarks/auto/creation/quick.text/delegates_text_plain.qml" + "benchmarks/auto/creation/quick.text/delegates_text_richtext.qml" + "benchmarks/auto/creation/quick.text/delegates_text_styled.qml" + "benchmarks/auto/creation/quick.text/delegates_textedit.qml" + "benchmarks/auto/creation/quick.text/delegates_textinput.qml" + "benchmarks/auto/creation/quick.transforms/delegates_item_rotated.qml" + "benchmarks/auto/creation/quick.transforms/delegates_item_rotated_transform.qml" + "benchmarks/auto/creation/quick.transforms/delegates_item_scaled.qml" + "benchmarks/auto/creation/quick.transforms/delegates_item_scaled_transform.qml" + "benchmarks/auto/creation/quick.transforms/delegates_item_translated.qml" + "benchmarks/auto/creation/quick.validators/delegates_doublevalidator.qml" + "benchmarks/auto/creation/quick.validators/delegates_intvalidator.qml" + "benchmarks/auto/creation/quick.validators/delegates_regexpvalidator.qml" + "benchmarks/auto/creation/quick/delegates_flickable.qml" + "benchmarks/auto/creation/quick/delegates_flipable.qml" + "benchmarks/auto/creation/quick/delegates_focusscope.qml" + "benchmarks/auto/creation/quick/delegates_fontloader.qml" + "benchmarks/auto/creation/quick/delegates_fontmetrics.qml" + "benchmarks/auto/creation/quick/delegates_gridview.qml" + "benchmarks/auto/creation/quick/delegates_listview.qml" + "benchmarks/auto/creation/quick/delegates_loader.qml" + "benchmarks/auto/creation/quick/delegates_mousearea.qml" + "benchmarks/auto/creation/quick/delegates_multipointtoucharea.qml" + "benchmarks/auto/creation/quick/delegates_pathview.qml" + "benchmarks/auto/creation/quick/delegates_pincharea.qml" + "benchmarks/auto/creation/quick/delegates_qobject.qml" + "benchmarks/auto/creation/quick/delegates_qobject_large_array.qml" + "benchmarks/auto/creation/quick/delegates_shadereffect.qml" + "benchmarks/auto/creation/quick/delegates_shadereffect_props.qml" + "benchmarks/auto/creation/quick/delegates_shadereffectsource.qml" + "benchmarks/auto/creation/quick/delegates_textmetrics.qml" + "benchmarks/auto/creation/quick/red.frag" + "benchmarks/auto/creation/quick/red.frag.qsb" + "benchmarks/auto/js/date_getYear.qml" + "benchmarks/auto/js/fib10.qml" + "benchmarks/auto/js/sum10k.qml" + "benchmarks/auto/js/sum10k_fixed.qml" + "benchmarks/auto/layouts/gridlayout_large.qml" + "benchmarks/auto/quick3d/lights.qml" + "benchmarks/auto/quick3d/multiview.qml" + "benchmarks/auto/quick3d/principledmaterial" + "benchmarks/auto/quick3d/principledmaterial/PrincipledMaterial.qml" + "benchmarks/auto/quick3d/principledmaterial/maps" + "benchmarks/auto/quick3d/principledmaterial/maps/OpenfootageNET_garage-1024.hdr" + "benchmarks/auto/quick3d/principledmaterial/maps/metallic" + "benchmarks/auto/quick3d/principledmaterial/maps/metallic/basecolor.jpg" + "benchmarks/auto/quick3d/principledmaterial/maps/metallic/metallic.jpg" + "benchmarks/auto/quick3d/principledmaterial/maps/metallic/normal.jpg" + "benchmarks/auto/quick3d/principledmaterial/maps/metallic/roughness.jpg" + "benchmarks/auto/quick3d/shapespawner/WeirdShape.qml" + "benchmarks/auto/quick3d/shapespawner/shapespawner.qml" + "benchmarks/auto/quick3d/shapespawner/weirdShape.mesh" + "shared/butterfly-collapsed.png" + "shared/butterfly-half.png" + "shared/butterfly-wide.png" + "shared/alpha.png" + "shared/solid.png" + ) qt_internal_add_resource(qmlbench "qmlbench" diff --git a/benchmarks/auto/animations/comparison/README.md b/src/benchmarks/auto/animations/comparison/README.md index a5c441d..a5c441d 100644 --- a/benchmarks/auto/animations/comparison/README.md +++ b/src/benchmarks/auto/animations/comparison/README.md diff --git a/benchmarks/auto/animations/comparison/moving-images-animations.qml b/src/benchmarks/auto/animations/comparison/moving-images-animations.qml index b9ecb61..e1ba723 100644 --- a/benchmarks/auto/animations/comparison/moving-images-animations.qml +++ b/src/benchmarks/auto/animations/comparison/moving-images-animations.qml @@ -12,7 +12,7 @@ Benchmark { Repeater { model: root.count Image { - source: "../../../../shared/butterfly-wide.png" + source: "qrc:///shared/butterfly-wide.png" x: QmlBench.getRandom() * (root.width - width) y: QmlBench.getRandom() * (root.height - height) width: 40 diff --git a/benchmarks/auto/animations/comparison/moving-images-animators.qml b/src/benchmarks/auto/animations/comparison/moving-images-animators.qml index 132c61b..b0c17a1 100644 --- a/benchmarks/auto/animations/comparison/moving-images-animators.qml +++ b/src/benchmarks/auto/animations/comparison/moving-images-animators.qml @@ -12,7 +12,7 @@ Benchmark { Repeater { model: root.count Image { - source: "../../../../shared/butterfly-wide.png" + source: "qrc:///shared/butterfly-wide.png" x: QmlBench.getRandom() * (root.width - width) y: QmlBench.getRandom() * (root.height - height) width: 40 diff --git a/benchmarks/auto/animations/comparison/moving-images-script.qml b/src/benchmarks/auto/animations/comparison/moving-images-script.qml index d2a2fcf..54f0c0c 100644 --- a/benchmarks/auto/animations/comparison/moving-images-script.qml +++ b/src/benchmarks/auto/animations/comparison/moving-images-script.qml @@ -12,7 +12,7 @@ Benchmark { Repeater { model: root.count Image { - source: "../../../../shared/butterfly-wide.png" + source: "qrc:///shared/butterfly-wide.png" x: QmlBench.getRandom() * (root.width - width) y: QmlBench.getRandom() * (root.height - height) width: 40 diff --git a/benchmarks/auto/animations/comparison/moving-images-simple.qml b/src/benchmarks/auto/animations/comparison/moving-images-simple.qml index 1db6c6a..39cc05e 100644 --- a/benchmarks/auto/animations/comparison/moving-images-simple.qml +++ b/src/benchmarks/auto/animations/comparison/moving-images-simple.qml @@ -17,7 +17,7 @@ Benchmark { Repeater { model: root.count Image { - source: "../../../../shared/butterfly-wide.png" + source: "qrc:///shared/butterfly-wide.png" x: QmlBench.getRandom() * (root.width - width) y: QmlBench.getRandom() * (root.height - height) width: 40 diff --git a/benchmarks/auto/bindings/compositesingleton.qml b/src/benchmarks/auto/bindings/compositesingleton.qml index aad80cc..ae77357 100644 --- a/benchmarks/auto/bindings/compositesingleton.qml +++ b/src/benchmarks/auto/bindings/compositesingleton.qml @@ -1,6 +1,6 @@ import QtQuick 2.0 import QmlBench 1.0 -import "../../../shared" +import "qrc:///shared" // Tests the creation of Items bound to a QML-defined singleton CreationBenchmark { diff --git a/benchmarks/auto/canvas/canvas_text_simple.qml b/src/benchmarks/auto/canvas/canvas_text_simple.qml index 7668a42..7668a42 100644 --- a/benchmarks/auto/canvas/canvas_text_simple.qml +++ b/src/benchmarks/auto/canvas/canvas_text_simple.qml diff --git a/benchmarks/auto/changes/README.md b/src/benchmarks/auto/changes/README.md index 9e5a905..9e5a905 100644 --- a/benchmarks/auto/changes/README.md +++ b/src/benchmarks/auto/changes/README.md diff --git a/benchmarks/auto/changes/changing_over_isolated.qml b/src/benchmarks/auto/changes/changing_over_isolated.qml index 72f9f1a..72f9f1a 100644 --- a/benchmarks/auto/changes/changing_over_isolated.qml +++ b/src/benchmarks/auto/changes/changing_over_isolated.qml diff --git a/benchmarks/auto/changes/changing_over_isolated_with_clip.qml b/src/benchmarks/auto/changes/changing_over_isolated_with_clip.qml index 487ed21..487ed21 100644 --- a/benchmarks/auto/changes/changing_over_isolated_with_clip.qml +++ b/src/benchmarks/auto/changes/changing_over_isolated_with_clip.qml diff --git a/benchmarks/auto/changes/changing_over_isolated_with_clip_rotated.qml b/src/benchmarks/auto/changes/changing_over_isolated_with_clip_rotated.qml index 48dae1d..48dae1d 100644 --- a/benchmarks/auto/changes/changing_over_isolated_with_clip_rotated.qml +++ b/src/benchmarks/auto/changes/changing_over_isolated_with_clip_rotated.qml diff --git a/benchmarks/auto/changes/changing_text_oneofmany.qml b/src/benchmarks/auto/changes/changing_text_oneofmany.qml index 879b99b..879b99b 100644 --- a/benchmarks/auto/changes/changing_text_oneofmany.qml +++ b/src/benchmarks/auto/changes/changing_text_oneofmany.qml diff --git a/benchmarks/auto/changes/changing_texts.qml b/src/benchmarks/auto/changes/changing_texts.qml index 2715482..2715482 100644 --- a/benchmarks/auto/changes/changing_texts.qml +++ b/src/benchmarks/auto/changes/changing_texts.qml diff --git a/benchmarks/auto/creation/README.md b/src/benchmarks/auto/creation/README.md index f0303d9..f0303d9 100644 --- a/benchmarks/auto/creation/README.md +++ b/src/benchmarks/auto/creation/README.md diff --git a/benchmarks/auto/creation/layouts/delegates_column.qml b/src/benchmarks/auto/creation/layouts/delegates_column.qml index 55be106..55be106 100644 --- a/benchmarks/auto/creation/layouts/delegates_column.qml +++ b/src/benchmarks/auto/creation/layouts/delegates_column.qml diff --git a/benchmarks/auto/creation/layouts/delegates_columnlayout.qml b/src/benchmarks/auto/creation/layouts/delegates_columnlayout.qml index bbb3b44..bbb3b44 100644 --- a/benchmarks/auto/creation/layouts/delegates_columnlayout.qml +++ b/src/benchmarks/auto/creation/layouts/delegates_columnlayout.qml diff --git a/benchmarks/auto/creation/layouts/delegates_flow.qml b/src/benchmarks/auto/creation/layouts/delegates_flow.qml index e7e1ad0..e7e1ad0 100644 --- a/benchmarks/auto/creation/layouts/delegates_flow.qml +++ b/src/benchmarks/auto/creation/layouts/delegates_flow.qml diff --git a/benchmarks/auto/creation/layouts/delegates_grid.qml b/src/benchmarks/auto/creation/layouts/delegates_grid.qml index a5c7f5f..a5c7f5f 100644 --- a/benchmarks/auto/creation/layouts/delegates_grid.qml +++ b/src/benchmarks/auto/creation/layouts/delegates_grid.qml diff --git a/benchmarks/auto/creation/layouts/delegates_gridlayout.qml b/src/benchmarks/auto/creation/layouts/delegates_gridlayout.qml index 0d152c8..0d152c8 100644 --- a/benchmarks/auto/creation/layouts/delegates_gridlayout.qml +++ b/src/benchmarks/auto/creation/layouts/delegates_gridlayout.qml diff --git a/benchmarks/auto/creation/layouts/delegates_row.qml b/src/benchmarks/auto/creation/layouts/delegates_row.qml index 8f3f8ae..8f3f8ae 100644 --- a/benchmarks/auto/creation/layouts/delegates_row.qml +++ b/src/benchmarks/auto/creation/layouts/delegates_row.qml diff --git a/benchmarks/auto/creation/layouts/delegates_rowlayout.qml b/src/benchmarks/auto/creation/layouts/delegates_rowlayout.qml index 4e001ea..4e001ea 100644 --- a/benchmarks/auto/creation/layouts/delegates_rowlayout.qml +++ b/src/benchmarks/auto/creation/layouts/delegates_rowlayout.qml diff --git a/benchmarks/auto/creation/qml.basictypes/delegates_basictype_bool.qml b/src/benchmarks/auto/creation/qml.basictypes/delegates_basictype_bool.qml index 7baf491..7baf491 100644 --- a/benchmarks/auto/creation/qml.basictypes/delegates_basictype_bool.qml +++ b/src/benchmarks/auto/creation/qml.basictypes/delegates_basictype_bool.qml diff --git a/benchmarks/auto/creation/qml.basictypes/delegates_basictype_double.qml b/src/benchmarks/auto/creation/qml.basictypes/delegates_basictype_double.qml index cbeafa8..cbeafa8 100644 --- a/benchmarks/auto/creation/qml.basictypes/delegates_basictype_double.qml +++ b/src/benchmarks/auto/creation/qml.basictypes/delegates_basictype_double.qml diff --git a/benchmarks/auto/creation/qml.basictypes/delegates_basictype_int.qml b/src/benchmarks/auto/creation/qml.basictypes/delegates_basictype_int.qml index 8ed7952..8ed7952 100644 --- a/benchmarks/auto/creation/qml.basictypes/delegates_basictype_int.qml +++ b/src/benchmarks/auto/creation/qml.basictypes/delegates_basictype_int.qml diff --git a/benchmarks/auto/creation/qml.basictypes/delegates_basictype_real.qml b/src/benchmarks/auto/creation/qml.basictypes/delegates_basictype_real.qml index 576841f..576841f 100644 --- a/benchmarks/auto/creation/qml.basictypes/delegates_basictype_real.qml +++ b/src/benchmarks/auto/creation/qml.basictypes/delegates_basictype_real.qml diff --git a/benchmarks/auto/creation/qml.basictypes/delegates_basictype_string.qml b/src/benchmarks/auto/creation/qml.basictypes/delegates_basictype_string.qml index efa5cf4..efa5cf4 100644 --- a/benchmarks/auto/creation/qml.basictypes/delegates_basictype_string.qml +++ b/src/benchmarks/auto/creation/qml.basictypes/delegates_basictype_string.qml diff --git a/benchmarks/auto/creation/qml.basictypes/delegates_basictype_url.qml b/src/benchmarks/auto/creation/qml.basictypes/delegates_basictype_url.qml index f8953e8..f8953e8 100644 --- a/benchmarks/auto/creation/qml.basictypes/delegates_basictype_url.qml +++ b/src/benchmarks/auto/creation/qml.basictypes/delegates_basictype_url.qml diff --git a/benchmarks/auto/creation/qml.basictypes/delegates_basictype_var_array.qml b/src/benchmarks/auto/creation/qml.basictypes/delegates_basictype_var_array.qml index c9436b3..c9436b3 100644 --- a/benchmarks/auto/creation/qml.basictypes/delegates_basictype_var_array.qml +++ b/src/benchmarks/auto/creation/qml.basictypes/delegates_basictype_var_array.qml diff --git a/benchmarks/auto/creation/qml.basictypes/delegates_basictype_var_bool.qml b/src/benchmarks/auto/creation/qml.basictypes/delegates_basictype_var_bool.qml index e514b6d..e514b6d 100644 --- a/benchmarks/auto/creation/qml.basictypes/delegates_basictype_var_bool.qml +++ b/src/benchmarks/auto/creation/qml.basictypes/delegates_basictype_var_bool.qml diff --git a/benchmarks/auto/creation/qml.basictypes/delegates_basictype_var_int.qml b/src/benchmarks/auto/creation/qml.basictypes/delegates_basictype_var_int.qml index 9b87f70..9b87f70 100644 --- a/benchmarks/auto/creation/qml.basictypes/delegates_basictype_var_int.qml +++ b/src/benchmarks/auto/creation/qml.basictypes/delegates_basictype_var_int.qml diff --git a/benchmarks/auto/creation/qml.basictypes/delegates_basictype_var_object.qml b/src/benchmarks/auto/creation/qml.basictypes/delegates_basictype_var_object.qml index 1fc5fd2..1fc5fd2 100644 --- a/benchmarks/auto/creation/qml.basictypes/delegates_basictype_var_object.qml +++ b/src/benchmarks/auto/creation/qml.basictypes/delegates_basictype_var_object.qml diff --git a/benchmarks/auto/creation/qml.basictypes/delegates_basictype_var_string.qml b/src/benchmarks/auto/creation/qml.basictypes/delegates_basictype_var_string.qml index cc61b6d..cc61b6d 100644 --- a/benchmarks/auto/creation/qml.basictypes/delegates_basictype_var_string.qml +++ b/src/benchmarks/auto/creation/qml.basictypes/delegates_basictype_var_string.qml diff --git a/benchmarks/auto/creation/qml.basictypes/delegates_basictype_variant_array.qml b/src/benchmarks/auto/creation/qml.basictypes/delegates_basictype_variant_array.qml index e220943..e220943 100644 --- a/benchmarks/auto/creation/qml.basictypes/delegates_basictype_variant_array.qml +++ b/src/benchmarks/auto/creation/qml.basictypes/delegates_basictype_variant_array.qml diff --git a/benchmarks/auto/creation/qml.basictypes/delegates_basictype_variant_bool.qml b/src/benchmarks/auto/creation/qml.basictypes/delegates_basictype_variant_bool.qml index 478bfb4..478bfb4 100644 --- a/benchmarks/auto/creation/qml.basictypes/delegates_basictype_variant_bool.qml +++ b/src/benchmarks/auto/creation/qml.basictypes/delegates_basictype_variant_bool.qml diff --git a/benchmarks/auto/creation/qml.basictypes/delegates_basictype_variant_int.qml b/src/benchmarks/auto/creation/qml.basictypes/delegates_basictype_variant_int.qml index da3a5f9..da3a5f9 100644 --- a/benchmarks/auto/creation/qml.basictypes/delegates_basictype_variant_int.qml +++ b/src/benchmarks/auto/creation/qml.basictypes/delegates_basictype_variant_int.qml diff --git a/benchmarks/auto/creation/qml.basictypes/delegates_basictype_variant_object.qml b/src/benchmarks/auto/creation/qml.basictypes/delegates_basictype_variant_object.qml index 4b2a863..4b2a863 100644 --- a/benchmarks/auto/creation/qml.basictypes/delegates_basictype_variant_object.qml +++ b/src/benchmarks/auto/creation/qml.basictypes/delegates_basictype_variant_object.qml diff --git a/benchmarks/auto/creation/qml.basictypes/delegates_basictype_variant_string.qml b/src/benchmarks/auto/creation/qml.basictypes/delegates_basictype_variant_string.qml index d8175f2..d8175f2 100644 --- a/benchmarks/auto/creation/qml.basictypes/delegates_basictype_variant_string.qml +++ b/src/benchmarks/auto/creation/qml.basictypes/delegates_basictype_variant_string.qml diff --git a/benchmarks/auto/creation/qml.modelaccess/modelaccess_bool.qml b/src/benchmarks/auto/creation/qml.modelaccess/modelaccess_bool.qml index 54f86f4..54f86f4 100644 --- a/benchmarks/auto/creation/qml.modelaccess/modelaccess_bool.qml +++ b/src/benchmarks/auto/creation/qml.modelaccess/modelaccess_bool.qml diff --git a/benchmarks/auto/creation/qml.modelaccess/modelaccess_bytearray.qml b/src/benchmarks/auto/creation/qml.modelaccess/modelaccess_bytearray.qml index 1bd73e6..1bd73e6 100644 --- a/benchmarks/auto/creation/qml.modelaccess/modelaccess_bytearray.qml +++ b/src/benchmarks/auto/creation/qml.modelaccess/modelaccess_bytearray.qml diff --git a/benchmarks/auto/creation/qml.modelaccess/modelaccess_color.qml b/src/benchmarks/auto/creation/qml.modelaccess/modelaccess_color.qml index 65cdd4f..65cdd4f 100644 --- a/benchmarks/auto/creation/qml.modelaccess/modelaccess_color.qml +++ b/src/benchmarks/auto/creation/qml.modelaccess/modelaccess_color.qml diff --git a/benchmarks/auto/creation/qml.modelaccess/modelaccess_datetime.qml b/src/benchmarks/auto/creation/qml.modelaccess/modelaccess_datetime.qml index 91205e9..91205e9 100644 --- a/benchmarks/auto/creation/qml.modelaccess/modelaccess_datetime.qml +++ b/src/benchmarks/auto/creation/qml.modelaccess/modelaccess_datetime.qml diff --git a/benchmarks/auto/creation/qml.modelaccess/modelaccess_int.qml b/src/benchmarks/auto/creation/qml.modelaccess/modelaccess_int.qml index 5eb06bf..5eb06bf 100644 --- a/benchmarks/auto/creation/qml.modelaccess/modelaccess_int.qml +++ b/src/benchmarks/auto/creation/qml.modelaccess/modelaccess_int.qml diff --git a/benchmarks/auto/creation/qml.modelaccess/modelaccess_jsvalue.qml b/src/benchmarks/auto/creation/qml.modelaccess/modelaccess_jsvalue.qml index 8e5d0fc..8e5d0fc 100644 --- a/benchmarks/auto/creation/qml.modelaccess/modelaccess_jsvalue.qml +++ b/src/benchmarks/auto/creation/qml.modelaccess/modelaccess_jsvalue.qml diff --git a/benchmarks/auto/creation/qml.modelaccess/modelaccess_point.qml b/src/benchmarks/auto/creation/qml.modelaccess/modelaccess_point.qml index d107e3b..d107e3b 100644 --- a/benchmarks/auto/creation/qml.modelaccess/modelaccess_point.qml +++ b/src/benchmarks/auto/creation/qml.modelaccess/modelaccess_point.qml diff --git a/benchmarks/auto/creation/qml.modelaccess/modelaccess_real.qml b/src/benchmarks/auto/creation/qml.modelaccess/modelaccess_real.qml index 2d66c38..2d66c38 100644 --- a/benchmarks/auto/creation/qml.modelaccess/modelaccess_real.qml +++ b/src/benchmarks/auto/creation/qml.modelaccess/modelaccess_real.qml diff --git a/benchmarks/auto/creation/qml.modelaccess/modelaccess_rect.qml b/src/benchmarks/auto/creation/qml.modelaccess/modelaccess_rect.qml index 9caad53..9caad53 100644 --- a/benchmarks/auto/creation/qml.modelaccess/modelaccess_rect.qml +++ b/src/benchmarks/auto/creation/qml.modelaccess/modelaccess_rect.qml diff --git a/benchmarks/auto/creation/qml.modelaccess/modelaccess_size.qml b/src/benchmarks/auto/creation/qml.modelaccess/modelaccess_size.qml index be8d0ce..be8d0ce 100644 --- a/benchmarks/auto/creation/qml.modelaccess/modelaccess_size.qml +++ b/src/benchmarks/auto/creation/qml.modelaccess/modelaccess_size.qml diff --git a/benchmarks/auto/creation/qml.modelaccess/modelaccess_string.qml b/src/benchmarks/auto/creation/qml.modelaccess/modelaccess_string.qml index 5217816..5217816 100644 --- a/benchmarks/auto/creation/qml.modelaccess/modelaccess_string.qml +++ b/src/benchmarks/auto/creation/qml.modelaccess/modelaccess_string.qml diff --git a/benchmarks/auto/creation/qml.modelaccess/modelaccess_url.qml b/src/benchmarks/auto/creation/qml.modelaccess/modelaccess_url.qml index eb314bb..eb314bb 100644 --- a/benchmarks/auto/creation/qml.modelaccess/modelaccess_url.qml +++ b/src/benchmarks/auto/creation/qml.modelaccess/modelaccess_url.qml diff --git a/benchmarks/auto/creation/qtgraphicaleffects/delegates_dropshadow.qml b/src/benchmarks/auto/creation/qtgraphicaleffects/delegates_dropshadow.qml index 075d74d..075d74d 100644 --- a/benchmarks/auto/creation/qtgraphicaleffects/delegates_dropshadow.qml +++ b/src/benchmarks/auto/creation/qtgraphicaleffects/delegates_dropshadow.qml diff --git a/benchmarks/auto/creation/qtgraphicaleffects/delegates_lineargradient.qml b/src/benchmarks/auto/creation/qtgraphicaleffects/delegates_lineargradient.qml index 2904bdc..2904bdc 100644 --- a/benchmarks/auto/creation/qtgraphicaleffects/delegates_lineargradient.qml +++ b/src/benchmarks/auto/creation/qtgraphicaleffects/delegates_lineargradient.qml diff --git a/benchmarks/auto/creation/quick.basictypes/delegates_basictype_color.qml b/src/benchmarks/auto/creation/quick.basictypes/delegates_basictype_color.qml index f777a8e..f777a8e 100644 --- a/benchmarks/auto/creation/quick.basictypes/delegates_basictype_color.qml +++ b/src/benchmarks/auto/creation/quick.basictypes/delegates_basictype_color.qml diff --git a/benchmarks/auto/creation/quick.basictypes/delegates_basictype_color_argb.qml b/src/benchmarks/auto/creation/quick.basictypes/delegates_basictype_color_argb.qml index 24582cb..24582cb 100644 --- a/benchmarks/auto/creation/quick.basictypes/delegates_basictype_color_argb.qml +++ b/src/benchmarks/auto/creation/quick.basictypes/delegates_basictype_color_argb.qml diff --git a/benchmarks/auto/creation/quick.basictypes/delegates_basictype_color_name.qml b/src/benchmarks/auto/creation/quick.basictypes/delegates_basictype_color_name.qml index 2815fc9..2815fc9 100644 --- a/benchmarks/auto/creation/quick.basictypes/delegates_basictype_color_name.qml +++ b/src/benchmarks/auto/creation/quick.basictypes/delegates_basictype_color_name.qml diff --git a/benchmarks/auto/creation/quick.basictypes/delegates_basictype_date.qml b/src/benchmarks/auto/creation/quick.basictypes/delegates_basictype_date.qml index ea93f0e..ea93f0e 100644 --- a/benchmarks/auto/creation/quick.basictypes/delegates_basictype_date.qml +++ b/src/benchmarks/auto/creation/quick.basictypes/delegates_basictype_date.qml diff --git a/benchmarks/auto/creation/quick.basictypes/delegates_basictype_date_object.qml b/src/benchmarks/auto/creation/quick.basictypes/delegates_basictype_date_object.qml index 59c1655..59c1655 100644 --- a/benchmarks/auto/creation/quick.basictypes/delegates_basictype_date_object.qml +++ b/src/benchmarks/auto/creation/quick.basictypes/delegates_basictype_date_object.qml diff --git a/benchmarks/auto/creation/quick.basictypes/delegates_basictype_matrix4x4.qml b/src/benchmarks/auto/creation/quick.basictypes/delegates_basictype_matrix4x4.qml index b7112da..b7112da 100644 --- a/benchmarks/auto/creation/quick.basictypes/delegates_basictype_matrix4x4.qml +++ b/src/benchmarks/auto/creation/quick.basictypes/delegates_basictype_matrix4x4.qml diff --git a/benchmarks/auto/creation/quick.basictypes/delegates_basictype_point.qml b/src/benchmarks/auto/creation/quick.basictypes/delegates_basictype_point.qml index 9b29234..9b29234 100644 --- a/benchmarks/auto/creation/quick.basictypes/delegates_basictype_point.qml +++ b/src/benchmarks/auto/creation/quick.basictypes/delegates_basictype_point.qml diff --git a/benchmarks/auto/creation/quick.basictypes/delegates_basictype_quaternion.qml b/src/benchmarks/auto/creation/quick.basictypes/delegates_basictype_quaternion.qml index 304b373..304b373 100644 --- a/benchmarks/auto/creation/quick.basictypes/delegates_basictype_quaternion.qml +++ b/src/benchmarks/auto/creation/quick.basictypes/delegates_basictype_quaternion.qml diff --git a/benchmarks/auto/creation/quick.basictypes/delegates_basictype_rect.qml b/src/benchmarks/auto/creation/quick.basictypes/delegates_basictype_rect.qml index 297ec4c..297ec4c 100644 --- a/benchmarks/auto/creation/quick.basictypes/delegates_basictype_rect.qml +++ b/src/benchmarks/auto/creation/quick.basictypes/delegates_basictype_rect.qml diff --git a/benchmarks/auto/creation/quick.basictypes/delegates_basictype_size.qml b/src/benchmarks/auto/creation/quick.basictypes/delegates_basictype_size.qml index e947cc1..e947cc1 100644 --- a/benchmarks/auto/creation/quick.basictypes/delegates_basictype_size.qml +++ b/src/benchmarks/auto/creation/quick.basictypes/delegates_basictype_size.qml diff --git a/benchmarks/auto/creation/quick.basictypes/delegates_basictype_var_size.qml b/src/benchmarks/auto/creation/quick.basictypes/delegates_basictype_var_size.qml index b8edd7c..b8edd7c 100644 --- a/benchmarks/auto/creation/quick.basictypes/delegates_basictype_var_size.qml +++ b/src/benchmarks/auto/creation/quick.basictypes/delegates_basictype_var_size.qml diff --git a/benchmarks/auto/creation/quick.basictypes/delegates_basictype_variant_size.qml b/src/benchmarks/auto/creation/quick.basictypes/delegates_basictype_variant_size.qml index 112df7f..112df7f 100644 --- a/benchmarks/auto/creation/quick.basictypes/delegates_basictype_variant_size.qml +++ b/src/benchmarks/auto/creation/quick.basictypes/delegates_basictype_variant_size.qml diff --git a/benchmarks/auto/creation/quick.basictypes/delegates_basictype_vector2d.qml b/src/benchmarks/auto/creation/quick.basictypes/delegates_basictype_vector2d.qml index 09d13ac..09d13ac 100644 --- a/benchmarks/auto/creation/quick.basictypes/delegates_basictype_vector2d.qml +++ b/src/benchmarks/auto/creation/quick.basictypes/delegates_basictype_vector2d.qml diff --git a/benchmarks/auto/creation/quick.basictypes/delegates_basictype_vector3d.qml b/src/benchmarks/auto/creation/quick.basictypes/delegates_basictype_vector3d.qml index 29f9669..29f9669 100644 --- a/benchmarks/auto/creation/quick.basictypes/delegates_basictype_vector3d.qml +++ b/src/benchmarks/auto/creation/quick.basictypes/delegates_basictype_vector3d.qml diff --git a/benchmarks/auto/creation/quick.basictypes/delegates_basictype_vector4d.qml b/src/benchmarks/auto/creation/quick.basictypes/delegates_basictype_vector4d.qml index 3db91fc..3db91fc 100644 --- a/benchmarks/auto/creation/quick.basictypes/delegates_basictype_vector4d.qml +++ b/src/benchmarks/auto/creation/quick.basictypes/delegates_basictype_vector4d.qml diff --git a/benchmarks/auto/creation/quick.canvas/delegates_canvas_fbo_cooperative.qml b/src/benchmarks/auto/creation/quick.canvas/delegates_canvas_fbo_cooperative.qml index e9f7e49..e9f7e49 100644 --- a/benchmarks/auto/creation/quick.canvas/delegates_canvas_fbo_cooperative.qml +++ b/src/benchmarks/auto/creation/quick.canvas/delegates_canvas_fbo_cooperative.qml diff --git a/benchmarks/auto/creation/quick.canvas/delegates_canvas_fbo_immediate.qml b/src/benchmarks/auto/creation/quick.canvas/delegates_canvas_fbo_immediate.qml index f9f55b3..f9f55b3 100644 --- a/benchmarks/auto/creation/quick.canvas/delegates_canvas_fbo_immediate.qml +++ b/src/benchmarks/auto/creation/quick.canvas/delegates_canvas_fbo_immediate.qml diff --git a/benchmarks/auto/creation/quick.canvas/delegates_canvas_fbo_threaded.qml b/src/benchmarks/auto/creation/quick.canvas/delegates_canvas_fbo_threaded.qml index dd351f9..dd351f9 100644 --- a/benchmarks/auto/creation/quick.canvas/delegates_canvas_fbo_threaded.qml +++ b/src/benchmarks/auto/creation/quick.canvas/delegates_canvas_fbo_threaded.qml diff --git a/benchmarks/auto/creation/quick.canvas/delegates_canvas_image_cooperative.qml b/src/benchmarks/auto/creation/quick.canvas/delegates_canvas_image_cooperative.qml index 1c2be52..1c2be52 100644 --- a/benchmarks/auto/creation/quick.canvas/delegates_canvas_image_cooperative.qml +++ b/src/benchmarks/auto/creation/quick.canvas/delegates_canvas_image_cooperative.qml diff --git a/benchmarks/auto/creation/quick.canvas/delegates_canvas_image_immediate.qml b/src/benchmarks/auto/creation/quick.canvas/delegates_canvas_image_immediate.qml index 3deb640..3deb640 100644 --- a/benchmarks/auto/creation/quick.canvas/delegates_canvas_image_immediate.qml +++ b/src/benchmarks/auto/creation/quick.canvas/delegates_canvas_image_immediate.qml diff --git a/benchmarks/auto/creation/quick.canvas/delegates_canvas_image_threaded.qml b/src/benchmarks/auto/creation/quick.canvas/delegates_canvas_image_threaded.qml index 49d2587..49d2587 100644 --- a/benchmarks/auto/creation/quick.canvas/delegates_canvas_image_threaded.qml +++ b/src/benchmarks/auto/creation/quick.canvas/delegates_canvas_image_threaded.qml diff --git a/benchmarks/auto/creation/quick.controls2/delegates_busyindicator.qml b/src/benchmarks/auto/creation/quick.controls2/delegates_busyindicator.qml index 6706d51..6706d51 100644 --- a/benchmarks/auto/creation/quick.controls2/delegates_busyindicator.qml +++ b/src/benchmarks/auto/creation/quick.controls2/delegates_busyindicator.qml diff --git a/benchmarks/auto/creation/quick.controls2/delegates_button.qml b/src/benchmarks/auto/creation/quick.controls2/delegates_button.qml index ab9b939..ab9b939 100644 --- a/benchmarks/auto/creation/quick.controls2/delegates_button.qml +++ b/src/benchmarks/auto/creation/quick.controls2/delegates_button.qml diff --git a/benchmarks/auto/creation/quick.controls2/delegates_checkbox.qml b/src/benchmarks/auto/creation/quick.controls2/delegates_checkbox.qml index 4603acb..4603acb 100644 --- a/benchmarks/auto/creation/quick.controls2/delegates_checkbox.qml +++ b/src/benchmarks/auto/creation/quick.controls2/delegates_checkbox.qml diff --git a/benchmarks/auto/creation/quick.controls2/delegates_combobox.qml b/src/benchmarks/auto/creation/quick.controls2/delegates_combobox.qml index 7eef93a..7eef93a 100644 --- a/benchmarks/auto/creation/quick.controls2/delegates_combobox.qml +++ b/src/benchmarks/auto/creation/quick.controls2/delegates_combobox.qml diff --git a/benchmarks/auto/creation/quick.controls2/delegates_dial.qml b/src/benchmarks/auto/creation/quick.controls2/delegates_dial.qml index a245f2c..a245f2c 100644 --- a/benchmarks/auto/creation/quick.controls2/delegates_dial.qml +++ b/src/benchmarks/auto/creation/quick.controls2/delegates_dial.qml diff --git a/benchmarks/auto/creation/quick.controls2/delegates_itemdelegate.qml b/src/benchmarks/auto/creation/quick.controls2/delegates_itemdelegate.qml index 61f7c64..61f7c64 100644 --- a/benchmarks/auto/creation/quick.controls2/delegates_itemdelegate.qml +++ b/src/benchmarks/auto/creation/quick.controls2/delegates_itemdelegate.qml diff --git a/benchmarks/auto/creation/quick.controls2/delegates_label.qml b/src/benchmarks/auto/creation/quick.controls2/delegates_label.qml index 7624e90..7624e90 100644 --- a/benchmarks/auto/creation/quick.controls2/delegates_label.qml +++ b/src/benchmarks/auto/creation/quick.controls2/delegates_label.qml diff --git a/benchmarks/auto/creation/quick.controls2/delegates_menu_custom.qml b/src/benchmarks/auto/creation/quick.controls2/delegates_menu_custom.qml index 71a5b98..71a5b98 100644 --- a/benchmarks/auto/creation/quick.controls2/delegates_menu_custom.qml +++ b/src/benchmarks/auto/creation/quick.controls2/delegates_menu_custom.qml diff --git a/benchmarks/auto/creation/quick.controls2/delegates_menuitem.qml b/src/benchmarks/auto/creation/quick.controls2/delegates_menuitem.qml index adefbc7..adefbc7 100644 --- a/benchmarks/auto/creation/quick.controls2/delegates_menuitem.qml +++ b/src/benchmarks/auto/creation/quick.controls2/delegates_menuitem.qml diff --git a/benchmarks/auto/creation/quick.controls2/delegates_progressbar.qml b/src/benchmarks/auto/creation/quick.controls2/delegates_progressbar.qml index 6c2475d..6c2475d 100644 --- a/benchmarks/auto/creation/quick.controls2/delegates_progressbar.qml +++ b/src/benchmarks/auto/creation/quick.controls2/delegates_progressbar.qml diff --git a/benchmarks/auto/creation/quick.controls2/delegates_radiobutton.qml b/src/benchmarks/auto/creation/quick.controls2/delegates_radiobutton.qml index 86847cf..86847cf 100644 --- a/benchmarks/auto/creation/quick.controls2/delegates_radiobutton.qml +++ b/src/benchmarks/auto/creation/quick.controls2/delegates_radiobutton.qml diff --git a/benchmarks/auto/creation/quick.controls2/delegates_scrollbar.qml b/src/benchmarks/auto/creation/quick.controls2/delegates_scrollbar.qml index 8e73e9d..8e73e9d 100644 --- a/benchmarks/auto/creation/quick.controls2/delegates_scrollbar.qml +++ b/src/benchmarks/auto/creation/quick.controls2/delegates_scrollbar.qml diff --git a/benchmarks/auto/creation/quick.controls2/delegates_scrollview.qml b/src/benchmarks/auto/creation/quick.controls2/delegates_scrollview.qml index eea7e34..eea7e34 100644 --- a/benchmarks/auto/creation/quick.controls2/delegates_scrollview.qml +++ b/src/benchmarks/auto/creation/quick.controls2/delegates_scrollview.qml diff --git a/benchmarks/auto/creation/quick.controls2/delegates_slider.qml b/src/benchmarks/auto/creation/quick.controls2/delegates_slider.qml index bf6df75..bf6df75 100644 --- a/benchmarks/auto/creation/quick.controls2/delegates_slider.qml +++ b/src/benchmarks/auto/creation/quick.controls2/delegates_slider.qml diff --git a/benchmarks/auto/creation/quick.controls2/delegates_spinbox.qml b/src/benchmarks/auto/creation/quick.controls2/delegates_spinbox.qml index 4ac4a95..4ac4a95 100644 --- a/benchmarks/auto/creation/quick.controls2/delegates_spinbox.qml +++ b/src/benchmarks/auto/creation/quick.controls2/delegates_spinbox.qml diff --git a/benchmarks/auto/creation/quick.controls2/delegates_switch.qml b/src/benchmarks/auto/creation/quick.controls2/delegates_switch.qml index d780bd1..d780bd1 100644 --- a/benchmarks/auto/creation/quick.controls2/delegates_switch.qml +++ b/src/benchmarks/auto/creation/quick.controls2/delegates_switch.qml diff --git a/benchmarks/auto/creation/quick.controls2/delegates_tabbar.qml b/src/benchmarks/auto/creation/quick.controls2/delegates_tabbar.qml index 418deb5..418deb5 100644 --- a/benchmarks/auto/creation/quick.controls2/delegates_tabbar.qml +++ b/src/benchmarks/auto/creation/quick.controls2/delegates_tabbar.qml diff --git a/benchmarks/auto/creation/quick.controls2/delegates_textarea.qml b/src/benchmarks/auto/creation/quick.controls2/delegates_textarea.qml index 28d1fb0..28d1fb0 100644 --- a/benchmarks/auto/creation/quick.controls2/delegates_textarea.qml +++ b/src/benchmarks/auto/creation/quick.controls2/delegates_textarea.qml diff --git a/benchmarks/auto/creation/quick.controls2/delegates_textfield.qml b/src/benchmarks/auto/creation/quick.controls2/delegates_textfield.qml index 6f03459..6f03459 100644 --- a/benchmarks/auto/creation/quick.controls2/delegates_textfield.qml +++ b/src/benchmarks/auto/creation/quick.controls2/delegates_textfield.qml diff --git a/benchmarks/auto/creation/quick.controls2/delegates_tumbler.qml b/src/benchmarks/auto/creation/quick.controls2/delegates_tumbler.qml index 9d80215..9d80215 100644 --- a/benchmarks/auto/creation/quick.controls2/delegates_tumbler.qml +++ b/src/benchmarks/auto/creation/quick.controls2/delegates_tumbler.qml diff --git a/benchmarks/auto/creation/quick.image/delegates_image.qml b/src/benchmarks/auto/creation/quick.image/delegates_image.qml index 6d692c1..93432ed 100644 --- a/benchmarks/auto/creation/quick.image/delegates_image.qml +++ b/src/benchmarks/auto/creation/quick.image/delegates_image.qml @@ -16,7 +16,7 @@ CreationBenchmark { delegate: Image { x: QmlBench.getRandom() * (root.width - width) y: QmlBench.getRandom() * (root.height - height) - source: "../../../../shared/" + root.names[index % 3]; + source: "qrc:///shared/" + root.names[index % 3]; width: 20 height: 20 } diff --git a/benchmarks/auto/creation/quick.image/delegates_image_alpha.qml b/src/benchmarks/auto/creation/quick.image/delegates_image_alpha.qml index e9649f2..ba52256 100644 --- a/benchmarks/auto/creation/quick.image/delegates_image_alpha.qml +++ b/src/benchmarks/auto/creation/quick.image/delegates_image_alpha.qml @@ -11,7 +11,7 @@ CreationBenchmark { delegate: Image { x: QmlBench.getRandom() * (root.width - width) y: QmlBench.getRandom() * (root.height - height) - source: "../../../../shared/alpha.png" + source: "qrc:///shared/alpha.png" width: 20 height: 20 } diff --git a/benchmarks/auto/creation/quick.image/delegates_image_antialiased.qml b/src/benchmarks/auto/creation/quick.image/delegates_image_antialiased.qml index e22aa85..a61808b 100644 --- a/benchmarks/auto/creation/quick.image/delegates_image_antialiased.qml +++ b/src/benchmarks/auto/creation/quick.image/delegates_image_antialiased.qml @@ -16,7 +16,7 @@ CreationBenchmark { delegate: Image { x: QmlBench.getRandom() * (root.width - width) y: QmlBench.getRandom() * (root.height - height) - source: "../../../../shared/" + root.names[index % 3]; + source: "qrc:///shared/" + root.names[index % 3]; width: 20 height: 20 antialiasing: true diff --git a/benchmarks/auto/creation/quick.image/delegates_image_async.qml b/src/benchmarks/auto/creation/quick.image/delegates_image_async.qml index 5c27029..80e13d6 100644 --- a/benchmarks/auto/creation/quick.image/delegates_image_async.qml +++ b/src/benchmarks/auto/creation/quick.image/delegates_image_async.qml @@ -16,7 +16,7 @@ CreationBenchmark { delegate: Image { x: QmlBench.getRandom() * (root.width - width) y: QmlBench.getRandom() * (root.height - height) - source: "../../../../shared/" + root.names[index % 3]; + source: "qrc:///shared/" + root.names[index % 3]; width: 20 height: 20 asynchronous: true diff --git a/benchmarks/auto/creation/quick.image/delegates_image_solid.qml b/src/benchmarks/auto/creation/quick.image/delegates_image_solid.qml index 3f05d71..99ceba6 100644 --- a/benchmarks/auto/creation/quick.image/delegates_image_solid.qml +++ b/src/benchmarks/auto/creation/quick.image/delegates_image_solid.qml @@ -11,7 +11,7 @@ CreationBenchmark { delegate: Image { x: QmlBench.getRandom() * (root.width - width) y: QmlBench.getRandom() * (root.height - height) - source: "../../../../shared/solid.png" + source: "qrc:///shared/solid.png" width: 20 height: 20 } diff --git a/benchmarks/auto/creation/quick.item/delegates_item.qml b/src/benchmarks/auto/creation/quick.item/delegates_item.qml index 8d150f9..8d150f9 100644 --- a/benchmarks/auto/creation/quick.item/delegates_item.qml +++ b/src/benchmarks/auto/creation/quick.item/delegates_item.qml diff --git a/benchmarks/auto/creation/quick.item/delegates_item_bindings.qml b/src/benchmarks/auto/creation/quick.item/delegates_item_bindings.qml index 3dbcb13..3dbcb13 100644 --- a/benchmarks/auto/creation/quick.item/delegates_item_bindings.qml +++ b/src/benchmarks/auto/creation/quick.item/delegates_item_bindings.qml diff --git a/benchmarks/auto/creation/quick.item/delegates_item_childrenRect.qml b/src/benchmarks/auto/creation/quick.item/delegates_item_childrenRect.qml index d445f05..d445f05 100644 --- a/benchmarks/auto/creation/quick.item/delegates_item_childrenRect.qml +++ b/src/benchmarks/auto/creation/quick.item/delegates_item_childrenRect.qml diff --git a/benchmarks/auto/creation/quick.item/delegates_item_empty.qml b/src/benchmarks/auto/creation/quick.item/delegates_item_empty.qml index f635909..f635909 100644 --- a/benchmarks/auto/creation/quick.item/delegates_item_empty.qml +++ b/src/benchmarks/auto/creation/quick.item/delegates_item_empty.qml diff --git a/benchmarks/auto/creation/quick.item/delegates_item_empty_jscreation.qml b/src/benchmarks/auto/creation/quick.item/delegates_item_empty_jscreation.qml index 89cded0..89cded0 100644 --- a/benchmarks/auto/creation/quick.item/delegates_item_empty_jscreation.qml +++ b/src/benchmarks/auto/creation/quick.item/delegates_item_empty_jscreation.qml diff --git a/benchmarks/auto/creation/quick.item/delegates_item_script.qml b/src/benchmarks/auto/creation/quick.item/delegates_item_script.qml index 37fbb54..37fbb54 100644 --- a/benchmarks/auto/creation/quick.item/delegates_item_script.qml +++ b/src/benchmarks/auto/creation/quick.item/delegates_item_script.qml diff --git a/benchmarks/auto/creation/quick.item/delegates_item_states.qml b/src/benchmarks/auto/creation/quick.item/delegates_item_states.qml index 2163d61..2163d61 100644 --- a/benchmarks/auto/creation/quick.item/delegates_item_states.qml +++ b/src/benchmarks/auto/creation/quick.item/delegates_item_states.qml diff --git a/benchmarks/auto/creation/quick.item/delegates_item_z.qml b/src/benchmarks/auto/creation/quick.item/delegates_item_z.qml index 791bcab..791bcab 100644 --- a/benchmarks/auto/creation/quick.item/delegates_item_z.qml +++ b/src/benchmarks/auto/creation/quick.item/delegates_item_z.qml diff --git a/benchmarks/auto/creation/quick.item/item_anchors.qml b/src/benchmarks/auto/creation/quick.item/item_anchors.qml index 1e0e8cc..1e0e8cc 100644 --- a/benchmarks/auto/creation/quick.item/item_anchors.qml +++ b/src/benchmarks/auto/creation/quick.item/item_anchors.qml diff --git a/benchmarks/auto/creation/quick.item/item_size.qml b/src/benchmarks/auto/creation/quick.item/item_size.qml index cc02942..cc02942 100644 --- a/benchmarks/auto/creation/quick.item/item_size.qml +++ b/src/benchmarks/auto/creation/quick.item/item_size.qml diff --git a/benchmarks/auto/creation/quick.rectangle/delegates_rect.qml b/src/benchmarks/auto/creation/quick.rectangle/delegates_rect.qml index a840b1c..a840b1c 100644 --- a/benchmarks/auto/creation/quick.rectangle/delegates_rect.qml +++ b/src/benchmarks/auto/creation/quick.rectangle/delegates_rect.qml diff --git a/benchmarks/auto/creation/quick.rectangle/delegates_rect_blended.qml b/src/benchmarks/auto/creation/quick.rectangle/delegates_rect_blended.qml index 5baa902..5baa902 100644 --- a/benchmarks/auto/creation/quick.rectangle/delegates_rect_blended.qml +++ b/src/benchmarks/auto/creation/quick.rectangle/delegates_rect_blended.qml diff --git a/benchmarks/auto/creation/quick.rectangle/delegates_rect_border.qml b/src/benchmarks/auto/creation/quick.rectangle/delegates_rect_border.qml index 86a47c2..86a47c2 100644 --- a/benchmarks/auto/creation/quick.rectangle/delegates_rect_border.qml +++ b/src/benchmarks/auto/creation/quick.rectangle/delegates_rect_border.qml diff --git a/benchmarks/auto/creation/quick.rectangle/delegates_rect_gradient.qml b/src/benchmarks/auto/creation/quick.rectangle/delegates_rect_gradient.qml index 85c3158..85c3158 100644 --- a/benchmarks/auto/creation/quick.rectangle/delegates_rect_gradient.qml +++ b/src/benchmarks/auto/creation/quick.rectangle/delegates_rect_gradient.qml diff --git a/benchmarks/auto/creation/quick.rectangle/delegates_rect_radius.qml b/src/benchmarks/auto/creation/quick.rectangle/delegates_rect_radius.qml index 693ede4..693ede4 100644 --- a/benchmarks/auto/creation/quick.rectangle/delegates_rect_radius.qml +++ b/src/benchmarks/auto/creation/quick.rectangle/delegates_rect_radius.qml diff --git a/benchmarks/auto/creation/quick.text/comparison/delegates_kerning.qml b/src/benchmarks/auto/creation/quick.text/comparison/delegates_kerning.qml index 0782c4a..0782c4a 100644 --- a/benchmarks/auto/creation/quick.text/comparison/delegates_kerning.qml +++ b/src/benchmarks/auto/creation/quick.text/comparison/delegates_kerning.qml diff --git a/benchmarks/auto/creation/quick.text/comparison/delegates_nokerning.qml b/src/benchmarks/auto/creation/quick.text/comparison/delegates_nokerning.qml index 9b9cbac..9b9cbac 100644 --- a/benchmarks/auto/creation/quick.text/comparison/delegates_nokerning.qml +++ b/src/benchmarks/auto/creation/quick.text/comparison/delegates_nokerning.qml diff --git a/benchmarks/auto/creation/quick.text/comparison/delegates_noshaping.qml b/src/benchmarks/auto/creation/quick.text/comparison/delegates_noshaping.qml index 5a29ff2..5a29ff2 100644 --- a/benchmarks/auto/creation/quick.text/comparison/delegates_noshaping.qml +++ b/src/benchmarks/auto/creation/quick.text/comparison/delegates_noshaping.qml diff --git a/benchmarks/auto/creation/quick.text/delegates_longtext.qml b/src/benchmarks/auto/creation/quick.text/delegates_longtext.qml index 806d996..806d996 100644 --- a/benchmarks/auto/creation/quick.text/delegates_longtext.qml +++ b/src/benchmarks/auto/creation/quick.text/delegates_longtext.qml diff --git a/benchmarks/auto/creation/quick.text/delegates_longtext_arabic.qml b/src/benchmarks/auto/creation/quick.text/delegates_longtext_arabic.qml index fd3434c..fd3434c 100644 --- a/benchmarks/auto/creation/quick.text/delegates_longtext_arabic.qml +++ b/src/benchmarks/auto/creation/quick.text/delegates_longtext_arabic.qml diff --git a/benchmarks/auto/creation/quick.text/delegates_longtext_chinese.qml b/src/benchmarks/auto/creation/quick.text/delegates_longtext_chinese.qml index 95526ec..95526ec 100644 --- a/benchmarks/auto/creation/quick.text/delegates_longtext_chinese.qml +++ b/src/benchmarks/auto/creation/quick.text/delegates_longtext_chinese.qml diff --git a/benchmarks/auto/creation/quick.text/delegates_longtext_hindi.qml b/src/benchmarks/auto/creation/quick.text/delegates_longtext_hindi.qml index 5f7aca0..5f7aca0 100644 --- a/benchmarks/auto/creation/quick.text/delegates_longtext_hindi.qml +++ b/src/benchmarks/auto/creation/quick.text/delegates_longtext_hindi.qml diff --git a/benchmarks/auto/creation/quick.text/delegates_text.qml b/src/benchmarks/auto/creation/quick.text/delegates_text.qml index 95a72a4..95a72a4 100644 --- a/benchmarks/auto/creation/quick.text/delegates_text.qml +++ b/src/benchmarks/auto/creation/quick.text/delegates_text.qml diff --git a/benchmarks/auto/creation/quick.text/delegates_text_arabic.qml b/src/benchmarks/auto/creation/quick.text/delegates_text_arabic.qml index b209113..b209113 100644 --- a/benchmarks/auto/creation/quick.text/delegates_text_arabic.qml +++ b/src/benchmarks/auto/creation/quick.text/delegates_text_arabic.qml diff --git a/benchmarks/auto/creation/quick.text/delegates_text_chinese.qml b/src/benchmarks/auto/creation/quick.text/delegates_text_chinese.qml index 1be0b0c..1be0b0c 100644 --- a/benchmarks/auto/creation/quick.text/delegates_text_chinese.qml +++ b/src/benchmarks/auto/creation/quick.text/delegates_text_chinese.qml diff --git a/benchmarks/auto/creation/quick.text/delegates_text_decoration_bold.qml b/src/benchmarks/auto/creation/quick.text/delegates_text_decoration_bold.qml index 8af788e..8af788e 100644 --- a/benchmarks/auto/creation/quick.text/delegates_text_decoration_bold.qml +++ b/src/benchmarks/auto/creation/quick.text/delegates_text_decoration_bold.qml diff --git a/benchmarks/auto/creation/quick.text/delegates_text_decoration_italic.qml b/src/benchmarks/auto/creation/quick.text/delegates_text_decoration_italic.qml index c4b4f32..c4b4f32 100644 --- a/benchmarks/auto/creation/quick.text/delegates_text_decoration_italic.qml +++ b/src/benchmarks/auto/creation/quick.text/delegates_text_decoration_italic.qml diff --git a/benchmarks/auto/creation/quick.text/delegates_text_decoration_strikeout.qml b/src/benchmarks/auto/creation/quick.text/delegates_text_decoration_strikeout.qml index e634a73..e634a73 100644 --- a/benchmarks/auto/creation/quick.text/delegates_text_decoration_strikeout.qml +++ b/src/benchmarks/auto/creation/quick.text/delegates_text_decoration_strikeout.qml diff --git a/benchmarks/auto/creation/quick.text/delegates_text_decoration_underline.qml b/src/benchmarks/auto/creation/quick.text/delegates_text_decoration_underline.qml index e61efe1..e61efe1 100644 --- a/benchmarks/auto/creation/quick.text/delegates_text_decoration_underline.qml +++ b/src/benchmarks/auto/creation/quick.text/delegates_text_decoration_underline.qml diff --git a/benchmarks/auto/creation/quick.text/delegates_text_elide.qml b/src/benchmarks/auto/creation/quick.text/delegates_text_elide.qml index a0743eb..a0743eb 100644 --- a/benchmarks/auto/creation/quick.text/delegates_text_elide.qml +++ b/src/benchmarks/auto/creation/quick.text/delegates_text_elide.qml diff --git a/benchmarks/auto/creation/quick.text/delegates_text_hindi.qml b/src/benchmarks/auto/creation/quick.text/delegates_text_hindi.qml index 2fecb49..2fecb49 100644 --- a/benchmarks/auto/creation/quick.text/delegates_text_hindi.qml +++ b/src/benchmarks/auto/creation/quick.text/delegates_text_hindi.qml diff --git a/benchmarks/auto/creation/quick.text/delegates_text_nativerendering.qml b/src/benchmarks/auto/creation/quick.text/delegates_text_nativerendering.qml index 2927c48..2927c48 100644 --- a/benchmarks/auto/creation/quick.text/delegates_text_nativerendering.qml +++ b/src/benchmarks/auto/creation/quick.text/delegates_text_nativerendering.qml diff --git a/benchmarks/auto/creation/quick.text/delegates_text_plain.qml b/src/benchmarks/auto/creation/quick.text/delegates_text_plain.qml index a060e9d..a060e9d 100644 --- a/benchmarks/auto/creation/quick.text/delegates_text_plain.qml +++ b/src/benchmarks/auto/creation/quick.text/delegates_text_plain.qml diff --git a/benchmarks/auto/creation/quick.text/delegates_text_richtext.qml b/src/benchmarks/auto/creation/quick.text/delegates_text_richtext.qml index 99aaa71..99aaa71 100644 --- a/benchmarks/auto/creation/quick.text/delegates_text_richtext.qml +++ b/src/benchmarks/auto/creation/quick.text/delegates_text_richtext.qml diff --git a/benchmarks/auto/creation/quick.text/delegates_text_styled.qml b/src/benchmarks/auto/creation/quick.text/delegates_text_styled.qml index c89d22d..c89d22d 100644 --- a/benchmarks/auto/creation/quick.text/delegates_text_styled.qml +++ b/src/benchmarks/auto/creation/quick.text/delegates_text_styled.qml diff --git a/benchmarks/auto/creation/quick.text/delegates_textedit.qml b/src/benchmarks/auto/creation/quick.text/delegates_textedit.qml index cf7921b..cf7921b 100644 --- a/benchmarks/auto/creation/quick.text/delegates_textedit.qml +++ b/src/benchmarks/auto/creation/quick.text/delegates_textedit.qml diff --git a/benchmarks/auto/creation/quick.text/delegates_textinput.qml b/src/benchmarks/auto/creation/quick.text/delegates_textinput.qml index 727c9ea..727c9ea 100644 --- a/benchmarks/auto/creation/quick.text/delegates_textinput.qml +++ b/src/benchmarks/auto/creation/quick.text/delegates_textinput.qml diff --git a/benchmarks/auto/creation/quick.transforms/delegates_item_rotated.qml b/src/benchmarks/auto/creation/quick.transforms/delegates_item_rotated.qml index f7b9ed2..f7b9ed2 100644 --- a/benchmarks/auto/creation/quick.transforms/delegates_item_rotated.qml +++ b/src/benchmarks/auto/creation/quick.transforms/delegates_item_rotated.qml diff --git a/benchmarks/auto/creation/quick.transforms/delegates_item_rotated_transform.qml b/src/benchmarks/auto/creation/quick.transforms/delegates_item_rotated_transform.qml index f1a2e8f..f1a2e8f 100644 --- a/benchmarks/auto/creation/quick.transforms/delegates_item_rotated_transform.qml +++ b/src/benchmarks/auto/creation/quick.transforms/delegates_item_rotated_transform.qml diff --git a/benchmarks/auto/creation/quick.transforms/delegates_item_scaled.qml b/src/benchmarks/auto/creation/quick.transforms/delegates_item_scaled.qml index d8c0c74..d8c0c74 100644 --- a/benchmarks/auto/creation/quick.transforms/delegates_item_scaled.qml +++ b/src/benchmarks/auto/creation/quick.transforms/delegates_item_scaled.qml diff --git a/benchmarks/auto/creation/quick.transforms/delegates_item_scaled_transform.qml b/src/benchmarks/auto/creation/quick.transforms/delegates_item_scaled_transform.qml index 851fcb8..851fcb8 100644 --- a/benchmarks/auto/creation/quick.transforms/delegates_item_scaled_transform.qml +++ b/src/benchmarks/auto/creation/quick.transforms/delegates_item_scaled_transform.qml diff --git a/benchmarks/auto/creation/quick.transforms/delegates_item_translated.qml b/src/benchmarks/auto/creation/quick.transforms/delegates_item_translated.qml index 8669e29..8669e29 100644 --- a/benchmarks/auto/creation/quick.transforms/delegates_item_translated.qml +++ b/src/benchmarks/auto/creation/quick.transforms/delegates_item_translated.qml diff --git a/benchmarks/auto/creation/quick.validators/delegates_doublevalidator.qml b/src/benchmarks/auto/creation/quick.validators/delegates_doublevalidator.qml index 4fb6f30..4fb6f30 100644 --- a/benchmarks/auto/creation/quick.validators/delegates_doublevalidator.qml +++ b/src/benchmarks/auto/creation/quick.validators/delegates_doublevalidator.qml diff --git a/benchmarks/auto/creation/quick.validators/delegates_intvalidator.qml b/src/benchmarks/auto/creation/quick.validators/delegates_intvalidator.qml index f99040b..f99040b 100644 --- a/benchmarks/auto/creation/quick.validators/delegates_intvalidator.qml +++ b/src/benchmarks/auto/creation/quick.validators/delegates_intvalidator.qml diff --git a/benchmarks/auto/creation/quick.validators/delegates_regexpvalidator.qml b/src/benchmarks/auto/creation/quick.validators/delegates_regexpvalidator.qml index b3b8d38..b3b8d38 100644 --- a/benchmarks/auto/creation/quick.validators/delegates_regexpvalidator.qml +++ b/src/benchmarks/auto/creation/quick.validators/delegates_regexpvalidator.qml diff --git a/benchmarks/auto/creation/quick/compile.bat b/src/benchmarks/auto/creation/quick/compile.bat index e0eeb95..e0eeb95 100644 --- a/benchmarks/auto/creation/quick/compile.bat +++ b/src/benchmarks/auto/creation/quick/compile.bat diff --git a/benchmarks/auto/creation/quick/delegates_flickable.qml b/src/benchmarks/auto/creation/quick/delegates_flickable.qml index 303570e..303570e 100644 --- a/benchmarks/auto/creation/quick/delegates_flickable.qml +++ b/src/benchmarks/auto/creation/quick/delegates_flickable.qml diff --git a/benchmarks/auto/creation/quick/delegates_flipable.qml b/src/benchmarks/auto/creation/quick/delegates_flipable.qml index 15a29b3..15a29b3 100644 --- a/benchmarks/auto/creation/quick/delegates_flipable.qml +++ b/src/benchmarks/auto/creation/quick/delegates_flipable.qml diff --git a/benchmarks/auto/creation/quick/delegates_focusscope.qml b/src/benchmarks/auto/creation/quick/delegates_focusscope.qml index 059ae2f..059ae2f 100644 --- a/benchmarks/auto/creation/quick/delegates_focusscope.qml +++ b/src/benchmarks/auto/creation/quick/delegates_focusscope.qml diff --git a/benchmarks/auto/creation/quick/delegates_fontloader.qml b/src/benchmarks/auto/creation/quick/delegates_fontloader.qml index 354552b..354552b 100644 --- a/benchmarks/auto/creation/quick/delegates_fontloader.qml +++ b/src/benchmarks/auto/creation/quick/delegates_fontloader.qml diff --git a/benchmarks/auto/creation/quick/delegates_fontmetrics.qml b/src/benchmarks/auto/creation/quick/delegates_fontmetrics.qml index 849dc0b..849dc0b 100644 --- a/benchmarks/auto/creation/quick/delegates_fontmetrics.qml +++ b/src/benchmarks/auto/creation/quick/delegates_fontmetrics.qml diff --git a/benchmarks/auto/creation/quick/delegates_gridview.qml b/src/benchmarks/auto/creation/quick/delegates_gridview.qml index 386d865..386d865 100644 --- a/benchmarks/auto/creation/quick/delegates_gridview.qml +++ b/src/benchmarks/auto/creation/quick/delegates_gridview.qml diff --git a/benchmarks/auto/creation/quick/delegates_listview.qml b/src/benchmarks/auto/creation/quick/delegates_listview.qml index 413bbb2..413bbb2 100644 --- a/benchmarks/auto/creation/quick/delegates_listview.qml +++ b/src/benchmarks/auto/creation/quick/delegates_listview.qml diff --git a/benchmarks/auto/creation/quick/delegates_loader.qml b/src/benchmarks/auto/creation/quick/delegates_loader.qml index 7271f15..7271f15 100644 --- a/benchmarks/auto/creation/quick/delegates_loader.qml +++ b/src/benchmarks/auto/creation/quick/delegates_loader.qml diff --git a/benchmarks/auto/creation/quick/delegates_mousearea.qml b/src/benchmarks/auto/creation/quick/delegates_mousearea.qml index eaf3ad0..eaf3ad0 100644 --- a/benchmarks/auto/creation/quick/delegates_mousearea.qml +++ b/src/benchmarks/auto/creation/quick/delegates_mousearea.qml diff --git a/benchmarks/auto/creation/quick/delegates_multipointtoucharea.qml b/src/benchmarks/auto/creation/quick/delegates_multipointtoucharea.qml index 68b4976..68b4976 100644 --- a/benchmarks/auto/creation/quick/delegates_multipointtoucharea.qml +++ b/src/benchmarks/auto/creation/quick/delegates_multipointtoucharea.qml diff --git a/benchmarks/auto/creation/quick/delegates_pathview.qml b/src/benchmarks/auto/creation/quick/delegates_pathview.qml index f370e3b..f370e3b 100644 --- a/benchmarks/auto/creation/quick/delegates_pathview.qml +++ b/src/benchmarks/auto/creation/quick/delegates_pathview.qml diff --git a/benchmarks/auto/creation/quick/delegates_pincharea.qml b/src/benchmarks/auto/creation/quick/delegates_pincharea.qml index b89efc6..b89efc6 100644 --- a/benchmarks/auto/creation/quick/delegates_pincharea.qml +++ b/src/benchmarks/auto/creation/quick/delegates_pincharea.qml diff --git a/benchmarks/auto/creation/quick/delegates_qobject.qml b/src/benchmarks/auto/creation/quick/delegates_qobject.qml index 2bd8d52..2bd8d52 100644 --- a/benchmarks/auto/creation/quick/delegates_qobject.qml +++ b/src/benchmarks/auto/creation/quick/delegates_qobject.qml diff --git a/benchmarks/auto/creation/quick/delegates_qobject_large_array.qml b/src/benchmarks/auto/creation/quick/delegates_qobject_large_array.qml index 01fc3cf..01fc3cf 100644 --- a/benchmarks/auto/creation/quick/delegates_qobject_large_array.qml +++ b/src/benchmarks/auto/creation/quick/delegates_qobject_large_array.qml diff --git a/benchmarks/auto/creation/quick/delegates_shadereffect.qml b/src/benchmarks/auto/creation/quick/delegates_shadereffect.qml index b81ba5c..b81ba5c 100644 --- a/benchmarks/auto/creation/quick/delegates_shadereffect.qml +++ b/src/benchmarks/auto/creation/quick/delegates_shadereffect.qml diff --git a/benchmarks/auto/creation/quick/delegates_shadereffect_props.qml b/src/benchmarks/auto/creation/quick/delegates_shadereffect_props.qml index bf52e81..4aa855b 100644 --- a/benchmarks/auto/creation/quick/delegates_shadereffect_props.qml +++ b/src/benchmarks/auto/creation/quick/delegates_shadereffect_props.qml @@ -10,7 +10,7 @@ CreationBenchmark { Image { id: sourceImage - source: "../../../../shared/butterfly-wide.png" + source: "qrc:///shared/butterfly-wide.png" } delegate: ShaderEffect { diff --git a/benchmarks/auto/creation/quick/delegates_shadereffectsource.qml b/src/benchmarks/auto/creation/quick/delegates_shadereffectsource.qml index 4e021a6..4e021a6 100644 --- a/benchmarks/auto/creation/quick/delegates_shadereffectsource.qml +++ b/src/benchmarks/auto/creation/quick/delegates_shadereffectsource.qml diff --git a/benchmarks/auto/creation/quick/delegates_textmetrics.qml b/src/benchmarks/auto/creation/quick/delegates_textmetrics.qml index 33a9506..33a9506 100644 --- a/benchmarks/auto/creation/quick/delegates_textmetrics.qml +++ b/src/benchmarks/auto/creation/quick/delegates_textmetrics.qml diff --git a/benchmarks/auto/creation/quick/red.frag b/src/benchmarks/auto/creation/quick/red.frag index 2aa500e..2aa500e 100644 --- a/benchmarks/auto/creation/quick/red.frag +++ b/src/benchmarks/auto/creation/quick/red.frag diff --git a/benchmarks/auto/creation/quick/red.frag.qsb b/src/benchmarks/auto/creation/quick/red.frag.qsb Binary files differindex 5bae5c1..5bae5c1 100644 --- a/benchmarks/auto/creation/quick/red.frag.qsb +++ b/src/benchmarks/auto/creation/quick/red.frag.qsb diff --git a/benchmarks/auto/js/date_getYear.qml b/src/benchmarks/auto/js/date_getYear.qml index 2e2639a..2e2639a 100644 --- a/benchmarks/auto/js/date_getYear.qml +++ b/src/benchmarks/auto/js/date_getYear.qml diff --git a/benchmarks/auto/js/fib10.qml b/src/benchmarks/auto/js/fib10.qml index 7e0df4f..7e0df4f 100644 --- a/benchmarks/auto/js/fib10.qml +++ b/src/benchmarks/auto/js/fib10.qml diff --git a/benchmarks/auto/js/sum10k.qml b/src/benchmarks/auto/js/sum10k.qml index ed9850f..ed9850f 100644 --- a/benchmarks/auto/js/sum10k.qml +++ b/src/benchmarks/auto/js/sum10k.qml diff --git a/benchmarks/auto/js/sum10k_fixed.qml b/src/benchmarks/auto/js/sum10k_fixed.qml index b638a94..b638a94 100644 --- a/benchmarks/auto/js/sum10k_fixed.qml +++ b/src/benchmarks/auto/js/sum10k_fixed.qml diff --git a/benchmarks/auto/layouts/gridlayout_large.qml b/src/benchmarks/auto/layouts/gridlayout_large.qml index 340a468..340a468 100644 --- a/benchmarks/auto/layouts/gridlayout_large.qml +++ b/src/benchmarks/auto/layouts/gridlayout_large.qml diff --git a/benchmarks/auto/quick3d/lights.qml b/src/benchmarks/auto/quick3d/lights.qml index 07439c1..07439c1 100644 --- a/benchmarks/auto/quick3d/lights.qml +++ b/src/benchmarks/auto/quick3d/lights.qml diff --git a/benchmarks/auto/quick3d/multiview.qml b/src/benchmarks/auto/quick3d/multiview.qml index 5b1077b..5b1077b 100644 --- a/benchmarks/auto/quick3d/multiview.qml +++ b/src/benchmarks/auto/quick3d/multiview.qml diff --git a/benchmarks/auto/quick3d/principledmaterial/PrincipledMaterial.qml b/src/benchmarks/auto/quick3d/principledmaterial/PrincipledMaterial.qml index 205b3b1..205b3b1 100644 --- a/benchmarks/auto/quick3d/principledmaterial/PrincipledMaterial.qml +++ b/src/benchmarks/auto/quick3d/principledmaterial/PrincipledMaterial.qml diff --git a/benchmarks/auto/quick3d/principledmaterial/maps/OpenfootageNET_garage-1024.hdr b/src/benchmarks/auto/quick3d/principledmaterial/maps/OpenfootageNET_garage-1024.hdr Binary files differindex 01e9e38..01e9e38 100644 --- a/benchmarks/auto/quick3d/principledmaterial/maps/OpenfootageNET_garage-1024.hdr +++ b/src/benchmarks/auto/quick3d/principledmaterial/maps/OpenfootageNET_garage-1024.hdr diff --git a/benchmarks/auto/quick3d/principledmaterial/maps/metallic/basecolor.jpg b/src/benchmarks/auto/quick3d/principledmaterial/maps/metallic/basecolor.jpg Binary files differindex 4401827..4401827 100644 --- a/benchmarks/auto/quick3d/principledmaterial/maps/metallic/basecolor.jpg +++ b/src/benchmarks/auto/quick3d/principledmaterial/maps/metallic/basecolor.jpg diff --git a/benchmarks/auto/quick3d/principledmaterial/maps/metallic/metallic.jpg b/src/benchmarks/auto/quick3d/principledmaterial/maps/metallic/metallic.jpg Binary files differindex 6fe7b17..6fe7b17 100644 --- a/benchmarks/auto/quick3d/principledmaterial/maps/metallic/metallic.jpg +++ b/src/benchmarks/auto/quick3d/principledmaterial/maps/metallic/metallic.jpg diff --git a/benchmarks/auto/quick3d/principledmaterial/maps/metallic/normal.jpg b/src/benchmarks/auto/quick3d/principledmaterial/maps/metallic/normal.jpg Binary files differindex c8d1a59..c8d1a59 100644 --- a/benchmarks/auto/quick3d/principledmaterial/maps/metallic/normal.jpg +++ b/src/benchmarks/auto/quick3d/principledmaterial/maps/metallic/normal.jpg diff --git a/benchmarks/auto/quick3d/principledmaterial/maps/metallic/roughness.jpg b/src/benchmarks/auto/quick3d/principledmaterial/maps/metallic/roughness.jpg Binary files differindex f200e33..f200e33 100644 --- a/benchmarks/auto/quick3d/principledmaterial/maps/metallic/roughness.jpg +++ b/src/benchmarks/auto/quick3d/principledmaterial/maps/metallic/roughness.jpg diff --git a/benchmarks/auto/quick3d/shapespawner/WeirdShape.qml b/src/benchmarks/auto/quick3d/shapespawner/WeirdShape.qml index 9bd820b..9bd820b 100644 --- a/benchmarks/auto/quick3d/shapespawner/WeirdShape.qml +++ b/src/benchmarks/auto/quick3d/shapespawner/WeirdShape.qml diff --git a/benchmarks/auto/quick3d/shapespawner/shapespawner.qml b/src/benchmarks/auto/quick3d/shapespawner/shapespawner.qml index c3a9e05..c3a9e05 100644 --- a/benchmarks/auto/quick3d/shapespawner/shapespawner.qml +++ b/src/benchmarks/auto/quick3d/shapespawner/shapespawner.qml diff --git a/benchmarks/auto/quick3d/shapespawner/weirdShape.mesh b/src/benchmarks/auto/quick3d/shapespawner/weirdShape.mesh Binary files differindex 2e4d6fa..2e4d6fa 100644 --- a/benchmarks/auto/quick3d/shapespawner/weirdShape.mesh +++ b/src/benchmarks/auto/quick3d/shapespawner/weirdShape.mesh diff --git a/benchmarks/benchmarks.md b/src/benchmarks/benchmarks.md index f8884b9..f8884b9 100644 --- a/benchmarks/benchmarks.md +++ b/src/benchmarks/benchmarks.md diff --git a/benchmarks/manual/gputhroughput/README.md b/src/benchmarks/manual/gputhroughput/README.md index 28800bb..28800bb 100644 --- a/benchmarks/manual/gputhroughput/README.md +++ b/src/benchmarks/manual/gputhroughput/README.md diff --git a/benchmarks/manual/gputhroughput/blendedrect.qml b/src/benchmarks/manual/gputhroughput/blendedrect.qml index cd0d2c6..cd0d2c6 100644 --- a/benchmarks/manual/gputhroughput/blendedrect.qml +++ b/src/benchmarks/manual/gputhroughput/blendedrect.qml diff --git a/benchmarks/manual/gputhroughput/blendedtexture.qml b/src/benchmarks/manual/gputhroughput/blendedtexture.qml index 51f067e..51f067e 100644 --- a/benchmarks/manual/gputhroughput/blendedtexture.qml +++ b/src/benchmarks/manual/gputhroughput/blendedtexture.qml diff --git a/benchmarks/manual/gputhroughput/drawcalls.qml b/src/benchmarks/manual/gputhroughput/drawcalls.qml index bdd6289..babf179 100644 --- a/benchmarks/manual/gputhroughput/drawcalls.qml +++ b/src/benchmarks/manual/gputhroughput/drawcalls.qml @@ -36,7 +36,7 @@ Item { width: x + 2 height: y + 2 sourceSize: Qt.size(width, height); - source: "../../../shared/butterfly-wide.png" + source: "qrc:///shared/butterfly-wide.png" } } } diff --git a/benchmarks/manual/gputhroughput/gaussblur.qml b/src/benchmarks/manual/gputhroughput/gaussblur.qml index 8c8860e..8c8860e 100644 --- a/benchmarks/manual/gputhroughput/gaussblur.qml +++ b/src/benchmarks/manual/gputhroughput/gaussblur.qml diff --git a/benchmarks/manual/gputhroughput/grapes.jpg b/src/benchmarks/manual/gputhroughput/grapes.jpg Binary files differindex a6c2213..a6c2213 100755 --- a/benchmarks/manual/gputhroughput/grapes.jpg +++ b/src/benchmarks/manual/gputhroughput/grapes.jpg diff --git a/benchmarks/manual/gputhroughput/opaquerect.qml b/src/benchmarks/manual/gputhroughput/opaquerect.qml index dd1a07b..dd1a07b 100644 --- a/benchmarks/manual/gputhroughput/opaquerect.qml +++ b/src/benchmarks/manual/gputhroughput/opaquerect.qml diff --git a/benchmarks/manual/gputhroughput/opaquetexture.qml b/src/benchmarks/manual/gputhroughput/opaquetexture.qml index 07762e0..07762e0 100644 --- a/benchmarks/manual/gputhroughput/opaquetexture.qml +++ b/src/benchmarks/manual/gputhroughput/opaquetexture.qml diff --git a/benchmarks/manual/v8bench/README.md b/src/benchmarks/manual/v8bench/README.md index 5515a69..5515a69 100644 --- a/benchmarks/manual/v8bench/README.md +++ b/src/benchmarks/manual/v8bench/README.md diff --git a/benchmarks/manual/v8bench/v8-Crypto.qml b/src/benchmarks/manual/v8bench/v8-Crypto.qml index 122e6c1..122e6c1 100644 --- a/benchmarks/manual/v8bench/v8-Crypto.qml +++ b/src/benchmarks/manual/v8bench/v8-Crypto.qml diff --git a/benchmarks/manual/v8bench/v8-DeltaBlue.qml b/src/benchmarks/manual/v8bench/v8-DeltaBlue.qml index d5c8384..d5c8384 100644 --- a/benchmarks/manual/v8bench/v8-DeltaBlue.qml +++ b/src/benchmarks/manual/v8bench/v8-DeltaBlue.qml diff --git a/benchmarks/manual/v8bench/v8-EarleyBoyer.qml b/src/benchmarks/manual/v8bench/v8-EarleyBoyer.qml index e3ee075..e3ee075 100644 --- a/benchmarks/manual/v8bench/v8-EarleyBoyer.qml +++ b/src/benchmarks/manual/v8bench/v8-EarleyBoyer.qml diff --git a/benchmarks/manual/v8bench/v8-RayTrace.qml b/src/benchmarks/manual/v8bench/v8-RayTrace.qml index e7dafa0..e7dafa0 100644 --- a/benchmarks/manual/v8bench/v8-RayTrace.qml +++ b/src/benchmarks/manual/v8bench/v8-RayTrace.qml diff --git a/benchmarks/manual/v8bench/v8-RegExp.qml b/src/benchmarks/manual/v8bench/v8-RegExp.qml index 28afc50..28afc50 100644 --- a/benchmarks/manual/v8bench/v8-RegExp.qml +++ b/src/benchmarks/manual/v8bench/v8-RegExp.qml diff --git a/benchmarks/manual/v8bench/v8-Richards.qml b/src/benchmarks/manual/v8bench/v8-Richards.qml index 4b644b2..4b644b2 100644 --- a/benchmarks/manual/v8bench/v8-Richards.qml +++ b/src/benchmarks/manual/v8bench/v8-Richards.qml diff --git a/benchmarks/manual/v8bench/v8-Splay.qml b/src/benchmarks/manual/v8bench/v8-Splay.qml index d4040b8..d4040b8 100644 --- a/benchmarks/manual/v8bench/v8-Splay.qml +++ b/src/benchmarks/manual/v8bench/v8-Splay.qml diff --git a/src/main.cpp b/src/main.cpp index a2e3036..36e3071 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -76,6 +76,14 @@ QStringList processCommandLineArguments(const QCoreApplication &app) QStringLiteral("Switches to provide JSON output of benchmark runs.")); parser.addOption(jsonOption); + QCommandLineOption jsonOptionQWarning(QStringLiteral("json-qwarning"), + QStringLiteral("Switches to provide JSON output as qWarning of benchmark runs.")); + parser.addOption(jsonOptionQWarning); + + QCommandLineOption jsonOptionFile(QStringLiteral("json-file"), + QStringLiteral("Switches to provide JSON output as an output file.")); + parser.addOption(jsonOptionFile); + QCommandLineOption repeatOption(QStringLiteral("repeat"), QStringLiteral("Sets the number of times to repeat the benchmark, to get more stable results"), QStringLiteral("iterations"), @@ -166,6 +174,14 @@ QStringList processCommandLineArguments(const QCoreApplication &app) Options::instance.printJsonToStdout = true; } + if (parser.isSet(jsonOptionQWarning)) { + Options::instance.printJsonToStdoutWithQWarning = true; + } + + if (parser.isSet(jsonOptionFile)) { + Options::instance.printJsonToFile = true; + } + if (parser.isSet(helpOption) || parser.positionalArguments().size() == 0) { parser.showHelp(0); } @@ -404,6 +420,7 @@ static QObject *qmlbench_singleton_provider(QQmlEngine *, QJSEngine *) int main(int argc, char **argv) { + qputenv("QT_ANDROID_NO_EXIT_CALL", "1"); // If it's not set, set the Qt Quick Controls style to Basic to ensure consistent results. const QByteArray controlsStyle = qgetenv("QT_QUICK_CONTROLS_STYLE"); if (controlsStyle.isEmpty()) diff --git a/src/options.h b/src/options.h index f01884e..9798cba 100644 --- a/src/options.h +++ b/src/options.h @@ -40,6 +40,8 @@ struct Options : fullscreen(false) , verbose(false) , printJsonToStdout(false) + , printJsonToStdoutWithQWarning(false) + , printJsonToFile(false) , isSubProcess(false) , repeat(1) , delayedStart(0) @@ -60,6 +62,8 @@ struct Options bool fullscreen; bool verbose; bool printJsonToStdout; + bool printJsonToStdoutWithQWarning; + bool printJsonToFile; bool isSubProcess; int repeat; int delayedStart; diff --git a/src/resultrecorder.cpp b/src/resultrecorder.cpp index 574d89e..430a697 100644 --- a/src/resultrecorder.cpp +++ b/src/resultrecorder.cpp @@ -26,6 +26,7 @@ ** ****************************************************************************/ +#include <QFile> #include <QGuiApplication> #include <QOpenGLContext> #include <QOffscreenSurface> @@ -33,6 +34,7 @@ #include <QDebug> #include <QJsonDocument> #include <QJsonObject> +#include <QStandardPaths> #include <iostream> #include <cmath> @@ -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/shared/Globals.qml b/src/shared/Globals.qml index 6531a1e..6531a1e 100644 --- a/shared/Globals.qml +++ b/src/shared/Globals.qml diff --git a/shared/alpha.png b/src/shared/alpha.png Binary files differindex e465b25..e465b25 100644 --- a/shared/alpha.png +++ b/src/shared/alpha.png diff --git a/shared/butterfly-collapsed.png b/src/shared/butterfly-collapsed.png Binary files differindex 93f8933..93f8933 100644 --- a/shared/butterfly-collapsed.png +++ b/src/shared/butterfly-collapsed.png diff --git a/shared/butterfly-half.png b/src/shared/butterfly-half.png Binary files differindex d601f17..d601f17 100644 --- a/shared/butterfly-half.png +++ b/src/shared/butterfly-half.png diff --git a/shared/butterfly-wide.png b/src/shared/butterfly-wide.png Binary files differindex 0899407..0899407 100644 --- a/shared/butterfly-wide.png +++ b/src/shared/butterfly-wide.png diff --git a/shared/qmldir b/src/shared/qmldir index 45b3b68..45b3b68 100644 --- a/shared/qmldir +++ b/src/shared/qmldir diff --git a/shared/solid.png b/src/shared/solid.png Binary files differindex 371e9c1..371e9c1 100644 --- a/shared/solid.png +++ b/src/shared/solid.png |