diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-06-08 00:59:48 +1000 |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-06-08 00:59:48 +1000 |
| commit | f6909d47b981720cb87cb96454cdf9ea493383ee (patch) | |
| tree | 44f13b6dd6af56c4f12b43597a1f8e8a94c6cbf9 /tests/benchmarks | |
| parent | cdb80e13ebd06b5e163891a9d6c888c2b4e78747 (diff) | |
| parent | dadb47e632d65ce886295e7848856d4030d6e7de (diff) | |
| download | qt4-tools-f6909d47b981720cb87cb96454cdf9ea493383ee.tar.gz | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging: (25 commits)
Horizontal lines appearing under entered characters
Move qts60plugindeployment rule to correct scope
Skipping tst_QEventLoop::processEventsExcludeSocket for qws
Fixed compile of tst_qscriptextensionplugin on some Windows configurations
QS60Style: Checked state is not shown on highlighted itemview item
Removing unused code after introduction of round robin scheduler
tst_qeventloop runs the event loop to ensure socket messages arrive
Schedule Symbian active objects with a round robin scheduler
Fix the build break for QUrl autotest on Symbian
Fixed def files for WINSCW
Fixed def files for ARMV5
Fix the build break for QStyleSheetStyle autotest on Symbian
Fix bug about daylight saving missing on Symbian platfrom.
Fix the build break caused by the missing parameter for QSKIP macro.
Document the Symbian main window size issue at application start.
QS60Style: icon is not shown correctly in a menu item in all cases
QS60Style: Remove 3.x specific code from style
Fix Coverity issues found from QS60Style
Removed qts60plugin references also from config.profiles
Remove s60 plugin dll from the iby file too.
...
Diffstat (limited to 'tests/benchmarks')
| -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 17eb5a3af7..941522f22a 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 30da54847a..70467bce5e 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 |