From 648400cb53d16125a7b1dc851cf01f09034f1fc7 Mon Sep 17 00:00:00 2001 From: axis Date: Tue, 30 Jun 2009 14:07:31 +0200 Subject: 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. --- src/corelib/global/qglobal.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 -- cgit v0.12