From 12d4465ad9af5473d48a3abfe6b277f0881a3604 Mon Sep 17 00:00:00 2001 From: Miikka Heikkinen Date: Thu, 19 May 2011 10:32:26 +0300 Subject: Fix qguimetatype benchmark for Symbian QMetaType::QColorGroup requires QT3_SUPPORT, so skip that in builds that do not include QT3_SUPPORT. Task-number: QTBUG-19254 Reviewed-by: Sami Merila --- tests/benchmarks/gui/kernel/qguimetatype/tst_qguimetatype.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tests/benchmarks/gui/kernel/qguimetatype/tst_qguimetatype.cpp b/tests/benchmarks/gui/kernel/qguimetatype/tst_qguimetatype.cpp index fd5132c..531943a 100644 --- a/tests/benchmarks/gui/kernel/qguimetatype/tst_qguimetatype.cpp +++ b/tests/benchmarks/gui/kernel/qguimetatype/tst_qguimetatype.cpp @@ -68,8 +68,12 @@ tst_QGuiMetaType::~tst_QGuiMetaType() void tst_QGuiMetaType::constructGuiType_data() { QTest::addColumn("typeId"); - for (int i = QMetaType::FirstGuiType; i <= QMetaType::LastGuiType; ++i) + for (int i = QMetaType::FirstGuiType; i <= QMetaType::LastGuiType; ++i) { +#ifndef QT3_SUPPORT + if (i != 63) // QMetaType::QColorGroup (63) requires QT3_SUPPORT +#endif QTest::newRow(QMetaType::typeName(i)) << i; + } } // Tests how fast QMetaType can default-construct and destroy a Qt GUI -- cgit v0.12 From 03e6eced23187d49d913a45846956c1fdbdc1bf7 Mon Sep 17 00:00:00 2001 From: Miikka Heikkinen Date: Thu, 19 May 2011 11:23:54 +0300 Subject: Fix qguivariant benchmark for Symbian QMetaType::QColorGroup requires QT3_SUPPORT, so skip that in builds that do not include QT3_SUPPORT. Task-number: QTBUG-19253 Reviewed-by: TrustMe --- tests/benchmarks/gui/kernel/qguivariant/tst_qguivariant.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tests/benchmarks/gui/kernel/qguivariant/tst_qguivariant.cpp b/tests/benchmarks/gui/kernel/qguivariant/tst_qguivariant.cpp index a9e49b5..5c1a4dc 100644 --- a/tests/benchmarks/gui/kernel/qguivariant/tst_qguivariant.cpp +++ b/tests/benchmarks/gui/kernel/qguivariant/tst_qguivariant.cpp @@ -70,8 +70,12 @@ tst_QGuiVariant::~tst_QGuiVariant() void tst_QGuiVariant::createGuiType_data() { QTest::addColumn("typeId"); - for (int i = QMetaType::FirstGuiType; i <= QMetaType::LastGuiType; ++i) + for (int i = QMetaType::FirstGuiType; i <= QMetaType::LastGuiType; ++i) { +#ifndef QT3_SUPPORT + if (i != 63) // QMetaType::QColorGroup (63) requires QT3_SUPPORT +#endif QTest::newRow(QMetaType::typeName(i)) << i; + } } // Tests how fast a Qt GUI type can be default-constructed by a -- cgit v0.12