AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

qglobal.h: remove __ASSEMBLER__ check

Browse Source 
__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>
This commit is contained in:
Marc Mutz 2022-12-06 07:39:30 +01:00
parent e4851fedd4
commit be36b6356a
1 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/corelib/global/qglobal.h
View File

@ -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 */