summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIvan Solovev <ivan.solovev@qt.io>2022-10-05 15:00:36 +0200
committerIvan Solovev <ivan.solovev@qt.io>2022-10-10 10:25:13 +0200
commit30b881b3946a0a09da03d1d50f46251b33851d1b (patch)
tree1e890e5adbd25dfd38545a28d4d4358045a10ab6
parentc9758d76c73c7e4bf6363a7f357ad8c2dfb8b4bc (diff)
qforeach.h: do not include qglobal.h
The qforeach.h header was extracted in ffcf4f400102aa3626bcf1dda6f8a703553f59f7, so this is not a new header. Still, it does not have any usages in Qt itself (except for the include in qglobal.h), and the influence of the user code should also be minimal, considering that Qt is built with QT_NO_FOREACH by default. [ChangeLog][QForeach][Potentially Source-Incompatible Changes] The qforeach.h header no longer includes qglobal.h. If you relied on the transitive include, you may have to include qglobal.h explicitly. Task-number: QTBUG-107046 Change-Id: I2588b2e774c456d926b6a63d0377e0a7991bf973 Reviewed-by: Marc Mutz <marc.mutz@qt.io>
-rw-r--r--src/corelib/global/qforeach.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/corelib/global/qforeach.h b/src/corelib/global/qforeach.h
index e8396c4fb0..228c128fa8 100644
--- a/src/corelib/global/qforeach.h
+++ b/src/corelib/global/qforeach.h
@@ -1,11 +1,12 @@
-// Copyright (C) 2020 The Qt Company Ltd.
+// Copyright (C) 2022 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 QFOREACH_H
#define QFOREACH_H
-#include <QtCore/qglobal.h>
+#include <QtCore/qtclasshelpermacros.h>
+#include <QtCore/qtconfigmacros.h>
#include <QtCore/qtdeprecationmarkers.h>
#include <QtCore/qttypetraits.h>