diff options
| author | Laszlo Agocs <laszlo.p.agocs@nokia.com> | 2011-05-12 10:16:45 (GMT) |
|---|---|---|
| committer | Laszlo Agocs <laszlo.p.agocs@nokia.com> | 2011-05-12 10:16:45 (GMT) |
| commit | 455440996f659ae246536b7450ba9b7900d015d0 (patch) | |
| tree | a2d26dbd78bc33643693fb10132d3fee64af5ed9 /tests | |
| parent | d7d9a14de00f9391ab0be953357d24713f580675 (diff) | |
| download | Qt-455440996f659ae246536b7450ba9b7900d015d0.zip Qt-455440996f659ae246536b7450ba9b7900d015d0.tar.gz Qt-455440996f659ae246536b7450ba9b7900d015d0.tar.bz2 | |
Disable QtConcurrent for Symbian winscw builds.
While QtConcurrent is nowadays usable with RVCT and GCCE compilers,
the compiler used for the winscw target has problems with the
templates still. To enable building 4.8 on winscw, the patch
defines QT_NO_CONCURRENT and QT_NO_QFUTURE in qglobal.h for
this target. However this causes further complications in the
Q_OBJECT classes of QtConcurrent because moc will be run without
having QT_NO_CONCURRENT and QFUTURE defined (as moc is not a Symbian
app and for other Symbian targets they must not be defined, which makes
differentiation in qglobal.h impossible for the moc run) and having a
moc file generated for a class that will be ifdef'ed out during
compilation causes build breaks. Therefore additional dummy stubs are
provided in QFutureWatcherBase.
Reviewed-by: Liang Qi
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 |