Merge remote-tracking branch 'origin/5.9' into dev

Conflicts:
	src/network/access/qnetworkreply.cpp
	tests/auto/corelib/kernel/qmetaobject/tst_qmetaobject.cpp

Change-Id: Iadf766269454087e69fb216fc3857d85b0ddfaad

55 files changed, 64 insertions, 3713 deletions

diff --git a/mkspecs/aix-xlc-64/qmake.conf b/mkspecs/aix-xlc-64/qmake.conf
deleted file mode 100644
index 1aea8d81c5..0000000000
--- a/mkspecs/aix-xlc-64/qmake.conf
+++ /dev/null
@@ -1,71 +0,0 @@
-#
-# qmake configuration for aix-xlc
-#
-
-MAKEFILE_GENERATOR      = UNIX
-QMAKE_PLATFORM          = aix
-
-include(../common/unix.conf)
-
-QMAKE_COMPILER          = ibm_xlc
-
-QMAKE_CC                = xlc
-QMAKE_CC_THREAD         = xlc_r
-QMAKE_LEX               = flex
-QMAKE_LEXFLAGS          =
-QMAKE_YACC              = yacc
-QMAKE_YACCFLAGS         = -d
-QMAKE_CFLAGS            = -qstrict -q64
-QMAKE_CFLAGS_WARN_ON    =
-QMAKE_CFLAGS_WARN_OFF   =
-QMAKE_CFLAGS_RELEASE    = -O3
-QMAKE_CFLAGS_DEBUG      = -g
-QMAKE_CFLAGS_SHLIB      =
-QMAKE_CFLAGS_STATIC_LIB = $$QMAKE_CFLAGS_SHLIB
-QMAKE_CFLAGS_YACC       =
-QMAKE_CFLAGS_THREAD     = -qthreaded -qtls
-
-QMAKE_CXX               = xlC
-QMAKE_CXX_THREAD        = xlC_r
-QMAKE_CXXFLAGS          = -+ $$QMAKE_CFLAGS
-QMAKE_CXXFLAGS_WARN_ON  = $$QMAKE_CFLAGS_WARN_ON
-QMAKE_CXXFLAGS_WARN_OFF = $$QMAKE_CFLAGS_WARN_OFF
-QMAKE_CXXFLAGS_RELEASE  = $$QMAKE_CFLAGS_RELEASE
-QMAKE_CXXFLAGS_DEBUG    = $$QMAKE_CFLAGS_DEBUG
-QMAKE_CXXFLAGS_SHLIB    = $$QMAKE_CFLAGS_SHLIB
-QMAKE_CXXFLAGS_STATIC_LIB = $$QMAKE_CFLAGS_STATIC_LIB
-QMAKE_CXXFLAGS_YACC     = $$QMAKE_CFLAGS_YACC
-QMAKE_CXXFLAGS_THREAD   = $$QMAKE_CFLAGS_THREAD
-QMAKE_COMPILER_DEFINES += __xlC__
-
-QMAKE_INCDIR            =
-QMAKE_LIBDIR            =
-QMAKE_INCDIR_X11        =
-QMAKE_LIBDIR_X11        =
-QMAKE_INCDIR_OPENGL     =
-QMAKE_LIBDIR_OPENGL     =
-
-QMAKE_LINK              = xlC
-QMAKE_LINK_THREAD       = xlC_r
-QMAKE_LINK_SHLIB        = ld
-QMAKE_LFLAGS            = -q64 -bbigtoc
-QMAKE_LFLAGS_RELEASE    =
-QMAKE_LFLAGS_DEBUG      =
-QMAKE_LFLAGS_SHLIB      = -qmkshrobj
-QMAKE_LFLAGS_PLUGIN     = $$QMAKE_LFLAGS_SHLIB
-QMAKE_LFLAGS_SONAME     =
-QMAKE_LFLAGS_THREAD     = -L/usr/lib/threads
-QMAKE_AIX_SHLIB         = 1
-
-QMAKE_LIBS              =
-QMAKE_LIBS_DYNLOAD      = -ldl
-QMAKE_LIBS_X11          = -lXext -lX11 -lm
-QMAKE_LIBS_OPENGL       = -lGL
-QMAKE_LIBS_THREAD       = -lpthreads
-
-QMAKE_AR                = ar -X64 cq
-QMAKE_OBJCOPY           = objcopy
-QMAKE_NM                = nm -P
-QMAKE_RANLIB            = ranlib -X64
-
-load(qt_config)
diff --git a/mkspecs/aix-xlc-64/qplatformdefs.h b/mkspecs/aix-xlc-64/qplatformdefs.h
deleted file mode 100644
index 8737517a79..0000000000
--- a/mkspecs/aix-xlc-64/qplatformdefs.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the qmake spec 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 QPLATFORMDEFS_H
-#define QPLATFORMDEFS_H
-
-#include "../common/aix/qplatformdefs.h"
-
-#endif // QPLATFORMDEFS_H
diff --git a/mkspecs/aix-xlc/qmake.conf b/mkspecs/aix-xlc/qmake.conf
deleted file mode 100644
index c765d4ff6b..0000000000
--- a/mkspecs/aix-xlc/qmake.conf
+++ /dev/null
@@ -1,74 +0,0 @@
-#
-# qmake configuration for aix-xlc
-#
-
-MAKEFILE_GENERATOR      = UNIX
-QMAKE_PLATFORM          = aix
-
-include(../common/unix.conf)
-
-QMAKE_COMPILER          = ibm_xlc
-
-QMAKE_CC                = xlc
-QMAKE_CC_THREAD         = xlc_r
-QMAKE_LEX               = flex
-QMAKE_LEXFLAGS          =
-QMAKE_YACC              = yacc
-QMAKE_YACCFLAGS         = -d
-QMAKE_CFLAGS            = -qstrict
-QMAKE_CFLAGS_WARN_ON    =
-QMAKE_CFLAGS_WARN_OFF   =
-QMAKE_CFLAGS_RELEASE    = -O3
-QMAKE_CFLAGS_DEBUG      = -g
-QMAKE_CFLAGS_SHLIB      =
-QMAKE_CFLAGS_STATIC_LIB = $$QMAKE_CFLAGS_SHLIB
-QMAKE_CFLAGS_YACC       =
-QMAKE_CFLAGS_THREAD     = -qthreaded -qtls
-
-QMAKE_CXX               = xlC
-QMAKE_CXX_THREAD        = xlC_r
-QMAKE_CXXFLAGS          = -+ $$QMAKE_CFLAGS
-QMAKE_CXXFLAGS_WARN_ON  = $$QMAKE_CFLAGS_WARN_ON
-QMAKE_CXXFLAGS_WARN_OFF = $$QMAKE_CFLAGS_WARN_OFF
-QMAKE_CXXFLAGS_RELEASE  = $$QMAKE_CFLAGS_RELEASE
-QMAKE_CXXFLAGS_DEBUG    = $$QMAKE_CFLAGS_DEBUG
-QMAKE_CXXFLAGS_SHLIB    = $$QMAKE_CFLAGS_SHLIB
-QMAKE_CXXFLAGS_STATIC_LIB = $$QMAKE_CFLAGS_STATIC_LIB
-QMAKE_CXXFLAGS_YACC     = $$QMAKE_CFLAGS_YACC
-QMAKE_CXXFLAGS_THREAD   = $$QMAKE_CFLAGS_THREAD
-QMAKE_CXXFLAGS_RTTI_ON  = -qrtti
-QMAKE_CXXFLAGS_RTTI_OFF = -qnortti
-QMAKE_COMPILER_DEFINES += __xlC__
-
-QMAKE_INCDIR            =
-QMAKE_LIBDIR            =
-QMAKE_INCDIR_X11        =
-QMAKE_LIBDIR_X11        =
-QMAKE_INCDIR_OPENGL     =
-QMAKE_LIBDIR_OPENGL     =
-
-QMAKE_LINK              = xlC
-QMAKE_LINK_THREAD       = xlC_r
-QMAKE_LINK_SHLIB        = ld
-QMAKE_LFLAGS            = -bmaxdata:0x80000000
-QMAKE_LFLAGS_RELEASE    =
-QMAKE_LFLAGS_DEBUG      =
-QMAKE_LFLAGS_SHLIB      = -qmkshrobj
-QMAKE_LFLAGS_PLUGIN     = $$QMAKE_LFLAGS_SHLIB
-QMAKE_LFLAGS_SONAME     =
-QMAKE_LFLAGS_THREAD     = -L/usr/lib/threads
-QMAKE_LFLAGS_NOUNDEF    =
-QMAKE_AIX_SHLIB         = 1
-
-QMAKE_LIBS              =
-QMAKE_LIBS_DYNLOAD      = -ldl
-QMAKE_LIBS_X11          = -lXext -lX11 -lm
-QMAKE_LIBS_OPENGL       = -lGL
-QMAKE_LIBS_THREAD       = -lpthreads
-
-QMAKE_AR                = ar cq
-QMAKE_OBJCOPY           = objcopy
-QMAKE_NM                = nm -P
-QMAKE_RANLIB            = ranlib
-
-load(qt_config)
diff --git a/mkspecs/aix-xlc/qplatformdefs.h b/mkspecs/aix-xlc/qplatformdefs.h
deleted file mode 100644
index 8737517a79..0000000000
--- a/mkspecs/aix-xlc/qplatformdefs.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the qmake spec 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 QPLATFORMDEFS_H
-#define QPLATFORMDEFS_H
-
-#include "../common/aix/qplatformdefs.h"
-
-#endif // QPLATFORMDEFS_H
diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf
index ca5697dd90..1a93a51f6b 100644
--- a/mkspecs/common/gcc-base.conf
+++ b/mkspecs/common/gcc-base.conf
@@ -34,6 +34,7 @@
 QMAKE_CFLAGS_OPTIMIZE      = -O2
 QMAKE_CFLAGS_OPTIMIZE_FULL = -O3
 QMAKE_CFLAGS_OPTIMIZE_DEBUG = -Og
+QMAKE_CFLAGS_OPTIMIZE_SIZE = -Os
 
 QMAKE_CFLAGS               += -pipe
 QMAKE_CFLAGS_DEPS          += -M
diff --git a/mkspecs/common/msvc-desktop.conf b/mkspecs/common/msvc-desktop.conf
index bd9098d7f1..d28c48506c 100644
--- a/mkspecs/common/msvc-desktop.conf
+++ b/mkspecs/common/msvc-desktop.conf
@@ -19,6 +19,9 @@ contains(QMAKE_TARGET.arch, x86_64) {
     QMAKE_COMPILER_DEFINES += _WIN64
 }
 
+QMAKE_CFLAGS_OPTIMIZE      = -O2
+QMAKE_CFLAGS_OPTIMIZE_SIZE = -O1
+
 QMAKE_CC                = cl
 QMAKE_LEX               = flex
 QMAKE_LEXFLAGS          =
@@ -27,8 +30,8 @@ QMAKE_YACCFLAGS         = -d
 QMAKE_CFLAGS            = -nologo -Zc:wchar_t
 QMAKE_CFLAGS_WARN_ON    = -W3
 QMAKE_CFLAGS_WARN_OFF   = -W0
-QMAKE_CFLAGS_RELEASE    = -O2 -MD
-QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += -O2 -MD -Zi
+QMAKE_CFLAGS_RELEASE    = $$QMAKE_CFLAGS_OPTIMIZE -MD
+QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -MD -Zi
 QMAKE_CFLAGS_DEBUG      = -Zi -MDd
 QMAKE_CFLAGS_YACC       =
 QMAKE_CFLAGS_LTCG       = -GL
diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
index 866ace6c5c..4f342d67d7 100644
--- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
+++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
@@ -252,7 +252,8 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
         endif()
     endforeach()
 
-    if (_Qt5$${CMAKE_MODULE_NAME}_PRIVATE_DIRS_EXIST)
+    if (_Qt5$${CMAKE_MODULE_NAME}_PRIVATE_DIRS_EXIST
+        AND NOT CMAKE_VERSION VERSION_LESS 3.0.0 )
         add_library(Qt5::$${CMAKE_MODULE_NAME}Private INTERFACE IMPORTED)
         set_property(TARGET Qt5::$${CMAKE_MODULE_NAME}Private PROPERTY
             INTERFACE_INCLUDE_DIRECTORIES ${Qt5$${CMAKE_MODULE_NAME}_OWN_PRIVATE_INCLUDE_DIRS}
diff --git a/mkspecs/features/default_post.prf b/mkspecs/features/default_post.prf
index 6d6707d6bb..d6caf870f7 100644
--- a/mkspecs/features/default_post.prf
+++ b/mkspecs/features/default_post.prf
@@ -38,7 +38,14 @@ force_debug_info {
     QMAKE_LFLAGS_RELEASE = $$QMAKE_LFLAGS_RELEASE_WITH_DEBUGINFO
 }
 
-optimize_full {
+optimize_size {
+    !isEmpty(QMAKE_CFLAGS_OPTIMIZE):!isEmpty(QMAKE_CFLAGS_OPTIMIZE_SIZE)  {
+        QMAKE_CFLAGS_RELEASE -= $$QMAKE_CFLAGS_OPTIMIZE
+        QMAKE_CXXFLAGS_RELEASE -= $$QMAKE_CFLAGS_OPTIMIZE
+        QMAKE_CFLAGS_RELEASE += $$QMAKE_CFLAGS_OPTIMIZE_SIZE
+        QMAKE_CXXFLAGS_RELEASE += $$QMAKE_CFLAGS_OPTIMIZE_SIZE
+    }
+} else: optimize_full {
     !isEmpty(QMAKE_CFLAGS_OPTIMIZE):!isEmpty(QMAKE_CFLAGS_OPTIMIZE_FULL)  {
         QMAKE_CFLAGS_RELEASE -= $$QMAKE_CFLAGS_OPTIMIZE
         QMAKE_CXXFLAGS_RELEASE -= $$QMAKE_CFLAGS_OPTIMIZE
diff --git a/mkspecs/features/file_copies.prf b/mkspecs/features/file_copies.prf
index 4ebf41c78f..58e07bd393 100644
--- a/mkspecs/features/file_copies.prf
+++ b/mkspecs/features/file_copies.prf
@@ -44,12 +44,7 @@ for (cp, COPIES) {
         $${pfx}.output = $$path/${QMAKE_FUNC_FILE_IN_qtStripSrcDir_$$cp}
     }
     $${pfx}.input = $${pfx}.files
-    !$$dir: \
-        $${pfx}.commands = $$QMAKE_COPY ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT_PATH}
-    else: !copy_dir_files: \
-        $${pfx}.commands = $$QMAKE_COPY_DIR ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT_PATH}
-    else: \
-        $${pfx}.commands = $$QMAKE_COPY_DIR ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT}
+    $${pfx}.commands = $(QINSTALL) ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT}
     $${pfx}.name = COPY ${QMAKE_FILE_IN}
     $${pfx}.CONFIG = no_link no_clean target_predeps
     QMAKE_EXTRA_COMPILERS += $${pfx}
diff --git a/mkspecs/features/qt_configure.prf b/mkspecs/features/qt_configure.prf
index 2b3faeb21b..966c43108c 100644
--- a/mkspecs/features/qt_configure.prf
+++ b/mkspecs/features/qt_configure.prf
@@ -575,11 +575,14 @@ defineTest(qtConfLibrary_pkgConfig) {
     }
 
     qtRunLoggedCommand("$$pkg_config --modversion $$args", version)|return(false)
-    qtRunLoggedCommand("$$pkg_config --libs-only-L --libs-only-l $$args", $${1}.libs)|return(false)
+    qtRunLoggedCommand("$$pkg_config --libs-only-L $$args", libpaths)|return(false)
+    qtRunLoggedCommand("$$pkg_config --libs-only-l $$args", libs)|return(false)
     qtRunLoggedCommand("$$pkg_config --cflags $$args", $${1}.cflags)|return(false)
     version ~= s/[^0-9.].*$//
     $${1}.version = $$first(version)
     export($${1}.version)
+    $${1}.libs = $$libpaths $$libs
+    export($${1}.libs)
     return(true)
 }
 
@@ -1958,6 +1961,15 @@ qtConfCheckErrors()
     error()
 }
 
