From 8951b628faefdb45eb6dc87186d02397e02b68f6 Mon Sep 17 00:00:00 2001
From: Rafael Roquetto <rafael.roquetto@kdab.com>
Date: Wed, 24 Dec 2014 19:42:20 -0200
Subject: 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>
---
 src/corelib/global/qglobal.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/corelib/global')

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.
-- 
cgit v1.2.3