From 180e55a5867a60b3702d8cd76673f4f13668863f Mon Sep 17 00:00:00 2001
From: Sona Kurazyan <sona.kurazyan@qt.io>
Date: Thu, 11 Aug 2022 16:24:03 +0200
Subject: [PATCH] Move Q_{OUTOFLINE, INLINE}_TEMPLATE definitions to
 qcompilerdetection.h

These seem to be leftovers after
475cef58f96d1d274e5c7b448df7231415783af0.

Task-number: QTBUG-99313
Change-Id: I6059cfe1ea0a0f85e3617338215effb114d3b60b
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
---
 src/corelib/global/qcompilerdetection.h | 7 +++++++
 src/corelib/global/qglobal.h            | 7 -------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/corelib/global/qcompilerdetection.h b/src/corelib/global/qcompilerdetection.h
index 54d1fd1ba89..3d5d1b1432a 100644
--- a/src/corelib/global/qcompilerdetection.h
+++ b/src/corelib/global/qcompilerdetection.h
@@ -1275,6 +1275,13 @@ static_assert(!std::is_convertible_v<std::nullptr_t, bool>,
 # define Q_CONSTINIT
 #endif
 
+#ifndef Q_OUTOFLINE_TEMPLATE
+#  define Q_OUTOFLINE_TEMPLATE
+#endif
+#ifndef Q_INLINE_TEMPLATE
+#  define Q_INLINE_TEMPLATE inline
+#endif
+
 #endif // __cplusplus
 
 #endif // QCOMPILERDETECTION_H
diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h
index c38fa385f2e..9ab12960ba7 100644
--- a/src/corelib/global/qglobal.h
+++ b/src/corelib/global/qglobal.h
@@ -316,13 +316,6 @@ Q_NORETURN Q_DECL_COLD_FUNCTION Q_CORE_EXPORT void qTerminate() noexcept;
 
 Q_CORE_EXPORT Q_DECL_CONST_FUNCTION bool qSharedBuild() noexcept;
 
-#ifndef Q_OUTOFLINE_TEMPLATE
-#  define Q_OUTOFLINE_TEMPLATE
-#endif
-#ifndef Q_INLINE_TEMPLATE
-#  define Q_INLINE_TEMPLATE inline
-#endif
-
 /*
    Debugging and error handling
 */