summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiikka Heikkinen <miikka.heikkinen@digia.com>2011-05-19 08:23:54 (GMT)
committerMiikka Heikkinen <miikka.heikkinen@digia.com>2011-05-19 08:23:54 (GMT)
commit03e6eced23187d49d913a45846956c1fdbdc1bf7 (patch)
treeddcd4a681d36fe845fdadef3876a457bfe65a63a
parent12d4465ad9af5473d48a3abfe6b277f0881a3604 (diff)
downloadQt-03e6eced23187d49d913a45846956c1fdbdc1bf7.zip
Qt-03e6eced23187d49d913a45846956c1fdbdc1bf7.tar.gz
Qt-03e6eced23187d49d913a45846956c1fdbdc1bf7.tar.bz2
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
-rw-r--r--tests/benchmarks/gui/kernel/qguivariant/tst_qguivariant.cpp6
1 files changed, 5 insertions, 1 deletions
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<int>("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