Remove obsolete native client platform

Change-Id: Ia27cfbb618d216c371a0f8210f0bec483d4f15db
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>

7 files changed, 5 insertions, 266 deletions

diff --git a/src/corelib/kernel/kernel.pri b/src/corelib/kernel/kernel.pri
index 0f158ba981..07ca3c12ae 100644
--- a/src/corelib/kernel/kernel.pri
+++ b/src/corelib/kernel/kernel.pri
@@ -111,10 +111,9 @@ mac {
         kernel/qcoreapplication_mac.cpp \
         kernel/qcore_foundation.mm \
         kernel/qcore_mac.mm \
+        kernel/qelapsedtimer_mac.cpp \
         kernel/qeventdispatcher_cf.mm
 
-    !nacl: SOURCES += kernel/qelapsedtimer_mac.cpp
-
     LIBS_PRIVATE += -framework Foundation
 
     osx: LIBS_PRIVATE += -framework CoreServices -framework AppKit -framework Security
@@ -130,19 +129,12 @@ mac {
     }
 }
 
-nacl {
-    SOURCES += \
-        kernel/qfunctions_nacl.cpp
-    HEADERS += \
-        kernel/qfunctions_nacl.h
-}
-
 unix|integrity {
     SOURCES += \
             kernel/qcore_unix.cpp \
             kernel/qeventdispatcher_unix.cpp \
             kernel/qtimerinfo_unix.cpp
-    !darwin|nacl: SOURCES += kernel/qelapsedtimer_unix.cpp
+    !darwin: SOURCES += kernel/qelapsedtimer_unix.cpp
 
     HEADERS += \
             kernel/qcore_unix_p.h \
diff --git a/src/corelib/kernel/qcore_unix_p.h b/src/corelib/kernel/qcore_unix_p.h
index 6ec7d28318..abe9bb3738 100644
--- a/src/corelib/kernel/qcore_unix_p.h
+++ b/src/corelib/kernel/qcore_unix_p.h
@@ -66,8 +66,7 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
-#ifdef Q_OS_NACL
-#elif !defined (Q_OS_VXWORKS)
+#if !defined (Q_OS_VXWORKS)
 # if !defined(Q_OS_HPUX) || defined(__ia64)
 #  include <sys/select.h>
 # endif
diff --git a/src/corelib/kernel/qeventdispatcher_unix.cpp b/src/corelib/kernel/qeventdispatcher_unix.cpp
index 0165ce9075..44da02781e 100644
--- a/src/corelib/kernel/qeventdispatcher_unix.cpp
+++ b/src/corelib/kernel/qeventdispatcher_unix.cpp
@@ -130,7 +130,7 @@ static void initThreadPipeFD(int fd)
 
 bool QThreadPipe::init()
 {
-#if defined(Q_OS_NACL) || defined(Q_OS_WASM)
+#if defined(Q_OS_WASM)
    // do nothing.
 #elif defined(Q_OS_VXWORKS)
     qsnprintf(name, sizeof(name), "/pipe/qt_%08x", int(taskIdSelf()));
diff --git a/src/corelib/kernel/qfunctions_nacl.cpp b/src/corelib/kernel/qfunctions_nacl.cpp
deleted file mode 100644
index 054ae94574..0000000000
--- a/src/corelib/kernel/qfunctions_nacl.cpp
+++ /dev/null
@@ -1,154 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtCore module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qfunctions_nacl.h"
-#include <pthread.h>
-#include <qglobal.h>
-
-/*
-    The purpose of this file is to stub out certain functions
-    that are not provided by the Native Client SDK. This is
-    done as an alterative to sprinkling the Qt sources with
-    NACL ifdefs.
-
-    There are two main classes of functions:
-
-    - Functions that are called but can have no effect:
-    For these we simply give an empty implementation
-
-    - Functions that are referenced in the source code, but
-    is not/must not be called at run-time:
-    These we either leave undefined or implement with a
-    qFatal.
-
-    This is a work in progress.
-*/
-
-extern "C" {
-
-void pthread_cleanup_push(void (*)(void *), void *)
-{
-
-}
-
-void pthread_cleanup_pop(int)
-{
-
-}
-
-int pthread_setcancelstate(int, int *)
-{
-    return 0;
-}
-
-int pthread_setcanceltype(int, int *)
-{
-    return 0;
-}
-
-void pthread_testcancel(void)
-{
-
-}
-
-
-int pthread_cancel(pthread_t)
-{
-    return 0;
-}
-
-int pthread_attr_setinheritsched(pthread_attr_t *,int)
-{
-    return 0;
-}
-
-
-int pthread_attr_getinheritsched(const pthread_attr_t *, int *)
-{
-    return 0;
-}
-
-// event dispatcher, select
-//struct fd_set;
-//struct timeval;
-
-int fcntl(int, int, ...)
-{
-    return 0;
-}
-
-int sigaction(int, const struct sigaction *, struct sigaction *)
-{
-    return 0;
-}
-
-int open(const char *, int, ...)
-{
-    return 0;
-}
-
-int open64(const char *, int, ...)
-{
-    return 0;
-}
-
-int access(const char *, int)
-{
-    return 0;
-}
-
-typedef long off64_t;
-off64_t ftello64(void *)
-{
-    qFatal("ftello64 called");
-    return 0;
-}
-
-off64_t lseek64(int, off_t, int)
-{
-    qFatal("lseek64 called");
-    return 0;
-}
-
-} // Extern C
-
-int select(int, fd_set *, fd_set *, fd_set *, struct timeval *)
-{
-    return 0;
-}
diff --git a/src/corelib/kernel/qfunctions_nacl.h b/src/corelib/kernel/qfunctions_nacl.h
deleted file mode 100644
index 15e415400a..0000000000
--- a/src/corelib/kernel/qfunctions_nacl.h
+++ /dev/null
@@ -1,92 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtCore module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QFUNCTIONS_NACL_H
-#define QFUNCTIONS_NACL_H
-
-#include <QtCore/qglobal.h>
-
-#ifdef Q_OS_NACL
-
-#include <sys/types.h>
-
-// pthread
-#include <pthread.h>
-#define PTHREAD_CANCEL_DISABLE 1
-#define PTHREAD_CANCEL_ENABLE 2
-#define PTHREAD_INHERIT_SCHED 3
-
-QT_BEGIN_NAMESPACE
-
-
-extern "C" {
-
-void pthread_cleanup_push(void (*handler)(void *), void *arg);
-void pthread_cleanup_pop(int execute);
-
-int pthread_setcancelstate(int state, int *oldstate);
-int pthread_setcanceltype(int type, int *oldtype);
-void pthread_testcancel(void);
-int pthread_cancel(pthread_t thread);
-
-int pthread_attr_setinheritsched(pthread_attr_t *attr,
-    int inheritsched);
-int pthread_attr_getinheritsched(const pthread_attr_t *attr,
-    int *inheritsched);
-
-// event dispatcher, select
-//struct fd_set;
-//struct timeval;
-int fcntl(int fildes, int cmd, ...);
-int sigaction(int sig, const struct sigaction * act, struct sigaction * oact);
-
-typedef long off64_t;
-off64_t ftello64(void *stream);
-off64_t lseek64(int fildes, off_t offset, int whence);
-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
-
-#endif //Q_OS_NACL
-
-#endif //QFUNCTIONS_NACL_H
diff --git a/src/corelib/kernel/qfunctions_p.h b/src/corelib/kernel/qfunctions_p.h
index 6744146aa8..8347dcca01 100644
--- a/src/corelib/kernel/qfunctions_p.h
+++ b/src/corelib/kernel/qfunctions_p.h
@@ -55,8 +55,6 @@
 
 #if defined(Q_OS_VXWORKS)
 #  include "QtCore/qfunctions_vxworks.h"
-#elif defined(Q_OS_NACL)
-#  include "QtCore/qfunctions_nacl.h"
 #endif
 
 #endif
diff --git a/src/corelib/kernel/qtimerinfo_unix.cpp b/src/corelib/kernel/qtimerinfo_unix.cpp
index af880ef522..10c5f04839 100644
--- a/src/corelib/kernel/qtimerinfo_unix.cpp
+++ b/src/corelib/kernel/qtimerinfo_unix.cpp
@@ -64,7 +64,7 @@ Q_CORE_EXPORT bool qt_disable_lowpriority_timers=false;
 
 QTimerInfoList::QTimerInfoList()
 {
-#if (_POSIX_MONOTONIC_CLOCK-0 <= 0) && !defined(Q_OS_MAC) && !defined(Q_OS_NACL)
+#if (_POSIX_MONOTONIC_CLOCK-0 <= 0) && !defined(Q_OS_MAC)
     if (!QElapsedTimer::isMonotonic()) {
         // not using monotonic timers, initialize the timeChanged() machinery
         previousTime = qt_gettime();
@@ -115,10 +115,6 @@ timespec qAbsTimespec(const timespec &t)
 */
 bool QTimerInfoList::timeChanged(timespec *delta)
 {
-#ifdef Q_OS_NACL
-    Q_UNUSED(delta);
-    return false; // Calling "times" crashes.
-#endif
     struct tms unused;
     clock_t currentTicks = times(&unused);