diff options
| author | axis <qt-info@nokia.com> | 2009-06-30 12:20:08 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2009-06-30 12:20:08 (GMT) |
| commit | c84ac698d29cb2317af5f478b02da6bfb5673716 (patch) | |
| tree | 336a75344546f18b06a29d1b85bda04eed2e9e09 /src/corelib/global | |
| parent | b69bf0e7c936de19ae31e55bee3c85ec3b2b2c59 (diff) | |
| parent | 648400cb53d16125a7b1dc851cf01f09034f1fc7 (diff) | |
| download | Qt-c84ac698d29cb2317af5f478b02da6bfb5673716.zip Qt-c84ac698d29cb2317af5f478b02da6bfb5673716.tar.gz Qt-c84ac698d29cb2317af5f478b02da6bfb5673716.tar.bz2 | |
Merge branch 'warningRemovals'
Diffstat (limited to 'src/corelib/global')
| -rw-r--r-- | src/corelib/global/qglobal.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h index 8a67d16..819bdf7 100644 --- a/src/corelib/global/qglobal.h +++ b/src/corelib/global/qglobal.h @@ -1512,7 +1512,7 @@ inline void qUnused(T &x) { (void)x; } Debugging and error handling */ -#if defined(Q_OS_SYMBIAN) && defined(NDEBUG) +#if defined(Q_OS_SYMBIAN) && defined(NDEBUG) && !defined(QT_NO_DEBUG) # define QT_NO_DEBUG #endif |