From 789929f939a60462373beae37ab4373809095cff Mon Sep 17 00:00:00 2001 From: Ulf Hermann Date: Wed, 22 Jan 2020 13:12:56 +0100 Subject: Use QTypeRevision for all versions and revisions In many places we carry major and minor versions or revisions that are loosely coupled to minor versions. As the Qt minor version resets now, we need to handle these things more systematically. In particular, we need to add a "major" part to revisions. QTypeRevision can express the current major/minor pairs more efficiently and can also be used to add a major version to revisions. This change does not change the semantics, yet, but only replaces the types. Change-Id: Ie58ba8114d7e4c6427f0f28716deee71995c0d24 Reviewed-by: Fabian Kosmale --- tests/benchmarks/qml/creation/tst_creation.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tests/benchmarks') diff --git a/tests/benchmarks/qml/creation/tst_creation.cpp b/tests/benchmarks/qml/creation/tst_creation.cpp index ed2e52f869..2044360b3d 100644 --- a/tests/benchmarks/qml/creation/tst_creation.cpp +++ b/tests/benchmarks/qml/creation/tst_creation.cpp @@ -196,7 +196,7 @@ void tst_creation::qobject_10tree_cpp() void tst_creation::qobject_qmltype() { - QQmlType t = QQmlMetaType::qmlType("QtQuick/QtObject", 2, 0); + QQmlType t = QQmlMetaType::qmlType("QtQuick/QtObject", QTypeRevision::fromVersion(2, 0)); QBENCHMARK { QObject *obj = t.create(); -- cgit v1.2.3 From 8e67e31a3b554f2932085e0d4692e84af4a63429 Mon Sep 17 00:00:00 2001 From: Fabian Kosmale Date: Thu, 27 Feb 2020 08:01:14 +0100 Subject: painting benchmark: adapt to openglwidgets split Change-Id: I603635dfaaa455a5a66d7a791a36008f9fb9b770 Reviewed-by: Johan Helsing --- tests/benchmarks/qml/painting/painting.pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tests/benchmarks') diff --git a/tests/benchmarks/qml/painting/painting.pro b/tests/benchmarks/qml/painting/painting.pro index 633be76e30..9948df511a 100644 --- a/tests/benchmarks/qml/painting/painting.pro +++ b/tests/benchmarks/qml/painting/painting.pro @@ -1,7 +1,7 @@ requires(qtHaveModule(opengl)) requires(qtHaveModule(widgets)) -QT += opengl widgets +QT += opengl widgets openglwidgets CONFIG += console macx:CONFIG -= app_bundle -- cgit v1.2.3