From 4842cc176881ae22e14ca193fba46c6a04d09530 Mon Sep 17 00:00:00 2001
From: Sona Kurazyan <sona.kurazyan@qt.io>
Date: Tue, 9 Aug 2022 18:53:13 +0200
Subject: [PATCH] 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                | 1 -
 src/corelib/global/qassert.h              | 2 +-
 src/corelib/global/qoverload.h            | 2 +-
 src/corelib/global/qtdeprecationmarkers.h | 2 +-
 src/corelib/global/qtnamespacemacros.h    | 9 ---------
 5 files changed, 3 insertions(+), 13 deletions(-)
 delete mode 100644 src/corelib/global/qtnamespacemacros.h

diff --git a/src/corelib/CMakeLists.txt b/src/corelib/CMakeLists.txt
index 50b9009f8d..b0af806710 100644
--- a/src/corelib/CMakeLists.txt
+++ b/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
diff --git a/src/corelib/global/qassert.h b/src/corelib/global/qassert.h
index 063cdf89c4..7e3deedccd 100644
--- a/src/corelib/global/qassert.h
+++ b/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)
diff --git a/src/corelib/global/qoverload.h b/src/corelib/global/qoverload.h
index 9e95815389..9376e1e246 100644
--- a/src/corelib/global/qoverload.h
+++ b/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)
diff --git a/src/corelib/global/qtdeprecationmarkers.h b/src/corelib/global/qtdeprecationmarkers.h
index 2fd382ad0d..858b00601b 100644
--- a/src/corelib/global/qtdeprecationmarkers.h
+++ b/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
 
diff --git a/src/corelib/global/qtnamespacemacros.h b/src/corelib/global/qtnamespacemacros.h
deleted file mode 100644
index 49c1e08842..0000000000
--- a/src/corelib/global/qtnamespacemacros.h
+++ /dev/null
@@ -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 */