Rename qnaclunimplemented -> qfunctions_nacl

(Match the existing files for wince and vxworks.)

8 files changed, 14 insertions, 9 deletions

diff --git a/mkspecs/qws/linux-nacl-g++/qplatformdefs.h b/mkspecs/qws/linux-nacl-g++/qplatformdefs.h
index 70572bf..ec8ca8f 100644
--- a/mkspecs/qws/linux-nacl-g++/qplatformdefs.h
+++ b/mkspecs/qws/linux-nacl-g++/qplatformdefs.h
@@ -59,6 +59,8 @@
 #define PATH_MAX 256
 
 #include "../../common/posix/qplatformdefs.h"
+#include "qfunctions_nacl.h"
+#include <pthread.h>
 
 #undef QT_LSTAT
 #define QT_LSTAT                QT_STAT
diff --git a/mkspecs/qws/macx-nacl-g++/qplatformdefs.h b/mkspecs/qws/macx-nacl-g++/qplatformdefs.h
index f893238..05b133f 100644
--- a/mkspecs/qws/macx-nacl-g++/qplatformdefs.h
+++ b/mkspecs/qws/macx-nacl-g++/qplatformdefs.h
@@ -58,6 +58,8 @@
 #define PATH_MAX 256
 
 #include "../../common/posix/qplatformdefs.h"
+#include "qfunctions_nacl.h"
+#include <pthread.h>
 
 #undef QT_LSTAT
 #define QT_LSTAT                QT_STAT
diff --git a/src/corelib/global/global.pri b/src/corelib/global/global.pri
index 83caa96..d80706a 100644
--- a/src/corelib/global/global.pri
+++ b/src/corelib/global/global.pri
@@ -13,10 +13,6 @@ SOURCES += \
 	global/qmalloc.cpp \
         global/qnumeric.cpp
 
-nacl {
-    SOURCES += global/qnaclunimplemented.cpp
-}
-
 # qlibraryinfo.cpp includes qconfig.cpp
 INCLUDEPATH += $$QT_BUILD_TREE/src/corelib/global
 
diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h
index 1879537..0bcaeb5 100644
--- a/src/corelib/global/qglobal.h
+++ b/src/corelib/global/qglobal.h
@@ -2714,10 +2714,6 @@ QT_LICENSED_MODULE(DBus)
 #  define QT_NO_PROCESS
 #endif
 
-#ifdef Q_OS_NACL
-#include <QtCore/qnaclunimplemented.h>
-#endif
-
 #if defined (__ELF__)
 #  if defined (Q_OS_LINUX) || defined (Q_OS_SOLARIS) || defined (Q_OS_FREEBSD) || defined (Q_OS_OPENBSD) || defined (Q_OS_IRIX)
 #    define Q_OF_ELF
diff --git a/src/corelib/kernel/kernel.pri b/src/corelib/kernel/kernel.pri
index c3a6721..a3628b1 100644
--- a/src/corelib/kernel/kernel.pri
+++ b/src/corelib/kernel/kernel.pri
@@ -90,6 +90,13 @@ mac:!nacl {
                 kernel/qcore_mac.cpp
 }
 
+nacl {
+    SOURCES += \
+        kernel/qfunctions_nacl.cpp
+    HEADERS += \
+        kernel/qfunctions_nacl.h
+}
+
 unix:!symbian {
         SOURCES += \
                 kernel/qcore_unix.cpp \
diff --git a/src/corelib/global/qnaclunimplemented.cpp b/src/corelib/kernel/qfunctions_nacl.cpp
index 1a89b8df..bc14cf0 100644
--- a/src/corelib/global/qnaclunimplemented.cpp
+++ b/src/corelib/kernel/qfunctions_nacl.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include "qnaclunimplemented.h"
+#include "qfunctions_nacl.h"
 #include <pthread.h>
 #include <qglobal.h>
 
diff --git a/src/corelib/global/qnaclunimplemented.h b/src/corelib/kernel/qfunctions_nacl.h
index 921667e..921667e 100644
--- a/src/corelib/global/qnaclunimplemented.h
+++ b/src/corelib/kernel/qfunctions_nacl.h
diff --git a/src/corelib/kernel/qfunctions_p.h b/src/corelib/kernel/qfunctions_p.h
index 3d41c0c..d27fec3 100644
--- a/src/corelib/kernel/qfunctions_p.h
+++ b/src/corelib/kernel/qfunctions_p.h
@@ -59,6 +59,8 @@
 #  include "QtCore/qfunctions_wince.h"
 #elif defined(Q_OS_VXWORKS)
 #  include "QtCore/qfunctions_vxworks.h"
+#elif defined(Q_OS_NACL)
+#  include "QtCore/qfunctions_nacl.h"
 #endif
 
 #ifdef Q_CC_RVCT