AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Break cyclic includes in qglobal.h [2/3]

Browse Source 
Task-number: QTBUG-106722
Change-Id: I6cf2b3fcd419659cc8a0633892393febd26e505b
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Ahmad Samir 2023-02-12 23:50:54 +02:00
parent 43ec3d8d01
commit 0677d334f8
9 changed files with 37 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/corelib/global/qcompare_impl.h
View File

@ -1,15 +1,16 @@
// Copyright (C) 2020 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com, author Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
#ifndef QCOMPARE_IMPL_H
#define QCOMPARE_IMPL_H
#if 0
#pragma qt_sync_skip_header_check
#pragma qt_sync_stop_processing
#endif
#ifndef QCOMPARE_IMPL_H
#define QCOMPARE_IMPL_H
#include <QtCore/qglobal.h>
#include <QtCore/qtconfigmacros.h>
#include <QtCore/qcompilerdetection.h>
QT_BEGIN_NAMESPACE

6
src/corelib/global/qflags.h
View File

@ -1,12 +1,12 @@
// Copyright (C) 2016 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
#include <QtCore/qglobal.h>
#include <QtCore/qcompare_impl.h>
#ifndef QFLAGS_H
#define QFLAGS_H
#include <QtCore/qcompare_impl.h>
#include <QtCore/qtypeinfo.h>
#include <initializer_list>
QT_BEGIN_NAMESPACE

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

@ -1,12 +1,11 @@
// Copyright (C) 2021 Intel Corporation.
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
#include <QtCore/qglobal.h>
#ifndef QGLOBALSTATIC_H
#define QGLOBALSTATIC_H
#include <QtCore/qatomic.h>
#include <QtCore/qtclasshelpermacros.h>
#include <atomic> // for bootstrapped (no thread) builds
#include <type_traits>

8
src/corelib/global/qlogging.h
View File

@ -1,11 +1,14 @@
// Copyright (C) 2016 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
#include <QtCore/qglobal.h>
#ifndef QLOGGING_H
#define QLOGGING_H
#include <QtCore/qtclasshelpermacros.h>
#include <QtCore/qtconfigmacros.h>
#include <QtCore/qtcoreexports.h>
#include <QtCore/qcontainerfwd.h>
#if 0
// header is automatically included in qglobal.h
#pragma qt_no_master_include
@ -22,6 +25,7 @@ QT_BEGIN_NAMESPACE
class QDebug;
class QNoDebug;
enum QtMsgType {
QtDebugMsg,
QtWarningMsg,

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

@ -8,7 +8,9 @@
#pragma qt_class(QtNumeric)
#endif
#include <QtCore/qglobal.h>
#include <QtCore/qtconfigmacros.h>
#include <QtCore/qtcoreexports.h>
#include <QtCore/qtypes.h>
#include <cmath>
#include <limits>

8
src/corelib/global/qsysinfo.h
View File

@ -2,11 +2,13 @@
// Copyright (C) 2016 Intel Corporation.
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
#include <QtCore/qglobal.h>
#ifndef QSYSINFO_H
#define QSYSINFO_H
#include <QtCore/qtconfigmacros.h>
#include <QtCore/qprocessordetection.h>
#include <QtCore/qtcoreexports.h>
QT_BEGIN_NAMESPACE
/*
@ -14,6 +16,8 @@ QT_BEGIN_NAMESPACE
*/
class QString;
class QByteArray;
class Q_CORE_EXPORT QSysInfo
{
public:

9
src/corelib/global/qtypeinfo.h
View File

@ -2,15 +2,16 @@
// Copyright (C) 2016 Intel Corporation.
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
#include <QtCore/qglobal.h>
#ifndef QTYPEINFO_H
#define QTYPEINFO_H
#include <QtCore/qcompilerdetection.h>
#include <QtCore/qcontainerfwd.h>
#include <variant>
#include <optional>
#include <tuple>
#ifndef QTYPEINFO_H
#define QTYPEINFO_H
QT_BEGIN_NAMESPACE
class QDebug;

8
src/corelib/global/qversiontagging.h
View File

@ -1,12 +1,14 @@
// Copyright (C) 2022 Intel Corporation.
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
// qglobal.h includes this header, so keep it outside of our include guards
#include <QtCore/qglobal.h>
#if !defined(QVERSIONTAGGING_H)
#define QVERSIONTAGGING_H
#include <QtCore/qcompilerdetection.h>
#include <QtCore/qtconfigmacros.h>
#include <QtCore/qtversionchecks.h>
#include <QtCore/qtypes.h>
QT_BEGIN_NAMESPACE
/*

5
src/corelib/tools/qcontainerfwd.h
View File

@ -1,11 +1,12 @@
// Copyright (C) 2020 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
#include <QtCore/qglobal.h>
#ifndef QCONTAINERFWD_H
#define QCONTAINERFWD_H
#include <QtCore/qtconfigmacros.h>
#include <QtCore/qtypes.h>
#if 0
#pragma qt_class(QtContainerFwd)
#endif