Remove remnants of Qt for Native Client (NACL)

The project has been superseded by Qt for WebAssembly and was
never supported in Qt 6.

Pick-to: 6.6 6.5
Change-Id: I36682cfe3ce6adac76a307b0faba97dcb7c655cc
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>

18 files changed, 16 insertions, 123 deletions

diff --git a/cmake/QtPlatformSupport.cmake b/cmake/QtPlatformSupport.cmake
index 16a5a1fe0a..e20a5e153d 100644
--- a/cmake/QtPlatformSupport.cmake
+++ b/cmake/QtPlatformSupport.cmake
@@ -12,7 +12,6 @@ endfunction()
 qt_set01(LINUX CMAKE_SYSTEM_NAME STREQUAL "Linux")
 qt_set01(HPUX CMAKE_SYSTEM_NAME STREQUAL "HPUX")
 qt_set01(ANDROID CMAKE_SYSTEM_NAME STREQUAL "Android")  # FIXME: How to identify this?
-qt_set01(NACL CMAKE_SYSTEM_NAME STREQUAL "NaCl") # FIXME: How to identify this?
 qt_set01(INTEGRITY CMAKE_SYSTEM_NAME STREQUAL "Integrity") # FIXME: How to identify this?
 qt_set01(VXWORKS CMAKE_SYSTEM_NAME STREQUAL "VxWorks") # FIXME: How to identify this?
 qt_set01(QNX CMAKE_SYSTEM_NAME STREQUAL "QNX") # FIXME: How to identify this?
