diff options
author | Sona Kurazyan <sona.kurazyan@qt.io> | 2022-08-11 13:20:52 +0200 |
---|---|---|
committer | Sona Kurazyan <sona.kurazyan@qt.io> | 2022-08-11 21:13:31 +0200 |
commit | 97f6878afddbef83b4a654ff0f9b118aa9ab2ab4 (patch) | |
tree | 3929c6b30df2c4bd7fc25b0008cc597db120c4b9 /src/corelib | |
parent | 85414ac6c0141c278d4f0213441fb7475cbe2ac8 (diff) |
Move Q_OF_ELF/Q_OF_MACH_O macros to qsystemdetection.h
Task-number: QTBUG-99313
Change-Id: I373fad6f8339a0bad1ebc5d81386b18794bf32cc
Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Diffstat (limited to 'src/corelib')
-rw-r--r-- | src/corelib/global/qglobal.h | 7 | ||||
-rw-r--r-- | src/corelib/global/qsystemdetection.h | 7 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h index 9e5a16093e..930252dad3 100644 --- a/src/corelib/global/qglobal.h +++ b/src/corelib/global/qglobal.h @@ -47,13 +47,6 @@ inline void qt_noop(void) {} #include <QtCore/qassert.h> #include <QtCore/qtypes.h> -#if defined (__ELF__) -# define Q_OF_ELF -#endif -#if defined (__MACH__) && defined (__APPLE__) -# define Q_OF_MACH_O -#endif - /* Avoid "unused parameter" warnings */ diff --git a/src/corelib/global/qsystemdetection.h b/src/corelib/global/qsystemdetection.h index a4cc20b540..b3e13e3c99 100644 --- a/src/corelib/global/qsystemdetection.h +++ b/src/corelib/global/qsystemdetection.h @@ -253,4 +253,11 @@ #endif #endif +#if defined (__ELF__) +# define Q_OF_ELF +#endif +#if defined (__MACH__) && defined (__APPLE__) +# define Q_OF_MACH_O +#endif + #endif // QSYSTEMDETECTION_H |