Remove qtnamespacemacros.h and use qtconfigmacros.h instead

Change-Id: Ibae6e6e255c1bb1ee52839a051d585de81833bf9
Pick-to: 6.4
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>

src/corelib/CMakeLists.txt

@@ -76,7 +76,6 @@ qt_internal_add_module(Core
         global/qsystemdetection.h
         global/qtconfigmacros.h
         global/qtdeprecationmarkers.h
-        global/qtnamespacemacros.h
         global/qtrace_p.h
         global/qtranslation.h
         global/qtversionchecks.h

src/corelib/global/qassert.h

@@ -5,7 +5,7 @@
 #define QASSERT_H
 
 #include <QtCore/qcompilerdetection.h>
-#include <QtCore/qtnamespacemacros.h>
+#include <QtCore/qtconfigmacros.h>
 
 #if 0
 #pragma qt_class(QtAssert)

src/corelib/global/qoverload.h

@@ -4,7 +4,7 @@
 #ifndef QOVERLOAD_H
 #define QOVERLOAD_H
 
-#include <QtCore/qtnamespacemacros.h>
+#include <QtCore/qtconfigmacros.h>
 
 #if 0
 #pragma qt_class(QOverload)

src/corelib/global/qtdeprecationmarkers.h

@@ -4,8 +4,8 @@
 #ifndef QTDEPRECATIONMARKERS_H
 #define QTDEPRECATIONMARKERS_H
 
+#include <QtCore/qtconfigmacros.h>
 #include <QtCore/qtversionchecks.h>
-#include <QtCore/qtnamespacemacros.h>
 
 QT_BEGIN_NAMESPACE
 

src/corelib/global/qtnamespacemacros.h

@@ -1,9 +0,0 @@
-// 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 QTNAMESPACEMACROS_H
-#define QTNAMESPACEMACROS_H
-
-#include <QtCore/qtconfigmacros.h>
-
-#endif /* QTNAMESPACEMACROS_H */