From 9afe954783cc7faec86bf2ef2c839f2362827e43 Mon Sep 17 00:00:00 2001 From: Sona Kurazyan Date: Mon, 22 Aug 2022 16:56:46 +0200 Subject: [PATCH] Move definition of QT_DEBUG from qglobal.h to qtconfigmacros.h Task-number: QTBUG-99313 Change-Id: I0bb9bcabbfff5b6d97a6473dbbcd47eb46d1fd3d Reviewed-by: Ivan Solovev --- src/corelib/global/qglobal.h | 8 -------- src/corelib/global/qtconfigmacros.h | 8 ++++++++ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h index bdf484d245..9ae45ec8ab 100644 --- a/src/corelib/global/qglobal.h +++ b/src/corelib/global/qglobal.h @@ -109,14 +109,6 @@ private: #endif // Q_OS_DARWIN -/* - Debugging and error handling -*/ - -#if !defined(QT_NO_DEBUG) && !defined(QT_DEBUG) -# define QT_DEBUG -#endif - #if 0 #pragma qt_class(QFunctionPointer) #endif diff --git a/src/corelib/global/qtconfigmacros.h b/src/corelib/global/qtconfigmacros.h index 3765a75dde..0ff6e2955a 100644 --- a/src/corelib/global/qtconfigmacros.h +++ b/src/corelib/global/qtconfigmacros.h @@ -69,6 +69,14 @@ # define QT_MOC_COMPAT #endif +/* + Debugging and error handling +*/ + +#if !defined(QT_NO_DEBUG) && !defined(QT_DEBUG) +# define QT_DEBUG +#endif + // valid for both C and C++ #define QT_MANGLE_NAMESPACE0(x) x #define QT_MANGLE_NAMESPACE1(a, b) a##_##b