diff --git a/mkspecs/common/nacl/g++-nacl32.conf b/mkspecs/common/nacl/g++-nacl32.conf
deleted file mode 100644
index 319d3ca475..0000000000
--- a/mkspecs/common/nacl/g++-nacl32.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-
-# 32-bit x86 nacl configuration.
-
-QMAKE_CC                = i686-nacl-gcc
-QMAKE_CXX               = i686-nacl-g++
-QMAKE_LINK              = i686-nacl-g++
-QMAKE_LINK_SHLIB        = i686-nacl-g++
-QMAKE_AR                = i686-nacl-ar q
-QMAKE_OBJCOPY           = i686-nacl-objcopy
-QMAKE_NM                = i686-nacl-nm -P
-QMAKE_STRIP             = i686-nacl-strip
-
diff --git a/mkspecs/common/nacl/g++-nacl64.conf b/mkspecs/common/nacl/g++-nacl64.conf
deleted file mode 100644
index 8a20535775..0000000000
--- a/mkspecs/common/nacl/g++-nacl64.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-
-# 32-bit x86 nacl configuration.
-
-QMAKE_CC                = x86_64-nacl-gcc
-QMAKE_CXX               = x86_64-nacl-g++
-QMAKE_LINK              = x86_64-nacl-g++
-QMAKE_LINK_SHLIB        = x86_64-nacl-g++
-QMAKE_AR                = x86_64-nacl-ar q
-QMAKE_OBJCOPY           = x86_64-nacl-objcopy
-QMAKE_NM                = x86_64-nacl-nm -P
-QMAKE_STRIP             = x86_64-nacl-strip
-
diff --git a/mkspecs/common/nacl/nacl-base.conf b/mkspecs/common/nacl/nacl-base.conf
deleted file mode 100644
index d94c5c96d7..0000000000
--- a/mkspecs/common/nacl/nacl-base.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-QMAKE_PLATFORM          = nacl $$QMAKE_PLATFORM
-
-# Work around linker crash when using PIC. We are building
-# statically so this is safe.
-QMAKE_CFLAGS_STATIC_LIB -= -fPIC
-QMAKE_CFLAGS_SHLIB     -= -fPIC
-QMAKE_CXXFLAGS_STATIC_LIB -= -fPIC
-QMAKE_CXXFLAGS_SHLIB   -= -fPIC
-
-QMAKE_LIBS_DYNLOAD     -= -ldl
-QMAKE_LIBS_OPENGL_ES2   = -lppapi_gles2
diff --git a/mkspecs/common/nacl/qplatformdefs.h b/mkspecs/common/nacl/qplatformdefs.h
deleted file mode 100644
index dda5baaf90..0000000000
--- a/mkspecs/common/nacl/qplatformdefs.h
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright (C) 2016 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
-#define _POSIX_TIMERS
-
-#include "qglobal.h"
-
-// extra disabling.
-#ifdef __native_client__
-#define QT_NO_FSFILEENGINE
-#endif
-
-#define QT_NO_SOCKET_H
-
-#define DIR void *
-#define PATH_MAX 256
-
-#include "qfunctions_nacl.h"
-#include <pthread.h>
diff --git a/mkspecs/unsupported/nacl-g++/qmake.conf b/mkspecs/unsupported/nacl-g++/qmake.conf
deleted file mode 100644
index 581422fcf1..0000000000
--- a/mkspecs/unsupported/nacl-g++/qmake.conf
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-# qmake configuration for building with nacl-g++
-#
-
-include(../../common/linux.conf)
-include(../../common/qws.conf)
-include(../../common/gcc-base-unix.conf)
-include(../../common/g++-unix.conf)
-include(../../common/nacl/nacl-base.conf)
-include(../../common/nacl/g++-nacl32.conf)
-
-
-load(qt_config)
diff --git a/mkspecs/unsupported/nacl-g++/qplatformdefs.h b/mkspecs/unsupported/nacl-g++/qplatformdefs.h
deleted file mode 100644
index a207b74c6b..0000000000
--- a/mkspecs/unsupported/nacl-g++/qplatformdefs.h
+++ /dev/null
@@ -1,9 +0,0 @@
-// Copyright (C) 2016 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
-#ifndef QPLATFORMDEFS_H
-#define QPLATFORMDEFS_H
-
-#include "../../common/nacl/qplatformdefs.h"
-#include "../../common/posix/qplatformdefs.h"
-
-#endif // QPLATFORMDEFS_H
diff --git a/mkspecs/unsupported/nacl64-g++/qmake.conf b/mkspecs/unsupported/nacl64-g++/qmake.conf
deleted file mode 100644
index fcef45faec..0000000000
--- a/mkspecs/unsupported/nacl64-g++/qmake.conf
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-# qmake configuration for building with nacl-g++
-#
-
-include(../../common/linux.conf)
-include(../../common/qws.conf)
-include(../../common/gcc-base-unix.conf)
-include(../../common/g++-unix.conf)
-include(../../common/nacl/nacl64-base.conf)
-include(../../common/nacl/g++-nacl64.conf)
-
-
-load(qt_config)
diff --git a/mkspecs/unsupported/nacl64-g++/qplatformdefs.h b/mkspecs/unsupported/nacl64-g++/qplatformdefs.h
deleted file mode 100644
index a207b74c6b..0000000000
--- a/mkspecs/unsupported/nacl64-g++/qplatformdefs.h
+++ /dev/null
@@ -1,9 +0,0 @@
-// Copyright (C) 2016 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
-#ifndef QPLATFORMDEFS_H
-#define QPLATFORMDEFS_H
-
-#include "../../common/nacl/qplatformdefs.h"
-#include "../../common/posix/qplatformdefs.h"
-
-#endif // QPLATFORMDEFS_H
diff --git a/src/corelib/CMakeLists.txt b/src/corelib/CMakeLists.txt
index 8578afc61d..f17051cf33 100644
--- a/src/corelib/CMakeLists.txt
+++ b/src/corelib/CMakeLists.txt
@@ -790,12 +790,12 @@ qt_internal_extend_target(Core CONDITION UNIX AND NOT HAIKU AND NOT INTEGRITY AN
         m
 )
 
