diff options
| author | aavit <qt-info@nokia.com> | 2011-06-09 07:36:34 (GMT) |
|---|---|---|
| committer | aavit <qt-info@nokia.com> | 2011-06-09 07:36:34 (GMT) |
| commit | 161fd33b199c96a92fbda4b009e85f910f73acc0 (patch) | |
| tree | 736e139d09f8cf8fee5fa4315fb3381d5c4f492b /tests/benchmarks/gui/kernel | |
| parent | 809fc41c9b19388a21ee8e23601156579780cda3 (diff) | |
| parent | 3916feefc5ebadba3320029a29ecf02d8934e879 (diff) | |
| download | Qt-161fd33b199c96a92fbda4b009e85f910f73acc0.zip Qt-161fd33b199c96a92fbda4b009e85f910f73acc0.tar.gz Qt-161fd33b199c96a92fbda4b009e85f910f73acc0.tar.bz2 | |
Merge remote branch 'qt-mainline/4.8'
Diffstat (limited to 'tests/benchmarks/gui/kernel')
| -rw-r--r-- | tests/benchmarks/gui/kernel/qguimetatype/tst_qguimetatype.cpp | 6 | ||||
| -rw-r--r-- | tests/benchmarks/gui/kernel/qguivariant/tst_qguivariant.cpp | 6 |
2 files changed, 10 insertions, 2 deletions
diff --git a/tests/benchmarks/gui/kernel/qguimetatype/tst_qguimetatype.cpp b/tests/benchmarks/gui/kernel/qguimetatype/tst_qguimetatype.cpp index 17eb5a3..941522f 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<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 QMetaType can default-construct and destroy a Qt GUI diff --git a/tests/benchmarks/gui/kernel/qguivariant/tst_qguivariant.cpp b/tests/benchmarks/gui/kernel/qguivariant/tst_qguivariant.cpp index 30da548..70467bc 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 |