diff options
| author | Sona Kurazyan <sona.kurazyan@qt.io> | 2022-08-22 16:56:46 +0200 |
|---|---|---|
| committer | Sona Kurazyan <sona.kurazyan@qt.io> | 2022-08-30 20:36:14 +0200 |
| commit | 9afe954783cc7faec86bf2ef2c839f2362827e43 (patch) | |
| tree | 361ba0ecf47dee5d9e8e33b8c84e89b4f26e7c98 /src | |
| parent | 5c01cbfe7670ef2d4d0267e0cd114ab02c390042 (diff) | |
Move definition of QT_DEBUG from qglobal.h to qtconfigmacros.h
Task-number: QTBUG-99313
Change-Id: I0bb9bcabbfff5b6d97a6473dbbcd47eb46d1fd3d
Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/global/qglobal.h | 8 | ||||
| -rw-r--r-- | 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 |