diff options
| author | axis <qt-info@nokia.com> | 2009-07-06 11:23:44 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2009-07-06 11:23:44 (GMT) |
| commit | b6909aedbfcafe67c5e2fc1bbda62e0ea672d239 (patch) | |
| tree | 0d3a61a5942f0fe4a2a8e5b95f11fc6ca39d48ca /src/corelib/global | |
| parent | 2eef0ba923644e62e0dd1e7829de57cc7118798a (diff) | |
| parent | b1607cfaaca575b5a8ce416cb23a23b1fa6c4db1 (diff) | |
| download | Qt-b6909aedbfcafe67c5e2fc1bbda62e0ea672d239.zip Qt-b6909aedbfcafe67c5e2fc1bbda62e0ea672d239.tar.gz Qt-b6909aedbfcafe67c5e2fc1bbda62e0ea672d239.tar.bz2 | |
Merge branch 'warningRemovals'
Diffstat (limited to 'src/corelib/global')
| -rw-r--r-- | src/corelib/global/qglobal.cpp | 2 | ||||
| -rw-r--r-- | src/corelib/global/qglobal.h | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/corelib/global/qglobal.cpp b/src/corelib/global/qglobal.cpp index 208d4a2..7d35926 100644 --- a/src/corelib/global/qglobal.cpp +++ b/src/corelib/global/qglobal.cpp @@ -2470,7 +2470,9 @@ typedef uint SeedStorageType; # endif typedef QThreadStorage<SeedStorageType *> SeedStorage; +#if defined(Q_OS_UNIX) && !defined(QT_NO_THREAD) && !defined(Q_OS_SYMBIAN) Q_GLOBAL_STATIC(SeedStorage, randTLS) // Thread Local Storage for seed value +#endif #endif diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h index f021d57..ff6dcb9 100644 --- a/src/corelib/global/qglobal.h +++ b/src/corelib/global/qglobal.h @@ -1500,7 +1500,7 @@ inline QT3_SUPPORT int qWinVersion() { return QSysInfo::WindowsVersion; } Avoid "unused parameter" warnings */ -#if defined(Q_CC_INTEL) && !defined(Q_OS_WIN) +#if defined(Q_CC_INTEL) && !defined(Q_OS_WIN) || defined(Q_CC_RVCT) template <typename T> inline void qUnused(T &x) { (void)x; } # define Q_UNUSED(x) qUnused(x); |