Extract header qassert.h from qglobal.h

For now qassert.h is included in the middle of qglobal.h, since some of
the code below needs it, but this will be cleaned up when that code is
moved in its own header.

Task-number: QTBUG-99313
Change-Id: I2cdfed44f5c8772c1dad4797cf8edc6cb4c964b4
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Marc Mutz <marc.mutz@qt.io>

4 files changed, 125 insertions, 90 deletions

diff --git a/src/corelib/global/qassert.cpp b/src/corelib/global/qassert.cpp
new file mode 100644
index 0000000000..9b7e5d9a38
--- /dev/null
+++ b/src/corelib/global/qassert.cpp
@@ -0,0 +1,74 @@
+// Copyright (C) 2022 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
+
+#include "qassert.h"
+
+#include <QtCore/qlogging.h>
+
+QT_BEGIN_NAMESPACE
+
+/*!
+    \macro void Q_ASSERT(bool test)
+    \relates <QtAssert>
+
+    Prints a warning message containing the source code file name and
+    line number if \a test is \c false.
+
+    Q_ASSERT() is useful for testing pre- and post-conditions
+    during development. It does nothing if \c QT_NO_DEBUG was defined
+    during compilation.
+
+    Example:
+
+    \snippet code/src_corelib_global_qglobal.cpp 17
+
+    If \c b is zero, the Q_ASSERT statement will output the following
+    message using the qFatal() function:
+
+    \snippet code/src_corelib_global_qglobal.cpp 18
+
+    \sa Q_ASSERT_X(), qFatal(), {Debugging Techniques}
+*/
+
+/*!
+    \macro void Q_ASSERT_X(bool test, const char *where, const char *what)
+    \relates <QtAssert>
+
+    Prints the message \a what together with the location \a where,
+    the source file name and line number if \a test is \c false.
+
+    Q_ASSERT_X is useful for testing pre- and post-conditions during
+    development. It does nothing if \c QT_NO_DEBUG was defined during
+    compilation.
+
+    Example:
+
+    \snippet code/src_corelib_global_qglobal.cpp 19
+
+    If \c b is zero, the Q_ASSERT_X statement will output the following
+    message using the qFatal() function:
+
+    \snippet code/src_corelib_global_qglobal.cpp 20
+
+    \sa Q_ASSERT(), qFatal(), {Debugging Techniques}
+*/
+
+/*
+    The Q_ASSERT macro calls this function when the test fails.
+*/
+void qt_assert(const char *assertion, const char *file, int line) noexcept
+{
+    QMessageLogger(file, line, nullptr)
+            .fatal("ASSERT: \"%s\" in file %s, line %d", assertion, file, line);
+}
+
+/*
+    The Q_ASSERT_X macro calls this function when the test fails.
+*/
+void qt_assert_x(const char *where, const char *what, const char *file, int line) noexcept
+{
+    QMessageLogger(file, line, nullptr)
+            .fatal("ASSERT failure in %s: \"%s\", file %s, line %d", where, what, file, line);
+}
+
+QT_END_NAMESPACE
diff --git a/src/corelib/global/qassert.h b/src/corelib/global/qassert.h
new file mode 100644
index 0000000000..acc311814b
--- /dev/null
+++ b/src/corelib/global/qassert.h
@@ -0,0 +1,48 @@
+// Copyright (C) 2022 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
+
+#ifndef QASSERT_H
+#define QASSERT_H
+
+#include <QtCore/qcompilerdetection.h>
+#include <QtCore/qtnamespacemacros.h>
+
+#if 0
+#pragma qt_class(QtAssert)
+#pragma qt_sync_stop_processing
+#endif
+
+QT_BEGIN_NAMESPACE
+
+#ifndef Q_CC_MSVC
+Q_NORETURN
+#endif
+Q_DECL_COLD_FUNCTION
+Q_CORE_EXPORT void qt_assert(const char *assertion, const char *file, int line) noexcept;
+
+#if !defined(Q_ASSERT)
+#  if defined(QT_NO_DEBUG) && !defined(QT_FORCE_ASSERTS)
+#    define Q_ASSERT(cond) static_cast<void>(false && (cond))
+#  else
+#    define Q_ASSERT(cond) ((cond) ? static_cast<void>(0) : qt_assert(#cond, __FILE__, __LINE__))
+#  endif
+#endif
+
+#ifndef Q_CC_MSVC
+Q_NORETURN
+#endif
+Q_DECL_COLD_FUNCTION
+Q_CORE_EXPORT
+void qt_assert_x(const char *where, const char *what, const char *file, int line) noexcept;
+
+#if !defined(Q_ASSERT_X)
+#  if defined(QT_NO_DEBUG) && !defined(QT_FORCE_ASSERTS)
+#    define Q_ASSERT_X(cond, where, what) static_cast<void>(false && (cond))
+#  else
+#    define Q_ASSERT_X(cond, where, what) ((cond) ? static_cast<void>(0) : qt_assert_x(where, what, __FILE__, __LINE__))
+#  endif
+#endif
+
+QT_END_NAMESPACE
+
+#endif // QASSERT_H
diff --git a/src/corelib/global/qglobal.cpp b/src/corelib/global/qglobal.cpp
index 075a9b6926..c8c55c1a38 100644
--- a/src/corelib/global/qglobal.cpp
+++ b/src/corelib/global/qglobal.cpp
@@ -2961,52 +2961,6 @@ QByteArray QSysInfo::bootUniqueId()
 };
 
 /*!
-    \macro void Q_ASSERT(bool test)
-    \relates <QtGlobal>
-
-    Prints a warning message containing the source code file name and
-    line number if \a test is \c false.
-
-    Q_ASSERT() is useful for testing pre- and post-conditions
-    during development. It does nothing if \c QT_NO_DEBUG was defined
-    during compilation.
-
-    Example:
-
-    \snippet code/src_corelib_global_qglobal.cpp 17
-
-    If \c b is zero, the Q_ASSERT statement will output the following
-    message using the qFatal() function:
-
-    \snippet code/src_corelib_global_qglobal.cpp 18
-
-    \sa Q_ASSERT_X(), qFatal(), {Debugging Techniques}
-*/
-
-/*!
-    \macro void Q_ASSERT_X(bool test, const char *where, const char *what)
-    \relates <QtGlobal>
-
-    Prints the message \a what together with the location \a where,
-    the source file name and line number if \a test is \c false.
-
-    Q_ASSERT_X is useful for testing pre- and post-conditions during
-    development. It does nothing if \c QT_NO_DEBUG was defined during
-    compilation.
-
-    Example:
-
-    \snippet code/src_corelib_global_qglobal.cpp 19
-
-    If \c b is zero, the Q_ASSERT_X statement will output the following
-    message using the qFatal() function:
-
-    \snippet code/src_corelib_global_qglobal.cpp 20
-
-    \sa Q_ASSERT(), qFatal(), {Debugging Techniques}
-*/
-
-/*!
     \macro void Q_ASSUME(bool expr)
     \relates <QtGlobal>
     \since 5.0
@@ -3171,23 +3125,6 @@ Q_NORETURN void qTerminate() noexcept
 }
 
 /*
-  The Q_ASSERT macro calls this function when the test fails.
-*/
-void qt_assert(const char *assertion, const char *file, int line) noexcept
-{
-    QMessageLogger(file, line, nullptr).fatal("ASSERT: \"%s\" in file %s, line %d", assertion, file, line);
-}
-
-/*
-  The Q_ASSERT_X macro calls this function when the test fails.
-*/
-void qt_assert_x(const char *where, const char *what, const char *file, int line) noexcept
-{
-    QMessageLogger(file, line, nullptr).fatal("ASSERT failure in %s: \"%s\", file %s, line %d", where, what, file, line);
-}
-
-
-/*
     Dijkstra's bisection algorithm to find the square root of an integer.
     Deliberately not exported as part of the Qt API, but used in both
     qsimplerichtext.cpp and qgfxraster_qws.cpp
diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h
index 9d482e7107..93954a4826 100644
--- a/src/corelib/global/qglobal.h
+++ b/src/corelib/global/qglobal.h
@@ -633,33 +633,9 @@ Q_CORE_EXPORT Q_DECL_CONST_FUNCTION bool qSharedBuild() noexcept;
 #  define QT_DEBUG
 #endif
 
-#ifndef Q_CC_MSVC
-Q_NORETURN
-#endif
-Q_DECL_COLD_FUNCTION
-Q_CORE_EXPORT void qt_assert(const char *assertion, const char *file, int line) noexcept;
-
-#if !defined(Q_ASSERT)
-#  if defined(QT_NO_DEBUG) && !defined(QT_FORCE_ASSERTS)
-#    define Q_ASSERT(cond) static_cast<void>(false && (cond))
-#  else
-#    define Q_ASSERT(cond) ((cond) ? static_cast<void>(0) : qt_assert(#cond, __FILE__, __LINE__))
-#  endif
-#endif
-
-#ifndef Q_CC_MSVC
-Q_NORETURN
-#endif
-Q_DECL_COLD_FUNCTION
-Q_CORE_EXPORT void qt_assert_x(const char *where, const char *what, const char *file, int line) noexcept;
-
-#if !defined(Q_ASSERT_X)
-#  if defined(QT_NO_DEBUG) && !defined(QT_FORCE_ASSERTS)
-#    define Q_ASSERT_X(cond, where, what) static_cast<void>(false && (cond))
-#  else
-#    define Q_ASSERT_X(cond, where, what) ((cond) ? static_cast<void>(0) : qt_assert_x(where, what, __FILE__, __LINE__))
-#  endif
-#endif
+QT_BEGIN_INCLUDE_NAMESPACE
+#include <QtCore/qassert.h>
+QT_END_INCLUDE_NAMESPACE
 
 Q_NORETURN Q_CORE_EXPORT void qt_check_pointer(const char *, int) noexcept;
 Q_NORETURN Q_DECL_COLD_FUNCTION