summaryrefslogtreecommitdiffstats
path: root/src/corelib/global
diff options
context:
space:
mode:
authorPaul Olav Tvete <paul.tvete@nokia.com>2010-08-26 12:27:29 (GMT)
committerPaul Olav Tvete <paul.tvete@nokia.com>2010-08-26 12:27:29 (GMT)
commit6de6d4d51f538150e64de35f0bcee0ff20a86261 (patch)
treeb6048e526373efb9e4cfb2547588f790d3bea977 /src/corelib/global
parent55123a9b94eb38a372a2d285b25c58085921f233 (diff)
parenteb9d1bb05ca32af2658ad38ea731c9ddf17a4954 (diff)
downloadQt-6de6d4d51f538150e64de35f0bcee0ff20a86261.zip
Qt-6de6d4d51f538150e64de35f0bcee0ff20a86261.tar.gz
Qt-6de6d4d51f538150e64de35f0bcee0ff20a86261.tar.bz2
Merge remote branch 'lighthouse/4.7' into lighthouse-master
Conflicts: src/opengl/qgl_p.h
Diffstat (limited to 'src/corelib/global')
-rw-r--r--src/corelib/global/qglobal.h2
-rw-r--r--src/corelib/global/qnaclunimplemented.h8
2 files changed, 9 insertions, 1 deletions
diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h
index 81271db..e154566 100644
--- a/src/corelib/global/qglobal.h
+++ b/src/corelib/global/qglobal.h
@@ -2615,7 +2615,7 @@ QT_LICENSED_MODULE(DBus)
#endif
#ifdef Q_OS_NACL
-#include <qnaclunimplemented.h>
+#include <QtCore/qnaclunimplemented.h>
#endif
QT_END_NAMESPACE
diff --git a/src/corelib/global/qnaclunimplemented.h b/src/corelib/global/qnaclunimplemented.h
index 84085b5..ba43915 100644
--- a/src/corelib/global/qnaclunimplemented.h
+++ b/src/corelib/global/qnaclunimplemented.h
@@ -50,6 +50,10 @@
#define PTHREAD_CANCEL_ENABLE 2
#define PTHREAD_INHERIT_SCHED 3
+QT_BEGIN_HEADER
+
+QT_BEGIN_NAMESPACE
+
extern "C" {
void pthread_cleanup_push(void (*handler)(void *), void *arg);
@@ -80,6 +84,10 @@ int open64(const char *path, int oflag, ...);
int select(int nfds, fd_set * readfds, fd_set * writefds, fd_set * errorfds, struct timeval * timeout);
+QT_END_NAMESPACE
+
+QT_END_HEADER
+
#endif //Q_OS_NACL
#endif //QNACLUNIMPLEMENTED_H