summaryrefslogtreecommitdiffstats
path: root/cmake
diff options
context:
space:
mode:
authorAhmad Samir <a.samirh78@gmail.com>2023-02-12 17:31:11 +0200
committerAhmad Samir <a.samirh78@gmail.com>2023-05-26 19:48:29 +0300
commit43ec3d8d011f1c067be2257ba657838f2c118415 (patch)
tree8cb9eb6010e5ffb5af52188dea3de717c26af953 /cmake
parent2d9f7633bfe73e48a4bb0fddf9d928176261c931 (diff)
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>
Diffstat (limited to 'cmake')
-rw-r--r--cmake/modulecppexports.h.in8
1 files changed, 4 insertions, 4 deletions
diff --git a/cmake/modulecppexports.h.in b/cmake/modulecppexports.h.in
index d4864bb9d4..324e86faa7 100644
--- a/cmake/modulecppexports.h.in
+++ b/cmake/modulecppexports.h.in
@@ -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