diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2009-07-16 13:37:54 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2009-07-21 13:21:22 (GMT) |
| commit | 08ff267fe37dcccb7f63a8158b260e2e3b1e0965 (patch) | |
| tree | a3d6a0651f710a43fa08a225236c4f555d1911c2 /src/corelib | |
| parent | 9317e521f0b0f689c87b95b927102dbf55edb89f (diff) | |
| download | Qt-08ff267fe37dcccb7f63a8158b260e2e3b1e0965.zip Qt-08ff267fe37dcccb7f63a8158b260e2e3b1e0965.tar.gz Qt-08ff267fe37dcccb7f63a8158b260e2e3b1e0965.tar.bz2 | |
Use the configure script to enable/disable QtConcurrent and QtXmlPatterns
Using qglobal.h and checking the compiler version with the
preprocessor has the side-effect that moc won't generate proper code
since it doesn't know about the compiler version.
Enable both modules under Sun CC 5.9 and IBM xlC 7.0.
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/global/qglobal.h | 23 |
1 files changed, 5 insertions, 18 deletions
diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h index 866247a..7b16dff 100644 --- a/src/corelib/global/qglobal.h +++ b/src/corelib/global/qglobal.h @@ -2408,28 +2408,15 @@ QT_LICENSED_MODULE(DBus) # define QT_NO_QFUTURE #endif -/* - Turn off certain features for compilers that have problems parsing - the code. -*/ -#if (defined(Q_CC_HPACC) && defined(QT_ARCH_PARISC)) \ - || defined(Q_CC_MIPS) \ - || defined(Q_CC_XLC) -// HP aCC A.03.*, MIPSpro, and xlC cannot handle -// the template function declarations for the QtConcurrent functions -# define QT_NO_QFUTURE -# define QT_NO_CONCURRENT -#endif - -// MSVC 6.0, MSVC .NET 2002, and old versions of Sun CC can`t handle the map(), etc templates, +// MSVC 6.0 and MSVC .NET 2002, can`t handle the map(), etc templates, // but the QFuture class compiles. -#if (defined(Q_CC_MSVC) && _MSC_VER <= 1300) || (defined (__SUNPRO_CC) && __SUNPRO_CC <= 0x590) +#if (defined(Q_CC_MSVC) && _MSC_VER <= 1300) # define QT_NO_CONCURRENT #endif -// Mingw uses a gcc 3 version which has problems with some of the -// map/filter overloads. So does IRIX and Solaris. -#if (defined(Q_OS_IRIX) || defined(Q_CC_MINGW) || defined (Q_OS_SOLARIS)) && (__GNUC__ < 4) +// gcc 3 version has problems with some of the +// map/filter overloads. +#if defined(Q_CC_GNU) && (__GNUC__ < 4) # define QT_NO_CONCURRENT_MAP # define QT_NO_CONCURRENT_FILTER #endif |