diff options
| author | Rafael Roquetto <rafael.roquetto@kdab.com> | 2014-12-24 19:42:20 -0200 |
|---|---|---|
| committer | Rafael Roquetto <rafael.roquetto@kdab.com> | 2014-12-31 18:21:51 +0100 |
| commit | 8951b628faefdb45eb6dc87186d02397e02b68f6 (patch) | |
| tree | 8a3a0645a92c9a576da20152257a750547820f82 /src/corelib/global | |
| parent | ca59365656e5af6faa5450ed9b33083828b52083 (diff) | |
QNX: Fix build.
Commit 99357e32a0e29c73ed721d6d31da66635e6586ca introduces a change that
causes <cstddef> to be included instead of <stddef.h> under QNX. That causes
symbols such as size_t to be placed on the std namespace only - QNX does not
put those in the global namespace, since it is not really required by the
standard, and therefore the build fails.
Merry Xmas!
Change-Id: I70c6976203a9d7beadd0076e122e2ac633a4ba69
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/global')
| -rw-r--r-- | src/corelib/global/qglobal.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h index e93bfbcc4a..cb0f66842c 100644 --- a/src/corelib/global/qglobal.h +++ b/src/corelib/global/qglobal.h @@ -37,10 +37,10 @@ #ifdef __cplusplus # include <cstddef> -#else -# include <stddef.h> #endif +#include <stddef.h> + #define QT_VERSION_STR "5.5.0" /* QT_VERSION is (major << 16) + (minor << 8) + patch. |