+QMAKE_CONFIG_VERBOSE = $$eval(config.input.verbose)
+isEmpty(QMAKE_CONFIG_VERBOSE): \
+    QMAKE_CONFIG_VERBOSE = false
+QMAKE_CONFIG_LOG = $$OUT_PWD/config.log
+write_file($$QMAKE_CONFIG_LOG, "")
+qtLog("Command line: $$qtSystemQuote($$QMAKE_SAVED_ARGS)")
+$$QMAKE_REDO_CONFIG: \
+    qtLog("config.opt: $$qtSystemQuote($$QMAKE_EXTRA_REDO_ARGS)")
+
 for (currentConfig, allConfigs) {
     qtConfSetModuleName()
     qtConfSetupModuleOutputs()
@@ -1987,18 +1999,6 @@ equals(QMAKE_CONFIG_CACHE_USE, none) {
     write_file($$QMAKE_CONFIG_CACHE, cont)
 }
 
-QMAKE_CONFIG_VERBOSE = $$eval(config.input.verbose)
-isEmpty(QMAKE_CONFIG_VERBOSE): \
-    QMAKE_CONFIG_VERBOSE = false
-QMAKE_CONFIG_LOG = $$OUT_PWD/config.log
-!equals(QMAKE_CONFIG_CACHE_USE, all): \
-    write_file($$QMAKE_CONFIG_LOG, "")
-else: \
-    write_file($$QMAKE_CONFIG_LOG, $$list($$escape_expand(\\n)), append)
-qtLog("Command line: $$qtSystemQuote($$QMAKE_SAVED_ARGS)")
-$$QMAKE_REDO_CONFIG: \
-    qtLog("config.opt: $$qtSystemQuote($$QMAKE_EXTRA_REDO_ARGS)")
-
 CONFIG += qt_conf_tests_allowed
 logn()
 logn("Running configuration tests...")
diff --git a/mkspecs/features/qt_module_headers.prf b/mkspecs/features/qt_module_headers.prf
index a196ad4505..e5b99e1406 100644
--- a/mkspecs/features/qt_module_headers.prf
+++ b/mkspecs/features/qt_module_headers.prf
@@ -175,6 +175,7 @@ headersclean:!internal_module {
     # Make sure that the header compiles with our strict options
     hcleanDEFS = -DQT_NO_CAST_TO_ASCII=1 \
                  -DQT_NO_CAST_FROM_ASCII=1 \
+                 -UQT_RESTRICTED_CAST_FROM_ASCII \
                  -DQT_STRICT_ITERATORS \
                  -DQT_NO_URL_CAST_FROM_STRING=1 \
                  -DQT_NO_CAST_FROM_BYTEARRAY=1 \
diff --git a/mkspecs/features/winrt/package_manifest.prf b/mkspecs/features/winrt/package_manifest.prf
index 8f4a7a6eab..a00c84948c 100644
--- a/mkspecs/features/winrt/package_manifest.prf
+++ b/mkspecs/features/winrt/package_manifest.prf
@@ -63,7 +63,9 @@
                 VCLIBS = $${VCLIBS}.Debug
             else: \
                 VCLIBS = $${VCLIBS}
-            contains(MSVC_VER, "14.0"): VCLIBS = "$${VCLIBS}\" MinVersion=\"14.0.0.0\" Publisher=\"CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US"
+            # VS 2017 still uses vclibs 140
+            contains(MSVC_VER, "15.0"): VCLIBS = $$replace(VCLIBS, 150, 140)
+            VCLIBS = "$${VCLIBS}\" MinVersion=\"14.0.0.0\" Publisher=\"CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US"
             WINRT_MANIFEST.dependencies += $$VCLIBS
         }
 
diff --git a/mkspecs/hpux-acc-64/qmake.conf b/mkspecs/hpux-acc-64/qmake.conf
deleted file mode 100644
index f0b879de83..0000000000
--- a/mkspecs/hpux-acc-64/qmake.conf
+++ /dev/null
@@ -1,116 +0,0 @@
-#
-# qmake configuration for hpux-n64
-#
-# We define _POSIX_C_SOURCE to 199506L when using threads, therefore
-# we also need to redefine _HPUX_SOURCE.
-# From pthread(3t):
-#   Some documentation will recommend the use of -D_REENTRANT for
-#   compilation.  While this also functions properly, it is considered
-#   an obsolescent form.
-# See pthread(3t) for more details.
-#
-# From the "HP aC++ Online Programmer's Guide":
-#   When +DA2.0W is specified:
-#   * 64-bit SVR4 Executable and Linking Format (ELF) object files
-#     are generated for PA-RISC 2.0.
-#   * The preprocessor predefined macro, __LP64__ is defined.
-#   * The correct path for 64-bit system and language libraries is
-#     selected.
-#   When +DD32 is specified:
-#   * The size of an int, long, or pointer data type is 32-bits.
-#     The size of an int data type is 32-bits. The size of a long or
-#     pointer data type is 64-bits.
-#   * This is the default, currently equivalent to +DA1.1 architecture.
-#   When +DD64 is specified:
-#   * The size of an int data type is 32-bits. The size of a long or
-#     pointer data type is 64-bits.
-#   * This is currently equivalent to +DA2.OW architecture.
-#   * The preprocessor predefined macro, __LP64__ is defined.
-#   Using +DS to Specify Instruction Scheduling:
-#   * By default, the compiler performs scheduling tuned for the system
-#     on which you are compiling, or, if specified, tuned for the setting
-#     of the +DA option.
-#
-# From the online "C/HP-UX Reference Manual":
-# -Aa
-#     Enables strict ANSI C compliance.
-#   -Ae
-#     Enables ANSI C compliance, HP value-added features (as described
-#     for +e option), and _HPUX_SOURCE name space macro. It is equivalent
-#     to -Aa +e -D_HPUX_SOURCE.
-#   +e
-#     Enables the following HP value added features while compiling in
-#     ANSI C mode: sized enum, long long, long pointers, compiler supplied
-#     defaults for missing arguments to intrinsic calls, and $ in identifier
-#     HP C extensions.
-#
-
-MAKEFILE_GENERATOR      = UNIX
-QMAKE_PLATFORM          = hpux
-QMAKE_COMPILER_DEFINES += __hpux __HP_aCC
-
-include(../common/unix.conf)
-
-QMAKE_COMPILER          = hp_acc
-
-QMAKE_CC                = cc
-QMAKE_LEX               = flex
-QMAKE_LEXFLAGS          =
-QMAKE_YACC              = yacc
-QMAKE_YACCFLAGS         = -d
-QMAKE_CFLAGS            = -Ae +DA2.0W -w
-QMAKE_CFLAGS_WARN_ON    =
-QMAKE_CFLAGS_WARN_OFF   = -w
-QMAKE_CFLAGS_RELEASE    = +O1
-QMAKE_CFLAGS_DEBUG      = -g
-QMAKE_CFLAGS_SHLIB      = +Z
-QMAKE_CFLAGS_STATIC_LIB = $$QMAKE_CFLAGS_SHLIB
-QMAKE_CFLAGS_YACC       =
-QMAKE_CFLAGS_THREAD     = -D_POSIX_C_SOURCE=199506L -D_HPUX_SOURCE -mt
-
-QMAKE_CXX               = aCC
-QMAKE_CXXFLAGS          = -AA +DA2.0W -w -D__STRICT_ANSI__ -D_HPUX_SOURCE
-QMAKE_CXXFLAGS_DEPS     = +M
-QMAKE_CXXFLAGS_WARN_ON  = $$QMAKE_CFLAGS_WARN_ON
-QMAKE_CXXFLAGS_WARN_OFF = $$QMAKE_CFLAGS_WARN_OFF
-QMAKE_CXXFLAGS_RELEASE  = $$QMAKE_CFLAGS_RELEASE
-QMAKE_CXXFLAGS_DEBUG    = $$QMAKE_CFLAGS_DEBUG
-QMAKE_CXXFLAGS_SHLIB    = $$QMAKE_CFLAGS_SHLIB
-QMAKE_CXXFLAGS_STATIC_LIB = $$QMAKE_CFLAGS_STATIC_LIB
-QMAKE_CXXFLAGS_YACC     = $$QMAKE_CFLAGS_YACC
-QMAKE_CXXFLAGS_THREAD   = -D_POSIX_C_SOURCE=199506L -mt
-
-QMAKE_INCDIR            =
-QMAKE_LIBDIR            =
-QMAKE_INCDIR_X11        = /usr/include/X11R6
-QMAKE_LIBDIR_X11        = /usr/lib/X11R6/pa20_64
-QMAKE_INCDIR_OPENGL     = /opt/graphics/OpenGL/include /usr/contrib/X11R6/include
-QMAKE_LIBDIR_OPENGL     = /opt/graphics/OpenGL/lib/pa20_64 /usr/contrib/X11R6/lib/pa20_64
-
-QMAKE_LINK              = aCC
-QMAKE_LINK_SHLIB        = aCC
-QMAKE_LFLAGS            = -AA +DA2.0W -Wl,+s
-QMAKE_LFLAGS_RELEASE    = -O
-QMAKE_LFLAGS_DEBUG      = -g
-QMAKE_LFLAGS_SHLIB      = -b -Wl,-a,shared
-QMAKE_LFLAGS_PLUGIN     = $$QMAKE_LFLAGS_SHLIB
-QMAKE_LFLAGS_SONAME     = -Wl,+h,
-QMAKE_LFLAGS_THREAD     =
-QMAKE_LFLAGS_NOUNDEF    = -Wl,+noallowunsats
-QMAKE_LFLAGS_RPATH      = -Wl,+b,
-QMAKE_HPUX_SHLIB        = 3
-QMAKE_EXTENSION_SHLIB   = sl
-
-QMAKE_LIBS              = -lm
-QMAKE_LIBS_DYNLOAD      = -ldl
-QMAKE_LIBS_X11          = -lXext -lX11
-QMAKE_LIBS_OPENGL       = -lGL -lXt
-QMAKE_LIBS_THREAD       = -lpthread
-QMAKE_LIBS_YACC         = -ly
-
-QMAKE_AR                = ar cqs
-QMAKE_OBJCOPY           = objcopy
-QMAKE_NM                = nm -P
-QMAKE_RANLIB            =
-
-load(qt_config)
diff --git a/mkspecs/hpux-acc-64/qplatformdefs.h b/mkspecs/hpux-acc-64/qplatformdefs.h
deleted file mode 100644
index 0c64e664d2..0000000000
--- a/mkspecs/hpux-acc-64/qplatformdefs.h
+++ /dev/null
@@ -1,87 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the qmake spec 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 QPLATFORMDEFS_H
-#define QPLATFORMDEFS_H
-
-// Get Qt defines/settings
-
-#include "qglobal.h"
-
-// Set any POSIX/XOPEN defines at the top of this file to turn on specific APIs
-
-#include <unistd.h>
-
-
-// We are hot - unistd.h should have turned on the specific APIs we requested
-
-#include <pthread.h>
-#include <sys/pstat.h>
-#define _REENTRANT
-#include <dirent.h>
-#include <fcntl.h>
-#include <grp.h>
-#include <pwd.h>
-#include <signal.h>
-#include <dlfcn.h>
-
-#include <sys/types.h>
-#include <sys/ioctl.h>
-#include <sys/ipc.h>
-#include <sys/time.h>
-#include <sys/shm.h>
-#include <sys/socket.h>
-#include <sys/stat.h>
-#include <sys/wait.h>
-#include <netinet/in.h>
-#ifndef QT_NO_IPV6IFNAME
-#include <net/if.h>
-#endif
-
-#define QT_USE_XOPEN_LFS_EXTENSIONS
-#define QT_NO_READDIR64
-#include "../common/posix/qplatformdefs.h"
-
-#undef QT_OPEN_LARGEFILE
-#undef QT_SOCKLEN_T
-
-#define QT_OPEN_LARGEFILE       0
-#define QT_SOCKLEN_T            int
-
-#endif // QPLATFORMDEFS_H
diff --git a/mkspecs/hpux-acc-o64/qmake.conf b/mkspecs/hpux-acc-o64/qmake.conf
deleted file mode 100644
index 750bb99155..0000000000
--- a/mkspecs/hpux-acc-o64/qmake.conf
+++ /dev/null
@@ -1,114 +0,0 @@
-#
-# qmake configuration for hpux-o64
-#
-# We define _POSIX_C_SOURCE to 199506L when using threads, therefore
-# we also need to redefine _HPUX_SOURCE.
-# From pthread(3t):
-#   Some documentation will recommend the use of -D_REENTRANT for
-#   compilation.  While this also functions properly, it is considered
-#   an obsolescent form.
-# See pthread(3t) for more details.
-#
-# From the "HP aC++ Online Programmer's Guide":
-#   When +DA2.0W is specified:
-#   * 64-bit SVR4 Executable and Linking Format (ELF) object files
-#     are generated for PA-RISC 2.0.
-#   * The preprocessor predefined macro, __LP64__ is defined.
-#   * The correct path for 64-bit system and language libraries is
-#     selected.
-#   When +DD32 is specified:
-#   * The size of an int, long, or pointer data type is 32-bits.
-#     The size of an int data type is 32-bits. The size of a long or
-#     pointer data type is 64-bits.
-#   * This is the default, currently equivalent to +DA1.1 architecture.
-#   When +DD64 is specified:
-#   * The size of an int data type is 32-bits. The size of a long or
-#     pointer data type is 64-bits.
-#   * This is currently equivalent to +DA2.OW architecture.
-#   * The preprocessor predefined macro, __LP64__ is defined.
-#   Using +DS to Specify Instruction Scheduling:
-#   * By default, the compiler performs scheduling tuned for the system
-#     on which you are compiling, or, if specified, tuned for the setting
-#     of the +DA option.
-#
-# From the online "C/HP-UX Reference Manual":
-#   -Aa
-#     Enables strict ANSI C compliance.
-#   -Ae
-#     Enables ANSI C compliance, HP value-added features (as described
-#     for +e option), and _HPUX_SOURCE name space macro. It is equivalent
-#     to -Aa +e -D_HPUX_SOURCE.
-#   +e
-#     Enables the following HP value added features while compiling in
-#     ANSI C mode: sized enum, long long, long pointers, compiler supplied
-#     defaults for missing arguments to intrinsic calls, and $ in identifier
-#     HP C extensions.
-#
-
-MAKEFILE_GENERATOR      = UNIX
-QMAKE_PLATFORM          = hpux
-
-include(../common/unix.conf)
-
-QMAKE_COMPILER          = hp_acc
-
-QMAKE_CC                = cc
-QMAKE_LEX               = flex
-QMAKE_LEXFLAGS          =
-QMAKE_YACC              = yacc
-QMAKE_YACCFLAGS         = -d
-QMAKE_CFLAGS            = -Ae +DA2.0 -w
-QMAKE_CFLAGS_WARN_ON    =
-QMAKE_CFLAGS_WARN_OFF   =
-QMAKE_CFLAGS_RELEASE    = -O +Oentrysched +Onolimit
-QMAKE_CFLAGS_DEBUG      = -y -g
-QMAKE_CFLAGS_SHLIB      = +Z
-QMAKE_CFLAGS_STATIC_LIB = $$QMAKE_CFLAGS_SHLIB
-QMAKE_CFLAGS_YACC       =
-QMAKE_CFLAGS_THREAD     = -D_POSIX_C_SOURCE=199506L -D_HPUX_SOURCE
-
-QMAKE_CXX               = aCC
-QMAKE_CXXFLAGS          = +DA2.0 -w -D__STRICT_ANSI__ -D_HPUX_SOURCE
-QMAKE_CXXFLAGS_WARN_ON  = $$QMAKE_CFLAGS_WARN_ON
-QMAKE_CXXFLAGS_WARN_OFF = $$QMAKE_CFLAGS_WARN_OFF
-QMAKE_CXXFLAGS_RELEASE  = $$QMAKE_CFLAGS_RELEASE
-QMAKE_CXXFLAGS_DEBUG    = -g
-QMAKE_CXXFLAGS_SHLIB    = $$QMAKE_CFLAGS_SHLIB
-QMAKE_CXXFLAGS_STATIC_LIB = $$QMAKE_CFLAGS_STATIC_LIB
-QMAKE_CXXFLAGS_YACC     = $$QMAKE_CFLAGS_YACC
-QMAKE_CXXFLAGS_THREAD   = -D_POSIX_C_SOURCE=199506L
-
-QMAKE_INCDIR            =
-QMAKE_LIBDIR            =
-QMAKE_INCDIR_X11        = /usr/include/X11R6
-QMAKE_LIBDIR_X11        = /usr/lib/X11R6
-QMAKE_INCDIR_OPENGL     = /opt/graphics/OpenGL/include /usr/contrib/X11R6/include
-QMAKE_LIBDIR_OPENGL     = /opt/graphics/OpenGL/lib /usr/contrib/X11R6/lib
-
-QMAKE_LINK              = aCC
-QMAKE_LINK_SHLIB        = aCC
-QMAKE_LFLAGS            = +DA2.0 -Wl,+s
-QMAKE_LFLAGS_RELEASE    = -O
-QMAKE_LFLAGS_DEBUG      =
-QMAKE_LFLAGS_SHLIB      = -b
-QMAKE_LFLAGS_PLUGIN     = $$QMAKE_LFLAGS_SHLIB
-QMAKE_LFLAGS_SONAME     = -Wl,+h,
-QMAKE_LFLAGS_NOUNDEF    = -Wl,+noallowunsats
-QMAKE_LFLAGS_RPATH      = -Wl,+b,
-QMAKE_HPUX_SHLIB        = 2
-QMAKE_EXTENSION_SHLIB   = sl
-
-QMAKE_LIBS              = -lm
-QMAKE_LIBS_DYNLOAD      = -ldld
-QMAKE_LIBS_X11          = -lXext -lX11
-
-QMAKE_LIBS_OPENGL       = -lGL
-QMAKE_LIBS_THREAD       = -lpthread
-QMAKE_LIBS_YACC         = -ly
-
-QMAKE_AR                = ar cqs
-QMAKE_OBJCOPY           = objcopy
-QMAKE_NM                = nm -P
-QMAKE_RANLIB            =
-
-load(qt_config)
diff --git a/mkspecs/hpux-acc-o64/qplatformdefs.h b/mkspecs/hpux-acc-o64/qplatformdefs.h
deleted file mode 100644
index 0e9dc48d9a..0000000000
--- a/mkspecs/hpux-acc-o64/qplatformdefs.h
+++ /dev/null
@@ -1,85 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the qmake spec 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 QPLATFORMDEFS_H
-#define QPLATFORMDEFS_H
-
-// Get Qt defines/settings
-
-#include "qglobal.h"
-
-// Set any POSIX/XOPEN defines at the top of this file to turn on specific APIs
-
-#include <unistd.h>
-
-
-// We are hot - unistd.h should have turned on the specific APIs we requested
-
-
-#include <pthread.h>
-#include <dirent.h>
-#include <fcntl.h>
-#include <grp.h>
-#include <pwd.h>
-#include <signal.h>
-#include <dl.h>
-#define QT_HPUX_LD
-#define QT_NO_LIBRARY_UNLOAD
-
-#include <sys/types.h>
-#include <sys/ioctl.h>
-#include <sys/ipc.h>
-#include <sys/time.h>
-#include <sys/shm.h>
-#include <sys/socket.h>
-#include <sys/stat.h>
-#include <sys/wait.h>
-#include <netinet/in.h>
-#ifndef QT_NO_IPV6IFNAME
-#include <net/if.h>
-#endif
-
-#define QT_USE_XOPEN_LFS_EXTENSIONS
-#define QT_NO_READDIR64
-#include "../common/posix/qplatformdefs.h"
-
-#undef QT_SOCKLEN_T
-#define QT_SOCKLEN_T            int
-
-#endif // QPLATFORMDEFS_H
diff --git a/mkspecs/hpux-acc/qmake.conf b/mkspecs/hpux-acc/qmake.conf
deleted file mode 100644
index 2f1ce1054c..0000000000
--- a/mkspecs/hpux-acc/qmake.conf
+++ /dev/null
@@ -1,95 +0,0 @@
-#
-# qmake configuration for hpux-acc
-#
-# We define _POSIX_C_SOURCE to 199506L when using threads, therefore
-# we also need to redefine _HPUX_SOURCE. See pthread(3t) for more details.
-#
-# From the "HP aC++ Online Programmer's Guide":
-#   Using +DS to Specify Instruction Scheduling:
-#   * By default, the compiler performs scheduling tuned for the system
-#     on which you are compiling, or, if specified, tuned for the setting
-#     of the +DA option.
-#
-# From the online "C/HP-UX Reference Manual":
-# -Aa
-#     Enables strict ANSI C compliance.
-#   -Ae
-#     Enables ANSI C compliance, HP value-added features (as described
-#     for +e option), and _HPUX_SOURCE name space macro. It is equivalent
-#     to -Aa +e -D_HPUX_SOURCE.
-#   +e
-#     Enables the following HP value added features while compiling in
-#     ANSI C mode: sized enum, long long, long pointers, compiler supplied
-#     defaults for missing arguments to intrinsic calls, and $ in identifier
-#     HP C extensions.
-#
-
-MAKEFILE_GENERATOR      = UNIX
-QMAKE_PLATFORM          = hpux
-QMAKE_COMPILER_DEFINES += __hpux __HP_aCC
-
-include(../common/unix.conf)
-
-QMAKE_COMPILER          = hp_acc
-
-QMAKE_CC                = cc
-QMAKE_LEX               = flex
-QMAKE_LEXFLAGS          =
-QMAKE_YACC              = yacc
-QMAKE_YACCFLAGS         = -d
-QMAKE_CFLAGS            = -Ae +DAportable -w
-QMAKE_CFLAGS_WARN_ON    =
-QMAKE_CFLAGS_WARN_OFF   = -w
-QMAKE_CFLAGS_RELEASE    = +O1
-QMAKE_CFLAGS_DEBUG      = -g
-QMAKE_CFLAGS_SHLIB      = +Z
-QMAKE_CFLAGS_STATIC_LIB = $$QMAKE_CFLAGS_SHLIB
-QMAKE_CFLAGS_YACC       =
-QMAKE_CFLAGS_THREAD     = -D_POSIX_C_SOURCE=199506L -D_HPUX_SOURCE -mt
-
-QMAKE_CXX               = aCC
-QMAKE_CXXFLAGS          = -AA +DAportable -w -D__STRICT_ANSI__ -D_HPUX_SOURCE
-QMAKE_CXXFLAGS_DEPS     = +M
-QMAKE_CXXFLAGS_WARN_ON  = $$QMAKE_CFLAGS_WARN_ON
-QMAKE_CXXFLAGS_WARN_OFF = $$QMAKE_CFLAGS_WARN_OFF
-QMAKE_CXXFLAGS_RELEASE  = $$QMAKE_CFLAGS_RELEASE
-QMAKE_CXXFLAGS_DEBUG    = $$QMAKE_CFLAGS_DEBUG
-QMAKE_CXXFLAGS_SHLIB    = $$QMAKE_CFLAGS_SHLIB
-QMAKE_CXXFLAGS_STATIC_LIB = $$QMAKE_CFLAGS_STATIC_LIB
-QMAKE_CXXFLAGS_YACC     = $$QMAKE_CFLAGS_YACC
-QMAKE_CXXFLAGS_THREAD   = -D_POSIX_C_SOURCE=199506L -mt
-
-QMAKE_INCDIR            =
-QMAKE_LIBDIR            =
-QMAKE_INCDIR_X11        = /usr/include/X11R6
-QMAKE_LIBDIR_X11        = /usr/lib/X11R6
-QMAKE_INCDIR_OPENGL     = /opt/graphics/OpenGL/include /usr/contrib/X11R6/include
-QMAKE_LIBDIR_OPENGL     = /opt/graphics/OpenGL/lib /usr/contrib/X11R6/lib
-
-QMAKE_LINK              = aCC
-QMAKE_LINK_SHLIB        = aCC
-QMAKE_LFLAGS            = -AA +DAportable -Wl,+s
-QMAKE_LFLAGS_RELEASE    = -O
-QMAKE_LFLAGS_DEBUG      = -g
-QMAKE_LFLAGS_SHLIB      = -b -Wl,-a,shared
-QMAKE_LFLAGS_PLUGIN     = $$QMAKE_LFLAGS_SHLIB
-QMAKE_LFLAGS_SONAME     = -Wl,+h,
-QMAKE_LFLAGS_THREAD     =
-QMAKE_LFLAGS_NOUNDEF    = -Wl,+noallowunsats
-QMAKE_LFLAGS_RPATH      = -Wl,+b,
-QMAKE_HPUX_SHLIB        = 1
-QMAKE_EXTENSION_SHLIB   = sl
-
-QMAKE_LIBS              = -lm
-QMAKE_LIBS_DYNLOAD      = -ldld
-QMAKE_LIBS_X11          = -lXext -lX11
-QMAKE_LIBS_OPENGL       = -lGL -lXt
-QMAKE_LIBS_THREAD       = -lpthread
-QMAKE_LIBS_YACC         = -ly
-
-QMAKE_AR                = ar cqs
-QMAKE_OBJCOPY           = objcopy
-QMAKE_NM                = nm -P
-QMAKE_RANLIB            =
-
-load(qt_config)
diff --git a/mkspecs/hpux-acc/qplatformdefs.h b/mkspecs/hpux-acc/qplatformdefs.h
deleted file mode 100644
index a6942ad58f..0000000000
--- a/mkspecs/hpux-acc/qplatformdefs.h
+++ /dev/null
@@ -1,96 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the qmake spec 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 QPLATFORMDEFS_H
-#define QPLATFORMDEFS_H
-
-// Get Qt defines/settings
-
-#include "qglobal.h"
-
-// Set any POSIX/XOPEN defines at the top of this file to turn on specific APIs
-
-#include <unistd.h>
-
-
-// We are hot - unistd.h should have turned on the specific APIs we requested
-
-
-#include <pthread.h>
-#include <sys/pstat.h>
-#define _REENTRANT
-#include <dirent.h>
-#include <fcntl.h>
-#include <grp.h>
-#include <pwd.h>
-#include <signal.h>
-#include <dl.h>
-#define QT_HPUX_LD
-#define QT_NO_LIBRARY_UNLOAD
-
-#include <sys/types.h>
-#include <sys/ioctl.h>
-#include <sys/ipc.h>
-#include <sys/time.h>
-#include <sys/shm.h>
-#include <sys/socket.h>
-#include <sys/stat.h>
-#include <sys/wait.h>
-#include <netinet/in.h>
-#ifndef QT_NO_IPV6IFNAME
-#include <net/if.h>
-#endif
-
-#define QT_USE_XOPEN_LFS_EXTENSIONS
-#define QT_NO_READDIR64
-#include "../common/posix/qplatformdefs.h"
-
-#undef QT_OPEN_LARGEFILE
-#undef QT_SOCKLEN_T
-
-#define QT_OPEN_LARGEFILE       0
-#define QT_SOCKLEN_T            int
-
-// presence of _XOPEN_UNIX can be used to detect HP-UX 10 or higher
-#if !defined(_XOPEN_UNIX)
-// HP-UX 9's select() didn't accept fd_set, yet.
-#define select(a,b,c,d,e) select((a), (int *)(b), (int *)(c), (int *)(d), (e))
-#endif
-
-#endif // QPLATFORMDEFS_H
diff --git a/mkspecs/hpux-g++-64/qmake.conf b/mkspecs/hpux-g++-64/qmake.conf
deleted file mode 100644
index a27333fa18..0000000000
--- a/mkspecs/hpux-g++-64/qmake.conf
+++ /dev/null
@@ -1,78 +0,0 @@
-#
-# qmake configuration for hpux-g++-64
-#
-# We define _POSIX_C_SOURCE to 199506L when using threads,
-# therefore we also need to redefine _HPUX_SOURCE.
-#
-
-MAKEFILE_GENERATOR      = UNIX
-QMAKE_PLATFORM          = hpux
-
-include(../common/unix.conf)
-
-QMAKE_COMPILER          = gcc
-
-QMAKE_CC                = gcc
-QMAKE_LEX               = flex
-QMAKE_LEXFLAGS          =
-QMAKE_YACC              = yacc
-QMAKE_YACCFLAGS         = -d
-QMAKE_CFLAGS            =
-QMAKE_CFLAGS_DEPS       = -M
-QMAKE_CFLAGS_WARN_ON    = -Wall -W
-QMAKE_CFLAGS_WARN_OFF   = -w
-QMAKE_CFLAGS_RELEASE    = -O2
-QMAKE_CFLAGS_DEBUG      = -g
-QMAKE_CFLAGS_SHLIB      = -fPIC
-QMAKE_CFLAGS_STATIC_LIB = $$QMAKE_CFLAGS_SHLIB
-QMAKE_CFLAGS_YACC       = -Wno-unused -Wno-parentheses
-QMAKE_CFLAGS_THREAD     = -D_POSIX_C_SOURCE=199506L -D_HPUX_SOURCE
-
-QMAKE_CXX               = g++
-QMAKE_CXXFLAGS          = $$QMAKE_CFLAGS -D_HPUX_SOURCE
-QMAKE_CXXFLAGS_DEPS     = $$QMAKE_CFLAGS_DEPS
-QMAKE_CXXFLAGS_WARN_ON  = $$QMAKE_CFLAGS_WARN_ON
-QMAKE_CXXFLAGS_WARN_OFF = $$QMAKE_CFLAGS_WARN_OFF
-QMAKE_CXXFLAGS_RELEASE  = $$QMAKE_CFLAGS_RELEASE
-QMAKE_CXXFLAGS_DEBUG    = $$QMAKE_CFLAGS_DEBUG
-QMAKE_CXXFLAGS_SHLIB    = $$QMAKE_CFLAGS_SHLIB
-QMAKE_CXXFLAGS_STATIC_LIB = $$QMAKE_CFLAGS_STATIC_LIB
-QMAKE_CXXFLAGS_YACC     = $$QMAKE_CFLAGS_YACC
-QMAKE_CXXFLAGS_THREAD   = -D_POSIX_C_SOURCE=199506L
-
-QMAKE_INCDIR            =
-QMAKE_LIBDIR            = /usr/lib/pa20_64
-QMAKE_INCDIR_X11        = /usr/include/X11R6
-QMAKE_LIBDIR_X11        = /usr/lib/X11R6/pa20_64
-QMAKE_INCDIR_OPENGL     = /opt/Mesa/include /usr/contrib/X11R6/include
-QMAKE_LIBDIR_OPENGL     = /opt/Mesa/lib/pa20_64 /usr/contrib/X11R6/lib/pa20_64
-
-QMAKE_LINK              = g++
-QMAKE_LINK_SHLIB        = g++
-QMAKE_LINK_C            = gcc
-QMAKE_LINK_C_SHLIB      = gcc
-QMAKE_LFLAGS            = -Wl,+s -lpthread
-QMAKE_LFLAGS_RELEASE    =
-QMAKE_LFLAGS_DEBUG      =
-QMAKE_LFLAGS_SHLIB      = -fPIC -shared
-QMAKE_LFLAGS_PLUGIN     = $$QMAKE_LFLAGS_SHLIB
-QMAKE_LFLAGS_SONAME     = -Wl,+h,
-QMAKE_LFLAGS_THREAD     =
-QMAKE_LFLAGS_NOUNDEF    = -Wl,+noallowunsats
-QMAKE_LFLAGS_RPATH      = -Wl,+b,
-QMAKE_HPUX_SHLIB        = 3
-QMAKE_EXTENSION_SHLIB   = sl
-
-QMAKE_LIBS              = -lm
-QMAKE_LIBS_DYNLOAD      = -ldld
-QMAKE_LIBS_X11          = -lXext -lX11
-QMAKE_LIBS_OPENGL       = -lGL
-QMAKE_LIBS_THREAD       = -lpthread
-QMAKE_LIBS_YACC         = -ly
-
-QMAKE_AR                = ar cqs
-QMAKE_OBJCOPY           = objcopy
-QMAKE_NM                = nm -P
-QMAKE_RANLIB            =
-
-load(qt_config)
diff --git a/mkspecs/hpux-g++-64/qplatformdefs.h b/mkspecs/hpux-g++-64/qplatformdefs.h
deleted file mode 100644
index 84ded7bd40..0000000000
--- a/mkspecs/hpux-g++-64/qplatformdefs.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the qmake spec 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 QPLATFORMDEFS_H
-#define QPLATFORMDEFS_H
-
-// Get Qt defines/settings
-
-#include "qglobal.h"
-
-// Set any POSIX/XOPEN defines at the top of this file to turn on specific APIs
-
-#include <unistd.h>
-
-
-// We are hot - unistd.h should have turned on the specific APIs we requested
-
-
-#include <pthread.h>
-#define _REENTRANT
-#include <dirent.h>
-#include <fcntl.h>
-#include <grp.h>
-#include <pwd.h>
-#include <signal.h>
-#include <dlfcn.h>
-
-#include <sys/types.h>
-#include <sys/ioctl.h>
-#include <sys/ipc.h>
-#include <sys/time.h>
-#include <sys/shm.h>
-#include <sys/socket.h>
-#include <sys/stat.h>
-#include <sys/wait.h>
-#include <netinet/in.h>
-#ifndef QT_NO_IPV6IFNAME
-#include <net/if.h>
-#endif
-
-#define QT_USE_XOPEN_LFS_EXTENSIONS
-#define QT_NO_READDIR64
-#include "../common/posix/qplatformdefs.h"
-
-#endif // QPLATFORMDEFS_H
diff --git a/mkspecs/hpux-g++/qmake.conf b/mkspecs/hpux-g++/qmake.conf
deleted file mode 100644
index bfd814b0cb..0000000000
--- a/mkspecs/hpux-g++/qmake.conf
+++ /dev/null
@@ -1,78 +0,0 @@
-#
-# qmake configuration for hpux-g++
-#
-# We define _POSIX_C_SOURCE to 199506L when using threads,
-# therefore we also need to redefine _HPUX_SOURCE.
-#
-
-MAKEFILE_GENERATOR      = UNIX
-QMAKE_PLATFORM          = hpux
-
-include(../common/unix.conf)
-
-QMAKE_COMPILER          = gcc
-
-QMAKE_CC                = gcc
-QMAKE_LEX               = flex
-QMAKE_LEXFLAGS          =
-QMAKE_YACC              = yacc
-QMAKE_YACCFLAGS         = -d
-QMAKE_CFLAGS            =
-QMAKE_CFLAGS_DEPS       = -M
-QMAKE_CFLAGS_WARN_ON    = -Wall -W
-QMAKE_CFLAGS_WARN_OFF   = -w
-QMAKE_CFLAGS_RELEASE    = -O2
-QMAKE_CFLAGS_DEBUG      = -g
-QMAKE_CFLAGS_SHLIB      = -fPIC
-QMAKE_CFLAGS_STATIC_LIB = $$QMAKE_CFLAGS_SHLIB
-QMAKE_CFLAGS_YACC       = -Wno-unused -Wno-parentheses
-QMAKE_CFLAGS_THREAD     = -D_POSIX_C_SOURCE=199506L -D_HPUX_SOURCE
-
-QMAKE_CXX               = g++
-QMAKE_CXXFLAGS          = $$QMAKE_CFLAGS -D_HPUX_SOURCE -DGLU_VERSION_1_2
-QMAKE_CXXFLAGS_DEPS     = $$QMAKE_CFLAGS_DEPS
-QMAKE_CXXFLAGS_WARN_ON  = $$QMAKE_CFLAGS_WARN_ON
-QMAKE_CXXFLAGS_WARN_OFF = $$QMAKE_CFLAGS_WARN_OFF
-QMAKE_CXXFLAGS_RELEASE  = $$QMAKE_CFLAGS_RELEASE
-QMAKE_CXXFLAGS_DEBUG    = $$QMAKE_CFLAGS_DEBUG
-QMAKE_CXXFLAGS_SHLIB    = $$QMAKE_CFLAGS_SHLIB
-QMAKE_CXXFLAGS_STATIC_LIB = $$QMAKE_CFLAGS_STATIC_LIB
-QMAKE_CXXFLAGS_YACC     = $$QMAKE_CFLAGS_YACC
-QMAKE_CXXFLAGS_THREAD   = -D_POSIX_C_SOURCE=199506L
-
-QMAKE_INCDIR            =
-QMAKE_LIBDIR            =
-QMAKE_INCDIR_X11        =
-QMAKE_LIBDIR_X11        = /usr/lib/X11R6
-QMAKE_INCDIR_OPENGL     = /opt/Mesa/include /usr/contrib/X11R6/include
-QMAKE_LIBDIR_OPENGL     = /opt/Mesa/lib /usr/contrib/X11R6/lib
-
-QMAKE_LINK              = g++
-QMAKE_LINK_SHLIB        = g++
-QMAKE_LINK_C            = gcc
-QMAKE_LINK_C_SHLIB      = gcc
-QMAKE_LFLAGS            = -Wl,+s
-QMAKE_LFLAGS_RELEASE    =
-QMAKE_LFLAGS_DEBUG      =
-QMAKE_LFLAGS_SHLIB      = -fPIC -shared
-QMAKE_LFLAGS_PLUGIN     = $$QMAKE_LFLAGS_SHLIB
-QMAKE_LFLAGS_SONAME     = -Wl,+h,
-QMAKE_LFLAGS_THREAD     =
-QMAKE_LFLAGS_NOUNDEF    = -Wl,+noallowunsats
-QMAKE_LFLAGS_RPATH      = -Wl,+b,
-QMAKE_HPUX_SHLIB        = 1
-QMAKE_EXTENSION_SHLIB   = sl
-
-QMAKE_LIBS              =
-QMAKE_LIBS_DYNLOAD      = -ldld
-QMAKE_LIBS_X11          = -lXext -lX11 -lm
-QMAKE_LIBS_OPENGL       = -lGL
-QMAKE_LIBS_THREAD       = -lpthread
-QMAKE_LIBS_YACC         = -ly
-
-QMAKE_AR                = ar cqs
-QMAKE_OBJCOPY           = objcopy
-QMAKE_NM                = nm -P
-QMAKE_RANLIB            =
-
-load(qt_config)
diff --git a/mkspecs/hpux-g++/qplatformdefs.h b/mkspecs/hpux-g++/qplatformdefs.h
deleted file mode 100644
index 4338bb670e..0000000000
--- a/mkspecs/hpux-g++/qplatformdefs.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 qmake spec 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 QPLATFORMDEFS_H
-#define QPLATFORMDEFS_H
-
-// Get Qt defines/settings
-
-#include "qglobal.h"
-
-// Set any POSIX/XOPEN defines at the top of this file to turn on specific APIs
-
-#include <unistd.h>
-
-
-// We are hot - unistd.h should have turned on the specific APIs we requested
-
-#define _REENTRANT // otherwise we don't get readdir_r, etc.
-#include <sys/pstat.h>
-#include <pthread.h>
-#include <dirent.h>
-#include <fcntl.h>
-#include <grp.h>
-#include <pwd.h>
-#include <signal.h>
-#include <dl.h>
-#define QT_HPUX_LD
-#define QT_NO_LIBRARY_UNLOAD
-
-#include <sys/types.h>
-#include <sys/ioctl.h>
-#include <sys/ipc.h>
-#include <sys/time.h>
-#include <sys/shm.h>
-#include <sys/socket.h>
-#include <sys/stat.h>
-#include <sys/wait.h>
-#include <netinet/in.h>
-#ifndef QT_NO_IPV6IFNAME
-#include <net/if.h>
-#endif
-
-#define QT_USE_XOPEN_LFS_EXTENSIONS
-#define QT_NO_READDIR64
-#include "../common/posix/qplatformdefs.h"
-
-#undef QT_SOCKLEN_T
-#define QT_SOCKLEN_T            int
-
-// presence of _XOPEN_UNIX can be used to detect HP-UX 10 or higher
-#if !defined(_XOPEN_UNIX)
-// HP-UX 9's select() didn't accept fd_set, yet.
-#define select(a,b,c,d,e) select((a), (int *)(b), (int *)(c), (int *)(d), (e))
-#endif
-
-#endif // QPLATFORMDEFS_H
diff --git a/mkspecs/hpuxi-acc-32/qmake.conf b/mkspecs/hpuxi-acc-32/qmake.conf
deleted file mode 100644
index fed3b112d1..0000000000
--- a/mkspecs/hpuxi-acc-32/qmake.conf
+++ /dev/null
@@ -1,70 +0,0 @@
-#
-# qmake configuration for hpuxi-acc-32
-#
-
-MAKEFILE_GENERATOR      = UNIX
-QMAKE_PLATFORM          = hpux
-
-include(../common/unix.conf)
-
-QMAKE_COMPILER          = hp_acc
-
-QMAKE_CC                = cc
-QMAKE_LEX               = lex
-QMAKE_LEXFLAGS          =
-QMAKE_YACC              = yacc
-QMAKE_YACCFLAGS         = -d
-QMAKE_CFLAGS            = +DSitanium -w
-QMAKE_CFLAGS_WARN_ON    =
-QMAKE_CFLAGS_WARN_OFF   = -w
-QMAKE_CFLAGS_RELEASE    = +O1
-QMAKE_CFLAGS_DEBUG      = -g
-QMAKE_CFLAGS_SHLIB      = +Z
-QMAKE_CFLAGS_STATIC_LIB = $$QMAKE_CFLAGS_SHLIB
-QMAKE_CFLAGS_YACC       =
-QMAKE_CFLAGS_THREAD     = -D_POSIX_C_SOURCE=199506L -D_HPUX_SOURCE -D_REENTRANT -mt
-
-QMAKE_CXX               = aCC
-QMAKE_CXXFLAGS          = $$QMAKE_CFLAGS -D__STRICT_ANSI__ -D_HPUX_SOURCE
-QMAKE_CXXFLAGS_DEPS     = +M
-QMAKE_CXXFLAGS_WARN_ON  = $$QMAKE_CFLAGS_WARN_ON
-QMAKE_CXXFLAGS_WARN_OFF = $$QMAKE_CFLAGS_WARN_OFF
-QMAKE_CXXFLAGS_RELEASE  = $$QMAKE_CFLAGS_RELEASE
-QMAKE_CXXFLAGS_DEBUG    = $$QMAKE_CFLAGS_DEBUG
-QMAKE_CXXFLAGS_SHLIB    = $$QMAKE_CFLAGS_SHLIB
-QMAKE_CXXFLAGS_STATIC_LIB = $$QMAKE_CFLAGS_STATIC_LIB
-QMAKE_CXXFLAGS_YACC     = $$QMAKE_CFLAGS_YACC
-QMAKE_CXXFLAGS_THREAD   = -D_POSIX_C_SOURCE=199506L -D_REENTRANT -mt
-
-QMAKE_INCDIR            =
-QMAKE_LIBDIR            =
-QMAKE_INCDIR_X11        = /usr/include/X11R6
-QMAKE_LIBDIR_X11        = /usr/lib/hpux32/X11R6
-QMAKE_INCDIR_OPENGL     = /opt/graphics/OpenGL/include /usr/contrib/X11R6/include
-QMAKE_LIBDIR_OPENGL     = /opt/graphics/OpenGL/lib/hpux32 /usr/contrib/X11R6/lib/hpux32
-
-QMAKE_LINK              = aCC
-QMAKE_LINK_SHLIB        = aCC
-QMAKE_LFLAGS            = +DSitanium -Wl,+s
-QMAKE_LFLAGS_RELEASE    = -O
-QMAKE_LFLAGS_DEBUG      = -g
-QMAKE_LFLAGS_SHLIB      = -b -Wl,-a,shared
-QMAKE_LFLAGS_PLUGIN     = $$QMAKE_LFLAGS_SHLIB
-QMAKE_LFLAGS_SONAME     = -Wl,+h,
-QMAKE_LFLAGS_NOUNDEF    = -Wl,+noallowunsats
-QMAKE_LFLAGS_THREAD     =
-QMAKE_LFLAGS_RPATH      =
-
-QMAKE_LIBS              = -lm
-QMAKE_LIBS_DYNLOAD      = -ldl
-QMAKE_LIBS_X11          = -lXext -lX11
-QMAKE_LIBS_OPENGL       = -lGL -lXt
-QMAKE_LIBS_THREAD       = -lpthread
-QMAKE_LIBS_YACC         = -ly
-
-QMAKE_AR                = ar cqs
-QMAKE_OBJCOPY           = objcopy
-QMAKE_NM                = nm -P
-QMAKE_RANLIB            =
-
-load(qt_config)
diff --git a/mkspecs/hpuxi-acc-32/qplatformdefs.h b/mkspecs/hpuxi-acc-32/qplatformdefs.h
deleted file mode 100644
index f9917b2a08..0000000000
--- a/mkspecs/hpuxi-acc-32/qplatformdefs.h
+++ /dev/null
@@ -1,88 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the qmake spec 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 QPLATFORMDEFS_H
-#define QPLATFORMDEFS_H
-
-// Get Qt defines/settings
-
-#define _INCLUDE_LONGLONG
-#include "qglobal.h"
-
-// Set any POSIX/XOPEN defines at the top of this file to turn on specific APIs
-
-#include <unistd.h>
-
-
-// We are hot - unistd.h should have turned on the specific APIs we requested
-
-#define _REENTRANT
-#include <pthread.h>
-#include <sys/pstat.h>
-#include <dirent.h>
-#include <fcntl.h>
-#include <grp.h>
-#include <pwd.h>
-#include <signal.h>
-#include <dl.h>
-
-#include <sys/types.h>
-#include <sys/ioctl.h>
-#include <sys/ipc.h>
-#include <sys/time.h>
-#include <sys/shm.h>
-#include <sys/socket.h>
-#include <sys/stat.h>
-#include <sys/wait.h>
-#include <netinet/in.h>
-#ifndef QT_NO_IPV6IFNAME
-#include <net/if.h>
-#endif
-
-#define QT_USE_XOPEN_LFS_EXTENSIONS
-#define QT_NO_READDIR64
-#include "../common/posix/qplatformdefs.h"
-
-#undef QT_OPEN_LARGEFILE
-#undef QT_SOCKLEN_T
-
-#define QT_OPEN_LARGEFILE       0
-#define QT_SOCKLEN_T            int
-
-#endif // QPLATFORMDEFS_H
diff --git a/mkspecs/hpuxi-acc-64/qmake.conf b/mkspecs/hpuxi-acc-64/qmake.conf
deleted file mode 100644
index 20578cb377..0000000000
--- a/mkspecs/hpuxi-acc-64/qmake.conf
+++ /dev/null
@@ -1,113 +0,0 @@
-#
-# qmake configuration for hpuxi-acc-64
-#
-# We define _POSIX_C_SOURCE to 199506L when using threads, therefore
-# we also need to redefine _HPUX_SOURCE.
-# From pthread(3t):
-#   Some documentation will recommend the use of -D_REENTRANT for
-#   compilation.  While this also functions properly, it is considered
-#   an obsolescent form.
-# See pthread(3t) for more details.
-#
-# From the "HP aC++ Online Programmer's Guide":
-#   When +DA2.0W is specified:
-#   * 64-bit SVR4 Executable and Linking Format (ELF) object files
-#     are generated for PA-RISC 2.0.
-#   * The preprocessor predefined macro, __LP64__ is defined.
-#   * The correct path for 64-bit system and language libraries is
-#     selected.
-#   When +DD32 is specified:
-#   * The size of an int, long, or pointer data type is 32-bits.
-#     The size of an int data type is 32-bits. The size of a long or
-#     pointer data type is 64-bits.
-#   * This is the default, currently equivalent to +DA1.1 architecture.
-#   When +DD64 is specified:
-#   * The size of an int data type is 32-bits. The size of a long or
-#     pointer data type is 64-bits.
-#   * This is currently equivalent to +DA2.OW architecture.
-#   * The preprocessor predefined macro, __LP64__ is defined.
-#   Using +DS to Specify Instruction Scheduling:
-#   * By default, the compiler performs scheduling tuned for the system
-#     on which you are compiling, or, if specified, tuned for the setting
-#     of the +DA option.
-#
-# From the online "C/HP-UX Reference Manual":
-#   -Aa
-#     Enables strict ANSI C compliance.
-#   -Ae
-#     Enables ANSI C compliance, HP value-added features (as described
-#     for +e option), and _HPUX_SOURCE name space macro. It is equivalent
-#     to -Aa +e -D_HPUX_SOURCE.
-#   +e
-#     Enables the following HP value added features while compiling in
-#     ANSI C mode: sized enum, long long, long pointers, compiler supplied
-#     defaults for missing arguments to intrinsic calls, and $ in identifier
-#     HP C extensions.
-#
-
-MAKEFILE_GENERATOR      = UNIX
-QMAKE_PLATFORM          = hpux
-
-include(../common/unix.conf)
-
-QMAKE_COMPILER          = hp_acc
-
-QMAKE_CC                = cc
-QMAKE_LEX               = lex
-QMAKE_LEXFLAGS          =
-QMAKE_YACC              = yacc
-QMAKE_YACCFLAGS         = -d
-QMAKE_CFLAGS            = +DD64 +DSitanium -w
-QMAKE_CFLAGS_WARN_ON    =
-QMAKE_CFLAGS_WARN_OFF   = -w
-QMAKE_CFLAGS_RELEASE    = +O1
-QMAKE_CFLAGS_DEBUG      = -g
-QMAKE_CFLAGS_SHLI       = +Z
-QMAKE_CFLAGS_STATIC_LIB = $$QMAKE_CFLAGS_SHLIB
-QMAKE_CFLAGS_YACC       =
-QMAKE_CFLAGS_THREAD     = -D_POSIX_C_SOURCE=199506L -D_HPUX_SOURCE -D_REENTRANT -mt
-
-QMAKE_CXX               = aCC
-QMAKE_CXXFLAGS          = $$QMAKE_CFLAGS -D__STRICT_ANSI__ -D_HPUX_SOURCE
-QMAKE_CXXFLAGS_DEPS     = +M
-QMAKE_CXXFLAGS_WARN_ON  = $$QMAKE_CFLAGS_WARN_ON
-QMAKE_CXXFLAGS_WARN_OFF = $$QMAKE_CFLAGS_WARN_OFF
-QMAKE_CXXFLAGS_RELEASE  = $$QMAKE_CFLAGS_RELEASE
-QMAKE_CXXFLAGS_DEBUG    = $$QMAKE_CFLAGS_DEBUG
-QMAKE_CXXFLAGS_SHLIB    = $$QMAKE_CFLAGS_SHLIB
-QMAKE_CXXFLAGS_STATIC_LB = $$QMAKE_CFLAGS_STATIC_LIB
-QMAKE_CXXFLAGS_YACC     = $$QMAKE_CFLAGS_YACC
-QMAKE_CXXFLAGS_THREAD   = -D_POSIX_C_SOURCE=199506L -D_REENTRANT -mt
-
-QMAKE_INCDIR            =
-QMAKE_LIBDIR            =
-QMAKE_INCDIR_X11        = /usr/include/X11R6
-QMAKE_LIBDIR_X11        = /usr/lib/hpux64/X11R6
-QMAKE_INCDIR_OPENGL     = /opt/graphics/OpenGL/include /usr/contrib/X11R6/include
-QMAKE_LIBDIR_OPENGL     = /opt/graphics/OpenGL/lib/hpux64 /usr/contrib/X11R6/lib/hpux64
-
-QMAKE_LINK              = aCC
-QMAKE_LINK_SHLIB        = aCC
-QMAKE_LFLAGS            = +DD64 +DSitanium -Wl,+s
-QMAKE_LFLAGS_RELEASE    = -O
-QMAKE_LFLAGS_DEBUG      = -g
-QMAKE_LFLAGS_SHLIB      = -b -Wl,-a,shared
-QMAKE_LFLAGS_PLUGIN     = $$QMAKE_LFLAGS_SHLIB
-QMAKE_LFLAGS_SONAME     = -Wl,+h,
-QMAKE_LFLAGS_THREAD     =
-QMAKE_LFLAGS_NOUNDEF    = -Wl,+noallowunsats
-QMAKE_LFLAGS_RPATH      =
-
-QMAKE_LIBS              = -lm
-QMAKE_LIBS_DYNLOAD      = -ldl
-QMAKE_LIBS_X11          = -lXext -lX11
-QMAKE_LIBS_OPENGL       = -lGL -lXt
-QMAKE_LIBS_THREAD       = -lpthread
-QMAKE_LIBS_YACC         = -ly
-
-QMAKE_AR                = ar cqs
-QMAKE_OBJCOPY           = objcopy
-QMAKE_NM                = nm -P
-QMAKE_RANLIB            =
-
-load(qt_config)
diff --git a/mkspecs/hpuxi-acc-64/qplatformdefs.h b/mkspecs/hpuxi-acc-64/qplatformdefs.h
deleted file mode 100644
index f9917b2a08..0000000000
--- a/mkspecs/hpuxi-acc-64/qplatformdefs.h
+++ /dev/null
@@ -1,88 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the qmake spec 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 QPLATFORMDEFS_H
-#define QPLATFORMDEFS_H
-
-// Get Qt defines/settings
-
-#define _INCLUDE_LONGLONG
-#include "qglobal.h"
-
-// Set any POSIX/XOPEN defines at the top of this file to turn on specific APIs
-
-#include <unistd.h>
-
-
-// We are hot - unistd.h should have turned on the specific APIs we requested
-
-#define _REENTRANT
-#include <pthread.h>
-#include <sys/pstat.h>
-#include <dirent.h>
-#include <fcntl.h>
-#include <grp.h>
-#include <pwd.h>
-#include <signal.h>
-#include <dl.h>
-
-#include <sys/types.h>
-#include <sys/ioctl.h>
-#include <sys/ipc.h>
-#include <sys/time.h>
-#include <sys/shm.h>
-#include <sys/socket.h>
-#include <sys/stat.h>
-#include <sys/wait.h>
-#include <netinet/in.h>
-#ifndef QT_NO_IPV6IFNAME
-#include <net/if.h>
-#endif
-
-#define QT_USE_XOPEN_LFS_EXTENSIONS
-#define QT_NO_READDIR64
-#include "../common/posix/qplatformdefs.h"
-
-#undef QT_OPEN_LARGEFILE
-#undef QT_SOCKLEN_T
-
-#define QT_OPEN_LARGEFILE       0
-#define QT_SOCKLEN_T            int
-
-#endif // QPLATFORMDEFS_H
diff --git a/mkspecs/irix-cc-64/qmake.conf b/mkspecs/irix-cc-64/qmake.conf
deleted file mode 100644
index ad5c6a3ee1..0000000000
--- a/mkspecs/irix-cc-64/qmake.conf
+++ /dev/null
@@ -1,108 +0,0 @@
-#
-# qmake configuration for irix-cc-64
-#
-# From cc(1):
-#   -64
-#     Generates a 64-bit object. This defaults to -mips4 if -mips3 has
-#     not been specified.
-#   -LANG: ...
-#     The language feature option group controls the source language
-#     interpretation assumed by the compiler. The individual controls
-#     in this group are as follows:
-#       ansi-for-init-scope [ = ( ON|OFF ) ]
-#         Enables or disables the ANSI scoping rules for for-init
-#         declarations (the scope of the name declared extends to
-#         the end of the for statement). This enables the behavior
-#         that is required by the C++ standard. The default value
-#         is OFF, which is the ARM behavior (the scope of the name
-#         declared extends to the end of the block enclosing the for
-#         statement).
-#       bool [ = ( ON|OFF ) ]
-#         Enables or disables the predefined bool data type, along
-#         with the predefined values true and false. Use this option
-#         only to suppress this type in old code that defines bool
-#         itself.  Because this option changes the mangling of function
-#         names with bool parameters, all files comprising a program
-#         should be compiled with consistent options.
-#         Default is ON.
-#         The _BOOL feature macro can be used in #ifdefs to do conditional
-#         compilation based on whether or not this option is enabled.
-#       std
-#         Enables use of the standard C++ library and standard-
-#         conforming iostream library.  Specifying this flag also
-#         triggers other standard-conforming behavior, such as the
-#         new rules for the scope of for loop initializers.
-#
-
-MAKEFILE_GENERATOR      = UNIX
-QMAKE_PLATFORM          = irix
-QMAKE_COMPILER_DEFINES += __sgi __EDG
-
-include(../common/unix.conf)
-
-QMAKE_COMPILER          = sgi_cc
-
-QMAKE_CC                = cc
-QMAKE_LEX               = flex
-QMAKE_LEXFLAGS          =
-QMAKE_YACC              = yacc
-QMAKE_YACCFLAGS         = -d
-QMAKE_CFLAGS            = -64 -signed -woff 1209,1355,1375,1424,3303
-QMAKE_CFLAGS_DEPS       = -M
-QMAKE_CFLAGS_WARN_ON    = -fullwarn
-QMAKE_CFLAGS_WARN_OFF   =
-QMAKE_CFLAGS_RELEASE    = -O2 -OPT:Olimit=3000
-QMAKE_CFLAGS_DEBUG      = -g
-QMAKE_CFLAGS_SHLIB      =
-QMAKE_CFLAGS_STATIC_LIB = $$QMAKE_CFLAGS_SHLIB
-QMAKE_CFLAGS_YACC       = -woff 1110,1174,3262
-QMAKE_CFLAGS_THREAD     =
-QMAKE_CFLAGS_EXCEPTIONS_OFF = -LANG:exceptions=off
-
-QMAKE_CXX               = CC
-QMAKE_CXXFLAGS          = -64 -signed -LANG:std:libc_in_namespace_std=ON -woff 1209,1355,1375,1424,3303
-QMAKE_CXXFLAGS_DEPS     = $$QMAKE_CFLAGS_DEPS
-QMAKE_CXXFLAGS_WARN_ON  = $$QMAKE_CFLAGS_WARN_ON
-QMAKE_CXXFLAGS_WARN_OFF = $$QMAKE_CFLAGS_WARN_OFF
-QMAKE_CXXFLAGS_RELEASE  = $$QMAKE_CFLAGS_RELEASE
-QMAKE_CXXFLAGS_DEBUG    = $$QMAKE_CFLAGS_DEBUG
-QMAKE_CXXFLAGS_SHLIB    = $$QMAKE_CFLAGS_SHLIB
-QMAKE_CXXFLAGS_STATIC_LIB = $$QMAKE_CFLAGS_STATIC_LIB
-QMAKE_CXXFLAGS_YACC     = $$QMAKE_CFLAGS_YACC
-QMAKE_CXXFLAGS_THREAD   =
-QMAKE_CXXFLAGS_EXCEPTIONS_OFF = $$QMAKE_CFLAGS_EXCEPTIONS_OFF
-
-QMAKE_INCDIR            =
-QMAKE_LIBDIR            =
-QMAKE_INCDIR_X11        =
-QMAKE_LIBDIR_X11        =
-QMAKE_INCDIR_OPENGL     =
-QMAKE_LIBDIR_OPENGL     =
-
-QMAKE_LINK              = CC
-QMAKE_LINK_SHLIB        = CC
-QMAKE_LFLAGS            = -64
-QMAKE_LFLAGS_RELEASE    =
-QMAKE_LFLAGS_DEBUG      = -g
-QMAKE_LFLAGS_SHLIB      = -shared
-QMAKE_LFLAGS_PLUGIN     = $$QMAKE_LFLAGS_SHLIB
-QMAKE_LFLAGS_SONAME     = -Wl,-soname,
-QMAKE_LFLAGS_THREAD     =
-QMAKE_LFLAGS_NOUNDEF    = -Wl,-no_unresolved
-QMAKE_LFLAGS_RPATH      = -Wl,-rpath,
-QMAKE_LFLAGS_EXCEPTIONS_OFF = $$QMAKE_CFLAGS_EXCEPTIONS_OFF
-
-QMAKE_LIBS              =
-QMAKE_LIBS_DYNLOAD      =
-QMAKE_LIBS_X11          = -lXext -lX11 -lm
-QMAKE_LIBS_OPENGL       = -lGL -lm
-QMAKE_LIBS_THREAD       = -lpthread
-
-QMAKE_AR                = CC -ar -o
-QMAKE_OBJCOPY           = objcopy
-QMAKE_NM                = nm -P
-QMAKE_RANLIB            =
-
-QMAKE_CLEAN             = -r $(OBJECTS_DIR)so_locations $(OBJECTS_DIR)ii_files
-
-load(qt_config)
diff --git a/mkspecs/irix-cc-64/qplatformdefs.h b/mkspecs/irix-cc-64/qplatformdefs.h
deleted file mode 100644
index 4a8e1da4de..0000000000
--- a/mkspecs/irix-cc-64/qplatformdefs.h
+++ /dev/null
@@ -1,93 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the qmake spec 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 QPLATFORMDEFS_H
-#define QPLATFORMDEFS_H
-
-// Get Qt defines/settings
-
-#include "qglobal.h"
-
-// Set any POSIX/XOPEN defines at the top of this file to turn on specific APIs
-
-#include <unistd.h>
-
-
-// We are hot - unistd.h should have turned on the specific APIs we requested
-
-
-#include <pthread.h>
-#include <dirent.h>
-#include <fcntl.h>
-#include <grp.h>
-#include <pwd.h>
-#include <signal.h>
-#include <dlfcn.h>
-
-#include <sys/types.h>
-#include <sys/ioctl.h>
-#include <sys/ipc.h>
-#include <sys/time.h>
-#include <sys/shm.h>
-#include <sys/socket.h>
-#include <sys/stat.h>
-#include <sys/wait.h>
-#include <netinet/in.h>
-#ifndef QT_NO_IPV6IFNAME
-#include <net/if.h>
-#endif
-
-#define QT_USE_XOPEN_LFS_EXTENSIONS
-#include "../common/posix/qplatformdefs.h"
-
-#undef QT_SOCKLEN_T
-
-#if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE-0 >= 500)
-#define QT_SOCKLEN_T            size_t
-#else
-#define QT_SOCKLEN_T            int
-#endif
-
-// Irix 6.5 and better
-#if defined(_SGIAPI)
-#define QT_SNPRINTF             ::snprintf
-#define QT_VSNPRINTF            ::vsnprintf
-#endif
-
-#endif // QPLATFORMDEFS_H
diff --git a/mkspecs/irix-cc/qmake.conf b/mkspecs/irix-cc/qmake.conf
deleted file mode 100644
index 52abdf8578..0000000000
--- a/mkspecs/irix-cc/qmake.conf
+++ /dev/null
@@ -1,108 +0,0 @@
-#
-# qmake configuration for irix-cc
-#
-# From cc(1):
-#   -n32
-#     Generates a (new) 32-bit object. This defaults to -mips3 if
-#     -mips4 has not been specified.
-#   -LANG: ...
-#     The language feature option group controls the source language
-#     interpretation assumed by the compiler. The individual controls
-#     in this group are as follows:
-#       ansi-for-init-scope [ = ( ON|OFF ) ]
-#         Enables or disables the ANSI scoping rules for for-init
-#         declarations (the scope of the name declared extends to
-#         the end of the for statement). This enables the behavior
-#         that is required by the C++ standard. The default value
-#         is OFF, which is the ARM behavior (the scope of the name
-#         declared extends to the end of the block enclosing the for
-#         statement).
-#       bool [ = ( ON|OFF ) ]
-#         Enables or disables the predefined bool data type, along
-#         with the predefined values true and false. Use this option
-#         only to suppress this type in old code that defines bool
-#         itself.  Because this option changes the mangling of function
-#         names with bool parameters, all files comprising a program
-#         should be compiled with consistent options.
-#         Default is ON.
-#         The _BOOL feature macro can be used in #ifdefs to do conditional
-#         compilation based on whether or not this option is enabled.
-#       std
-#         Enables use of the standard C++ library and standard-
-#         conforming iostream library.  Specifying this flag also
-#         triggers other standard-conforming behavior, such as the
-#         new rules for the scope of for loop initializers.
-#
-
-MAKEFILE_GENERATOR      = UNIX
-QMAKE_PLATFORM          = irix
-QMAKE_COMPILER_DEFINES += __sgi __EDG
-
-include(../common/unix.conf)
-
-QMAKE_COMPILER          = sgi_cc
-
-QMAKE_CC                = cc
-QMAKE_LEX               = flex
-QMAKE_LEXFLAGS          =
-QMAKE_YACC              = yacc
-QMAKE_YACCFLAGS         = -d
-QMAKE_CFLAGS            = -n32 -signed -woff 1209,1355,1375,1424,3303
-QMAKE_CFLAGS_DEPS       = -M
-QMAKE_CFLAGS_WARN_ON    = -fullwarn
-QMAKE_CFLAGS_WARN_OFF   =
-QMAKE_CFLAGS_RELEASE    = -O2 -OPT:Olimit=3000
-QMAKE_CFLAGS_DEBUG      = -g
-QMAKE_CFLAGS_SHLIB      =
-QMAKE_CFLAGS_STATIC_LIB = $$QMAKE_CFLAGS_SHLIB
-QMAKE_CFLAGS_YACC       = -woff 1110,1174,3262
-QMAKE_CFLAGS_THREAD     =
-QMAKE_CFLAGS_EXCEPTIONS_OFF = -LANG:exceptions=off
-
-QMAKE_CXX               = CC
-QMAKE_CXXFLAGS          = -n32 -signed -LANG:std:libc_in_namespace_std=ON -woff 1209,1355,1375,1424,3303
-QMAKE_CXXFLAGS_DEPS     = $$QMAKE_CFLAGS_DEPS
-QMAKE_CXXFLAGS_WARN_ON  = $$QMAKE_CFLAGS_WARN_ON
-QMAKE_CXXFLAGS_WARN_OFF = $$QMAKE_CFLAGS_WARN_OFF
-QMAKE_CXXFLAGS_RELEASE  = $$QMAKE_CFLAGS_RELEASE
-QMAKE_CXXFLAGS_DEBUG    = $$QMAKE_CFLAGS_DEBUG
-QMAKE_CXXFLAGS_SHLIB    = $$QMAKE_CFLAGS_SHLIB
-QMAKE_CXXFLAGS_STATIC_LIB = $$QMAKE_CFLAGS_STATIC_LIB
-QMAKE_CXXFLAGS_YACC     = $$QMAKE_CFLAGS_YACC
-QMAKE_CXXFLAGS_THREAD   =
-QMAKE_CXXFLAGS_EXCEPTIONS_OFF = $$QMAKE_CFLAGS_EXCEPTIONS_OFF
-
-QMAKE_INCDIR            =
-QMAKE_LIBDIR            =
-QMAKE_INCDIR_X11        =
-QMAKE_LIBDIR_X11        =
-QMAKE_INCDIR_OPENGL     =
-QMAKE_LIBDIR_OPENGL     =
-
-QMAKE_LINK              = CC
-QMAKE_LINK_SHLIB        = CC
-QMAKE_LFLAGS            = -n32
-QMAKE_LFLAGS_RELEASE    =
-QMAKE_LFLAGS_DEBUG      = -g
-QMAKE_LFLAGS_SHLIB      = -shared
-QMAKE_LFLAGS_PLUGIN     = $$QMAKE_LFLAGS_SHLIB
-QMAKE_LFLAGS_SONAME     = -Wl,-soname,
-QMAKE_LFLAGS_THREAD     =
-QMAKE_LFLAGS_NOUNDEF    = -Wl,-no_unresolved
-QMAKE_LFLAGS_RPATH      = -Wl,-rpath,
-QMAKE_LFLAGS_EXCEPTIONS_OFF = $$QMAKE_CFLAGS_EXCEPTIONS_OFF
-
-QMAKE_LIBS              =
-QMAKE_LIBS_DYNLOAD      =
-QMAKE_LIBS_X11          = -lXext -lX11 -lm
-QMAKE_LIBS_OPENGL       = -lGL -lm
-QMAKE_LIBS_THREAD       = -lpthread
-
-QMAKE_AR                = CC -ar -o
-QMAKE_OBJCOPY           = objcopy
-QMAKE_NM                = nm -P
-QMAKE_RANLIB            =
-
-QMAKE_CLEAN             = -r $(OBJECTS_DIR)so_locations $(OBJECTS_DIR)ii_files
-
-load(qt_config)
diff --git a/mkspecs/irix-cc/qplatformdefs.h b/mkspecs/irix-cc/qplatformdefs.h
deleted file mode 100644
index 4a8e1da4de..0000000000
--- a/mkspecs/irix-cc/qplatformdefs.h
+++ /dev/null
@@ -1,93 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the qmake spec 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 QPLATFORMDEFS_H
-#define QPLATFORMDEFS_H
-
-// Get Qt defines/settings
-
-#include "qglobal.h"
-
-// Set any POSIX/XOPEN defines at the top of this file to turn on specific APIs
-
-#include <unistd.h>
-
-
-// We are hot - unistd.h should have turned on the specific APIs we requested
-
-
-#include <pthread.h>
-#include <dirent.h>
-#include <fcntl.h>
-#include <grp.h>
-#include <pwd.h>
-#include <signal.h>
-#include <dlfcn.h>
-
-#include <sys/types.h>
-#include <sys/ioctl.h>
-#include <sys/ipc.h>
-#include <sys/time.h>
-#include <sys/shm.h>
-#include <sys/socket.h>
-#include <sys/stat.h>
-#include <sys/wait.h>
-#include <netinet/in.h>
-#ifndef QT_NO_IPV6IFNAME
-#include <net/if.h>
-#endif
-
-#define QT_USE_XOPEN_LFS_EXTENSIONS
-#include "../common/posix/qplatformdefs.h"
-
-#undef QT_SOCKLEN_T
-
-#if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE-0 >= 500)
-#define QT_SOCKLEN_T            size_t
-#else
-#define QT_SOCKLEN_T            int
-#endif
-
-// Irix 6.5 and better
-#if defined(_SGIAPI)
-#define QT_SNPRINTF             ::snprintf
-#define QT_VSNPRINTF            ::vsnprintf
-#endif
-
-#endif // QPLATFORMDEFS_H
diff --git a/mkspecs/irix-g++-64/qmake.conf b/mkspecs/irix-g++-64/qmake.conf
deleted file mode 100644
index bd258df5e8..0000000000
--- a/mkspecs/irix-g++-64/qmake.conf
+++ /dev/null
@@ -1,78 +0,0 @@
-#
-# qmake configuration for irix-g++-64
-#
-
-MAKEFILE_GENERATOR      = UNIX
-QMAKE_PLATFORM          = irix
-QMAKE_COMPILER_DEFINES += __sgi __GNUC__
-
-include(../common/unix.conf)
-
-QMAKE_COMPILER          = gcc
-
-QMAKE_CC                = gcc
-QMAKE_LEX               = flex
-QMAKE_LEXFLAGS          =
-QMAKE_YACC              = yacc
-QMAKE_YACCFLAGS         = -d
-QMAKE_CFLAGS            = -mabi=64
-QMAKE_CFLAGS_DEPS       = -M
-QMAKE_CFLAGS_WARN_ON    = -Wall -W
-QMAKE_CFLAGS_WARN_OFF   = -w
-QMAKE_CFLAGS_RELEASE    = -O2
-QMAKE_CFLAGS_DEBUG      = -g
-QMAKE_CFLAGS_SHLIB      = -fPIC
-QMAKE_CFLAGS_STATIC_LIB = $$QMAKE_CFLAGS_SHLIB
-QMAKE_CFLAGS_YACC       = -Wno-unused -Wno-parentheses
-QMAKE_CFLAGS_THREAD     =
-
-QMAKE_CXX               = g++
-QMAKE_CXXFLAGS          = $$QMAKE_CFLAGS
-QMAKE_CXXFLAGS_DEPS     = $$QMAKE_CFLAGS_DEPS
-QMAKE_CXXFLAGS_WARN_ON  = $$QMAKE_CFLAGS_WARN_ON
-QMAKE_CXXFLAGS_WARN_OFF = $$QMAKE_CFLAGS_WARN_OFF
-QMAKE_CXXFLAGS_RELEASE  = $$QMAKE_CFLAGS_RELEASE
-QMAKE_CXXFLAGS_DEBUG    = $$QMAKE_CFLAGS_DEBUG
-QMAKE_CXXFLAGS_SHLIB    = $$QMAKE_CFLAGS_SHLIB
-QMAKE_CXXFLAGS_STATIC_LIB = $$QMAKE_CFLAGS_STATIC_LIB
-QMAKE_CXXFLAGS_YACC     = $$QMAKE_CFLAGS_YACC
-QMAKE_CXXFLAGS_THREAD   =
-
-QMAKE_INCDIR            =
-QMAKE_LIBDIR            =
-QMAKE_INCDIR_X11        =
-QMAKE_LIBDIR_X11        =
-QMAKE_INCDIR_OPENGL     =
-QMAKE_LIBDIR_OPENGL     =
-
-QMAKE_LINK              = g++
-QMAKE_LINK_SHLIB        = g++
-QMAKE_LINK_C            = gcc
-QMAKE_LINK_C_SHLIB      = gcc
-QMAKE_LFLAGS            = -mabi=64
-QMAKE_LFLAGS_RELEASE    =
-QMAKE_LFLAGS_DEBUG      =
-QMAKE_LFLAGS_SHLIB      = -shared -Wl,-LD_LAYOUT:lgot_buffer=1000
-QMAKE_LFLAGS_PLUGIN     = $$QMAKE_LFLAGS_SHLIB
-QMAKE_LFLAGS_SONAME     = -Wl,-soname,
-QMAKE_LFLAGS_THREAD     =
-QMAKE_LFLAGS_NOUNDEF    = -Wl,-no_unresolved
-QMAKE_LFLAGS_RPATH      = -Wl,-rpath,
-
-QMAKE_LIBS              = -lC
-QMAKE_LIBS_DYNLOAD      =
-QMAKE_LIBS_X11          = -lXext -lX11 -lm
-# libGLU is using the SGI C++ library internally and this somehow clashes
-# with the GNU C++ library (similar name mangling and symbol names?)
-# so we add -lC so that the SGI C++ library is used first...
-QMAKE_LIBS_OPENGL       = -lGL
-QMAKE_LIBS_THREAD       = -lpthread
-
-QMAKE_AR                = ar cq
-QMAKE_OBJCOPY           = objcopy
-QMAKE_NM                = nm -P
-QMAKE_RANLIB            =
-
-QMAKE_CLEAN             = so_locations
-
-load(qt_config)
diff --git a/mkspecs/irix-g++/qmake.conf b/mkspecs/irix-g++/qmake.conf
deleted file mode 100644
index 57a27b6a1b..0000000000
--- a/mkspecs/irix-g++/qmake.conf
+++ /dev/null
@@ -1,78 +0,0 @@
-#
-# qmake configuration for irix-g++
-#
-
-MAKEFILE_GENERATOR      = UNIX
-QMAKE_PLATFORM          = irix
-QMAKE_COMPILER_DEFINES += __sgi __GNUC__
-
-include(../common/unix.conf)
-
-QMAKE_COMPILER          = gcc
-
-QMAKE_CC                = gcc
-QMAKE_LEX               = flex
-QMAKE_LEXFLAGS          =
-QMAKE_YACC              = yacc
-QMAKE_YACCFLAGS         = -d
-QMAKE_CFLAGS            =
-QMAKE_CFLAGS_DEPS       = -M
-QMAKE_CFLAGS_WARN_ON    = -Wall -W
-QMAKE_CFLAGS_WARN_OFF   = -w
-QMAKE_CFLAGS_RELEASE    = -O2
-QMAKE_CFLAGS_DEBUG      = -g
-QMAKE_CFLAGS_SHLIB      = -fPIC
-QMAKE_CFLAGS_STATIC_LIB = $$QMAKE_CFLAGS_SHLIB
-QMAKE_CFLAGS_YACC       = -Wno-unused -Wno-parentheses
-QMAKE_CFLAGS_THREAD     =
-
-QMAKE_CXX               = g++
-QMAKE_CXXFLAGS          = $$QMAKE_CFLAGS
-QMAKE_CXXFLAGS_DEPS     = $$QMAKE_CFLAGS_DEPS
-QMAKE_CXXFLAGS_WARN_ON  = $$QMAKE_CFLAGS_WARN_ON
-QMAKE_CXXFLAGS_WARN_OFF = $$QMAKE_CFLAGS_WARN_OFF
-QMAKE_CXXFLAGS_RELEASE  = $$QMAKE_CFLAGS_RELEASE
-QMAKE_CXXFLAGS_DEBUG    = $$QMAKE_CFLAGS_DEBUG
-QMAKE_CXXFLAGS_SHLIB    = $$QMAKE_CFLAGS_SHLIB
-QMAKE_CXXFLAGS_STATIC_LIB = $$QMAKE_CFLAGS_STATIC_LIB
-QMAKE_CXXFLAGS_YACC     = $$QMAKE_CFLAGS_YACC
-QMAKE_CXXFLAGS_THREAD   =
-
-QMAKE_INCDIR            =
-QMAKE_LIBDIR            =
-QMAKE_INCDIR_X11        =
-QMAKE_LIBDIR_X11        =
-QMAKE_INCDIR_OPENGL     =
-QMAKE_LIBDIR_OPENGL     =
-
-QMAKE_LINK              = g++
-QMAKE_LINK_SHLIB        = g++
-QMAKE_LINK_C            = gcc
-QMAKE_LINK_C_SHLIB      = gcc
-QMAKE_LFLAGS            =
-QMAKE_LFLAGS_RELEASE    =
-QMAKE_LFLAGS_DEBUG      =
-QMAKE_LFLAGS_SHLIB      = -shared -Wl,-LD_LAYOUT:lgot_buffer=1000
-QMAKE_LFLAGS_PLUGIN     = $$QMAKE_LFLAGS_SHLIB
-QMAKE_LFLAGS_SONAME     = -Wl,-soname,
-QMAKE_LFLAGS_THREAD     =
-QMAKE_LFLAGS_NOUNDEF    = -Wl,-no_unresolved
-QMAKE_LFLAGS_RPATH      = -Wl,-rpath,
-
-QMAKE_LIBS              = -lC
-QMAKE_LIBS_DYNLOAD      =
-QMAKE_LIBS_X11          = -lXext -lX11 -lm
-# libGLU is using the SGI C++ library internally and this somehow clashes
-# with the GNU C++ library (similar name mangling and symbol names?)
-# so we add -lC so that the SGI C++ library is used first...
-QMAKE_LIBS_OPENGL       = -lGL
-QMAKE_LIBS_THREAD       = -lpthread
-
-QMAKE_AR                = ar cq
-QMAKE_OBJCOPY           = objcopy
-QMAKE_NM                = nm -P
-QMAKE_RANLIB            =
-
-QMAKE_CLEAN             = so_locations
-
-load(qt_config)
diff --git a/mkspecs/irix-g++/qplatformdefs.h b/mkspecs/irix-g++/qplatformdefs.h
deleted file mode 100644
index 4b3918a491..0000000000
--- a/mkspecs/irix-g++/qplatformdefs.h
+++ /dev/null
@@ -1,100 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the qmake spec 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 QPLATFORMDEFS_H
-#define QPLATFORMDEFS_H
-
-// Get Qt defines/settings
-
-#include "qglobal.h"
-
-// Set any POSIX/XOPEN defines at the top of this file to turn on specific APIs
-
-#include <unistd.h>
-
-
-// We are hot - unistd.h should have turned on the specific APIs we requested
-
-
-#include <pthread.h>
-#include <dirent.h>
-#include <fcntl.h>
-#include <grp.h>
-#include <pwd.h>
-#include <signal.h>
-#include <dlfcn.h>
-
-#include <sys/types.h>
-#include <sys/ioctl.h>
-#include <sys/ipc.h>
-#include <sys/time.h>
-#include <sys/shm.h>
-#include <sys/socket.h>
-#include <sys/stat.h>
-#include <sys/wait.h>
-#include <netinet/in.h>
-#ifndef QT_NO_IPV6IFNAME
-#include <net/if.h>
-#endif
-
-#define QT_USE_XOPEN_LFS_EXTENSIONS
-#include "../common/posix/qplatformdefs.h"
-
-#undef QT_SOCKLEN_T
-#undef QT_SIGNAL_ARGS
-
-#if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE-0 >= 500)
-#define QT_SOCKLEN_T            size_t
-#else
-#define QT_SOCKLEN_T            int
-#endif
-
-#if defined(_LANGUAGE_C_PLUS_PLUS) || !defined(_SGIAPI)
-#define QT_SIGNAL_ARGS          int
-#else
-#define QT_SIGNAL_ARGS          void
-#endif
-
-// Irix 6.5 and better
-#if defined(_SGIAPI)
-#define QT_SNPRINTF             ::snprintf
-#define QT_VSNPRINTF            ::vsnprintf
-#endif
-
-#endif // QPLATFORMDEFS_H
diff --git a/mkspecs/linux-cxx/qmake.conf b/mkspecs/linux-cxx/qmake.conf
deleted file mode 100644
index b156bea084..0000000000
--- a/mkspecs/linux-cxx/qmake.conf
+++ /dev/null
@@ -1,66 +0,0 @@
-#
-# qmake configuration for linux-cxx
-#
-# Written for Compaq C++ for GNU/Linux on Alpha
-#
-
-MAKEFILE_GENERATOR      = UNIX
-QMAKE_PLATFORM          = linux
-
-include(../common/unix.conf)
-
-QMAKE_COMPILER          = compaq_cc
-
-QMAKE_CC                = ccc
-QMAKE_LEX               = flex
-QMAKE_LEXFLAGS          =
-QMAKE_YACC              = yacc
-QMAKE_YACCFLAGS         = -d
-QMAKE_CFLAGS            = -w
-QMAKE_CFLAGS_DEPS       = -M
-QMAKE_CFLAGS_WARN_ON    =
-QMAKE_CFLAGS_WARN_OFF   =
-QMAKE_CFLAGS_RELEASE    = -O2
-QMAKE_CFLAGS_DEBUG      = -g
-QMAKE_CFLAGS_SHLIB      =
-QMAKE_CFLAGS_STATIC_LIB = $$QMAKE_CFLAGS_SHLIB
-QMAKE_CFLAGS_YACC       = -Olimit 1000
-
-QMAKE_CXX               = cxx
-QMAKE_CXXFLAGS          = -w
-QMAKE_CXXFLAGS_DEPS     = $$QMAKE_CFLAGS_DEPS
-QMAKE_CXXFLAGS_WARN_ON  = $$QMAKE_CFLAGS_WARN_ON
-QMAKE_CXXFLAGS_WARN_OFF = $$QMAKE_CFLAGS_WARN_OFF
-QMAKE_CXXFLAGS_RELEASE  = $$QMAKE_CFLAGS_RELEASE
-QMAKE_CXXFLAGS_DEBUG    = $$QMAKE_CFLAGS_DEBUG
-QMAKE_CXXFLAGS_SHLIB    = $$QMAKE_CFLAGS_SHLIB
-QMAKE_CXXFLAGS_STATIC_LIB = $$QMAKE_CFLAGS_STATIC_LIB
-QMAKE_CXXFLAGS_YACC     = $$QMAKE_CFLAGS_YACC
-
-QMAKE_INCDIR            =
-QMAKE_LIBDIR            =
-QMAKE_INCDIR_X11        =
-QMAKE_LIBDIR_X11        =
-QMAKE_INCDIR_OPENGL     =
-QMAKE_LIBDIR_OPENGL     =
-
-QMAKE_LINK              = cxx
-QMAKE_LINK_SHLIB        = cxx
-QMAKE_LFLAGS            =
-QMAKE_LFLAGS_RELEASE    =
-QMAKE_LFLAGS_DEBUG      =
-QMAKE_LFLAGS_SHLIB      = -shared
-QMAKE_LFLAGS_PLUGIN     = $$QMAKE_LFLAGS_SHLIB
-QMAKE_LFLAGS_SONAME     = -Wl,-soname,
-
-QMAKE_LIBS              =
-QMAKE_LIBS_DYNLOAD      = -ldl
-QMAKE_LIBS_X11          = -lXext -lX11 -lm
-QMAKE_LIBS_NIS          = -lnsl
-
-QMAKE_LIBS_OPENGL       = -lGL
-
-QMAKE_AR                = ar cqs
-QMAKE_RANLIB            =
-
-load(qt_config)
diff --git a/mkspecs/linux-cxx/qplatformdefs.h b/mkspecs/linux-cxx/qplatformdefs.h
deleted file mode 100644
index 0c26017140..0000000000
--- a/mkspecs/linux-cxx/qplatformdefs.h
+++ /dev/null
@@ -1,99 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the qmake spec 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 QPLATFORMDEFS_H
-#define QPLATFORMDEFS_H
-
-// Get Qt defines/settings
-
-#include "qglobal.h"
-
-// Set any POSIX/XOPEN defines at the top of this file to turn on specific APIs
-
-// 1) need to reset default environment if _BSD_SOURCE is defined
-// 2) need to specify POSIX thread interfaces explicitly in glibc 2.0
-// 3) it seems older glibc need this to include the X/Open stuff
-#ifndef _GNU_SOURCE
-#  define _GNU_SOURCE
-#endif
-
-#include <unistd.h>
-
-
-// We are hot - unistd.h should have turned on the specific APIs we requested
-
-
-#include <pthread.h>
-#include <dirent.h>
-#include <fcntl.h>
-#include <grp.h>
-#include <pwd.h>
-#include <signal.h>
-#include <dlfcn.h>
-
-#include <sys/types.h>
-#include <sys/ioctl.h>
-#include <sys/ipc.h>
-#include <sys/time.h>
-#include <sys/shm.h>
-#include <sys/socket.h>
-#include <sys/stat.h>
-#include <sys/wait.h>
-#include <netinet/in.h>
-#ifndef QT_NO_IPV6IFNAME
-#include <net/if.h>
-#endif
-
-#define QT_USE_XOPEN_LFS_EXTENSIONS
-#include "../common/posix/qplatformdefs.h"
-
-#undef QT_SOCKLEN_T
-
-#if defined(__GLIBC__) && (__GLIBC__ >= 2)
-#define QT_SOCKLEN_T            socklen_t
-#else
-#define QT_SOCKLEN_T            int
-#endif
-
-#if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE >= 500)
-#define QT_SNPRINTF             ::snprintf
-#define QT_VSNPRINTF            ::vsnprintf
-#endif
-
-#endif // QPLATFORMDEFS_H
diff --git a/mkspecs/linux-icc/qmake.conf b/mkspecs/linux-icc/qmake.conf
index 19d8181ada..d043d54740 100644
--- a/mkspecs/linux-icc/qmake.conf
+++ b/mkspecs/linux-icc/qmake.conf
@@ -6,6 +6,9 @@ MAKEFILE_GENERATOR      = UNIX
 
 QMAKE_COMPILER          = gcc intel_icc   # icc pretends to be gcc
 
+QMAKE_CFLAGS_OPTIMIZE      = -O2
+QMAKE_CFLAGS_OPTIMIZE_SIZE = -Os
+
 QMAKE_CC                = icc
 QMAKE_LEX               = flex
 QMAKE_LEXFLAGS          =
@@ -16,7 +19,7 @@ QMAKE_CFLAGS_APP        = -fPIC
 QMAKE_CFLAGS_DEPS       = -M
 QMAKE_CFLAGS_WARN_ON    = -w1 -Wall -Wcheck -wd1572,873,2259,2261,3373
 QMAKE_CFLAGS_WARN_OFF   = -w
-QMAKE_CFLAGS_RELEASE    = -O2
+QMAKE_CFLAGS_RELEASE    = $$QMAKE_CFLAGS_OPTIMIZE
 QMAKE_CFLAGS_DEBUG      = -O0 -g
 QMAKE_CFLAGS_SHLIB      = -fPIC
 QMAKE_CFLAGS_STATIC_LIB = $$QMAKE_CFLAGS_SHLIB
diff --git a/mkspecs/linux-kcc/qmake.conf b/mkspecs/linux-kcc/qmake.conf
deleted file mode 100644
index 591a59537f..0000000000
--- a/mkspecs/linux-kcc/qmake.conf
+++ /dev/null
@@ -1,83 +0,0 @@
-#
-# qmake configuration for linux-kcc
-#
-# Written for KAI C++ 4.0f for GNU/Linux
-#
-# This product has been discontinued, use Intel C++ instead.
-#
-# From the KAI C++ man page for Linux:
-# --[no_]thread_safe
-#   [Waive or] Request thread-safe handling of system-allocated objects.
-#   To guarantee thread safety, this option must be used when both
-#   compiling and linking. Thread-safe C++ is not link-compatible with
-#   (the default) non-thread-safe C++.
-#
-
-MAKEFILE_GENERATOR      = UNIX
-QMAKE_PLATFORM          = linux
-
-include(../common/unix.conf)
-
-QMAKE_COMPILER          = kai_cc
-
-QMAKE_CC                = KCC
-QMAKE_LEX               = flex
-QMAKE_LEXFLAGS          =
-QMAKE_YACC              = yacc
-QMAKE_YACCFLAGS         = -d
-QMAKE_CFLAGS            = --c --display_error_number --backend -pipe
-QMAKE_CFLAGS_DEPS       = -M
-QMAKE_CFLAGS_WARN_ON    =
-QMAKE_CFLAGS_WARN_OFF   = -w
-QMAKE_CFLAGS_RELEASE    = +K2
-QMAKE_CFLAGS_DEBUG      = +K0
-QMAKE_CFLAGS_SHLIB      = -fPIC
-QMAKE_CFLAGS_STATIC_LIB = $$QMAKE_CFLAGS_SHLIB
-QMAKE_CFLAGS_YACC       = --diag_suppress 111,177
-QMAKE_CFLAGS_THREAD     = --thread_safe
-
-QMAKE_CXX               = KCC
-QMAKE_CXXFLAGS          = --display_error_number --diag_suppress 611,1142 --backend -pipe
-QMAKE_CXXFLAGS_DEPS     = $$QMAKE_CFLAGS_DEPS
-QMAKE_CXXFLAGS_WARN_ON  = $$QMAKE_CFLAGS_WARN_ON
-QMAKE_CXXFLAGS_WARN_OFF = $$QMAKE_CFLAGS_WARN_OFF
-QMAKE_CXXFLAGS_RELEASE  = $$QMAKE_CFLAGS_RELEASE
-QMAKE_CXXFLAGS_DEBUG    = $$QMAKE_CFLAGS_DEBUG
-QMAKE_CXXFLAGS_SHLIB    = $$QMAKE_CFLAGS_SHLIB
-QMAKE_CXXFLAGS_STATIC_LIB = $$QMAKE_CFLAGS_STATIC_LIB
-QMAKE_CXXFLAGS_YACC     = $$QMAKE_CFLAGS_YACC
-QMAKE_CXXFLAGS_THREAD   = $$QMAKE_CFLAGS_THREAD
-
-QMAKE_INCDIR            =
-QMAKE_LIBDIR            =
-QMAKE_INCDIR_X11        =
-QMAKE_LIBDIR_X11        =
-QMAKE_INCDIR_OPENGL     =
-QMAKE_LIBDIR_OPENGL     =
-
-QMAKE_LINK              = KCC
-QMAKE_LINK_SHLIB        = KCC
-QMAKE_LFLAGS            =
-QMAKE_LFLAGS_RELEASE    =
-QMAKE_LFLAGS_DEBUG      =
-QMAKE_LFLAGS_SHLIB      =
-QMAKE_LFLAGS_PLUGIN     = $$QMAKE_LFLAGS_SHLIB
-QMAKE_LFLAGS_SONAME     = --soname$$LITERAL_WHITESPACE
-QMAKE_LFLAGS_THREAD     = --thread_safe
-QMAKE_LFLAGS_RPATH      = -rpath$$LITERAL_WHITESPACE
-
-QMAKE_LIBS              =
-QMAKE_LIBS_DYNLOAD      = -ldl
-QMAKE_LIBS_X11          = -lXext -lX11 -lm
-QMAKE_LIBS_NIS          = -lnsl
-QMAKE_LIBS_OPENGL       = -lGL
-QMAKE_LIBS_THREAD       =
-
-QMAKE_AR                = ar cqs
-QMAKE_OBJCOPY           = objcopy
-QMAKE_NM                = nm -P
-QMAKE_RANLIB            =
-
-QMAKE_CLEAN             = -r $(OBJECTS_DIR)ti_files
-
-load(qt_config)
diff --git a/mkspecs/linux-kcc/qplatformdefs.h b/mkspecs/linux-kcc/qplatformdefs.h
deleted file mode 100644
index 7398e62c5e..0000000000
--- a/mkspecs/linux-kcc/qplatformdefs.h
+++ /dev/null
@@ -1,102 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the qmake spec 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 QPLATFORMDEFS_H
-#define QPLATFORMDEFS_H
-
-// Get Qt defines/settings
-
-#include "qglobal.h"
-
-// Set any POSIX/XOPEN defines at the top of this file to turn on specific APIs
-
-// 1) need to reset default environment if _BSD_SOURCE is defined
-// 2) need to specify POSIX thread interfaces explicitly in glibc 2.0
-// 3) it seems older glibc need this to include the X/Open stuff
-#ifndef _GNU_SOURCE
-#  define _GNU_SOURCE
-#endif
-
-#include <unistd.h>
-
-
-// We are hot - unistd.h should have turned on the specific APIs we requested
-
-
-#include <pthread.h>
-#include <dirent.h>
-#include <fcntl.h>
-#include <grp.h>
-#include <pwd.h>
-#include <signal.h>
-#include <dlfcn.h>
-// KAI C++ has at the moment problems with unloading the Qt plugins.
-// So don't unload them as a workaround for now.
-#define QT_NO_LIBRARY_UNLOAD
-
-#include <sys/types.h>
-#include <sys/ioctl.h>
-#include <sys/ipc.h>
-#include <sys/time.h>
-#include <sys/shm.h>
-#include <sys/socket.h>
-#include <sys/stat.h>
-#include <sys/wait.h>
-#include <netinet/in.h>
-#ifndef QT_NO_IPV6IFNAME
-#include <net/if.h>
-#endif
-
-#define QT_USE_XOPEN_LFS_EXTENSIONS
-#include "../common/posix/qplatformdefs.h"
-
-#undef QT_SOCKLEN_T
-
-#if defined(__GLIBC__) && (__GLIBC__ >= 2)
-#define QT_SOCKLEN_T            socklen_t
-#else
-#define QT_SOCKLEN_T            int
-#endif
-
-#if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE >= 500)
-#define QT_SNPRINTF             ::snprintf
-#define QT_VSNPRINTF            ::vsnprintf
-#endif
-
-#endif // QPLATFORMDEFS_H
diff --git a/mkspecs/linux-pgcc/qmake.conf b/mkspecs/linux-pgcc/qmake.conf
deleted file mode 100644
index c41823ba94..0000000000
--- a/mkspecs/linux-pgcc/qmake.conf
+++ /dev/null
@@ -1,72 +0,0 @@
-#
-# qmake configuration for linux-pgcc
-#
-# Written for the Portland Group compiler 6.0-5
-#
-
-MAKEFILE_GENERATOR      = UNIX
-QMAKE_PLATFORM          = linux
-
-include(../common/unix.conf)
-
-QMAKE_COMPILER          = portland_cc
-
-QMAKE_CC                = pgcc
-QMAKE_LEX               = flex
-QMAKE_LEXFLAGS          =
-QMAKE_YACC              = yacc
-QMAKE_YACCFLAGS         = -d
-QMAKE_CFLAGS            =
-QMAKE_CFLAGS_DEPS       = -M
-QMAKE_CFLAGS_WARN_ON    =
-QMAKE_CFLAGS_WARN_OFF   = -w
-QMAKE_CFLAGS_RELEASE    = -fast
-QMAKE_CFLAGS_DEBUG      = -g
-QMAKE_CFLAGS_SHLIB      = -fpic
-QMAKE_CFLAGS_STATIC_LIB = $$QMAKE_CFLAGS_SHLIB
-QMAKE_CFLAGS_YACC       =
-QMAKE_CFLAGS_THREAD     = -D_REENTRANT
-
-QMAKE_CXX               = pgCC
-QMAKE_CXXFLAGS          = --display_error_number --diag_suppress815 $$QMAKE_CFLAGS
-QMAKE_CXXFLAGS_DEPS     = $$QMAKE_CFLAGS_DEPS
-QMAKE_CXXFLAGS_WARN_ON  = $$QMAKE_CFLAGS_WARN_ON
-QMAKE_CXXFLAGS_WARN_OFF = $$QMAKE_CFLAGS_WARN_OFF
-QMAKE_CXXFLAGS_RELEASE  = $$QMAKE_CFLAGS_RELEASE
-QMAKE_CXXFLAGS_DEBUG    = $$QMAKE_CFLAGS_DEBUG
-QMAKE_CXXFLAGS_SHLIB    = $$QMAKE_CFLAGS_SHLIB
-QMAKE_CXXFLAGS_STATIC_LIB = $$QMAKE_CFLAGS_STATIC_LIB
-QMAKE_CXXFLAGS_YACC     = $$QMAKE_CFLAGS_YACC
-QMAKE_CXXFLAGS_THREAD   = $$QMAKE_CFLAGS_THREAD
-
-QMAKE_INCDIR            =
-QMAKE_LIBDIR            =
-QMAKE_INCDIR_X11        =
-QMAKE_LIBDIR_X11        =
-QMAKE_INCDIR_OPENGL     =
-QMAKE_LIBDIR_OPENGL     =
-
-QMAKE_LINK              = pgCC
-QMAKE_LINK_SHLIB        = pgCC
-QMAKE_LFLAGS            =
-QMAKE_LFLAGS_RELEASE    =
-QMAKE_LFLAGS_DEBUG      =
-QMAKE_LFLAGS_SHLIB      = -shared -fpic
-QMAKE_LFLAGS_PLUGIN     = $$QMAKE_LFLAGS_SHLIB
-QMAKE_LFLAGS_SONAME     = -Wl,-soname,
-QMAKE_LFLAGS_THREAD     =
-QMAKE_LFLAGS_RPATH      = -R
-
-QMAKE_LIBS              =
-QMAKE_LIBS_DYNLOAD      = -ldl
-QMAKE_LIBS_X11          = -lXext -lX11 -lm
-QMAKE_LIBS_NIS          = -lnsl
-QMAKE_LIBS_OPENGL       = -lGL
-QMAKE_LIBS_THREAD       = -lpthread
-
-QMAKE_AR                = ar cqs
-QMAKE_OBJCOPY           = objcopy
-QMAKE_NM                = nm -P
-QMAKE_RANLIB            =
-
-load(qt_config)
diff --git a/mkspecs/linux-pgcc/qplatformdefs.h b/mkspecs/linux-pgcc/qplatformdefs.h
deleted file mode 100644
index 0c26017140..0000000000
--- a/mkspecs/linux-pgcc/qplatformdefs.h
+++ /dev/null
@@ -1,99 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the qmake spec 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 QPLATFORMDEFS_H
-#define QPLATFORMDEFS_H
-
-// Get Qt defines/settings
-
-#include "qglobal.h"
-
-// Set any POSIX/XOPEN defines at the top of this file to turn on specific APIs
-
-// 1) need to reset default environment if _BSD_SOURCE is defined
-// 2) need to specify POSIX thread interfaces explicitly in glibc 2.0
-// 3) it seems older glibc need this to include the X/Open stuff
-#ifndef _GNU_SOURCE
-#  define _GNU_SOURCE
-#endif
-
-#include <unistd.h>
-
-
-// We are hot - unistd.h should have turned on the specific APIs we requested
-
-
-#include <pthread.h>
-#include <dirent.h>
-#include <fcntl.h>
-#include <grp.h>
-#include <pwd.h>
-#include <signal.h>
-#include <dlfcn.h>
-
-#include <sys/types.h>
-#include <sys/ioctl.h>
-#include <sys/ipc.h>
-#include <sys/time.h>
-#include <sys/shm.h>
-#include <sys/socket.h>
-#include <sys/stat.h>
-#include <sys/wait.h>
-#include <netinet/in.h>
-#ifndef QT_NO_IPV6IFNAME
-#include <net/if.h>
-#endif
-
-#define QT_USE_XOPEN_LFS_EXTENSIONS
-#include "../common/posix/qplatformdefs.h"
-
-#undef QT_SOCKLEN_T
-
-#if defined(__GLIBC__) && (__GLIBC__ >= 2)
-#define QT_SOCKLEN_T            socklen_t
-#else
-#define QT_SOCKLEN_T            int
-#endif
-
-#if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE >= 500)
-#define QT_SNPRINTF             ::snprintf
-#define QT_VSNPRINTF            ::vsnprintf
-#endif
-
-#endif // QPLATFORMDEFS_H
diff --git a/mkspecs/macx-icc/qmake.conf b/mkspecs/macx-icc/qmake.conf
index feeaa08113..ec8e13452f 100644
--- a/mkspecs/macx-icc/qmake.conf
+++ b/mkspecs/macx-icc/qmake.conf
@@ -11,12 +11,15 @@ QMAKE_COMPILER_DEFINES += __APPLE__ __GNUC__
 
 QMAKE_COMPILER          = gcc clang intel_icc   # icc pretends to be gcc and clang
 
+QMAKE_CFLAGS_OPTIMIZE      = -O2
+QMAKE_CFLAGS_OPTIMIZE_SIZE = -Os
+
 QMAKE_CC                = icc
 QMAKE_CFLAGS            =
 QMAKE_CFLAGS_DEPS       = -M
 QMAKE_CFLAGS_WARN_ON    = -w1 -Wcheck -wd654,1572,411,873,1125,2259,2261,3280,3373
 QMAKE_CFLAGS_WARN_OFF   = -w
-QMAKE_CFLAGS_RELEASE    = -O2
+QMAKE_CFLAGS_RELEASE    = $$QMAKE_CFLAGS_OPTIMIZE
 QMAKE_CFLAGS_DEBUG      = -g -O0
 QMAKE_CFLAGS_SHLIB      = -fPIC
 QMAKE_CFLAGS_STATIC_LIB = $$QMAKE_CFLAGS_SHLIB
diff --git a/mkspecs/sco-cc/qmake.conf b/mkspecs/sco-cc/qmake.conf
deleted file mode 100644
index fab66b4215..0000000000
--- a/mkspecs/sco-cc/qmake.conf
+++ /dev/null
@@ -1,67 +0,0 @@
-#
-# qmake configuration for sco-cc
-#
-# Written for SCO OpenServer with UDK
-#
-# -Wf,--diag_suppress,838
-#   turns off warning about missing return types in X headers
-#
-
-MAKEFILE_GENERATOR      = UNIX
-QMAKE_PLATFORM          = sco
-
-QMAKE_COMPILER          = sco_cc
-
-QMAKE_CC                = cc
-QMAKE_LEX               = flex
-QMAKE_LEXFLAGS          =
-QMAKE_YACC              = yacc
-QMAKE_YACCFLAGS         = -d
-QMAKE_CFLAGS            =
-QMAKE_CFLAGS_WARN_ON    =
-QMAKE_CFLAGS_WARN_OFF   = -w
-QMAKE_CFLAGS_RELEASE    = -O
-QMAKE_CFLAGS_DEBUG      = -g
-QMAKE_CFLAGS_SHLIB      = -KPIC
-QMAKE_CFLAGS_STATIC_LIB = $$QMAKE_CFLAGS_SHLIB
-QMAKE_CFLAGS_YACC       = -Wf,--diag_suppress,111 -Wf,--diag_suppress,177
-
-QMAKE_CXX               = CC
-QMAKE_CXXFLAGS          = $$QMAKE_CFLAGS -Wf,--display_error_number -Wf,--diag_suppress,838
-QMAKE_CXXFLAGS_WARN_ON  = $$QMAKE_CFLAGS_WARN_ON
-QMAKE_CXXFLAGS_WARN_OFF = $$QMAKE_CFLAGS_WARN_OFF
-QMAKE_CXXFLAGS_RELEASE  = $$QMAKE_CFLAGS_RELEASE -Tused
-QMAKE_CXXFLAGS_DEBUG    = $$QMAKE_CFLAGS_DEBUG
-QMAKE_CXXFLAGS_SHLIB    = $$QMAKE_CFLAGS_SHLIB
-QMAKE_CXXFLAGS_STATIC_LIB = $$QMAKE_CFLAGS_STATIC_LIB
-QMAKE_CXXFLAGS_YACC     = $$QMAKE_CFLAGS_YACC
-
-QMAKE_INCDIR            =
-QMAKE_LIBDIR            =
-QMAKE_INCDIR_X11        =
-QMAKE_LIBDIR_X11        = /usr/X/lib
-QMAKE_INCDIR_OPENGL     =
-QMAKE_LIBDIR_OPENGL     =
-
-QMAKE_LINK              = CC
-QMAKE_LINK_SHLIB        = CC
-QMAKE_LFLAGS            =
-QMAKE_LFLAGS_RELEASE    =
-QMAKE_LFLAGS_DEBUG      =
-QMAKE_LFLAGS_SHLIB      = -G
-QMAKE_LFLAGS_PLUGIN     = $$QMAKE_LFLAGS_SHLIB
-QMAKE_LFLAGS_SONAME     = -h$$LITERAL_WHITESPACE
-
-QMAKE_LIBS              =
-QMAKE_LIBS_DYNLOAD      = -ldl
-QMAKE_LIBS_X11          = -lXext -lX11 -lresolv -lsocket -lnsl -lm
-
-QMAKE_LIBS_OPENGL       = -lGL -lXt
-
-QMAKE_AR                = ar cq
-QMAKE_OBJCOPY           = objcopy
-QMAKE_NM                = nm -P
-QMAKE_RANLIB            =
-
-include(../common/unix.conf)
-load(qt_config)
diff --git a/mkspecs/sco-cc/qplatformdefs.h b/mkspecs/sco-cc/qplatformdefs.h
deleted file mode 100644
index 23f5d41394..0000000000
--- a/mkspecs/sco-cc/qplatformdefs.h
+++ /dev/null
@@ -1,85 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the qmake spec 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 QPLATFORMDEFS_H
-#define QPLATFORMDEFS_H
-
-// Get Qt defines/settings
-
-#include "qglobal.h"
-
-// Set any POSIX/XOPEN defines at the top of this file to turn on specific APIs
-
-#include <unistd.h>
-
-
-// We are hot - unistd.h should have turned on the specific APIs we requested
-
-
-#include <pthread.h>
-#include <dirent.h>
-#include <fcntl.h>
-#include <grp.h>
-#include <pwd.h>
-#include <signal.h>
-#include <dlfcn.h>
-
-#include <sys/types.h>
-#include <sys/ioctl.h>
-#include <sys/filio.h>
-#include <sys/ipc.h>
-#include <sys/time.h>
-#include <sys/shm.h>
-#include <sys/socket.h>
-#include <sys/stat.h>
-#include <sys/wait.h>
-#include <netinet/in.h>
-#ifndef QT_NO_IPV6IFNAME
-#include <net/if.h>
-#endif
-
-#include "../common/posix/qplatformdefs.h"
-
-#undef QT_SOCKLEN_T
-#define QT_SOCKLEN_T            size_t
-
-#define QT_SNPRINTF             ::snprintf
-#define QT_VSNPRINTF            ::vsnprintf
-
-#endif // QPLATFORMDEFS_H
diff --git a/mkspecs/sco-g++/qmake.conf b/mkspecs/sco-g++/qmake.conf
deleted file mode 100644
index 27fc1cffe3..0000000000
--- a/mkspecs/sco-g++/qmake.conf
+++ /dev/null
@@ -1,70 +0,0 @@
-#
-# qmake configuration for sco-g++
-#
-# Written for SCO OpenServer 5.0.6 with Skunkware's compiler
-#
-
-MAKEFILE_GENERATOR      = UNIX
-QMAKE_PLATFORM          = sco
-
-include(../common/unix.conf)
-
-QMAKE_COMPILER          = gcc
-
-QMAKE_CC                = gcc
-QMAKE_LEX               = flex
-QMAKE_LEXFLAGS          =
-QMAKE_YACC              = yacc
-QMAKE_YACCFLAGS         = -d
-QMAKE_CFLAGS            =
-QMAKE_CFLAGS_DEPS       = -M
-QMAKE_CFLAGS_WARN_ON    = -Wall -W
-QMAKE_CFLAGS_WARN_OFF   = -w
-QMAKE_CFLAGS_RELEASE    = -O2
-QMAKE_CFLAGS_DEBUG      = -g
-QMAKE_CFLAGS_SHLIB      = -fPIC
-QMAKE_CFLAGS_STATIC_LIB = $$QMAKE_CFLAGS_SHLIB
-QMAKE_CFLAGS_YACC       = -Wno-unused -Wno-parentheses
-
-QMAKE_CXX               = g++
-QMAKE_CXXFLAGS          = $$QMAKE_CFLAGS
-QMAKE_CXXFLAGS_DEPS     = $$QMAKE_CFLAGS_DEPS
-QMAKE_CXXFLAGS_WARN_ON  = $$QMAKE_CFLAGS_WARN_ON
-QMAKE_CXXFLAGS_WARN_OFF = $$QMAKE_CFLAGS_WARN_OFF
-QMAKE_CXXFLAGS_RELEASE  = $$QMAKE_CFLAGS_RELEASE
-QMAKE_CXXFLAGS_DEBUG    = $$QMAKE_CFLAGS_DEBUG
-QMAKE_CXXFLAGS_SHLIB    = $$QMAKE_CFLAGS_SHLIB
-QMAKE_CXXFLAGS_STATIC_LIB = $$QMAKE_CFLAGS_STATIC_LIB
-QMAKE_CXXFLAGS_YACC     = $$QMAKE_CFLAGS_YACC
-
-QMAKE_INCDIR            =
-QMAKE_LIBDIR            =
-QMAKE_INCDIR_X11        =
-QMAKE_LIBDIR_X11        =
-QMAKE_INCDIR_OPENGL     =
-QMAKE_LIBDIR_OPENGL     =
-
-QMAKE_LINK              = g++
-QMAKE_LINK_SHLIB        = g++
-QMAKE_LINK_C            = gcc
-QMAKE_LINK_C_SHLIB      = gcc
-QMAKE_LFLAGS            =
-QMAKE_LFLAGS_RELEASE    =
-QMAKE_LFLAGS_DEBUG      =
-QMAKE_LFLAGS_SHLIB      = -G
-QMAKE_LFLAGS_PLUGIN     = $$QMAKE_LFLAGS_SHLIB
-QMAKE_LFLAGS_SONAME     = -h$$LITERAL_WHITESPACE
-QMAKE_LFLAGS_RPATH      =
-
-QMAKE_LIBS              =
-QMAKE_LIBS_DYNLOAD      = -ldl
-QMAKE_LIBS_X11          = -lXext -lX11 -lsocket -lm
-
-QMAKE_LIBS_OPENGL       = -lGL
-
-QMAKE_AR                = ar cqs
-QMAKE_OBJCOPY           = objcopy
-QMAKE_NM                = nm -P
-QMAKE_RANLIB            =
-
-load(qt_config)
diff --git a/mkspecs/sco-g++/qplatformdefs.h b/mkspecs/sco-g++/qplatformdefs.h
deleted file mode 100644
index aed4756d7f..0000000000
--- a/mkspecs/sco-g++/qplatformdefs.h
+++ /dev/null
@@ -1,89 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the qmake spec 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 QPLATFORMDEFS_H
-#define QPLATFORMDEFS_H
-
-// Get Qt defines/settings
-
-#include "qglobal.h"
-
-// Set any POSIX/XOPEN defines at the top of this file to turn on specific APIs
-
-// This is to have PATH_MAX defined in <limits.h>
-#ifndef _IBCS2
-#  define _IBCS2
-#endif
-
-#include <unistd.h>
-
-
-// We are hot - unistd.h should have turned on the specific APIs we requested
-
-
-#include <pthread.h>
-#include <dirent.h>
-#include <fcntl.h>
-#include <grp.h>
-#include <pwd.h>
-#include <signal.h>
-#include <dlfcn.h>
-
-#include <sys/types.h>
-#include <sys/ioctl.h>
-#include <sys/ipc.h>
-#include <sys/time.h>
-#include <sys/shm.h>
-#include <sys/socket.h>
-#include <sys/stat.h>
-#include <sys/wait.h>
-#include <netinet/in.h>
-#ifndef QT_NO_IPV6IFNAME
-#include <net/if.h>
-#endif
-
-#include "../common/posix/qplatformdefs.h"
-
-#undef QT_SOCKLEN_T
-#define QT_SOCKLEN_T            int
-
-#define QT_SNPRINTF             ::snprintf
-#define QT_VSNPRINTF            ::vsnprintf
-
-#endif // QPLATFORMDEFS_H
diff --git a/mkspecs/tru64-cxx/qmake.conf b/mkspecs/tru64-cxx/qmake.conf
deleted file mode 100644
index 87dabfb7e1..0000000000
--- a/mkspecs/tru64-cxx/qmake.conf
+++ /dev/null
@@ -1,69 +0,0 @@
-#
-# qmake configuration for tru64-cxx
-#
-
-MAKEFILE_GENERATOR      = UNIX
-QMAKE_PLATFORM          = tru64
-
-include(../common/unix.conf)
-
-QMAKE_COMPILER          = dec_cc
-
-QMAKE_CC                = cc
-QMAKE_LEX               = flex
-QMAKE_LEXFLAGS          =
-QMAKE_YACC              = yacc
-QMAKE_YACCFLAGS         = -d
-QMAKE_CFLAGS            =
-QMAKE_CFLAGS_DEPS       = -M
-QMAKE_CFLAGS_WARN_ON    =
-QMAKE_CFLAGS_WARN_OFF   =
-QMAKE_CFLAGS_RELEASE    = -O2
-QMAKE_CFLAGS_DEBUG      = -g
-QMAKE_CFLAGS_SHLIB      =
-QMAKE_CFLAGS_STATIC_LIB = $$QMAKE_CFLAGS_SHLIB
-QMAKE_CFLAGS_YACC       = -Olimit 1000
-QMAKE_CFLAGS_THREAD     = -pthread
-
-QMAKE_CXX               = cxx
-QMAKE_CXXFLAGS          = -x cxx -model ansi $$QMAKE_CFLAGS
-QMAKE_CXXFLAGS_DEPS     = $$QMAKE_CFLAGS_DEPS
-QMAKE_CXXFLAGS_WARN_ON  = $$QMAKE_CFLAGS_WARN_ON
-QMAKE_CXXFLAGS_WARN_OFF = $$QMAKE_CFLAGS_WARN_OFF
-QMAKE_CXXFLAGS_RELEASE  = $$QMAKE_CFLAGS_RELEASE
-QMAKE_CXXFLAGS_DEBUG    = $$QMAKE_CFLAGS_DEBUG
-QMAKE_CXXFLAGS_SHLIB    = $$QMAKE_CFLAGS_SHLIB
-QMAKE_CXXFLAGS_STATIC_LIB = $$QMAKE_CFLAGS_STATIC_LIB
-QMAKE_CXXFLAGS_YACC     = $$QMAKE_CFLAGS_YACC
-QMAKE_CXXFLAGS_THREAD   = $$QMAKE_CFLAGS_THREAD
-
-QMAKE_INCDIR            =
-QMAKE_LIBDIR            =
-QMAKE_INCDIR_X11        =
-QMAKE_LIBDIR_X11        =
-QMAKE_INCDIR_OPENGL     =
-QMAKE_LIBDIR_OPENGL     =
-
-QMAKE_LINK              = cxx
-QMAKE_LINK_SHLIB        = cxx
-QMAKE_LFLAGS            = -model ansi
-QMAKE_LFLAGS_RELEASE    =
-QMAKE_LFLAGS_DEBUG      =
-QMAKE_LFLAGS_SHLIB      = -shared
-QMAKE_LFLAGS_PLUGIN     = $$QMAKE_LFLAGS_SHLIB
-QMAKE_LFLAGS_THREAD     = -pthread
-QMAKE_LFLAGS_SONAME     = -soname$$LITERAL_WHITESPACE
-QMAKE_LFLAGS_RPATH      = -rpath$$LITERAL_WHITESPACE
-
-QMAKE_LIBS              = -lm
-QMAKE_LIBS_DYNLOAD      =
-QMAKE_LIBS_X11          = -lXext -lX11
-QMAKE_LIBS_OPENGL       = -lGL
-QMAKE_LIBS_THREAD       = -lrt
-
-QMAKE_AR                = ar cqs
-QMAKE_OBJCOPY           = objcopy
-QMAKE_NM                = nm -P
-QMAKE_RANLIB            =
-
-load(qt_config)
diff --git a/mkspecs/tru64-cxx/qplatformdefs.h b/mkspecs/tru64-cxx/qplatformdefs.h
deleted file mode 100644
index f0eadf8566..0000000000
--- a/mkspecs/tru64-cxx/qplatformdefs.h
+++ /dev/null
@@ -1,107 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the qmake spec 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 QPLATFORMDEFS_H
-#define QPLATFORMDEFS_H
-
-// Get Qt defines/settings
-
-#include "qglobal.h"
-
-// Set any POSIX/XOPEN defines at the top of this file to turn on specific APIs
-
-#include <unistd.h>
-
-
-// We are hot - unistd.h should have turned on the specific APIs we requested
-
-
-#ifndef QT_NO_THREAD
-#include <pthread.h>
-#endif
-#include <dirent.h>
-#include <fcntl.h>
-#include <grp.h>
-#include <pwd.h>
-#include <signal.h>
-#include <dlfcn.h>
-
-#include <sys/types.h>
-#include <sys/ioctl.h>
-#include <sys/ipc.h>
-#include <sys/time.h>
-#include <sys/select.h>
-#include <sys/shm.h>
-#include <sys/socket.h>
-#include <sys/stat.h>
-#include <sys/wait.h>
-#include <netinet/in.h>
-#ifndef QT_NO_IPV6IFNAME
-#include <net/if.h>
-#endif
-
-#define QT_NO_USE_FSEEKO
-#include "../common/posix/qplatformdefs.h"
-
-#undef QT_OFF_T
-#undef QT_SOCKLEN_T
-
-#define QT_OFF_T                off_t
-
-#if defined(_POSIX_PII_SOCKET)
-#define QT_SOCKLEN_T            socklen_t
-#elif defined(_XOPEN_SOURCE_EXTENDED)
-#define QT_SOCKLEN_T            size_t
-#else
-#define QT_SOCKLEN_T            int
-#endif
-
-#if defined(_XOPEN_SOURCE) && defined(_OSF_SOURCE)
-// Not available in the <unistd.h> header file of Tru64 4.0F.
-// Fixed in the <unistd.h> header of Tru64 5.0A so we copy/paste from there...
-extern "C" int usleep(useconds_t);
-#endif
-
-#if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE-0 >= 400)
-// Tru64 5.0 and better
-#define QT_SNPRINTF             ::snprintf
-#define QT_VSNPRINTF            ::vsnprintf
-#endif
-
-#endif // QPLATFORMDEFS_H
diff --git a/mkspecs/tru64-g++/qmake.conf b/mkspecs/tru64-g++/qmake.conf
deleted file mode 100644
index c31eccca3e..0000000000
--- a/mkspecs/tru64-g++/qmake.conf
+++ /dev/null
@@ -1,71 +0,0 @@
-#
-# qmake configuration for tru64-g++
-#
-
-MAKEFILE_GENERATOR      = UNIX
-QMAKE_PLATFORM          = tru64
-
-include(../common/unix.conf)
-
-QMAKE_COMPILER          = gcc
-
-QMAKE_CC                = gcc
-QMAKE_LEX               = flex
-QMAKE_LEXFLAGS          =
-QMAKE_YACC              = yacc
-QMAKE_YACCFLAGS         = -d
-QMAKE_CFLAGS            =
-QMAKE_CFLAGS_DEPS       = -M
-QMAKE_CFLAGS_WARN_ON    = -Wall -W
-QMAKE_CFLAGS_WARN_OFF   = -w
-QMAKE_CFLAGS_RELEASE    = -O2
-QMAKE_CFLAGS_DEBUG      = -g
-QMAKE_CFLAGS_SHLIB      = -fPIC
-QMAKE_CFLAGS_STATIC_LIB = $$QMAKE_CFLAGS_SHLIB
-QMAKE_CFLAGS_YACC       = -Wno-unused -Wno-parentheses
-QMAKE_CFLAGS_THREAD     = -D_REENTRANT
-
-QMAKE_CXX               = g++
-QMAKE_CXXFLAGS          = $$QMAKE_CFLAGS
-QMAKE_CXXFLAGS_DEPS     = $$QMAKE_CFLAGS_DEPS
-QMAKE_CXXFLAGS_WARN_ON  = $$QMAKE_CFLAGS_WARN_ON
-QMAKE_CXXFLAGS_WARN_OFF = $$QMAKE_CFLAGS_WARN_OFF
-QMAKE_CXXFLAGS_RELEASE  = $$QMAKE_CFLAGS_RELEASE
-QMAKE_CXXFLAGS_DEBUG    = $$QMAKE_CFLAGS_DEBUG
-QMAKE_CXXFLAGS_SHLIB    = $$QMAKE_CFLAGS_SHLIB
-QMAKE_CXXFLAGS_STATIC_LIB = $$QMAKE_CFLAGS_STATIC_LIB
-QMAKE_CXXFLAGS_YACC     = $$QMAKE_CFLAGS_YACC
-QMAKE_CXXFLAGS_THREAD   = $$QMAKE_CFLAGS_THREAD
-
-QMAKE_INCDIR            =
-QMAKE_LIBDIR            =
-QMAKE_INCDIR_X11        =
-QMAKE_LIBDIR_X11        =
-QMAKE_INCDIR_OPENGL     =
-QMAKE_LIBDIR_OPENGL     =
-
-QMAKE_LINK              = g++
-QMAKE_LINK_SHLIB        = g++
-QMAKE_LINK_C            = gcc
-QMAKE_LINK_C_SHLIB      = gcc
-QMAKE_LFLAGS            =
-QMAKE_LFLAGS_RELEASE    =
-QMAKE_LFLAGS_DEBUG      =
-QMAKE_LFLAGS_SHLIB      = -shared
-QMAKE_LFLAGS_PLUGIN     = $$QMAKE_LFLAGS_SHLIB
-QMAKE_LFLAGS_THREAD     =
-QMAKE_LFLAGS_SONAME     = -Wl,-soname,
-QMAKE_LFLAGS_RPATH      = -Wl,-rpath,
-
-QMAKE_LIBS              =
-QMAKE_LIBS_DYNLOAD      =
-QMAKE_LIBS_X11          = -lXext -lX11 -lm
-QMAKE_LIBS_OPENGL       = -lGL
-QMAKE_LIBS_THREAD       = -lpthread -lexc -lrt
-
-QMAKE_AR                = ar cqs
-QMAKE_OBJCOPY           = objcopy
-QMAKE_NM                = nm -P
-QMAKE_RANLIB            =
-
-load(qt_config)
diff --git a/mkspecs/tru64-g++/qplatformdefs.h b/mkspecs/tru64-g++/qplatformdefs.h
deleted file mode 100644
index f0eadf8566..0000000000
--- a/mkspecs/tru64-g++/qplatformdefs.h
+++ /dev/null
@@ -1,107 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the qmake spec 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 QPLATFORMDEFS_H
-#define QPLATFORMDEFS_H
-
-// Get Qt defines/settings
-
-#include "qglobal.h"
-
-// Set any POSIX/XOPEN defines at the top of this file to turn on specific APIs
-
-#include <unistd.h>
-
-
-// We are hot - unistd.h should have turned on the specific APIs we requested
-
-
-#ifndef QT_NO_THREAD
-#include <pthread.h>
-#endif
-#include <dirent.h>
-#include <fcntl.h>
-#include <grp.h>
-#include <pwd.h>
-#include <signal.h>
-#include <dlfcn.h>
-
-#include <sys/types.h>
-#include <sys/ioctl.h>
-#include <sys/ipc.h>
-#include <sys/time.h>
-#include <sys/select.h>
-#include <sys/shm.h>
-#include <sys/socket.h>
-#include <sys/stat.h>
-#include <sys/wait.h>
-#include <netinet/in.h>
-#ifndef QT_NO_IPV6IFNAME
-#include <net/if.h>
-#endif
-
-#define QT_NO_USE_FSEEKO
-#include "../common/posix/qplatformdefs.h"
-
-#undef QT_OFF_T
-#undef QT_SOCKLEN_T
-
-#define QT_OFF_T                off_t
-
-#if defined(_POSIX_PII_SOCKET)
-#define QT_SOCKLEN_T            socklen_t
-#elif defined(_XOPEN_SOURCE_EXTENDED)
-#define QT_SOCKLEN_T            size_t
-#else
-#define QT_SOCKLEN_T            int
-#endif
-
-#if defined(_XOPEN_SOURCE) && defined(_OSF_SOURCE)
-// Not available in the <unistd.h> header file of Tru64 4.0F.
-// Fixed in the <unistd.h> header of Tru64 5.0A so we copy/paste from there...
-extern "C" int usleep(useconds_t);
-#endif
-
-#if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE-0 >= 400)
-// Tru64 5.0 and better
-#define QT_SNPRINTF             ::snprintf
-#define QT_VSNPRINTF            ::vsnprintf
-#endif
-
-#endif // QPLATFORMDEFS_H
diff --git a/mkspecs/unixware-cc/qmake.conf b/mkspecs/unixware-cc/qmake.conf
deleted file mode 100644
index 1a36a3e76b..0000000000
--- a/mkspecs/unixware-cc/qmake.conf
+++ /dev/null
@@ -1,74 +0,0 @@
-#
-# qmake configuration for unixware-cc
-#
-# Written for UnixWare 7 with UDK or OUDK
-#
-# -Wf,--diag_suppress,838
-#   turns off warning about missing return types in X headers
-#
-
-MAKEFILE_GENERATOR      = UNIX
-QMAKE_PLATFORM          = unixware
-
-include(../common/unix.conf)
-
-QMAKE_COMPILER          = sco_cc
-
-QMAKE_CC                = cc
-QMAKE_LEX               = flex
-QMAKE_LEXFLAGS          =
-QMAKE_YACC              = yacc
-QMAKE_YACCFLAGS         = -d
-QMAKE_CFLAGS            =
-QMAKE_CFLAGS_WARN_ON    =
-QMAKE_CFLAGS_WARN_OFF   = -w
-QMAKE_CFLAGS_RELEASE    = -O
-QMAKE_CFLAGS_DEBUG      = -g
-QMAKE_CFLAGS_SHLIB      = -KPIC
-QMAKE_CFLAGS_STATIC_LIB = $$QMAKE_CFLAGS_SHLIB
-QMAKE_CFLAGS_YACC       = -Wf,--diag_suppress,111 -Wf,--diag_suppress,177
-QMAKE_CFLAGS_THREAD     = -Kthread
-
-QMAKE_CXX               = CC
-QMAKE_CXXFLAGS          = $$QMAKE_CFLAGS -Wf,--display_error_number -Wf,--diag_suppress,838
-QMAKE_CXXFLAGS_WARN_ON  = $$QMAKE_CFLAGS_WARN_ON
-QMAKE_CXXFLAGS_WARN_OFF = $$QMAKE_CFLAGS_WARN_OFF
-QMAKE_CXXFLAGS_RELEASE  = $$QMAKE_CFLAGS_RELEASE -Tused
-QMAKE_CXXFLAGS_DEBUG    = $$QMAKE_CFLAGS_DEBUG
-QMAKE_CXXFLAGS_SHLIB    = $$QMAKE_CFLAGS_SHLIB
-QMAKE_CXXFLAGS_STATIC_LIB = $$QMAKE_CFLAGS_STATIC_LIB
-QMAKE_CXXFLAGS_YACC     = $$QMAKE_CFLAGS_YACC
-QMAKE_CXXFLAGS_THREAD   = $$QMAKE_CFLAGS_THREAD
-
-QMAKE_INCDIR            =
-QMAKE_LIBDIR            =
-QMAKE_INCDIR_X11        =
-QMAKE_LIBDIR_X11        = /usr/X/lib
-QMAKE_INCDIR_OPENGL     =
-QMAKE_LIBDIR_OPENGL     =
-
-QMAKE_LINK              = CC
-QMAKE_LINK_SHLIB        = CC
-QMAKE_LFLAGS            =
-QMAKE_LFLAGS_RELEASE    =
-QMAKE_LFLAGS_DEBUG      =
-QMAKE_LFLAGS_SHLIB      = -G
-QMAKE_LFLAGS_PLUGIN     = $$QMAKE_LFLAGS_SHLIB
-QMAKE_LFLAGS_SONAME     = -h$$LITERAL_WHITESPACE
-QMAKE_LFLAGS_THREAD     = -Kthread
-QMAKE_LFLAGS_RPATH      = -R
-
-QMAKE_LIBS              =
-QMAKE_LIBS_DYNLOAD      = -ldl
-QMAKE_LIBS_X11          = -lXext -lX11 -lresolv -lsocket -lnsl -lm
-
-QMAKE_LIBS_OPENGL       = -lGL -lXt
-
-QMAKE_LIBS_THREAD       =
-
-QMAKE_AR                = ar cq
-QMAKE_OBJCOPY           = objcopy
-QMAKE_NM                = nm -P
-QMAKE_RANLIB            =
-
-load(qt_config)
diff --git a/mkspecs/unixware-cc/qplatformdefs.h b/mkspecs/unixware-cc/qplatformdefs.h
deleted file mode 100644
index 036a9aa5bd..0000000000
--- a/mkspecs/unixware-cc/qplatformdefs.h
+++ /dev/null
@@ -1,89 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the qmake spec 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 QPLATFORMDEFS_H
-#define QPLATFORMDEFS_H
-
-// Get Qt defines/settings
-
-#include "qglobal.h"
-
-// Set any POSIX/XOPEN defines at the top of this file to turn on specific APIs
-
-#include <unistd.h>
-
-
-// We are hot - unistd.h should have turned on the specific APIs we requested
-
-
-#include <pthread.h>
-#include <dirent.h>
-#include <fcntl.h>
-#include <grp.h>
-#include <pwd.h>
-#include <signal.h>
-#include <dlfcn.h>
-
-#include <sys/types.h>
-#include <sys/ioctl.h>
-#include <sys/filio.h>
-#include <sys/ipc.h>
-#include <sys/time.h>
-#include <sys/shm.h>
-#include <sys/socket.h>
-#include <sys/stat.h>
-#include <sys/wait.h>
-#include <netinet/in.h>
-#ifndef QT_NO_IPV6IFNAME
-#include <net/if.h>
-#endif
-
-#define QT_NO_USE_FSEEKO
-#include "../common/posix/qplatformdefs.h"
-
-#undef QT_OFF_T
-#undef QT_SOCKLEN_T
-
-#define QT_OFF_T                off_t
-#define QT_SOCKLEN_T            size_t
-
-#define QT_SNPRINTF             ::snprintf
-#define QT_VSNPRINTF            ::vsnprintf
-
-#endif // QPLATFORMDEFS_H
diff --git a/mkspecs/unixware-g++/qmake.conf b/mkspecs/unixware-g++/qmake.conf
deleted file mode 100644
index abe2773deb..0000000000
--- a/mkspecs/unixware-g++/qmake.conf
+++ /dev/null
@@ -1,73 +0,0 @@
-#
-# qmake configuration for unixware-g++
-#
-# Written for UnixWare 7 with OSTK
-#
-
-MAKEFILE_GENERATOR      = UNIX
-QMAKE_PLATFORM          = unixware
-
-include(../common/unix.conf)
-
-QMAKE_COMPILER          = gcc
-
-QMAKE_CC                = gcc
-QMAKE_LEX               = flex
-QMAKE_LEXFLAGS          =
-QMAKE_YACC              = yacc
-QMAKE_YACCFLAGS         = -d
-QMAKE_CFLAGS            =
-QMAKE_CFLAGS_DEPS       = -M
-QMAKE_CFLAGS_WARN_ON    = -Wall -W
-QMAKE_CFLAGS_WARN_OFF   = -w
-QMAKE_CFLAGS_RELEASE    = -O2
-QMAKE_CFLAGS_DEBUG      = -g
-QMAKE_CFLAGS_SHLIB      = -fPIC
-QMAKE_CFLAGS_STATIC_LIB = $$QMAKE_CFLAGS_SHLIB
-QMAKE_CFLAGS_YACC       = -Wno-unused -Wno-parentheses
-QMAKE_CFLAGS_THREAD     =
-
-QMAKE_CXX               = g++
-QMAKE_CXXFLAGS          = $$QMAKE_CFLAGS
-QMAKE_CXXFLAGS_DEPS     = $$QMAKE_CFLAGS_DEPS
-QMAKE_CXXFLAGS_WARN_ON  = $$QMAKE_CFLAGS_WARN_ON
-QMAKE_CXXFLAGS_WARN_OFF = $$QMAKE_CFLAGS_WARN_OFF
-QMAKE_CXXFLAGS_RELEASE  = $$QMAKE_CFLAGS_RELEASE
-QMAKE_CXXFLAGS_DEBUG    = $$QMAKE_CFLAGS_DEBUG
-QMAKE_CXXFLAGS_SHLIB    = $$QMAKE_CFLAGS_SHLIB
-QMAKE_CXXFLAGS_STATIC_LIB = $$QMAKE_CFLAGS_STATIC_LIB
-QMAKE_CXXFLAGS_YACC     = $$QMAKE_CFLAGS_YACC
-QMAKE_CXXFLAGS_THREAD   = $$QMAKE_CFLAGS_THREAD
-
-QMAKE_INCDIR            =
-QMAKE_LIBDIR            =
-QMAKE_INCDIR_X11        =
-QMAKE_LIBDIR_X11        = /usr/X/lib
-QMAKE_INCDIR_OPENGL     =
-QMAKE_LIBDIR_OPENGL     =
-
-QMAKE_LINK              = g++
-QMAKE_LINK_SHLIB        = g++
-QMAKE_LINK_C            = gcc
-QMAKE_LINK_C_SHLIB      = gcc
-QMAKE_LFLAGS            =
-QMAKE_LFLAGS_RELEASE    =
-QMAKE_LFLAGS_DEBUG      =
-QMAKE_LFLAGS_SHLIB      = -shared
-QMAKE_LFLAGS_PLUGIN     = $$QMAKE_LFLAGS_SHLIB
-QMAKE_LFLAGS_SONAME     =
-QMAKE_LFLAGS_THREAD     =
-QMAKE_LFLAGS_RPATH      = -Wl,-R,
-
-QMAKE_LIBS              =
-QMAKE_LIBS_DYNLOAD      = -ldl
-QMAKE_LIBS_X11          = -lXext -lX11 -lresolv -lsocket -lnsl -lm
-QMAKE_LIBS_OPENGL       = -lGL -lXt
-QMAKE_LIBS_THREAD       = -lthread
-
-QMAKE_AR                = ar cq
-QMAKE_OBJCOPY           = objcopy
-QMAKE_NM                = nm -P
-QMAKE_RANLIB            =
-
-load(qt_config)
diff --git a/mkspecs/unixware-g++/qplatformdefs.h b/mkspecs/unixware-g++/qplatformdefs.h
deleted file mode 100644
index 036a9aa5bd..0000000000
--- a/mkspecs/unixware-g++/qplatformdefs.h
+++ /dev/null
@@ -1,89 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the qmake spec 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 QPLATFORMDEFS_H
-#define QPLATFORMDEFS_H
-
-// Get Qt defines/settings
-
-#include "qglobal.h"
-
-// Set any POSIX/XOPEN defines at the top of this file to turn on specific APIs
-
-#include <unistd.h>
-
-
-// We are hot - unistd.h should have turned on the specific APIs we requested
-
-
-#include <pthread.h>
-#include <dirent.h>
-#include <fcntl.h>
-#include <grp.h>
-#include <pwd.h>
-#include <signal.h>
-#include <dlfcn.h>
-
-#include <sys/types.h>
-#include <sys/ioctl.h>
-#include <sys/filio.h>
-#include <sys/ipc.h>
-#include <sys/time.h>
-#include <sys/shm.h>
-#include <sys/socket.h>
-#include <sys/stat.h>
-#include <sys/wait.h>
-#include <netinet/in.h>
-#ifndef QT_NO_IPV6IFNAME
-#include <net/if.h>
-#endif
-
-#define QT_NO_USE_FSEEKO
-#include "../common/posix/qplatformdefs.h"
-
-#undef QT_OFF_T
-#undef QT_SOCKLEN_T
-
-#define QT_OFF_T                off_t
-#define QT_SOCKLEN_T            size_t
-
-#define QT_SNPRINTF             ::snprintf
-#define QT_VSNPRINTF            ::vsnprintf
-
-#endif // QPLATFORMDEFS_H
diff --git a/mkspecs/winrt-arm-msvc2017/qmake.conf b/mkspecs/winrt-arm-msvc2017/qmake.conf
new file mode 100644
index 0000000000..bf571d620c
--- /dev/null
+++ b/mkspecs/winrt-arm-msvc2017/qmake.conf
@@ -0,0 +1,20 @@
+#
+# qmake configuration for winrt-arm-msvc2017
+#
+# Written for Microsoft Visual C++ 2017
+#
+
+include(../common/winrt_winphone/qmake.conf)
+DEFINES                += WINAPI_FAMILY=WINAPI_FAMILY_PC_APP WINAPI_PARTITION_PHONE_APP=1 ARM __ARM__ __arm__
+
+QMAKE_CFLAGS           += -FS
+QMAKE_CXXFLAGS         += -FS
+QMAKE_LFLAGS           += /MACHINE:ARM /NODEFAULTLIB:kernel32.lib
+
+QMAKE_LIBS             += windowscodecs.lib WindowsApp.lib runtimeobject.lib OneCore.lib
+
+VCPROJ_ARCH             = ARM
+WINSDK_VER              = 10.0
+WINTARGET_VER           = winv10.0
+WINRT_MANIFEST          = $$PWD/../common/winrt_winphone/manifests/10.0/AppxManifest.xml.in
+WINRT_MANIFEST.architecture = arm
diff --git a/mkspecs/irix-g++-64/qplatformdefs.h b/mkspecs/winrt-arm-msvc2017/qplatformdefs.h
index e5c3cda265..907834d385 100644
--- a/mkspecs/irix-g++-64/qplatformdefs.h
+++ b/mkspecs/winrt-arm-msvc2017/qplatformdefs.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2017 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the qmake spec of the Qt Toolkit.
@@ -37,4 +37,4 @@
 **
 ****************************************************************************/
 
-#include "../irix-g++/qplatformdefs.h"
+#include "../common/winrt_winphone/qplatformdefs.h"