diff options
| author | Marc Mutz <marc.mutz@qt.io> | 2022-12-06 07:39:30 +0100 |
|---|---|---|
| committer | Marc Mutz <marc.mutz@qt.io> | 2022-12-08 05:08:24 +0100 |
| commit | be36b6356ad718f9618012f25f8f26361c69bdcb (patch) | |
| tree | 96cce0d6ae97f74cd28412fffe3fd976df2e5b51 /src/corelib/global/qglobal.h | |
| parent | e4851fedd429cfe00de061e81596856fdd22d2c8 (diff) | |
qglobal.h: remove __ASSEMBLER__ check
__ASSEMBLER__ and __cplusplus cannot both be defined at the same time,
so it suffices to check just one of them. Thanks to Thiago for
noticing.
Change-Id: I92e43d1a1c551ee48c51490b2878bb0c84bfb36f
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/global/qglobal.h')
| -rw-r--r-- | src/corelib/global/qglobal.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h index fe3403fc60..3a9d40a068 100644 --- a/src/corelib/global/qglobal.h +++ b/src/corelib/global/qglobal.h @@ -39,7 +39,6 @@ #include <QtCore/qtversion.h> -#ifndef __ASSEMBLER__ #if defined(__cplusplus) // We need to keep QTypeInfo, QSysInfo, QFlags, qDebug & family in qglobal.h for compatibility with Qt 4. @@ -70,6 +69,5 @@ #include <QtCore/qversiontagging.h> #endif /* __cplusplus */ -#endif /* !__ASSEMBLER__ */ #endif /* QGLOBAL_H */ |