diff --git a/src/corelib/CMakeLists.txt b/src/corelib/CMakeLists.txt index b7a351dac5d..e26dcfb326a 100644 --- a/src/corelib/CMakeLists.txt +++ b/src/corelib/CMakeLists.txt @@ -74,6 +74,7 @@ qt_internal_add_module(Core global/qtclasshelpermacros.h global/qtconfiginclude.h global/qtconfigmacros.h + global/qtcoreglobal.h global/qtcoreglobal_p.h global/qtdeprecationmarkers.h global/qtenvironmentvariables.cpp global/qtenvironmentvariables.h global/qtenvironmentvariables_p.h diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h index 2d70e82370d..07fc99b20b0 100644 --- a/src/corelib/global/qglobal.h +++ b/src/corelib/global/qglobal.h @@ -21,9 +21,7 @@ # include #endif -#include -#include -#include +#include #include diff --git a/src/corelib/global/qglobal_p.h b/src/corelib/global/qglobal_p.h index 31f67510e3b..1911d3c3e7c 100644 --- a/src/corelib/global/qglobal_p.h +++ b/src/corelib/global/qglobal_p.h @@ -20,8 +20,7 @@ #include "qglobal_p.h" // include self to avoid syncqt warning - no-op #ifndef QT_BOOTSTRAPPED -#include -#include +#include #endif #if defined(Q_CC_MSVC) diff --git a/src/corelib/global/qtcoreglobal.h b/src/corelib/global/qtcoreglobal.h new file mode 100644 index 00000000000..b067f449528 --- /dev/null +++ b/src/corelib/global/qtcoreglobal.h @@ -0,0 +1,16 @@ +// Copyright (C) 2020 The Qt Company Ltd. +// Copyright (C) 2019 Intel Corporation. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only + +#if 0 +#pragma qt_class(QtCoreGlobal) +#endif + +#ifndef QTCOREGLOBAL_H +#define QTCOREGLOBAL_H + +#include +#include +#include + +#endif // QTCOREGLOBAL_H diff --git a/src/corelib/global/qtcoreglobal_p.h b/src/corelib/global/qtcoreglobal_p.h new file mode 100644 index 00000000000..46ad68ad7e7 --- /dev/null +++ b/src/corelib/global/qtcoreglobal_p.h @@ -0,0 +1,23 @@ + +// Copyright (C) 2020 The Qt Company Ltd. +// Copyright (C) 2019 Intel Corporation. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only + +#ifndef QTCOREGLOBAL_P_H +#define QTCOREGLOBAL_P_H + +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + +#include +#include + +#endif // QTCOREGLOBAL_P_H