-qt_internal_extend_target(Core CONDITION APPLE AND NOT NACL
+qt_internal_extend_target(Core CONDITION APPLE
     SOURCES
         text/qlocale_mac.mm
 )
 
-qt_internal_extend_target(Core CONDITION UNIX AND (NACL OR NOT APPLE)
+qt_internal_extend_target(Core CONDITION UNIX AND NOT APPLE
     SOURCES
         text/qlocale_unix.cpp
 )
@@ -869,32 +869,32 @@ qt_internal_extend_target(Core CONDITION QT_FEATURE_timezone
         time/qtimezoneprivate_data_p.h
 )
 
-qt_internal_extend_target(Core CONDITION APPLE AND QT_FEATURE_timezone AND NOT NACL
+qt_internal_extend_target(Core CONDITION APPLE AND QT_FEATURE_timezone
     SOURCES
         time/qtimezoneprivate_mac.mm
 )
 
-qt_internal_extend_target(Core CONDITION QT_FEATURE_timezone AND ANDROID AND (NACL OR NOT APPLE)
+qt_internal_extend_target(Core CONDITION QT_FEATURE_timezone AND ANDROID AND NOT APPLE
     SOURCES
         time/qtimezoneprivate_android.cpp
 )
 
-qt_internal_extend_target(Core CONDITION QT_FEATURE_timezone AND UNIX AND NOT ANDROID AND (NACL OR NOT APPLE)
+qt_internal_extend_target(Core CONDITION QT_FEATURE_timezone AND UNIX AND NOT ANDROID AND NOT APPLE
     SOURCES
         time/qtimezoneprivate_tz.cpp
 )
 
-qt_internal_extend_target(Core CONDITION QT_FEATURE_icu AND QT_FEATURE_timezone AND UNIX AND NOT ANDROID AND (NACL OR NOT APPLE)
+qt_internal_extend_target(Core CONDITION QT_FEATURE_icu AND QT_FEATURE_timezone AND UNIX AND NOT ANDROID AND NOT APPLE
     SOURCES
         time/qtimezoneprivate_icu.cpp
 )
 
-qt_internal_extend_target(Core CONDITION QT_FEATURE_icu AND QT_FEATURE_timezone AND WIN32 AND NOT ANDROID AND (NACL OR NOT APPLE)
+qt_internal_extend_target(Core CONDITION QT_FEATURE_icu AND QT_FEATURE_timezone AND WIN32 AND NOT ANDROID AND NOT APPLE
     SOURCES
         time/qtimezoneprivate_icu.cpp
 )
 
-qt_internal_extend_target(Core CONDITION QT_FEATURE_timezone AND WIN32 AND NOT QT_FEATURE_icu AND NOT ANDROID AND (NACL OR NOT APPLE)
+qt_internal_extend_target(Core CONDITION QT_FEATURE_timezone AND WIN32 AND NOT QT_FEATURE_icu AND NOT ANDROID AND NOT APPLE
     SOURCES
         time/qtimezoneprivate_win.cpp
 )
@@ -960,7 +960,7 @@ qt_internal_extend_target(Core CONDITION QT_FEATURE_settings AND WIN32
         io/qsettings_win.cpp
 )
 
-qt_internal_extend_target(Core CONDITION APPLE AND QT_FEATURE_settings AND NOT NACL
+qt_internal_extend_target(Core CONDITION APPLE AND QT_FEATURE_settings
     SOURCES
         io/qsettings_mac.cpp
 )
diff --git a/src/corelib/configure.cmake b/src/corelib/configure.cmake
index d1f7028d23..111b710460 100644
--- a/src/corelib/configure.cmake
+++ b/src/corelib/configure.cmake
@@ -685,7 +685,7 @@ qt_feature("library" PUBLIC
     SECTION "File I/O"
     LABEL "QLibrary"
     PURPOSE "Provides a wrapper for dynamically loaded libraries."
-    CONDITION WIN32 OR HPUX OR ( NOT NACL AND QT_FEATURE_dlopen )
+    CONDITION WIN32 OR HPUX OR QT_FEATURE_dlopen
 )
 qt_feature_definition("library" "QT_NO_LIBRARY" NEGATE VALUE "1")
 qt_feature("settings" PUBLIC
diff --git a/src/corelib/global/qsimd.cpp b/src/corelib/global/qsimd.cpp
index 7985283d15..a8e99b0df8 100644
--- a/src/corelib/global/qsimd.cpp
+++ b/src/corelib/global/qsimd.cpp
@@ -103,12 +103,7 @@ static const int features_indices[] = { 0 };
 #endif
 // end generated
 
-#if defined (Q_OS_NACL)
-static inline uint detectProcessorFeatures()
-{
-    return 0;
-}
-#elif defined(Q_PROCESSOR_ARM)
+#if defined(Q_PROCESSOR_ARM)
 static inline quint64 detectProcessorFeatures()
 {
     quint64 features = 0;
@@ -766,7 +761,7 @@ QT_FUNCTION_TARGET(RDRND) qsizetype qRandomCpu(void *buffer, qsizetype count) no
     ptr = qt_random_rdrnd(ptr, end);
     return ptr - reinterpret_cast<unsigned *>(buffer);
 }
-#elif defined(Q_PROCESSOR_X86) && !defined(Q_OS_NACL) && !defined(Q_PROCESSOR_ARM)
+#elif defined(Q_PROCESSOR_X86) && !defined(Q_PROCESSOR_ARM)
 static bool checkRdrndWorks() noexcept { return false; }
 #endif // Q_PROCESSOR_X86 && RDRND
 
diff --git a/src/corelib/global/qsystemdetection.h b/src/corelib/global/qsystemdetection.h
index 74ff3fea9b..cc78443af7 100644
--- a/src/corelib/global/qsystemdetection.h
+++ b/src/corelib/global/qsystemdetection.h
@@ -90,8 +90,6 @@
 #  define Q_OS_SOLARIS
 #elif defined(hpux) || defined(__hpux)
 #  define Q_OS_HPUX
-#elif defined(__native_client__)
-#  define Q_OS_NACL
 #elif defined(__EMSCRIPTEN__)
 #  define Q_OS_WASM
 #elif defined(__linux__) || defined(__linux)
diff --git a/src/corelib/io/qresource.cpp b/src/corelib/io/qresource.cpp
index 5639491125..1bdcf246be 100644
--- a/src/corelib/io/qresource.cpp
+++ b/src/corelib/io/qresource.cpp
@@ -33,7 +33,7 @@
 #  include <zstd.h>
 #endif
 
-#if defined(Q_OS_UNIX) && !defined(Q_OS_NACL) && !defined(Q_OS_INTEGRITY)
+#if defined(Q_OS_UNIX) && !defined(Q_OS_INTEGRITY)
 #  define QT_USE_MMAP
 #  include <sys/mman.h>
 #endif
diff --git a/src/corelib/kernel/qtranslator.cpp b/src/corelib/kernel/qtranslator.cpp
index b4fe045052..8ae35f5ef2 100644
--- a/src/corelib/kernel/qtranslator.cpp
+++ b/src/corelib/kernel/qtranslator.cpp
@@ -22,7 +22,7 @@
 #include "qendian.h"
 #include "qresource.h"
 
-#if defined(Q_OS_UNIX) && !defined(Q_OS_NACL) && !defined(Q_OS_INTEGRITY)
+#if defined(Q_OS_UNIX) && !defined(Q_OS_INTEGRITY)
 #  define QT_USE_MMAP
 #  include "private/qcore_unix_p.h"
 // for mmap
diff --git a/src/corelib/mimetypes/qmimedatabase.cpp b/src/corelib/mimetypes/qmimedatabase.cpp
index 96bcb24902..a982872ea5 100644
--- a/src/corelib/mimetypes/qmimedatabase.cpp
+++ b/src/corelib/mimetypes/qmimedatabase.cpp
@@ -74,7 +74,7 @@ static QStringList locateMimeDirectories()
     return QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, QStringLiteral("mime"), QStandardPaths::LocateDirectory);
 }
 
-#if defined(Q_OS_UNIX) && !defined(Q_OS_NACL) && !defined(Q_OS_INTEGRITY)
+#if defined(Q_OS_UNIX) && !defined(Q_OS_INTEGRITY)
 #  define QT_USE_MMAP
 #endif
 
diff --git a/tests/shared/localechange.h b/tests/shared/localechange.h
index 0e27fd297b..b2fd1d5e52 100644
--- a/tests/shared/localechange.h
+++ b/tests/shared/localechange.h
@@ -27,8 +27,7 @@ namespace QTestLocaleChange {
         const int m_category;
         const QByteArray m_prior;
         const bool m_didSet;
-#if !defined(QT_NO_SYSTEMLOCALE) && defined(Q_OS_UNIX) \
-    && (!defined(Q_OS_DARWIN) || defined(Q_OS_NACL))
+#if !defined(QT_NO_SYSTEMLOCALE) && defined(Q_OS_UNIX) && !defined(Q_OS_DARWIN)
 #define TRANSIENT_ENV
         // Unix system locale consults environment variables, so we need to set
         // the appropriate one, too.
diff --git a/util/cmake/helper.py b/util/cmake/helper.py
index 2ace22c26c..3e9f4d73b2 100644
--- a/util/cmake/helper.py
+++ b/util/cmake/helper.py
@@ -679,7 +679,6 @@ platform_mapping = {
     "qnx": "QNX",
     "vxworks": "VXWORKS",
     "hpux": "HPUX",
-    "nacl": "NACL",
     "android": "ANDROID",
     "uikit": "UIKIT",
     "tvos": "TVOS",