diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2009-07-01 12:40:40 (GMT) |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2009-07-01 12:40:40 (GMT) |
| commit | 5e4b53a50db19fe5d51f0a5fe035a29ff331a725 (patch) | |
| tree | 4f8f0baa23be7c0e6c4549f6824b6cdfe14aa503 /src | |
| parent | 42e63a7e65d4dbfb2a79133eb63a561f50760344 (diff) | |
| parent | 27c4a4d9c91e6c16d1d43d2d99c0176a58650e15 (diff) | |
| download | Qt-5e4b53a50db19fe5d51f0a5fe035a29ff331a725.zip Qt-5e4b53a50db19fe5d51f0a5fe035a29ff331a725.tar.gz Qt-5e4b53a50db19fe5d51f0a5fe035a29ff331a725.tar.bz2 | |
Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-public
Diffstat (limited to 'src')
| -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 |