1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Core: split out qcoreglobal headers

Browse Source 
If we ever want to stop including qglobal.h everywhere we need new
module-specific 'global' headers for QtCore.

Task-number: QTBUG-106722
Change-Id: I138b9ddc50029151c6099d5671b11cd41c4a7387
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Mårten Nordheim 2024-02-13 14:55:31 +01:00
parent 2ea099b679
commit 38bb72720a
5 changed files with 42 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/corelib/CMakeLists.txt
View File

@ -74,6 +74,7 @@ qt_internal_add_module(Core
global/qtclasshelpermacros.h global/qtclasshelpermacros.h
global/qtconfiginclude.h global/qtconfiginclude.h
global/qtconfigmacros.h global/qtconfigmacros.h
global/qtcoreglobal.h global/qtcoreglobal_p.h
global/qtdeprecationmarkers.h global/qtdeprecationmarkers.h
global/qtenvironmentvariables.cpp global/qtenvironmentvariables.h global/qtenvironmentvariables.cpp global/qtenvironmentvariables.h
global/qtenvironmentvariables_p.h global/qtenvironmentvariables_p.h

4
src/corelib/global/qglobal.h
View File

@ -21,9 +21,7 @@
# include <stddef.h> # include <stddef.h>
#endif #endif
#include <QtCore/qtversionchecks.h> #include <QtCore/qtcoreglobal.h>
#include <QtCore/qtconfigmacros.h>
#include <QtCore/qtcoreexports.h>
#include <QtCore/qtpreprocessorsupport.h> #include <QtCore/qtpreprocessorsupport.h>

3
src/corelib/global/qglobal_p.h
View File

@ -20,8 +20,7 @@
#include "qglobal_p.h" // include self to avoid syncqt warning - no-op #include "qglobal_p.h" // include self to avoid syncqt warning - no-op
#ifndef QT_BOOTSTRAPPED #ifndef QT_BOOTSTRAPPED
#include <QtCore/private/qconfig_p.h> #include <QtCore/private/qtcoreglobal_p.h>
#include <QtCore/private/qtcore-config_p.h>
#endif #endif
#if defined(Q_CC_MSVC) #if defined(Q_CC_MSVC)

16
src/corelib/global/qtcoreglobal.h Normal file
View File

@ -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 <QtCore/qtversionchecks.h>
#include <QtCore/qtconfigmacros.h>
#include <QtCore/qtcoreexports.h>
#endif // QTCOREGLOBAL_H

23
src/corelib/global/qtcoreglobal_p.h Normal file
View File

@ -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 <QtCore/private/qconfig_p.h>
#include <QtCore/private/qtcore-config_p.h>
#endif // QTCOREGLOBAL_P_H