diff options
| author | Ivan Solovev <ivan.solovev@qt.io> | 2022-10-05 14:39:41 +0200 |
|---|---|---|
| committer | Ivan Solovev <ivan.solovev@qt.io> | 2022-10-06 14:26:25 +0200 |
| commit | 9d1e9285129b4c65c978c806bb839798ace61a60 (patch) | |
| tree | ddf5ab4cf2f18857e357a83866481e0df89d1648 /cmake | |
| parent | f03f830e711ead302fa48ba67dc101a9a834d260 (diff) | |
Do not include qglobal.h into the new headers
Several new headers were extracted from qglobal.h in scope of
QTBUG-99313. This commit makes sure that none of them actually includes
qglobal.h.
As those files are new, it should be safe to introduce this change, as
it shouldn't have any impact on the user code.
This patch also modifies the autogenerated module exports header to
include qglobal.h before the include guard. This is needed to prevent
circular dependencies which result in Q_<MODULE>_EXPORT being
undefined.
Task-number: QTBUG-107046
Change-Id: I8d998792fd8129173d9ec811557e7d7604282813
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/modulecppexports.h.in | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cmake/modulecppexports.h.in b/cmake/modulecppexports.h.in index f4e976b540..725d9d79f1 100644 --- a/cmake/modulecppexports.h.in +++ b/cmake/modulecppexports.h.in @@ -1,11 +1,11 @@ // 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 +#include <QtCore/qglobal.h> + #ifndef @header_base_name_upper@_H #define @header_base_name_upper@_H -#include <QtCore/qglobal.h> - #if defined(QT_SHARED) || !defined(QT_STATIC) # if defined(QT_BUILD_@module_define_infix@_LIB) # define Q_@module_define_infix@_EXPORT Q_DECL_EXPORT |