diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-13 06:32:13 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-13 06:32:13 (GMT) |
| commit | a80130b07c5b8ee4b06eabbceb65eb23d4d4602e (patch) | |
| tree | 403a1f35f8b11fa60ce3c1959dcb41e6a55bde1e /tests | |
| parent | 51684a152f380ed86bb45303871c0881f138d6d9 (diff) | |
| parent | 8fff413524c588f496a9ba5ac07c75e534bc036e (diff) | |
| download | Qt-a80130b07c5b8ee4b06eabbceb65eb23d4d4602e.zip Qt-a80130b07c5b8ee4b06eabbceb65eb23d4d4602e.tar.gz Qt-a80130b07c5b8ee4b06eabbceb65eb23d4d4602e.tar.bz2 | |
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:
Fix QtOpenGL def file for armv5.
Disable QtConcurrent for Symbian winscw builds.
Fix loss of focus and activation when hiding a child widget
Symbian build failure for Armv5
Fix softkeys in case a dialog with softkeys that have icons is closed.
Update softkeys after orientation switch.
Provide internal API to avoid automatic translation of input widget
Do not allow fullscreen/maximized windows to expand beyond client rect
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/qfuture/versioncheck.h | 4 | ||||
| -rw-r--r-- | tests/auto/qtconcurrentmap/tst_qtconcurrentmap.cpp | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/tests/auto/qfuture/versioncheck.h b/tests/auto/qfuture/versioncheck.h index 0cf7b76..32a33c8 100644 --- a/tests/auto/qfuture/versioncheck.h +++ b/tests/auto/qfuture/versioncheck.h @@ -47,3 +47,7 @@ #if defined(Q_CC_MSVC) && _MSC_VER < 1400 #define QT_NO_CONCURRENT_TEST #endif + +#if defined(Q_CC_NOKIAX86) +#define QT_NO_CONCURRENT_TEST +#endif diff --git a/tests/auto/qtconcurrentmap/tst_qtconcurrentmap.cpp b/tests/auto/qtconcurrentmap/tst_qtconcurrentmap.cpp index f287450..2f1adb4 100644 --- a/tests/auto/qtconcurrentmap/tst_qtconcurrentmap.cpp +++ b/tests/auto/qtconcurrentmap/tst_qtconcurrentmap.cpp @@ -2418,6 +2418,7 @@ void tst_QtConcurrentMap::incrementalResults() {} void tst_QtConcurrentMap::stressTest() {} void tst_QtConcurrentMap::throttling() {} void tst_QtConcurrentMap::stlContainers() {} +void tst_QtConcurrentMap::qFutureAssignmentLeak() { } void tst_QtConcurrentMap::noDetatch() {} QTEST_NOOP_MAIN |