diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2017-06-16 22:55:02 -0700 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@intel.com> | 2017-06-30 17:15:51 +0000 |
| commit | 919b12d969ded1d004f0ba2f7bf303c034bdd204 (patch) | |
| tree | 110ce2f7a15a00b77fc1b2bcaf60d797f0a83f86 /src/corelib | |
| parent | 92cfa3dfa638b193bf9d754dc24016f9ddb74d0d (diff) | |
qglobal.h: fix build in assembler mode
QT_CONFIG and some other macros are unavailable there.
Change-Id: Ia53158e207a94bf49489fffd14c8d306e2dbd9d2
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/global/qglobal.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h index 0628b524fb..dccbe52ab3 100644 --- a/src/corelib/global/qglobal.h +++ b/src/corelib/global/qglobal.h @@ -46,8 +46,9 @@ # include <cstddef> # include <utility> #endif - -#include <stddef.h> +#ifndef __ASSEMBLER__ +# include <stddef.h> +#endif /* QT_VERSION is (major << 16) + (minor << 8) + patch. @@ -188,6 +189,7 @@ namespace QT_NAMESPACE {} # define QT_LARGEFILE_SUPPORT 64 #endif +#ifndef __ASSEMBLER__ QT_BEGIN_NAMESPACE /* @@ -1173,5 +1175,6 @@ QT_END_NAMESPACE #include <QtCore/qversiontagging.h> #endif /* __cplusplus */ +#endif /* !__ASSEMBLER__ */ #endif /* QGLOBAL_H */ |