diff options
| author | Sona Kurazyan <sona.kurazyan@qt.io> | 2022-08-09 18:53:13 +0200 |
|---|---|---|
| committer | Sona Kurazyan <sona.kurazyan@qt.io> | 2022-08-19 09:16:11 +0200 |
| commit | 4842cc176881ae22e14ca193fba46c6a04d09530 (patch) | |
| tree | 7293a754669350c1924be285b80d420160599ae3 /src/corelib/global | |
| parent | 0329792602310577fa66c6991b891140b6edd210 (diff) | |
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>
Diffstat (limited to 'src/corelib/global')
| -rw-r--r-- | src/corelib/global/qassert.h | 2 | ||||
| -rw-r--r-- | src/corelib/global/qoverload.h | 2 | ||||
| -rw-r--r-- | src/corelib/global/qtdeprecationmarkers.h | 2 | ||||
| -rw-r--r-- | src/corelib/global/qtnamespacemacros.h | 9 |
4 files changed, 3 insertions, 12 deletions
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 */ |