From 3c7bfc156797b2f3ef08a8cf620b79da80e4b061 Mon Sep 17 00:00:00 2001 From: Mitch Curtis Date: Tue, 23 Oct 2018 15:23:58 +0200 Subject: Tie minor version of all imports to Qt's minor version This change makes all Qt Quick Controls 2 imports match the current Qt minor version, which is 12 as of this patch. It also updates all other Qt Quick imports to match. This will also make future version bumps easier as all version numbers in existing code/docs will match. The following commands were used to verify that no old versions remain: for i in `seq 0 11`; do git grep "import QtGraphicalEffects.*1.$i$"; done for i in `seq 0 11`; do git grep "import QtQuick 2.$i$"; done for i in `seq 0 11`; do git grep "import QtQuick.Layouts 1.$i$"; done for i in `seq 0 5`; do git grep "import QtQuick.Controls.*2.$i$"; done for i in `seq 0 11`; do git grep "import QtQuick.Templates 2.$i as T$"; done [ChangeLog] From Qt 5.12 onwards, all import versions in Qt Quick Controls 2 follow the same minor version as Qt's minor version number. For example, the import version for Qt 5.12 is: "import QtQuick.Controls 2.12". Change-Id: I6d87573f20912e041d9c3b7c773cc7bf7b152ec3 Fixes: QTBUG-71095 Reviewed-by: Simon Hausmann Reviewed-by: Shawn Rutledge --- tests/benchmarks/qmlbench/creation/delegates_abstractbutton.qml | 4 ++-- tests/benchmarks/qmlbench/creation/delegates_busyindicator.qml | 4 ++-- tests/benchmarks/qmlbench/creation/delegates_button.qml | 4 ++-- tests/benchmarks/qmlbench/creation/delegates_checkbox.qml | 4 ++-- tests/benchmarks/qmlbench/creation/delegates_checkdelegate.qml | 4 ++-- tests/benchmarks/qmlbench/creation/delegates_combobox.qml | 4 ++-- tests/benchmarks/qmlbench/creation/delegates_container.qml | 4 ++-- tests/benchmarks/qmlbench/creation/delegates_control.qml | 4 ++-- tests/benchmarks/qmlbench/creation/delegates_delaybutton.qml | 4 ++-- tests/benchmarks/qmlbench/creation/delegates_dial.qml | 4 ++-- tests/benchmarks/qmlbench/creation/delegates_dialog.qml | 4 ++-- tests/benchmarks/qmlbench/creation/delegates_dialogbuttonbox.qml | 4 ++-- tests/benchmarks/qmlbench/creation/delegates_drawer.qml | 4 ++-- tests/benchmarks/qmlbench/creation/delegates_frame.qml | 4 ++-- tests/benchmarks/qmlbench/creation/delegates_groupbox.qml | 4 ++-- tests/benchmarks/qmlbench/creation/delegates_itemdelegate.qml | 4 ++-- tests/benchmarks/qmlbench/creation/delegates_label.qml | 4 ++-- tests/benchmarks/qmlbench/creation/delegates_menu.qml | 4 ++-- tests/benchmarks/qmlbench/creation/delegates_menuitem.qml | 4 ++-- tests/benchmarks/qmlbench/creation/delegates_menuseparator.qml | 4 ++-- tests/benchmarks/qmlbench/creation/delegates_page.qml | 4 ++-- tests/benchmarks/qmlbench/creation/delegates_pageindicator.qml | 4 ++-- tests/benchmarks/qmlbench/creation/delegates_pane.qml | 4 ++-- tests/benchmarks/qmlbench/creation/delegates_popup.qml | 4 ++-- tests/benchmarks/qmlbench/creation/delegates_progressbar.qml | 4 ++-- tests/benchmarks/qmlbench/creation/delegates_radiobutton.qml | 4 ++-- tests/benchmarks/qmlbench/creation/delegates_radiodelegate.qml | 4 ++-- tests/benchmarks/qmlbench/creation/delegates_rangeslider.qml | 4 ++-- tests/benchmarks/qmlbench/creation/delegates_roundbutton.qml | 4 ++-- tests/benchmarks/qmlbench/creation/delegates_scrollbar.qml | 4 ++-- tests/benchmarks/qmlbench/creation/delegates_scrollindicator.qml | 4 ++-- tests/benchmarks/qmlbench/creation/delegates_scrollview.qml | 4 ++-- tests/benchmarks/qmlbench/creation/delegates_slider.qml | 4 ++-- tests/benchmarks/qmlbench/creation/delegates_spinbox.qml | 4 ++-- tests/benchmarks/qmlbench/creation/delegates_stackview.qml | 4 ++-- tests/benchmarks/qmlbench/creation/delegates_swipedelegate.qml | 4 ++-- tests/benchmarks/qmlbench/creation/delegates_swipeview.qml | 4 ++-- tests/benchmarks/qmlbench/creation/delegates_switch.qml | 4 ++-- tests/benchmarks/qmlbench/creation/delegates_switchdelegate.qml | 4 ++-- tests/benchmarks/qmlbench/creation/delegates_tabbar.qml | 4 ++-- tests/benchmarks/qmlbench/creation/delegates_tabbutton.qml | 4 ++-- tests/benchmarks/qmlbench/creation/delegates_textarea.qml | 4 ++-- tests/benchmarks/qmlbench/creation/delegates_textfield.qml | 4 ++-- tests/benchmarks/qmlbench/creation/delegates_toolbutton.qml | 4 ++-- tests/benchmarks/qmlbench/creation/delegates_toolseparator.qml | 4 ++-- tests/benchmarks/qmlbench/creation/delegates_tooltip.qml | 4 ++-- tests/benchmarks/qmlbench/creation/delegates_tumbler.qml | 4 ++-- 47 files changed, 94 insertions(+), 94 deletions(-) (limited to 'tests/benchmarks/qmlbench') diff --git a/tests/benchmarks/qmlbench/creation/delegates_abstractbutton.qml b/tests/benchmarks/qmlbench/creation/delegates_abstractbutton.qml index e6decdf0..02074cb0 100644 --- a/tests/benchmarks/qmlbench/creation/delegates_abstractbutton.qml +++ b/tests/benchmarks/qmlbench/creation/delegates_abstractbutton.qml @@ -1,6 +1,6 @@ -import QtQuick 2.0 +import QtQuick 2.12 import QmlBench 1.0 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.12 CreationBenchmark { id: root diff --git a/tests/benchmarks/qmlbench/creation/delegates_busyindicator.qml b/tests/benchmarks/qmlbench/creation/delegates_busyindicator.qml index a5a6a72d..c6e53bcf 100644 --- a/tests/benchmarks/qmlbench/creation/delegates_busyindicator.qml +++ b/tests/benchmarks/qmlbench/creation/delegates_busyindicator.qml @@ -1,6 +1,6 @@ -import QtQuick 2.0 +import QtQuick 2.12 import QmlBench 1.0 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.12 CreationBenchmark { id: root diff --git a/tests/benchmarks/qmlbench/creation/delegates_button.qml b/tests/benchmarks/qmlbench/creation/delegates_button.qml index 05abe1a0..5e6cc12f 100644 --- a/tests/benchmarks/qmlbench/creation/delegates_button.qml +++ b/tests/benchmarks/qmlbench/creation/delegates_button.qml @@ -1,6 +1,6 @@ -import QtQuick 2.0 +import QtQuick 2.12 import QmlBench 1.0 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.12 CreationBenchmark { id: root diff --git a/tests/benchmarks/qmlbench/creation/delegates_checkbox.qml b/tests/benchmarks/qmlbench/creation/delegates_checkbox.qml index 6969ebf7..73b18865 100644 --- a/tests/benchmarks/qmlbench/creation/delegates_checkbox.qml +++ b/tests/benchmarks/qmlbench/creation/delegates_checkbox.qml @@ -1,6 +1,6 @@ -import QtQuick 2.0 +import QtQuick 2.12 import QmlBench 1.0 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.12 CreationBenchmark { id: root diff --git a/tests/benchmarks/qmlbench/creation/delegates_checkdelegate.qml b/tests/benchmarks/qmlbench/creation/delegates_checkdelegate.qml index eda99905..b4fde74a 100644 --- a/tests/benchmarks/qmlbench/creation/delegates_checkdelegate.qml +++ b/tests/benchmarks/qmlbench/creation/delegates_checkdelegate.qml @@ -1,6 +1,6 @@ -import QtQuick 2.0 +import QtQuick 2.12 import QmlBench 1.0 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.12 CreationBenchmark { id: root diff --git a/tests/benchmarks/qmlbench/creation/delegates_combobox.qml b/tests/benchmarks/qmlbench/creation/delegates_combobox.qml index 22552bf8..6519fc77 100644 --- a/tests/benchmarks/qmlbench/creation/delegates_combobox.qml +++ b/tests/benchmarks/qmlbench/creation/delegates_combobox.qml @@ -1,6 +1,6 @@ -import QtQuick 2.0 +import QtQuick 2.12 import QmlBench 1.0 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.12 CreationBenchmark { id: root diff --git a/tests/benchmarks/qmlbench/creation/delegates_container.qml b/tests/benchmarks/qmlbench/creation/delegates_container.qml index 6df6d83e..eb684a74 100644 --- a/tests/benchmarks/qmlbench/creation/delegates_container.qml +++ b/tests/benchmarks/qmlbench/creation/delegates_container.qml @@ -1,6 +1,6 @@ -import QtQuick 2.0 +import QtQuick 2.12 import QmlBench 1.0 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.12 CreationBenchmark { id: root diff --git a/tests/benchmarks/qmlbench/creation/delegates_control.qml b/tests/benchmarks/qmlbench/creation/delegates_control.qml index bf08a7eb..da4263dc 100644 --- a/tests/benchmarks/qmlbench/creation/delegates_control.qml +++ b/tests/benchmarks/qmlbench/creation/delegates_control.qml @@ -1,6 +1,6 @@ -import QtQuick 2.0 +import QtQuick 2.12 import QmlBench 1.0 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.12 CreationBenchmark { id: root diff --git a/tests/benchmarks/qmlbench/creation/delegates_delaybutton.qml b/tests/benchmarks/qmlbench/creation/delegates_delaybutton.qml index d88996d9..ae8aa0b7 100644 --- a/tests/benchmarks/qmlbench/creation/delegates_delaybutton.qml +++ b/tests/benchmarks/qmlbench/creation/delegates_delaybutton.qml @@ -1,6 +1,6 @@ -import QtQuick 2.0 +import QtQuick 2.12 import QmlBench 1.0 -import QtQuick.Controls 2.2 +import QtQuick.Controls 2.12 CreationBenchmark { id: root diff --git a/tests/benchmarks/qmlbench/creation/delegates_dial.qml b/tests/benchmarks/qmlbench/creation/delegates_dial.qml index 118bac61..6fd33c70 100644 --- a/tests/benchmarks/qmlbench/creation/delegates_dial.qml +++ b/tests/benchmarks/qmlbench/creation/delegates_dial.qml @@ -1,6 +1,6 @@ -import QtQuick 2.0 +import QtQuick 2.12 import QmlBench 1.0 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.12 CreationBenchmark { id: root diff --git a/tests/benchmarks/qmlbench/creation/delegates_dialog.qml b/tests/benchmarks/qmlbench/creation/delegates_dialog.qml index b653252c..36b1fbe1 100644 --- a/tests/benchmarks/qmlbench/creation/delegates_dialog.qml +++ b/tests/benchmarks/qmlbench/creation/delegates_dialog.qml @@ -1,6 +1,6 @@ -import QtQuick 2.0 +import QtQuick 2.12 import QmlBench 1.0 -import QtQuick.Controls 2.1 +import QtQuick.Controls 2.12 CreationBenchmark { id: root diff --git a/tests/benchmarks/qmlbench/creation/delegates_dialogbuttonbox.qml b/tests/benchmarks/qmlbench/creation/delegates_dialogbuttonbox.qml index e676d144..e5fac0eb 100644 --- a/tests/benchmarks/qmlbench/creation/delegates_dialogbuttonbox.qml +++ b/tests/benchmarks/qmlbench/creation/delegates_dialogbuttonbox.qml @@ -1,6 +1,6 @@ -import QtQuick 2.0 +import QtQuick 2.12 import QmlBench 1.0 -import QtQuick.Controls 2.1 +import QtQuick.Controls 2.12 CreationBenchmark { id: root diff --git a/tests/benchmarks/qmlbench/creation/delegates_drawer.qml b/tests/benchmarks/qmlbench/creation/delegates_drawer.qml index 886a2c65..9c1e74b5 100644 --- a/tests/benchmarks/qmlbench/creation/delegates_drawer.qml +++ b/tests/benchmarks/qmlbench/creation/delegates_drawer.qml @@ -1,6 +1,6 @@ -import QtQuick 2.0 +import QtQuick 2.12 import QmlBench 1.0 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.12 CreationBenchmark { id: root diff --git a/tests/benchmarks/qmlbench/creation/delegates_frame.qml b/tests/benchmarks/qmlbench/creation/delegates_frame.qml index a511f508..27852898 100644 --- a/tests/benchmarks/qmlbench/creation/delegates_frame.qml +++ b/tests/benchmarks/qmlbench/creation/delegates_frame.qml @@ -1,6 +1,6 @@ -import QtQuick 2.0 +import QtQuick 2.12 import QmlBench 1.0 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.12 CreationBenchmark { id: root diff --git a/tests/benchmarks/qmlbench/creation/delegates_groupbox.qml b/tests/benchmarks/qmlbench/creation/delegates_groupbox.qml index 146cd400..ccfe2927 100644 --- a/tests/benchmarks/qmlbench/creation/delegates_groupbox.qml +++ b/tests/benchmarks/qmlbench/creation/delegates_groupbox.qml @@ -1,6 +1,6 @@ -import QtQuick 2.0 +import QtQuick 2.12 import QmlBench 1.0 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.12 CreationBenchmark { id: root diff --git a/tests/benchmarks/qmlbench/creation/delegates_itemdelegate.qml b/tests/benchmarks/qmlbench/creation/delegates_itemdelegate.qml index 62f6558f..8c7f67dd 100644 --- a/tests/benchmarks/qmlbench/creation/delegates_itemdelegate.qml +++ b/tests/benchmarks/qmlbench/creation/delegates_itemdelegate.qml @@ -1,6 +1,6 @@ -import QtQuick 2.0 +import QtQuick 2.12 import QmlBench 1.0 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.12 CreationBenchmark { id: root diff --git a/tests/benchmarks/qmlbench/creation/delegates_label.qml b/tests/benchmarks/qmlbench/creation/delegates_label.qml index 8a22226b..3c3e76b1 100644 --- a/tests/benchmarks/qmlbench/creation/delegates_label.qml +++ b/tests/benchmarks/qmlbench/creation/delegates_label.qml @@ -1,6 +1,6 @@ -import QtQuick 2.0 +import QtQuick 2.12 import QmlBench 1.0 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.12 CreationBenchmark { id: root diff --git a/tests/benchmarks/qmlbench/creation/delegates_menu.qml b/tests/benchmarks/qmlbench/creation/delegates_menu.qml index 1ef29da1..1566f40a 100644 --- a/tests/benchmarks/qmlbench/creation/delegates_menu.qml +++ b/tests/benchmarks/qmlbench/creation/delegates_menu.qml @@ -1,6 +1,6 @@ -import QtQuick 2.0 +import QtQuick 2.12 import QmlBench 1.0 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.12 CreationBenchmark { id: root diff --git a/tests/benchmarks/qmlbench/creation/delegates_menuitem.qml b/tests/benchmarks/qmlbench/creation/delegates_menuitem.qml index 6bf481e8..5c700707 100644 --- a/tests/benchmarks/qmlbench/creation/delegates_menuitem.qml +++ b/tests/benchmarks/qmlbench/creation/delegates_menuitem.qml @@ -1,6 +1,6 @@ -import QtQuick 2.0 +import QtQuick 2.12 import QmlBench 1.0 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.12 CreationBenchmark { id: root diff --git a/tests/benchmarks/qmlbench/creation/delegates_menuseparator.qml b/tests/benchmarks/qmlbench/creation/delegates_menuseparator.qml index 8322a0c5..59abe333 100644 --- a/tests/benchmarks/qmlbench/creation/delegates_menuseparator.qml +++ b/tests/benchmarks/qmlbench/creation/delegates_menuseparator.qml @@ -1,6 +1,6 @@ -import QtQuick 2.0 +import QtQuick 2.12 import QmlBench 1.0 -import QtQuick.Controls 2.1 +import QtQuick.Controls 2.12 CreationBenchmark { id: root diff --git a/tests/benchmarks/qmlbench/creation/delegates_page.qml b/tests/benchmarks/qmlbench/creation/delegates_page.qml index 827bf004..9c9124dc 100644 --- a/tests/benchmarks/qmlbench/creation/delegates_page.qml +++ b/tests/benchmarks/qmlbench/creation/delegates_page.qml @@ -1,6 +1,6 @@ -import QtQuick 2.0 +import QtQuick 2.12 import QmlBench 1.0 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.12 CreationBenchmark { id: root diff --git a/tests/benchmarks/qmlbench/creation/delegates_pageindicator.qml b/tests/benchmarks/qmlbench/creation/delegates_pageindicator.qml index 1bcb3a48..37eee037 100644 --- a/tests/benchmarks/qmlbench/creation/delegates_pageindicator.qml +++ b/tests/benchmarks/qmlbench/creation/delegates_pageindicator.qml @@ -1,6 +1,6 @@ -import QtQuick 2.0 +import QtQuick 2.12 import QmlBench 1.0 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.12 CreationBenchmark { id: root diff --git a/tests/benchmarks/qmlbench/creation/delegates_pane.qml b/tests/benchmarks/qmlbench/creation/delegates_pane.qml index 55a26557..e811df93 100644 --- a/tests/benchmarks/qmlbench/creation/delegates_pane.qml +++ b/tests/benchmarks/qmlbench/creation/delegates_pane.qml @@ -1,6 +1,6 @@ -import QtQuick 2.0 +import QtQuick 2.12 import QmlBench 1.0 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.12 CreationBenchmark { id: root diff --git a/tests/benchmarks/qmlbench/creation/delegates_popup.qml b/tests/benchmarks/qmlbench/creation/delegates_popup.qml index acb4ce25..9effd917 100644 --- a/tests/benchmarks/qmlbench/creation/delegates_popup.qml +++ b/tests/benchmarks/qmlbench/creation/delegates_popup.qml @@ -1,6 +1,6 @@ -import QtQuick 2.0 +import QtQuick 2.12 import QmlBench 1.0 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.12 CreationBenchmark { id: root diff --git a/tests/benchmarks/qmlbench/creation/delegates_progressbar.qml b/tests/benchmarks/qmlbench/creation/delegates_progressbar.qml index 8eb06d0f..4bb773f2 100644 --- a/tests/benchmarks/qmlbench/creation/delegates_progressbar.qml +++ b/tests/benchmarks/qmlbench/creation/delegates_progressbar.qml @@ -1,6 +1,6 @@ -import QtQuick 2.0 +import QtQuick 2.12 import QmlBench 1.0 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.12 CreationBenchmark { id: root diff --git a/tests/benchmarks/qmlbench/creation/delegates_radiobutton.qml b/tests/benchmarks/qmlbench/creation/delegates_radiobutton.qml index 47a3ed98..3236835f 100644 --- a/tests/benchmarks/qmlbench/creation/delegates_radiobutton.qml +++ b/tests/benchmarks/qmlbench/creation/delegates_radiobutton.qml @@ -1,6 +1,6 @@ -import QtQuick 2.0 +import QtQuick 2.12 import QmlBench 1.0 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.12 CreationBenchmark { id: root diff --git a/tests/benchmarks/qmlbench/creation/delegates_radiodelegate.qml b/tests/benchmarks/qmlbench/creation/delegates_radiodelegate.qml index 01d21a12..b6ffe174 100644 --- a/tests/benchmarks/qmlbench/creation/delegates_radiodelegate.qml +++ b/tests/benchmarks/qmlbench/creation/delegates_radiodelegate.qml @@ -1,6 +1,6 @@ -import QtQuick 2.0 +import QtQuick 2.12 import QmlBench 1.0 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.12 CreationBenchmark { id: root diff --git a/tests/benchmarks/qmlbench/creation/delegates_rangeslider.qml b/tests/benchmarks/qmlbench/creation/delegates_rangeslider.qml index afa23d2e..a595bd7a 100644 --- a/tests/benchmarks/qmlbench/creation/delegates_rangeslider.qml +++ b/tests/benchmarks/qmlbench/creation/delegates_rangeslider.qml @@ -1,6 +1,6 @@ -import QtQuick 2.0 +import QtQuick 2.12 import QmlBench 1.0 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.12 CreationBenchmark { id: root diff --git a/tests/benchmarks/qmlbench/creation/delegates_roundbutton.qml b/tests/benchmarks/qmlbench/creation/delegates_roundbutton.qml index 79495a91..572bf5e9 100644 --- a/tests/benchmarks/qmlbench/creation/delegates_roundbutton.qml +++ b/tests/benchmarks/qmlbench/creation/delegates_roundbutton.qml @@ -1,6 +1,6 @@ -import QtQuick 2.0 +import QtQuick 2.12 import QmlBench 1.0 -import QtQuick.Controls 2.1 +import QtQuick.Controls 2.12 CreationBenchmark { id: root diff --git a/tests/benchmarks/qmlbench/creation/delegates_scrollbar.qml b/tests/benchmarks/qmlbench/creation/delegates_scrollbar.qml index 1edb9062..2e6fc1fd 100644 --- a/tests/benchmarks/qmlbench/creation/delegates_scrollbar.qml +++ b/tests/benchmarks/qmlbench/creation/delegates_scrollbar.qml @@ -1,6 +1,6 @@ -import QtQuick 2.0 +import QtQuick 2.12 import QmlBench 1.0 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.12 CreationBenchmark { id: root diff --git a/tests/benchmarks/qmlbench/creation/delegates_scrollindicator.qml b/tests/benchmarks/qmlbench/creation/delegates_scrollindicator.qml index 8e8b616f..fd9e52e6 100644 --- a/tests/benchmarks/qmlbench/creation/delegates_scrollindicator.qml +++ b/tests/benchmarks/qmlbench/creation/delegates_scrollindicator.qml @@ -1,6 +1,6 @@ -import QtQuick 2.0 +import QtQuick 2.12 import QmlBench 1.0 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.12 CreationBenchmark { id: root diff --git a/tests/benchmarks/qmlbench/creation/delegates_scrollview.qml b/tests/benchmarks/qmlbench/creation/delegates_scrollview.qml index da8630bc..0daa44dd 100644 --- a/tests/benchmarks/qmlbench/creation/delegates_scrollview.qml +++ b/tests/benchmarks/qmlbench/creation/delegates_scrollview.qml @@ -1,6 +1,6 @@ -import QtQuick 2.0 +import QtQuick 2.12 import QmlBench 1.0 -import QtQuick.Controls 2.2 +import QtQuick.Controls 2.12 CreationBenchmark { id: root diff --git a/tests/benchmarks/qmlbench/creation/delegates_slider.qml b/tests/benchmarks/qmlbench/creation/delegates_slider.qml index 55e0c8ef..44dac819 100644 --- a/tests/benchmarks/qmlbench/creation/delegates_slider.qml +++ b/tests/benchmarks/qmlbench/creation/delegates_slider.qml @@ -1,6 +1,6 @@ -import QtQuick 2.0 +import QtQuick 2.12 import QmlBench 1.0 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.12 CreationBenchmark { id: root diff --git a/tests/benchmarks/qmlbench/creation/delegates_spinbox.qml b/tests/benchmarks/qmlbench/creation/delegates_spinbox.qml index d4a3900a..90695102 100644 --- a/tests/benchmarks/qmlbench/creation/delegates_spinbox.qml +++ b/tests/benchmarks/qmlbench/creation/delegates_spinbox.qml @@ -1,6 +1,6 @@ -import QtQuick 2.0 +import QtQuick 2.12 import QmlBench 1.0 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.12 CreationBenchmark { id: root diff --git a/tests/benchmarks/qmlbench/creation/delegates_stackview.qml b/tests/benchmarks/qmlbench/creation/delegates_stackview.qml index 620b3874..e2644aef 100644 --- a/tests/benchmarks/qmlbench/creation/delegates_stackview.qml +++ b/tests/benchmarks/qmlbench/creation/delegates_stackview.qml @@ -1,6 +1,6 @@ -import QtQuick 2.0 +import QtQuick 2.12 import QmlBench 1.0 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.12 CreationBenchmark { id: root diff --git a/tests/benchmarks/qmlbench/creation/delegates_swipedelegate.qml b/tests/benchmarks/qmlbench/creation/delegates_swipedelegate.qml index 2f4624c5..752dc37b 100644 --- a/tests/benchmarks/qmlbench/creation/delegates_swipedelegate.qml +++ b/tests/benchmarks/qmlbench/creation/delegates_swipedelegate.qml @@ -1,6 +1,6 @@ -import QtQuick 2.0 +import QtQuick 2.12 import QmlBench 1.0 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.12 CreationBenchmark { id: root diff --git a/tests/benchmarks/qmlbench/creation/delegates_swipeview.qml b/tests/benchmarks/qmlbench/creation/delegates_swipeview.qml index d81203cf..0a922343 100644 --- a/tests/benchmarks/qmlbench/creation/delegates_swipeview.qml +++ b/tests/benchmarks/qmlbench/creation/delegates_swipeview.qml @@ -1,6 +1,6 @@ -import QtQuick 2.0 +import QtQuick 2.12 import QmlBench 1.0 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.12 CreationBenchmark { id: root diff --git a/tests/benchmarks/qmlbench/creation/delegates_switch.qml b/tests/benchmarks/qmlbench/creation/delegates_switch.qml index 49104a1e..9381342d 100644 --- a/tests/benchmarks/qmlbench/creation/delegates_switch.qml +++ b/tests/benchmarks/qmlbench/creation/delegates_switch.qml @@ -1,6 +1,6 @@ -import QtQuick 2.0 +import QtQuick 2.12 import QmlBench 1.0 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.12 CreationBenchmark { id: root diff --git a/tests/benchmarks/qmlbench/creation/delegates_switchdelegate.qml b/tests/benchmarks/qmlbench/creation/delegates_switchdelegate.qml index 1122d712..f41281fa 100644 --- a/tests/benchmarks/qmlbench/creation/delegates_switchdelegate.qml +++ b/tests/benchmarks/qmlbench/creation/delegates_switchdelegate.qml @@ -1,6 +1,6 @@ -import QtQuick 2.0 +import QtQuick 2.12 import QmlBench 1.0 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.12 CreationBenchmark { id: root diff --git a/tests/benchmarks/qmlbench/creation/delegates_tabbar.qml b/tests/benchmarks/qmlbench/creation/delegates_tabbar.qml index d3243d82..95bb7291 100644 --- a/tests/benchmarks/qmlbench/creation/delegates_tabbar.qml +++ b/tests/benchmarks/qmlbench/creation/delegates_tabbar.qml @@ -1,6 +1,6 @@ -import QtQuick 2.0 +import QtQuick 2.12 import QmlBench 1.0 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.12 CreationBenchmark { id: root diff --git a/tests/benchmarks/qmlbench/creation/delegates_tabbutton.qml b/tests/benchmarks/qmlbench/creation/delegates_tabbutton.qml index 713e4ea5..dc549a3a 100644 --- a/tests/benchmarks/qmlbench/creation/delegates_tabbutton.qml +++ b/tests/benchmarks/qmlbench/creation/delegates_tabbutton.qml @@ -1,6 +1,6 @@ -import QtQuick 2.0 +import QtQuick 2.12 import QmlBench 1.0 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.12 CreationBenchmark { id: root diff --git a/tests/benchmarks/qmlbench/creation/delegates_textarea.qml b/tests/benchmarks/qmlbench/creation/delegates_textarea.qml index 68a79684..ab383ad4 100644 --- a/tests/benchmarks/qmlbench/creation/delegates_textarea.qml +++ b/tests/benchmarks/qmlbench/creation/delegates_textarea.qml @@ -1,6 +1,6 @@ -import QtQuick 2.0 +import QtQuick 2.12 import QmlBench 1.0 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.12 CreationBenchmark { id: root diff --git a/tests/benchmarks/qmlbench/creation/delegates_textfield.qml b/tests/benchmarks/qmlbench/creation/delegates_textfield.qml index fe500d40..32f31fe8 100644 --- a/tests/benchmarks/qmlbench/creation/delegates_textfield.qml +++ b/tests/benchmarks/qmlbench/creation/delegates_textfield.qml @@ -1,6 +1,6 @@ -import QtQuick 2.0 +import QtQuick 2.12 import QmlBench 1.0 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.12 CreationBenchmark { id: root diff --git a/tests/benchmarks/qmlbench/creation/delegates_toolbutton.qml b/tests/benchmarks/qmlbench/creation/delegates_toolbutton.qml index fd966c57..38e9a59f 100644 --- a/tests/benchmarks/qmlbench/creation/delegates_toolbutton.qml +++ b/tests/benchmarks/qmlbench/creation/delegates_toolbutton.qml @@ -1,6 +1,6 @@ -import QtQuick 2.0 +import QtQuick 2.12 import QmlBench 1.0 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.12 CreationBenchmark { id: root diff --git a/tests/benchmarks/qmlbench/creation/delegates_toolseparator.qml b/tests/benchmarks/qmlbench/creation/delegates_toolseparator.qml index 6031d4bc..e3db91f8 100644 --- a/tests/benchmarks/qmlbench/creation/delegates_toolseparator.qml +++ b/tests/benchmarks/qmlbench/creation/delegates_toolseparator.qml @@ -1,6 +1,6 @@ -import QtQuick 2.0 +import QtQuick 2.12 import QmlBench 1.0 -import QtQuick.Controls 2.1 +import QtQuick.Controls 2.12 CreationBenchmark { id: root diff --git a/tests/benchmarks/qmlbench/creation/delegates_tooltip.qml b/tests/benchmarks/qmlbench/creation/delegates_tooltip.qml index 7efa4b24..f8e7a283 100644 --- a/tests/benchmarks/qmlbench/creation/delegates_tooltip.qml +++ b/tests/benchmarks/qmlbench/creation/delegates_tooltip.qml @@ -1,6 +1,6 @@ -import QtQuick 2.0 +import QtQuick 2.12 import QmlBench 1.0 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.12 CreationBenchmark { id: root diff --git a/tests/benchmarks/qmlbench/creation/delegates_tumbler.qml b/tests/benchmarks/qmlbench/creation/delegates_tumbler.qml index 4322536d..4af07b7f 100644 --- a/tests/benchmarks/qmlbench/creation/delegates_tumbler.qml +++ b/tests/benchmarks/qmlbench/creation/delegates_tumbler.qml @@ -1,6 +1,6 @@ -import QtQuick 2.0 +import QtQuick 2.12 import QmlBench 1.0 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.12 CreationBenchmark { id: root -- cgit v1.2.3