1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qglobal.h: fix build in assembler mode

Browse Source 
QT_CONFIG and some other macros are unavailable there.

Change-Id: Ia53158e207a94bf49489fffd14c8d306e2dbd9d2
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
This commit is contained in:
Thiago Macieira 2017-06-16 22:55:02 -07:00
parent 92cfa3dfa6
commit 919b12d969
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -46,8 +46,9 @@
# include <cstddef> # include <cstddef>
# include <utility> # include <utility>
#endif #endif
#ifndef __ASSEMBLER__
#include <stddef.h> # include <stddef.h>
#endif
/* /*
QT_VERSION is (major << 16) + (minor << 8) + patch. QT_VERSION is (major << 16) + (minor << 8) + patch.
@ -188,6 +189,7 @@ namespace QT_NAMESPACE {}
# define QT_LARGEFILE_SUPPORT 64 # define QT_LARGEFILE_SUPPORT 64
#endif #endif
#ifndef __ASSEMBLER__
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
/* /*
@ -1173,5 +1175,6 @@ QT_END_NAMESPACE
#include <QtCore/qversiontagging.h> #include <QtCore/qversiontagging.h>
#endif /* __cplusplus */ #endif /* __cplusplus */
#endif /* !__ASSEMBLER__ */
#endif /* QGLOBAL_H */ #endif /* QGLOBAL_H */