From 7af626e08cc21463a86d0d0614d4aeb9c036643d Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Thu, 7 Jul 2016 16:04:29 +0200 Subject: Bump up all controls and templates imports to version 2.1 Controls must import templates version 2.1 in order to "inherit" 1-revisioned properties, methods, and signals. So far, this has been done case by case, but it's less error prone and more clear to change them all. For example, if you ever see a source file pasted/linked somewhere, it's easy to identify the version it belongs to. Change-Id: I41609ec1a22bc05ac3e79f953a147ca42d9e0786 Reviewed-by: Mitch Curtis --- tests/benchmarks/objectcount/data/dependencies.qml | 6 +++--- tests/benchmarks/objectcount/tst_objectcount.cpp | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'tests/benchmarks/objectcount') diff --git a/tests/benchmarks/objectcount/data/dependencies.qml b/tests/benchmarks/objectcount/data/dependencies.qml index 4c1702cc..6b6d951b 100644 --- a/tests/benchmarks/objectcount/data/dependencies.qml +++ b/tests/benchmarks/objectcount/data/dependencies.qml @@ -1,7 +1,7 @@ import QtQuick 2.6 -import QtQuick.Controls 2.0 -import QtQuick.Controls.Material 2.0 -import QtQuick.Controls.Universal 2.0 +import QtQuick.Controls 2.1 +import QtQuick.Controls.Material 2.1 +import QtQuick.Controls.Universal 2.1 import Qt.labs.calendar 1.0 Control { } diff --git a/tests/benchmarks/objectcount/tst_objectcount.cpp b/tests/benchmarks/objectcount/tst_objectcount.cpp index 554b8af1..91c17fcc 100644 --- a/tests/benchmarks/objectcount/tst_objectcount.cpp +++ b/tests/benchmarks/objectcount/tst_objectcount.cpp @@ -84,7 +84,7 @@ void tst_ObjectCount::init() // warmup QQmlComponent component(&engine); - component.setData("import QtQuick 2.0; import QtQuick.Controls 2.0; Item { Button {} }", QUrl()); + component.setData("import QtQuick 2.0; import QtQuick.Controls 2.1; Item { Button {} }", QUrl()); delete component.create(); } -- cgit v1.2.3