diff options
| author | axis <qt-info@nokia.com> | 2009-06-30 12:07:31 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2009-06-30 12:14:33 (GMT) |
| commit | 648400cb53d16125a7b1dc851cf01f09034f1fc7 (patch) | |
| tree | 926c6fc3919910d195b6428433a87296f9af2833 | |
| parent | 494902e71479c5410cb77e62ef7152125f39dc67 (diff) | |
| download | Qt-648400cb53d16125a7b1dc851cf01f09034f1fc7.zip Qt-648400cb53d16125a7b1dc851cf01f09034f1fc7.tar.gz Qt-648400cb53d16125a7b1dc851cf01f09034f1fc7.tar.bz2 | |
Fixed a warning on Symbian.
If the profile has release mode set, QT_NO_DEBUG was defined twice
(once on command line and once in qglobal.h). So now we check for
that. This is better than to ignore debug and release completely,
because there may be other flags that also change when they change.
| -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 14b6895..3129349 100644 --- a/src/corelib/global/qglobal.h +++ b/src/corelib/global/qglobal.h @@ -1508,7 +1508,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 |