diff options
| author | Olivier Goffart <olivier.goffart@nokia.com> | 2011-05-16 08:02:12 (GMT) |
|---|---|---|
| committer | Olivier Goffart <olivier.goffart@nokia.com> | 2011-05-16 08:08:59 (GMT) |
| commit | 3773fcb78db02a2577c89f755c07c2c7dbf0de74 (patch) | |
| tree | 95115e9ccebc81ae8fdb6dfa9f8305ff9feff462 /src/corelib/global | |
| parent | 9f1bf75b1d55af2dda000cba580fafed2aa83838 (diff) | |
| parent | 7e4a9187bb11b794e45d95d2e9fae026d6b0d07d (diff) | |
| download | Qt-3773fcb78db02a2577c89f755c07c2c7dbf0de74.zip Qt-3773fcb78db02a2577c89f755c07c2c7dbf0de74.tar.gz Qt-3773fcb78db02a2577c89f755c07c2c7dbf0de74.tar.bz2 | |
Merge remote-tracking branch 'origin/4.8' into qt-4.8-from-4.7
Conflicts:
src/gui/kernel/qt_s60_p.h
Diffstat (limited to 'src/corelib/global')
| -rw-r--r-- | src/corelib/global/qglobal.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h index 49f5f98..3e1f011 100644 --- a/src/corelib/global/qglobal.h +++ b/src/corelib/global/qglobal.h @@ -2545,6 +2545,16 @@ QT3_SUPPORT Q_CORE_EXPORT const char *qInstallPathSysconf(); //Symbian does not support data imports from a DLL #define Q_NO_DATA_RELOCATION +// Winscw compiler is unable to compile QtConcurrent. +#ifdef Q_CC_NOKIAX86 +#ifndef QT_NO_CONCURRENT +#define QT_NO_CONCURRENT +#endif +#ifndef QT_NO_QFUTURE +#define QT_NO_QFUTURE +#endif +#endif + QT_END_NAMESPACE // forward declare std::exception #ifdef __cplusplus |