Break some include cycles in qglobal.h [1/3]
Remove qglobal.h include from qcompilerdetection.h, qsystemdetection.h and modulecppexports.h.in Testing locally, the code builds on Linux with precompiled headers disabled/enabled (qt_pch.h includes qglobal.h, so building with PCH enabled isn't useful for testing this) and with/without bootstrap. qrunnable.*: missing includes detected by compiling with -DFEATURE_headersclean=ON. Task-number: QTBUG-106722 Change-Id: I70864dfbf117ffd7fe492eb715a413eb6f209990 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
parent
2d9f7633bf
commit
43ec3d8d01
@ -1,13 +1,13 @@
|
||||
// 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
|
||||
|
||||
// This file is autogenerated. Changes will be overwritten.
|
||||
|
||||
#include <QtCore/qglobal.h>
|
||||
|
||||
#ifndef @header_base_name_upper@_H
|
||||
#define @header_base_name_upper@_H
|
||||
|
||||
#include <QtCore/qcompilerdetection.h>
|
||||
#include <QtCore/qtconfigmacros.h> // Q_@module_define_infix@_EXPORT
|
||||
#include <QtCore/qtdeprecationmarkers.h> // QT_IF_DEPRECATED_SINCE
|
||||
|
||||
#if defined(QT_SHARED) || !defined(QT_STATIC)
|
||||
# if defined(QT_BUILD_@module_define_infix@_LIB)
|
||||
# define Q_@module_define_infix@_EXPORT Q_DECL_EXPORT
|
||||
|
@ -2,9 +2,7 @@
|
||||
// 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
|
||||
|
||||
#ifndef QGLOBAL_H
|
||||
# include <QtCore/qglobal.h>
|
||||
#endif
|
||||
#include <QtCore/qsystemdetection.h>
|
||||
|
||||
#if 0
|
||||
#pragma qt_class(QtCompilerDetection)
|
||||
|
@ -6,6 +6,7 @@
|
||||
|
||||
#include <QtCore/qtconfigmacros.h>
|
||||
#include <QtCore/qcompilerdetection.h>
|
||||
#include <QtCore/qtcoreexports.h>
|
||||
|
||||
#if 0
|
||||
#pragma qt_class(QtExceptionHandling)
|
||||
|
@ -2,10 +2,6 @@
|
||||
// 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 QGLOBAL_H
|
||||
# include <QtCore/qglobal.h>
|
||||
#endif
|
||||
|
||||
#if 0
|
||||
#pragma qt_class(QtSystemDetection)
|
||||
#pragma qt_sync_skip_header_check
|
||||
|
@ -3,6 +3,8 @@
|
||||
|
||||
#include "qrunnable.h"
|
||||
|
||||
#include <QtCore/qlogging.h>
|
||||
|
||||
QT_BEGIN_NAMESPACE
|
||||
|
||||
QRunnable::~QRunnable()
|
||||
|
@ -6,6 +6,8 @@
|
||||
|
||||
#include <QtCore/qcompilerdetection.h>
|
||||
#include <QtCore/qfunctionaltools_impl.h>
|
||||
#include <QtCore/qtclasshelpermacros.h>
|
||||
#include <QtCore/qtcoreexports.h>
|
||||
|
||||
#include <functional>
|
||||
#include <type_traits>
|
||||
|
Loading…
Reference in New Issue
Block a user