From 97f6878afddbef83b4a654ff0f9b118aa9ab2ab4 Mon Sep 17 00:00:00 2001
From: Sona Kurazyan <sona.kurazyan@qt.io>
Date: Thu, 11 Aug 2022 13:20:52 +0200
Subject: [PATCH] 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>
---
 src/corelib/global/qglobal.h          | 7 -------
 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 9e5a16093e5..930252dad3f 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 a4cc20b5400..b3e13e3c99b 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