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

Conflicts: tests/auto/corelib/io/qfile/tst_qfile.cpp tests/auto/corelib/io/qprocess/tst_qprocess.cpp tests/auto/corelib/tools/qversionnumber/qversionnumber.pro Change-Id: Ia93ce500349d96a2fbf0b4a37b73f088cc505c6e
author: Liang Qi <liang.qi@theqtcompany.com> 2015-10-14 15:45:35 +0200
committer: Liang Qi <liang.qi@theqtcompany.com> 2015-10-14 15:45:35 +0200
commit: 4456984da780b14572e1ec0f079a4d349ab299bd (patch)
tree: f586a281a81c57c91c49e83a5d3ec6c7eece0578 /mkspecs
parent: e824abd987d77efaa085fe1f9fb514d270798d55 (diff)
parent: 281121697340084f7d385eab530f41916789b94d (diff)
84 files changed, 195 insertions, 319 deletions
diff --git a/mkspecs/aix-g++-64/qmake.conf b/mkspecs/aix-g++-64/qmake.conf
index 176c437c45..7f620a9577 100644
--- a/mkspecs/aix-g++-64/qmake.conf
+++ b/mkspecs/aix-g++-64/qmake.conf
@@ -5,6 +5,8 @@
 MAKEFILE_GENERATOR      = UNIX
 QMAKE_PLATFORM          = aix
 
+include(../common/unix.conf)
+
 QMAKE_COMPILER          = gcc
 
 QMAKE_CC                = gcc
@@ -67,5 +69,4 @@ QMAKE_OBJCOPY           = objcopy
 QMAKE_NM                = nm -P
 QMAKE_RANLIB            = ranlib -X64
 
-include(../common/unix.conf)
 load(qt_config)
diff --git a/mkspecs/aix-g++/qmake.conf b/mkspecs/aix-g++/qmake.conf
index 553d9af544..d2f26a1b41 100644
--- a/mkspecs/aix-g++/qmake.conf
+++ b/mkspecs/aix-g++/qmake.conf
@@ -5,6 +5,8 @@
 MAKEFILE_GENERATOR      = UNIX
 QMAKE_PLATFORM          = aix
 
+include(../common/unix.conf)
+
 QMAKE_COMPILER          = gcc
 
 QMAKE_CC                = gcc
@@ -67,5 +69,4 @@ QMAKE_OBJCOPY           = objcopy
 QMAKE_NM                = nm -P
 QMAKE_RANLIB            =
 
-include(../common/unix.conf)
 load(qt_config)
diff --git a/mkspecs/aix-xlc-64/qmake.conf b/mkspecs/aix-xlc-64/qmake.conf
index 42dbd18b4a..1aea8d81c5 100644
--- a/mkspecs/aix-xlc-64/qmake.conf
+++ b/mkspecs/aix-xlc-64/qmake.conf
@@ -5,6 +5,8 @@
 MAKEFILE_GENERATOR      = UNIX
 QMAKE_PLATFORM          = aix
 
+include(../common/unix.conf)
+
 QMAKE_COMPILER          = ibm_xlc
 
 QMAKE_CC                = xlc
@@ -66,5 +68,4 @@ QMAKE_OBJCOPY           = objcopy
 QMAKE_NM                = nm -P
 QMAKE_RANLIB            = ranlib -X64
 
-include(../common/unix.conf)
 load(qt_config)
diff --git a/mkspecs/aix-xlc/qmake.conf b/mkspecs/aix-xlc/qmake.conf
index d2de649355..c765d4ff6b 100644
--- a/mkspecs/aix-xlc/qmake.conf
+++ b/mkspecs/aix-xlc/qmake.conf
@@ -5,6 +5,8 @@
 MAKEFILE_GENERATOR      = UNIX
 QMAKE_PLATFORM          = aix
 
+include(../common/unix.conf)
+
 QMAKE_COMPILER          = ibm_xlc
 
 QMAKE_CC                = xlc
@@ -69,5 +71,4 @@ QMAKE_OBJCOPY           = objcopy
 QMAKE_NM                = nm -P
 QMAKE_RANLIB            = ranlib
 
-include(../common/unix.conf)
 load(qt_config)
diff --git a/mkspecs/common/armcc.conf b/mkspecs/common/armcc.conf
deleted file mode 100644
index a52fefc106..0000000000
--- a/mkspecs/common/armcc.conf
+++ /dev/null
@@ -1,44 +0,0 @@
-#
-# qmake configuration for armcc
-#
-
-QMAKE_COMPILER          = armcc
-
-CONFIG                 += rvct_linker
-QMAKE_CC                = armcc
-QMAKE_CFLAGS           +=
-QMAKE_CFLAGS_DEPS      += -M
-QMAKE_CFLAGS_WARN_ON   +=
-QMAKE_CFLAGS_WARN_OFF  += -W
-QMAKE_CFLAGS_RELEASE   += -O2
-QMAKE_CFLAGS_DEBUG     += -g -O0
-QMAKE_CFLAGS_HIDESYMS  += --visibility_inlines_hidden
-
-QMAKE_CXX               = armcc
-QMAKE_CXXFLAGS         += $$QMAKE_CFLAGS --exceptions --exceptions_unwind
-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_HIDESYMS += $$QMAKE_CFLAGS_HIDESYMS
-
-QMAKE_LINK              = armlink
-QMAKE_LINK_SHLIB        = armlink
-QMAKE_LINK_C            = armlink
-QMAKE_LINK_C_SHLIB      = armlink
-QMAKE_LFLAGS           +=
-QMAKE_LFLAGS_RELEASE   +=
-QMAKE_LFLAGS_DEBUG     +=
-QMAKE_LFLAGS_APP       +=
-QMAKE_LFLAGS_SHLIB     +=
-QMAKE_LFLAGS_PLUGIN    += $$QMAKE_LFLAGS_SHLIB
-QMAKE_LFLAGS_THREAD    +=
-
-QMAKE_AR                = armar --create
-QMAKE_LIB               = armar --create
-QMAKE_RANLIB            =
-
diff --git a/mkspecs/common/clang-mac.conf b/mkspecs/common/clang-mac.conf
index d95e982b14..c616e20b6e 100644
--- a/mkspecs/common/clang-mac.conf
+++ b/mkspecs/common/clang-mac.conf
@@ -7,5 +7,4 @@ QMAKE_OBJCXXFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE
 QMAKE_XCODE_GCC_VERSION = com.apple.compilers.llvm.clang.1_0
 
 QMAKE_CXXFLAGS += -stdlib=libc++
-QMAKE_OBJECTIVE_CFLAGS += -stdlib=libc++
 QMAKE_LFLAGS   += -stdlib=libc++
diff --git a/mkspecs/common/gcc-base-mac.conf b/mkspecs/common/gcc-base-mac.conf
index 747f09ae81..e9bf780ec1 100644
--- a/mkspecs/common/gcc-base-mac.conf
+++ b/mkspecs/common/gcc-base-mac.conf
@@ -12,14 +12,6 @@ include(gcc-base.conf)
 
 QMAKE_COMPILER_DEFINES += __APPLE__ __GNUC__=4 __APPLE_CC__
 
-QMAKE_OBJECTIVE_CFLAGS          = $$QMAKE_CFLAGS
-QMAKE_OBJECTIVE_CFLAGS_WARN_ON  = $$QMAKE_CFLAGS_WARN_ON
-QMAKE_OBJECTIVE_CFLAGS_WARN_OFF = $$QMAKE_CFLAGS_WARN_OFF
-QMAKE_OBJECTIVE_CFLAGS_DEBUG    = $$QMAKE_CFLAGS_DEBUG
-QMAKE_OBJECTIVE_CFLAGS_RELEASE  = $$QMAKE_CFLAGS_RELEASE
-QMAKE_OBJECTIVE_CFLAGS_RELEASE_WITH_DEBUGINFO = $$QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO
-QMAKE_OBJECTIVE_CFLAGS_HIDESYMS = $$QMAKE_CXXFLAGS_HIDESYMS
-
 QMAKE_LFLAGS           += -headerpad_max_install_names
 
 QMAKE_LFLAGS_SHLIB         += -single_module -dynamiclib
diff --git a/mkspecs/common/ios/clang.conf b/mkspecs/common/ios/clang.conf
index 36cb655229..f45b89665f 100644
--- a/mkspecs/common/ios/clang.conf
+++ b/mkspecs/common/ios/clang.conf
@@ -22,7 +22,7 @@ QMAKE_IOS_OBJ_CFLAGS   += -Wno-deprecated-implementations -Wprotocol -Wno-select
 # Set build flags
 QMAKE_CFLAGS           += $$QMAKE_IOS_CFLAGS
 QMAKE_CXXFLAGS         += $$QMAKE_IOS_CFLAGS $$QMAKE_IOS_CXXFLAGS
-QMAKE_OBJECTIVE_CFLAGS += $$QMAKE_IOS_CFLAGS $$QMAKE_IOS_CXXFLAGS $$QMAKE_IOS_OBJ_CFLAGS
+QMAKE_OBJECTIVE_CFLAGS += $$QMAKE_IOS_OBJ_CFLAGS
 
 QMAKE_IOS_CFLAGS        =
 QMAKE_IOS_CXXFLAGS      =
diff --git a/mkspecs/common/linux.conf b/mkspecs/common/linux.conf
index 8d6fb6fe17..b98d9bdf2d 100644
--- a/mkspecs/common/linux.conf
+++ b/mkspecs/common/linux.conf
@@ -4,6 +4,8 @@
 
 QMAKE_PLATFORM         += linux
 
+include(unix.conf)
+
 QMAKE_CFLAGS_THREAD    += -D_REENTRANT
 QMAKE_CXXFLAGS_THREAD  += $$QMAKE_CFLAGS_THREAD
 QMAKE_LFLAGS_GCSECTIONS = -Wl,--gc-sections
@@ -51,5 +53,3 @@ QMAKE_RANLIB            =
 
 QMAKE_STRIP             = strip
 QMAKE_STRIPFLAGS_LIB   += --strip-unneeded
-
-include(unix.conf)
diff --git a/mkspecs/common/mac.conf b/mkspecs/common/mac.conf
index 91639ddb50..d80b41c74b 100644
--- a/mkspecs/common/mac.conf
+++ b/mkspecs/common/mac.conf
@@ -6,6 +6,8 @@
 
 QMAKE_PLATFORM         += mac darwin
 
+include(unix.conf)
+
 QMAKE_RESOURCE          = /Developer/Tools/Rez
 QMAKE_EXTENSION_SHLIB   = dylib
 QMAKE_LIBDIR            =
@@ -27,5 +29,3 @@ QMAKE_LIBS_THREAD       =
 QMAKE_AR                = ar cq
 QMAKE_RANLIB            = ranlib -s
 QMAKE_NM                = nm -P
-
-include(unix.conf)
diff --git a/mkspecs/common/msvc-desktop.conf b/mkspecs/common/msvc-desktop.conf
index 849048dad0..a1c436388c 100644
--- a/mkspecs/common/msvc-desktop.conf
+++ b/mkspecs/common/msvc-desktop.conf
@@ -74,6 +74,9 @@ QMAKE_LFLAGS_WINDOWS    = /SUBSYSTEM:WINDOWS
 QMAKE_LFLAGS_EXE        = \"/MANIFESTDEPENDENCY:type=\'win32\' name=\'Microsoft.Windows.Common-Controls\' version=\'6.0.0.0\' publicKeyToken=\'6595b64144ccf1df\' language=\'*\' processorArchitecture=\'*\'\"
 QMAKE_LFLAGS_DLL        = /DLL
 QMAKE_LFLAGS_LTCG       = /LTCG
+QMAKE_PREFIX_SHLIB      =
+QMAKE_EXTENSION_SHLIB   = dll
+QMAKE_PREFIX_STATICLIB  =
 QMAKE_EXTENSION_STATICLIB = lib
 
 QMAKE_LIBS_CORE         = kernel32.lib user32.lib shell32.lib uuid.lib ole32.lib advapi32.lib ws2_32.lib
diff --git a/mkspecs/common/qcc-base-qnx-armle-v7.conf b/mkspecs/common/qcc-base-qnx-armle-v7.conf
index 12d393f070..ad3bb33da4 100644
--- a/mkspecs/common/qcc-base-qnx-armle-v7.conf
+++ b/mkspecs/common/qcc-base-qnx-armle-v7.conf
@@ -4,9 +4,10 @@
 
 MAKEFILE_GENERATOR      = UNIX
 
-include(g++-unix.conf)
 include(unix.conf)
 
+include(g++-unix.conf)
+
 QMAKE_CC                = qcc -Vgcc_ntoarmv7le
 QMAKE_CXX               = qcc -Vgcc_ntoarmv7le
 QNX_CPUDIR              = armle-v7
diff --git a/mkspecs/common/qcc-base-qnx-x86.conf b/mkspecs/common/qcc-base-qnx-x86.conf
index b49075086d..37a5d9ce70 100644
--- a/mkspecs/common/qcc-base-qnx-x86.conf
+++ b/mkspecs/common/qcc-base-qnx-x86.conf
@@ -4,9 +4,10 @@
 
 MAKEFILE_GENERATOR      = UNIX
 
-include(g++-unix.conf)
 include(unix.conf)
 
+include(g++-unix.conf)
+
 QMAKE_CC                = qcc -Vgcc_ntox86
 QMAKE_CXX               = qcc -Vgcc_ntox86
 QNX_CPUDIR              = x86
diff --git a/mkspecs/common/qcc-base-qnx.conf b/mkspecs/common/qcc-base-qnx.conf
index dbbf346ea2..156ba0ddd8 100644
--- a/mkspecs/common/qcc-base-qnx.conf
+++ b/mkspecs/common/qcc-base-qnx.conf
@@ -4,7 +4,7 @@
 
 include(qcc-base.conf)
 
-QMAKE_PLATFORM         += qnx
+QMAKE_PLATFORM          = qnx $$QMAKE_PLATFORM
 
 #Choose qnx QPA Plugin as default
 QT_QPA_DEFAULT_PLATFORM = qnx
diff --git a/mkspecs/common/unix.conf b/mkspecs/common/unix.conf
index 2146b62f17..8521c85b99 100644
--- a/mkspecs/common/unix.conf
+++ b/mkspecs/common/unix.conf
@@ -12,5 +12,6 @@ QMAKE_YACCFLAGS_MANGLE += -p $base -b $base
 QMAKE_YACC_HEADER       = $base.tab.h
 QMAKE_YACC_SOURCE       = $base.tab.c
 QMAKE_PREFIX_SHLIB      = lib
+QMAKE_EXTENSION_SHLIB   = so
 QMAKE_PREFIX_STATICLIB  = lib
 QMAKE_EXTENSION_STATICLIB = a
diff --git a/mkspecs/common/wince/qmake.conf b/mkspecs/common/wince/qmake.conf
index 3eac38f6b7..224c350e2f 100644
--- a/mkspecs/common/wince/qmake.conf
+++ b/mkspecs/common/wince/qmake.conf
@@ -62,6 +62,9 @@ QMAKE_LFLAGS_LTCG       = /LTCG
 QMAKE_LIBS_NETWORK      = ws2.lib
 QMAKE_LIBS_OPENGL       =
 QMAKE_LIBS_COMPAT       =
+QMAKE_PREFIX_SHLIB      =
+QMAKE_EXTENSION_SHLIB   = dll
+QMAKE_PREFIX_STATICLIB  =
 QMAKE_EXTENSION_STATICLIB = lib
 
 QMAKE_LIBS_EGL          = libEGL.lib
diff --git a/mkspecs/common/winrt_winphone/qmake.conf b/mkspecs/common/winrt_winphone/qmake.conf
index 9ff1966284..288043da88 100644
--- a/mkspecs/common/winrt_winphone/qmake.conf
+++ b/mkspecs/common/winrt_winphone/qmake.conf
@@ -70,6 +70,9 @@ QMAKE_LFLAGS_WINDOWS    = /SUBSYSTEM:WINDOWS
 QMAKE_LFLAGS_EXE        = /MANIFEST:NO
 QMAKE_LFLAGS_DLL        = /MANIFEST:NO /DLL
 QMAKE_LFLAGS_LTCG       = /LTCG
+QMAKE_PREFIX_SHLIB      =
+QMAKE_EXTENSION_SHLIB   = dll
+QMAKE_PREFIX_STATICLIB  =
 QMAKE_EXTENSION_STATICLIB = lib
 
 QMAKE_LIBS             += runtimeobject.lib
diff --git a/mkspecs/cygwin-g++/qmake.conf b/mkspecs/cygwin-g++/qmake.conf
index 53cd35611f..a4f64d9c66 100644
--- a/mkspecs/cygwin-g++/qmake.conf
+++ b/mkspecs/cygwin-g++/qmake.conf
@@ -6,7 +6,7 @@
 
 MAKEFILE_GENERATOR      = UNIX
 QMAKE_PLATFORM          = cygwin unix posix
-CONFIG                 += incremental
+CONFIG                 += incremental unversioned_libname
 QMAKE_INCREMENTAL_STYLE = sublib
 
 QMAKE_COMPILER          = gcc
@@ -56,8 +56,6 @@ QMAKE_LFLAGS_PLUGIN     = $$QMAKE_LFLAGS_SHLIB
 QMAKE_LFLAGS_SONAME     = -Wl,-soname,
 QMAKE_LFLAGS_THREAD     =
 QMAKE_LFLAGS_RPATH      = -Wl,-rpath,
-QMAKE_CYGWIN_SHLIB      = 1
-QMAKE_CYGWIN_EXE        = 1
 
 QMAKE_LIBS              =
 QMAKE_LIBS_DYNLOAD      = -ldl
@@ -65,6 +63,7 @@ QMAKE_LIBS_X11          = -lXext -lX11
 QMAKE_LIBS_OPENGL       = -lGL
 QMAKE_LIBS_THREAD       = -lpthread
 QMAKE_PREFIX_SHLIB      = lib
+QMAKE_EXTENSION_SHLIB   = dll
 QMAKE_PREFIX_STATICLIB  = lib
 QMAKE_EXTENSION_STATICLIB = a
 
diff --git a/mkspecs/darwin-g++/qmake.conf b/mkspecs/darwin-g++/qmake.conf
index ab333b1684..79f81a990f 100644
--- a/mkspecs/darwin-g++/qmake.conf
+++ b/mkspecs/darwin-g++/qmake.conf
@@ -9,6 +9,8 @@ QMAKE_PLATFORM          = osx macx mac darwin
 CONFIG                 += native_precompiled_headers
 DEFINES                += __USE_WS_X11__
 
+include(../common/unix.conf)
+
 QMAKE_COMPILER          = gcc
 
 QMAKE_CC                = cc
@@ -84,5 +86,4 @@ QMAKE_PCH_OUTPUT_EXT    = .gch
 QMAKE_CXXFLAGS_PRECOMPILE += -x objective-c++-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT}
 QMAKE_CXXFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE
 
-include(../common/unix.conf)
 load(qt_config)
diff --git a/mkspecs/devices/linux-jetson-tk1-pro-g++/qmake.conf b/mkspecs/devices/linux-jetson-tk1-pro-g++/qmake.conf
new file mode 100644
index 0000000000..ca9ebda087
--- /dev/null
+++ b/mkspecs/devices/linux-jetson-tk1-pro-g++/qmake.conf
@@ -0,0 +1,38 @@
+#
+# qmake configuration for the Jetson TK1 Pro boards
+#
+# A typical configure line might look like:
+# configure \
+#   -device jetson-tk1-pro \
+#   -device-option VIBRANTE_SDK_TOPDIR=/opt/nvidia/vibrante-vcm30t124-linux
+#   -device-option CROSS_COMPILE=/opt/nvidia/toolchains/tegra-4.8.1-nv/usr/bin/arm-cortex_a15-linux-gnueabi/arm-cortex_a15-linux-gnueabi- \
+#   -sysroot /opt/nvidia/vibrante-vcm30t124-linux/targetfs \
+#   -no-gcc-sysroot
+
+include(../common/linux_device_pre.conf)
+
+isEmpty(VIBRANTE_SDK_TOPDIR):error("You must pass -device-option VIBRANTE_SDK_TOPDIR=/path/to/sdk")
+
+QMAKE_INCDIR += \
+    $${VIBRANTE_SDK_TOPDIR}/include \
+    $$[QT_SYSROOT]/usr/include
+
+QMAKE_LIBDIR += \
+    $${VIBRANTE_SDK_TOPDIR}/lib-target \
+    $$[QT_SYSROOT]/usr/lib \
+    $$[QT_SYSROOT]/lib/arm-linux-gnueabihf \
+    $$[QT_SYSROOT]/usr/lib/arm-linux-gnueabihf
+
+QMAKE_LFLAGS += \
+    -Wl,-rpath-link,$${VIBRANTE_SDK_TOPDIR}/lib-target \
+    -Wl,-rpath-link,$$[QT_SYSROOT]/usr/lib \
+    -Wl,-rpath-link,$$[QT_SYSROOT]/usr/lib/arm-linux-gnueabihf \
+    -Wl,-rpath-link,$$[QT_SYSROOT]/lib/arm-linux-gnueabihf
+
+DISTRO_OPTS                  += hard-float
+COMPILER_FLAGS               += -mtune=cortex-a15 -march=armv7-a -mfpu=neon-vfpv4 -DWIN_INTERFACE_CUSTOM
+
+EGLFS_DEVICE_INTEGRATION = eglfs_kms_egldevice
+
+include(../common/linux_arm_device_post.conf)
+load(qt_config)
diff --git a/mkspecs/unsupported/linux-armcc/qplatformdefs.h b/mkspecs/devices/linux-jetson-tk1-pro-g++/qplatformdefs.h
index 946b4d2b90..beacd150b8 100644
--- a/mkspecs/unsupported/linux-armcc/qplatformdefs.h
+++ b/mkspecs/devices/linux-jetson-tk1-pro-g++/qplatformdefs.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2015 The Qt Company Ltd.
 ** Contact: http://www.qt.io/licensing/
 **
-** This file is part of the qmake spec of the Qt Toolkit.
+** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL21$
 ** Commercial License Usage
@@ -31,62 +31,4 @@
 **
 ****************************************************************************/
 
-#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 <features.h>
-#include <pthread.h>
-#include <dirent.h>
-#include <fcntl.h>
-#include <grp.h>
-#include <pwd.h>
-#include <signal.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
+#include "../../linux-g++/qplatformdefs.h"
diff --git a/mkspecs/features/default_post.prf b/mkspecs/features/default_post.prf
index ebe83af25e..cd8d8859aa 100644
--- a/mkspecs/features/default_post.prf
+++ b/mkspecs/features/default_post.prf
@@ -35,7 +35,6 @@ force_debug_info|debug: \
 force_debug_info {
     QMAKE_CFLAGS_RELEASE = $$QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO
     QMAKE_CXXFLAGS_RELEASE = $$QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO
-    QMAKE_OBJECTIVE_CFLAGS_RELEASE = $$QMAKE_OBJECTIVE_CFLAGS_RELEASE_WITH_DEBUGINFO
     QMAKE_LFLAGS_RELEASE = $$QMAKE_LFLAGS_RELEASE_WITH_DEBUGINFO
 }
 
@@ -51,13 +50,11 @@ optimize_full {
 debug {
     QMAKE_CFLAGS += $$QMAKE_CFLAGS_DEBUG
     QMAKE_CXXFLAGS += $$QMAKE_CXXFLAGS_DEBUG
-    QMAKE_OBJECTIVE_CFLAGS += $$QMAKE_OBJECTIVE_CFLAGS_DEBUG
     QMAKE_LFLAGS += $$QMAKE_LFLAGS_DEBUG
     QMAKE_LIBFLAGS += $$QMAKE_LIBFLAGS_DEBUG
 } else {
     QMAKE_CFLAGS += $$QMAKE_CFLAGS_RELEASE
     QMAKE_CXXFLAGS += $$QMAKE_CXXFLAGS_RELEASE
-    QMAKE_OBJECTIVE_CFLAGS += $$QMAKE_OBJECTIVE_CFLAGS_RELEASE
     QMAKE_LFLAGS += $$QMAKE_LFLAGS_RELEASE
     QMAKE_LIBFLAGS += $$QMAKE_LIBFLAGS_RELEASE
 }
@@ -107,7 +104,6 @@ c++11|c++14|c++1z {
     !strict_c++:!isEmpty(QMAKE_CXXFLAGS_GNU$$cxxstd): cxxstd = GNU$$cxxstd
 
     QMAKE_CXXFLAGS += $$eval(QMAKE_CXXFLAGS_$$cxxstd)
-    QMAKE_OBJECTIVE_CFLAGS += $$eval(QMAKE_CXXFLAGS_$$cxxstd)
     QMAKE_LFLAGS += $$eval(QMAKE_LFLAGS_$$cxxstd)
 
     unset(cxxstd)
diff --git a/mkspecs/features/gcov.prf b/mkspecs/features/gcov.prf
index 330831fc0e..f45ba4c520 100644
--- a/mkspecs/features/gcov.prf
+++ b/mkspecs/features/gcov.prf
@@ -25,7 +25,6 @@
 
 QMAKE_CFLAGS           += -fprofile-arcs -ftest-coverage
 QMAKE_CXXFLAGS         += -fprofile-arcs -ftest-coverage
-QMAKE_OBJECTIVE_CFLAGS += -fprofile-arcs -ftest-coverage
 QMAKE_LFLAGS           += -fprofile-arcs -ftest-coverage
 
 QMAKE_CLEAN += $(OBJECTS_DIR)*.gcno and $(OBJECTS_DIR)*.gcda
diff --git a/mkspecs/features/mac/objective_c.prf b/mkspecs/features/mac/objective_c.prf
index 0f25f41eec..b3b1d4be99 100644
--- a/mkspecs/features/mac/objective_c.prf
+++ b/mkspecs/features/mac/objective_c.prf
@@ -1,23 +1,10 @@
 
-for(source, SOURCES) {
-    contains(source,.*\\.mm?$) {
-        warning(Objective-C source \'$$source\' found in SOURCES but should be in OBJECTIVE_SOURCES)
-        SOURCES -= $$source
-        OBJECTIVE_SOURCES += $$source
-    }
-}
+# Objective-C/C++ sources go in SOURCES, like all other sources
+SOURCES += $$OBJECTIVE_SOURCES
 
-isEmpty(QMAKE_OBJECTIVE_CC):QMAKE_OBJECTIVE_CC = $$QMAKE_CC
+# Strip C/C++ flags from QMAKE_OBJECTIVE_CFLAGS just in case
+QMAKE_OBJECTIVE_CFLAGS -= $$QMAKE_CFLAGS $$QMAKE_CXXFLAGS
 
-OBJECTIVE_C_OBJECTS_DIR = $$OBJECTS_DIR
-isEmpty(OBJECTIVE_C_OBJECTS_DIR):OBJECTIVE_C_OBJECTS_DIR = .
-isEmpty(QMAKE_EXT_OBJECTIVE_C):QMAKE_EXT_OBJECTIVE_C = .mm .m
-
-objective_c.dependency_type = TYPE_C
-objective_c.variables = QMAKE_OBJECTIVE_CFLAGS
-objective_c.commands = $$QMAKE_OBJECTIVE_CC -c $(QMAKE_COMP_QMAKE_OBJECTIVE_CFLAGS) $(DEFINES) $(INCPATH) ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT}
-objective_c.output = $$OBJECTIVE_C_OBJECTS_DIR/${QMAKE_FILE_BASE}$${first(QMAKE_EXT_OBJ)}
-objective_c.input = OBJECTIVE_SOURCES
-objective_c.name = Compile ${QMAKE_FILE_IN}
-silent:objective_c.commands = @echo objective-c ${QMAKE_FILE_IN} && $$objective_c.commands
-QMAKE_EXTRA_COMPILERS += objective_c
+# Add Objective-C/C++ flags to C/C++ flags, the compiler can handle it
+QMAKE_CFLAGS += $$QMAKE_OBJECTIVE_CFLAGS
+QMAKE_CXXFLAGS += $$QMAKE_OBJECTIVE_CFLAGS
diff --git a/mkspecs/features/mac/sdk.prf b/mkspecs/features/mac/sdk.prf
index a5643e311d..210843bd94 100644
--- a/mkspecs/features/mac/sdk.prf
+++ b/mkspecs/features/mac/sdk.prf
@@ -32,7 +32,6 @@ isEmpty(QMAKE_MAC_SDK.$${QMAKE_MAC_SDK}.version) {
 !equals(MAKEFILE_GENERATOR, XCODE) {
     QMAKE_CFLAGS += -isysroot $$QMAKE_MAC_SDK_PATH
     QMAKE_CXXFLAGS += -isysroot $$QMAKE_MAC_SDK_PATH
-    QMAKE_OBJECTIVE_CFLAGS += -isysroot $$QMAKE_MAC_SDK_PATH
     QMAKE_LFLAGS += -Wl,-syslibroot,$$QMAKE_MAC_SDK_PATH
 }
 
@@ -80,6 +79,5 @@ isEmpty(QMAKE_MAC_SDK.$${QMAKE_MAC_SDK}.platform_name) {
     version_min_flag = -m$${version_identifier}-version-min=$$deployment_target
     QMAKE_CFLAGS += $$version_min_flag
     QMAKE_CXXFLAGS += $$version_min_flag
-    QMAKE_OBJECTIVE_CFLAGS += $$version_min_flag
     QMAKE_LFLAGS += $$version_min_flag
 }
diff --git a/mkspecs/features/moc.prf b/mkspecs/features/moc.prf
index c0b5682446..8e8deec63c 100644
--- a/mkspecs/features/moc.prf
+++ b/mkspecs/features/moc.prf
@@ -16,7 +16,7 @@ MOC_INCLUDEPATH = $$QMAKESPEC $$_PRO_FILE_PWD_ $$MOC_INCLUDEPATH $$QMAKE_DEFAULT
 # has too many includes. We do this to overcome a command-line limit on Win < XP
 WIN_INCLUDETEMP=
 win32:count(MOC_INCLUDEPATH, 40, >) {
-    WIN_INCLUDETEMP = $$MOC_DIR/mocinclude.tmp
+    WIN_INCLUDETEMP = $$MOC_DIR/mocinclude.opt
 
     WIN_INCLUDETEMP_CONT =
     for (inc, MOC_INCLUDEPATH): \
diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf
index 2e466ec9be..d416a8955a 100644
--- a/mkspecs/features/qt.prf
+++ b/mkspecs/features/qt.prf
@@ -119,12 +119,6 @@ for(ever) {
             !mac|!contains(MODULE_CONFIG, lib_bundle): \
                 MODULE_NAME ~= s,^Qt,Qt$$QT_MAJOR_VERSION,
 
-            win32 {
-                # Make sure the version number isn't appended again to the lib name
-                QMAKE_$${upper($$MODULE_NAME$$QT_LIBINFIX)}_VERSION_OVERRIDE = 0
-                QMAKE_$${upper($$MODULE_NAME$$QT_LIBINFIX)}D_VERSION_OVERRIDE = 0
-            }
-
             isEmpty(LINKAGE) {
                 !isEmpty(MODULE_LIBS_ADD): \
                     LINKAGE = -L$$MODULE_LIBS_ADD
@@ -161,7 +155,8 @@ qt_module_deps = $$resolve_depends(qt_module_deps, "QT.")
 
 !no_qt_rpath:!static:contains(QT_CONFIG, rpath):!contains(QT_CONFIG, static):\
         contains(qt_module_deps, core) {
-    relative_qt_rpath:defined(target.path, var) {
+    relative_qt_rpath:contains(INSTALLS, target):\
+            isEmpty(target.files):isEmpty(target.commands):isEmpty(target.extra) {
         mac {
             if(equals(TEMPLATE, app):app_bundle)|\
                     if(equals(TEMPLATE, lib):plugin:plugin_bundle) {
@@ -172,11 +167,17 @@ qt_module_deps = $$resolve_depends(qt_module_deps, "QT.")
             } else {
                 binpath = $$target.path
             }
-            QMAKE_RPATHDIR += @loader_path/$$relative_path($$[QT_INSTALL_LIBS], $$binpath)
+            rpath = @loader_path
         } else {
             QMAKE_LFLAGS += -Wl,-z,origin
-            QMAKE_RPATHDIR += $ORIGIN/$$relative_path($$[QT_INSTALL_LIBS], $$target.path)
+            binpath = $$target.path
+            rpath = $ORIGIN
         }
+        # NOT the /dev property, as INSTALLS use host paths
+        relpath = $$relative_path($$[QT_INSTALL_LIBS], $$binpath)
+        !equals(relpath, .): \
+            rpath = $$rpath/$$relpath
+        QMAKE_RPATHDIR += $$rpath
     } else {
         QMAKE_RPATHDIR += $$[QT_INSTALL_LIBS/dev]
     }
diff --git a/mkspecs/features/resolve_target.prf b/mkspecs/features/resolve_target.prf
index aa52e9d67e..d6460c1d9d 100644
--- a/mkspecs/features/resolve_target.prf
+++ b/mkspecs/features/resolve_target.prf
@@ -54,13 +54,13 @@ win32 {
     } else {
         equals(TEMPLATE, lib) {
             static {
-                QMAKE_RESOLVED_TARGET = $${QMAKE_RESOLVED_TARGET}$${LIBPREFIX}$${TARGET}.a
+                QMAKE_RESOLVED_TARGET = $${QMAKE_RESOLVED_TARGET}$${LIBPREFIX}$${TARGET}.$${QMAKE_EXTENSION_STATICLIB}
             } else: plugin|unversioned_libname {
-                QMAKE_RESOLVED_TARGET = $${QMAKE_RESOLVED_TARGET}$${LIBPREFIX}$${TARGET}.so
+                QMAKE_RESOLVED_TARGET = $${QMAKE_RESOLVED_TARGET}$${LIBPREFIX}$${TARGET}.$${QMAKE_EXTENSION_SHLIB}
             } else {
                 TEMP_VERSION = $$VERSION
                 isEmpty(TEMP_VERSION):TEMP_VERSION = 1.0.0
-                QMAKE_RESOLVED_TARGET = $${QMAKE_RESOLVED_TARGET}$${LIBPREFIX}$${TARGET}.so.$${TEMP_VERSION}
+                QMAKE_RESOLVED_TARGET = $${QMAKE_RESOLVED_TARGET}$${LIBPREFIX}$${TARGET}.$${QMAKE_EXTENSION_SHLIB}.$${TEMP_VERSION}
             }
         } else {
             QMAKE_RESOLVED_TARGET = $${QMAKE_RESOLVED_TARGET}$${TARGET}
diff --git a/mkspecs/features/spec_pre.prf b/mkspecs/features/spec_pre.prf
index cdc1d7ee1e..ff310d9793 100644
--- a/mkspecs/features/spec_pre.prf
+++ b/mkspecs/features/spec_pre.prf
@@ -7,6 +7,8 @@ QMAKE_DIRLIST_SEP       = $$DIRLIST_SEPARATOR
 
 QMAKE_EXT_C             = .c
 QMAKE_EXT_CPP           = .cpp .cc .cxx
+QMAKE_EXT_OBJC          = .m
+QMAKE_EXT_OBJCXX        = .mm
 QMAKE_EXT_CPP_MOC       = .moc
 QMAKE_EXT_H             = .h .hpp .hh .hxx
 QMAKE_EXT_H_MOC         = .cpp
diff --git a/mkspecs/features/unix/hide_symbols.prf b/mkspecs/features/unix/hide_symbols.prf
index 4af99c2eac..f4d3921cb1 100644
--- a/mkspecs/features/unix/hide_symbols.prf
+++ b/mkspecs/features/unix/hide_symbols.prf
@@ -1,4 +1,3 @@
 QMAKE_CFLAGS += $$QMAKE_CFLAGS_HIDESYMS
 QMAKE_CXXFLAGS += $$QMAKE_CXXFLAGS_HIDESYMS
-QMAKE_OBJECTIVE_CFLAGS += $$QMAKE_OBJECTIVE_CFLAGS_HIDESYMS
 QMAKE_LFLAGS += $$QMAKE_LFLAGS_HIDESYMS
diff --git a/mkspecs/features/warn_off.prf b/mkspecs/features/warn_off.prf
index e37979c035..072a7aca15 100644
--- a/mkspecs/features/warn_off.prf
+++ b/mkspecs/features/warn_off.prf
@@ -1,4 +1,3 @@
 CONFIG -= warn_on
 QMAKE_CFLAGS += $$QMAKE_CFLAGS_WARN_OFF
 QMAKE_CXXFLAGS += $$QMAKE_CXXFLAGS_WARN_OFF
-QMAKE_OBJECTIVE_CFLAGS += $$QMAKE_OBJECTIVE_CFLAGS_WARN_OFF
-\ No newline at end of file
diff --git a/mkspecs/features/warn_on.prf b/mkspecs/features/warn_on.prf
index 7e78a8e0d3..03a4a24a61 100644
--- a/mkspecs/features/warn_on.prf
+++ b/mkspecs/features/warn_on.prf
@@ -1,5 +1,4 @@
 CONFIG -= warn_off
 QMAKE_CFLAGS += $$QMAKE_CFLAGS_WARN_ON
 QMAKE_CXXFLAGS += $$QMAKE_CXXFLAGS_WARN_ON
-QMAKE_OBJECTIVE_CFLAGS += $$QMAKE_OBJECTIVE_CFLAGS_WARN_ON
 
diff --git a/mkspecs/features/winrt/font_deployment.prf b/mkspecs/features/winrt/font_deployment.prf
deleted file mode 100644
index c767d5bc1a..0000000000
--- a/mkspecs/features/winrt/font_deployment.prf
+++ /dev/null
@@ -1,62 +0,0 @@
-# Provide default fonts for windows phone
-# The DEFAULTFONTS variable indicates, whether the default set of fonts is
-# used for deployment. The check below won't work after the fonts are added
-# so this helper variable is added and used for the user warning check later.
-!defined(FONTS, var):winphone {
-    FONTS = \
-        $$[QT_HOST_PREFIX/src]/lib/fonts/DejaVuSans.ttf \
-        $$[QT_HOST_PREFIX/src]/lib/fonts/DejaVuSans-Bold.ttf \
-        $$[QT_HOST_PREFIX/src]/lib/fonts/DejaVuSans-BoldOblique.ttf \
-        $$[QT_HOST_PREFIX/src]/lib/fonts/DejaVuSansMono.ttf \
-        $$[QT_HOST_PREFIX/src]/lib/fonts/DejaVuSansMono-Bold.ttf \
-        $$[QT_HOST_PREFIX/src]/lib/fonts/DejaVuSansMono-BoldOblique.ttf \
-        $$[QT_HOST_PREFIX/src]/lib/fonts/DejaVuSansMono-Oblique.ttf \
-        $$[QT_HOST_PREFIX/src]/lib/fonts/DejaVuSans-Oblique.ttf \
-        $$[QT_HOST_PREFIX/src]/lib/fonts/DejaVuSerif.ttf \
-        $$[QT_HOST_PREFIX/src]/lib/fonts/DejaVuSerif-Bold.ttf \
-        $$[QT_HOST_PREFIX/src]/lib/fonts/DejaVuSerif-BoldOblique.ttf \
-        $$[QT_HOST_PREFIX/src]/lib/fonts/DejaVuSerif-Oblique.ttf
-    DEFAULTFONTS =
-}
-
-if(build_pass:equals(TEMPLATE, "app"))| \
-if(!build_pass:equals(TEMPLATE, "vcapp")) {
-    defined(DEFAULTFONTS, var) {
-        message(Default fonts will automatically be deployed with your application. \
-            To avoid automatic deployment unset the \"FONTS\" variable (\"FONTS =\") in your .pro file. \
-            You can also customize which fonts are deployed by setting the \"FONTS\" variable.)
-    }
-
-    contains(TEMPLATE, "vc.*") {
-        BUILD_DIR = $$OUT_PWD
-    } else {
-        load(resolve_target)
-        BUILD_DIR = $$dirname(QMAKE_RESOLVED_TARGET)
-    }
-
-    for (FONT, FONTS) {
-        font_$${FONT}.input = $$FONT
-        font_$${FONT}.output = $$BUILD_DIR/fonts/$$basename(FONT)
-        font_$${FONT}.CONFIG = verbatim
-        QMAKE_SUBSTITUTES += font_$${FONT}
-    }
-
-    !isEmpty(FONTS):equals(TEMPLATE, "app") {
-        fonts.files = $$BUILD_DIR/fonts/*
-        isEmpty(target.path) {
-            fonts.path = $$OUT_PWD/fonts
-        } else {
-            fonts.path = $$target.path/fonts
-        }
-
-        INSTALLS += fonts
-    }
-}
-
-!isEmpty(FONTS):winphone:equals(TEMPLATE, "vcapp"):build_pass {
-    for (FONT, FONTS) {
-        fonts.files += $$OUT_PWD/fonts/$$basename(FONT)
-    }
-    fonts.path = fonts
-    DEPLOYMENT += fonts
-}
diff --git a/mkspecs/freebsd-g++/qmake.conf b/mkspecs/freebsd-g++/qmake.conf
index 47505fc06a..282b6bdfa7 100644
--- a/mkspecs/freebsd-g++/qmake.conf
+++ b/mkspecs/freebsd-g++/qmake.conf
@@ -5,6 +5,8 @@
 MAKEFILE_GENERATOR      = UNIX
 QMAKE_PLATFORM          = freebsd bsd
 
+include(../common/unix.conf)
+
 QMAKE_CFLAGS_THREAD     = -pthread -D_THREAD_SAFE
 
 QMAKE_CXXFLAGS_THREAD   = $$QMAKE_CFLAGS_THREAD
@@ -27,7 +29,6 @@ QMAKE_OBJCOPY           = objcopy
 QMAKE_NM                = nm -P
 QMAKE_RANLIB            =
 
-include(../common/unix.conf)
 include(../common/gcc-base-unix.conf)
 include(../common/g++-unix.conf)
 load(qt_config)
diff --git a/mkspecs/freebsd-g++46/qmake.conf b/mkspecs/freebsd-g++46/qmake.conf
index 277997ab28..b930fca78b 100644
--- a/mkspecs/freebsd-g++46/qmake.conf
+++ b/mkspecs/freebsd-g++46/qmake.conf
@@ -5,6 +5,8 @@
 MAKEFILE_GENERATOR      = UNIX
 QMAKE_PLATFORM          = freebsd bsd
 
+include(../common/unix.conf)
+
 QMAKE_CFLAGS_THREAD     = -pthread -D_THREAD_SAFE
 
 QMAKE_CXXFLAGS_THREAD   = $$QMAKE_CFLAGS_THREAD
@@ -27,7 +29,6 @@ QMAKE_OBJCOPY           = objcopy
 QMAKE_NM                = nm -P
 QMAKE_RANLIB            =
 
-include(../common/unix.conf)
 include(../common/gcc-base-unix.conf)
 include(../common/g++-unix.conf)
 
diff --git a/mkspecs/freebsd-icc/qmake.conf b/mkspecs/freebsd-icc/qmake.conf
index fb419f7e5b..d72ea73278 100644
--- a/mkspecs/freebsd-icc/qmake.conf
+++ b/mkspecs/freebsd-icc/qmake.conf
@@ -30,6 +30,8 @@
 MAKEFILE_GENERATOR      = UNIX
 QMAKE_PLATFORM          = freebsd bsd
 
+include(../common/unix.conf)
+
 QMAKE_COMPILER          = gcc intel_icc   # icc pretends to be gcc
 
 QMAKE_CC                = icc
@@ -90,5 +92,4 @@ QMAKE_OBJCOPY           = objcopy
 QMAKE_NM                = nm -P
 QMAKE_RANLIB            =
 
-include(../common/unix.conf)
 load(qt_config)
diff --git a/mkspecs/haiku-g++/qmake.conf b/mkspecs/haiku-g++/qmake.conf
index 6144392385..ac28069864 100644
--- a/mkspecs/haiku-g++/qmake.conf
+++ b/mkspecs/haiku-g++/qmake.conf
@@ -5,6 +5,8 @@
 MAKEFILE_GENERATOR      = UNIX
 QMAKE_PLATFORM          = haiku
 
+include(../common/unix.conf)
+
 # Choose haiku QPA Plugin as default
 QT_QPA_DEFAULT_PLATFORM = haiku
 
@@ -23,5 +25,5 @@ QMAKE_RANLIB            =
 
 include(../common/gcc-base-unix.conf)
 include(../common/g++-unix.conf)
-include(../common/unix.conf)
+
 load(qt_config)
diff --git a/mkspecs/hpux-acc-64/qmake.conf b/mkspecs/hpux-acc-64/qmake.conf
index 2156b448fe..f0b879de83 100644
--- a/mkspecs/hpux-acc-64/qmake.conf
+++ b/mkspecs/hpux-acc-64/qmake.conf
@@ -49,6 +49,8 @@ MAKEFILE_GENERATOR      = UNIX
 QMAKE_PLATFORM          = hpux
 QMAKE_COMPILER_DEFINES += __hpux __HP_aCC
 
+include(../common/unix.conf)
+
 QMAKE_COMPILER          = hp_acc
 
 QMAKE_CC                = cc
@@ -111,5 +113,4 @@ QMAKE_OBJCOPY           = objcopy
 QMAKE_NM                = nm -P
 QMAKE_RANLIB            =
 
-include(../common/unix.conf)
 load(qt_config)
diff --git a/mkspecs/hpux-acc-o64/qmake.conf b/mkspecs/hpux-acc-o64/qmake.conf
index 69c3df1375..750bb99155 100644
--- a/mkspecs/hpux-acc-o64/qmake.conf
+++ b/mkspecs/hpux-acc-o64/qmake.conf
@@ -48,6 +48,8 @@
 MAKEFILE_GENERATOR      = UNIX
 QMAKE_PLATFORM          = hpux
 
+include(../common/unix.conf)
+
 QMAKE_COMPILER          = hp_acc
 
 QMAKE_CC                = cc
@@ -109,5 +111,4 @@ QMAKE_OBJCOPY           = objcopy
 QMAKE_NM                = nm -P
 QMAKE_RANLIB            =
 
-include(../common/unix.conf)
 load(qt_config)
diff --git a/mkspecs/hpux-acc/qmake.conf b/mkspecs/hpux-acc/qmake.conf
index eaa8888fbe..2f1ce1054c 100644
--- a/mkspecs/hpux-acc/qmake.conf
+++ b/mkspecs/hpux-acc/qmake.conf
@@ -28,6 +28,8 @@ MAKEFILE_GENERATOR      = UNIX
 QMAKE_PLATFORM          = hpux
 QMAKE_COMPILER_DEFINES += __hpux __HP_aCC
 
+include(../common/unix.conf)
+
 QMAKE_COMPILER          = hp_acc
 
 QMAKE_CC                = cc
@@ -90,5 +92,4 @@ QMAKE_OBJCOPY           = objcopy
 QMAKE_NM                = nm -P
 QMAKE_RANLIB            =
 
-include(../common/unix.conf)
 load(qt_config)
diff --git a/mkspecs/hpux-g++-64/qmake.conf b/mkspecs/hpux-g++-64/qmake.conf
index 3e822edbfb..a27333fa18 100644
--- a/mkspecs/hpux-g++-64/qmake.conf
+++ b/mkspecs/hpux-g++-64/qmake.conf
@@ -8,6 +8,8 @@
 MAKEFILE_GENERATOR      = UNIX
 QMAKE_PLATFORM          = hpux
 
+include(../common/unix.conf)
+
 QMAKE_COMPILER          = gcc
 
 QMAKE_CC                = gcc
@@ -73,5 +75,4 @@ QMAKE_OBJCOPY           = objcopy
 QMAKE_NM                = nm -P
 QMAKE_RANLIB            =
 
-include(../common/unix.conf)
 load(qt_config)
diff --git a/mkspecs/hpux-g++/qmake.conf b/mkspecs/hpux-g++/qmake.conf
index 866a3416bc..b488da7178 100644
--- a/mkspecs/hpux-g++/qmake.conf
+++ b/mkspecs/hpux-g++/qmake.conf
@@ -9,6 +9,8 @@ MAKEFILE_GENERATOR      = UNIX
 QMAKE_PLATFORM          = hpux
 CONFIG                 += plugin_no_soname
 
+include(../common/unix.conf)
+
 QMAKE_COMPILER          = gcc
 
 QMAKE_CC                = gcc
@@ -74,5 +76,4 @@ QMAKE_OBJCOPY           = objcopy
 QMAKE_NM                = nm -P
 QMAKE_RANLIB            =
 
-include(../common/unix.conf)
 load(qt_config)
diff --git a/mkspecs/hpuxi-acc-32/qmake.conf b/mkspecs/hpuxi-acc-32/qmake.conf
index 79bf20fbb2..e80a7973fe 100644
--- a/mkspecs/hpuxi-acc-32/qmake.conf
+++ b/mkspecs/hpuxi-acc-32/qmake.conf
@@ -6,6 +6,8 @@ MAKEFILE_GENERATOR      = UNIX
 QMAKE_PLATFORM          = hpux
 CONFIG                 += plugin_no_soname
 
+include(../common/unix.conf)
+
 QMAKE_COMPILER          = hp_acc
 
 QMAKE_CC                = cc
@@ -66,5 +68,4 @@ QMAKE_OBJCOPY           = objcopy
 QMAKE_NM                = nm -P
 QMAKE_RANLIB            =
 
-include(../common/unix.conf)
 load(qt_config)
diff --git a/mkspecs/hpuxi-acc-64/qmake.conf b/mkspecs/hpuxi-acc-64/qmake.conf
index aaec3eab14..360e35c5d6 100644
--- a/mkspecs/hpuxi-acc-64/qmake.conf
+++ b/mkspecs/hpuxi-acc-64/qmake.conf
@@ -49,6 +49,8 @@ MAKEFILE_GENERATOR      = UNIX
 QMAKE_PLATFORM          = hpux
 CONFIG                 += plugin_no_soname
 
+include(../common/unix.conf)
+
 QMAKE_COMPILER          = hp_acc
 
 QMAKE_CC                = cc
@@ -109,5 +111,4 @@ QMAKE_OBJCOPY           = objcopy
 QMAKE_NM                = nm -P
 QMAKE_RANLIB            =
 
-include(../common/unix.conf)
 load(qt_config)
diff --git a/mkspecs/hpuxi-g++-64/qmake.conf b/mkspecs/hpuxi-g++-64/qmake.conf
index 8a05a5f611..4c376de719 100644
--- a/mkspecs/hpuxi-g++-64/qmake.conf
+++ b/mkspecs/hpuxi-g++-64/qmake.conf
@@ -13,6 +13,8 @@
 MAKEFILE_GENERATOR      = UNIX
 QMAKE_PLATFORM          = hpux
 
+include(../common/unix.conf)
+
 QMAKE_COMPILER          = gcc
 
 QMAKE_CC                = gcc
@@ -76,5 +78,4 @@ QMAKE_OBJCOPY           = objcopy
 QMAKE_NM                = nm -P
 QMAKE_RANLIB            =
 
-include(../common/unix.conf)
 load(qt_config)
diff --git a/mkspecs/hurd-g++/qmake.conf b/mkspecs/hurd-g++/qmake.conf
index e7e4e3a82d..f2e3242627 100644
--- a/mkspecs/hurd-g++/qmake.conf
+++ b/mkspecs/hurd-g++/qmake.conf
@@ -7,6 +7,8 @@ QMAKE_PLATFORM         += hurd
 CONFIG                 += incremental
 QMAKE_INCREMENTAL_STYLE = sublib
 
+include(../common/unix.conf)
+
 QMAKE_CFLAGS_THREAD    += -D_REENTRANT
 QMAKE_CXXFLAGS_THREAD  += $$QMAKE_CFLAGS_THREAD
 QMAKE_LFLAGS_GCSECTIONS = -Wl,--gc-sections
@@ -46,7 +48,6 @@ QMAKE_RANLIB            =
 QMAKE_STRIP             = strip
 QMAKE_STRIPFLAGS_LIB   += --strip-unneeded
 
-include(../common/unix.conf)
 include(../common/gcc-base-unix.conf)
 include(../common/g++-unix.conf)
 load(qt_config)
diff --git a/mkspecs/irix-cc-64/qmake.conf b/mkspecs/irix-cc-64/qmake.conf
index 05c8b6fc84..ad5c6a3ee1 100644
--- a/mkspecs/irix-cc-64/qmake.conf
+++ b/mkspecs/irix-cc-64/qmake.conf
@@ -38,6 +38,8 @@ MAKEFILE_GENERATOR      = UNIX
 QMAKE_PLATFORM          = irix
 QMAKE_COMPILER_DEFINES += __sgi __EDG
 
+include(../common/unix.conf)
+
 QMAKE_COMPILER          = sgi_cc
 
 QMAKE_CC                = cc
@@ -103,5 +105,4 @@ QMAKE_RANLIB            =
 
 QMAKE_CLEAN             = -r $(OBJECTS_DIR)so_locations $(OBJECTS_DIR)ii_files
 
-include(../common/unix.conf)
 load(qt_config)
diff --git a/mkspecs/irix-cc/qmake.conf b/mkspecs/irix-cc/qmake.conf
index 72d4e65474..52abdf8578 100644
--- a/mkspecs/irix-cc/qmake.conf
+++ b/mkspecs/irix-cc/qmake.conf
@@ -38,6 +38,8 @@ MAKEFILE_GENERATOR      = UNIX
 QMAKE_PLATFORM          = irix
 QMAKE_COMPILER_DEFINES += __sgi __EDG
 
+include(../common/unix.conf)
+
 QMAKE_COMPILER          = sgi_cc
 
 QMAKE_CC                = cc
@@ -103,5 +105,4 @@ QMAKE_RANLIB            =
 
 QMAKE_CLEAN             = -r $(OBJECTS_DIR)so_locations $(OBJECTS_DIR)ii_files
 
-include(../common/unix.conf)
 load(qt_config)
diff --git a/mkspecs/irix-g++-64/qmake.conf b/mkspecs/irix-g++-64/qmake.conf
index 12c224b5c0..bd258df5e8 100644
--- a/mkspecs/irix-g++-64/qmake.conf
+++ b/mkspecs/irix-g++-64/qmake.conf
@@ -6,6 +6,8 @@ MAKEFILE_GENERATOR      = UNIX
 QMAKE_PLATFORM          = irix
 QMAKE_COMPILER_DEFINES += __sgi __GNUC__
 
+include(../common/unix.conf)
+
 QMAKE_COMPILER          = gcc
 
 QMAKE_CC                = gcc
@@ -73,5 +75,4 @@ QMAKE_RANLIB            =
 
 QMAKE_CLEAN             = so_locations
 
-include(../common/unix.conf)
 load(qt_config)
diff --git a/mkspecs/irix-g++/qmake.conf b/mkspecs/irix-g++/qmake.conf
index 2c02165e0d..57a27b6a1b 100644
--- a/mkspecs/irix-g++/qmake.conf
+++ b/mkspecs/irix-g++/qmake.conf
@@ -6,6 +6,8 @@ MAKEFILE_GENERATOR      = UNIX
 QMAKE_PLATFORM          = irix
 QMAKE_COMPILER_DEFINES += __sgi __GNUC__
 
+include(../common/unix.conf)
+
 QMAKE_COMPILER          = gcc
 
 QMAKE_CC                = gcc
@@ -73,5 +75,4 @@ QMAKE_RANLIB            =
 
 QMAKE_CLEAN             = so_locations
 
-include(../common/unix.conf)
 load(qt_config)
diff --git a/mkspecs/linux-cxx/qmake.conf b/mkspecs/linux-cxx/qmake.conf
index 1c7cafc6f2..b156bea084 100644
--- a/mkspecs/linux-cxx/qmake.conf
+++ b/mkspecs/linux-cxx/qmake.conf
@@ -7,6 +7,8 @@
 MAKEFILE_GENERATOR      = UNIX
 QMAKE_PLATFORM          = linux
 
+include(../common/unix.conf)
+
 QMAKE_COMPILER          = compaq_cc
 
 QMAKE_CC                = ccc
@@ -61,5 +63,4 @@ QMAKE_LIBS_OPENGL       = -lGL
 QMAKE_AR                = ar cqs
 QMAKE_RANLIB            =
 
-include(../common/unix.conf)
 load(qt_config)
diff --git a/mkspecs/linux-g++-32/qmake.conf b/mkspecs/linux-g++-32/qmake.conf
index 340aa85e7c..f09abeeec0 100644
--- a/mkspecs/linux-g++-32/qmake.conf
+++ b/mkspecs/linux-g++-32/qmake.conf
@@ -6,10 +6,12 @@ MAKEFILE_GENERATOR      = UNIX
 CONFIG                 += incremental
 QMAKE_INCREMENTAL_STYLE = sublib
 
+include(../common/linux.conf)
+
 QMAKE_CFLAGS            = -m32
 QMAKE_LFLAGS            = -m32
 
-include(../common/linux.conf)
 include(../common/gcc-base-unix.conf)
 include(../common/g++-unix.conf)
+
 load(qt_config)
diff --git a/mkspecs/linux-g++-64/qmake.conf b/mkspecs/linux-g++-64/qmake.conf
index 36fb6a83eb..a79b69ff31 100644
--- a/mkspecs/linux-g++-64/qmake.conf
+++ b/mkspecs/linux-g++-64/qmake.conf
@@ -9,10 +9,11 @@ MAKEFILE_GENERATOR      = UNIX
 CONFIG                 += incremental
 QMAKE_INCREMENTAL_STYLE = sublib
 
+include(../common/linux.conf)
+
 QMAKE_CFLAGS            = -m64
 QMAKE_LFLAGS            = -m64
 
-include(../common/linux.conf)
 include(../common/gcc-base-unix.conf)
 include(../common/g++-unix.conf)
 
diff --git a/mkspecs/linux-g++/qplatformdefs.h b/mkspecs/linux-g++/qplatformdefs.h
index 5c18632e5d..95a57585d9 100644
--- a/mkspecs/linux-g++/qplatformdefs.h
+++ b/mkspecs/linux-g++/qplatformdefs.h
@@ -78,10 +78,10 @@
 
 #undef QT_SOCKLEN_T
 
-#if defined(__GLIBC__) && (__GLIBC__ >= 2)
-#define QT_SOCKLEN_T            socklen_t
-#else
+#if defined(__GLIBC__) && (__GLIBC__ < 2)
 #define QT_SOCKLEN_T            int
+#else
+#define QT_SOCKLEN_T            socklen_t
 #endif
 
 #if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE >= 500)
diff --git a/mkspecs/linux-kcc/qmake.conf b/mkspecs/linux-kcc/qmake.conf
index 06efc8c12c..591a59537f 100644
--- a/mkspecs/linux-kcc/qmake.conf
+++ b/mkspecs/linux-kcc/qmake.conf
@@ -16,6 +16,8 @@
 MAKEFILE_GENERATOR      = UNIX
 QMAKE_PLATFORM          = linux
 
+include(../common/unix.conf)
+
 QMAKE_COMPILER          = kai_cc
 
 QMAKE_CC                = KCC
@@ -78,5 +80,4 @@ QMAKE_RANLIB            =
 
 QMAKE_CLEAN             = -r $(OBJECTS_DIR)ti_files
 
-include(../common/unix.conf)
 load(qt_config)
diff --git a/mkspecs/linux-pgcc/qmake.conf b/mkspecs/linux-pgcc/qmake.conf
index 286f937b0e..c41823ba94 100644
--- a/mkspecs/linux-pgcc/qmake.conf
+++ b/mkspecs/linux-pgcc/qmake.conf
@@ -7,6 +7,8 @@
 MAKEFILE_GENERATOR      = UNIX
 QMAKE_PLATFORM          = linux
 
+include(../common/unix.conf)
+
 QMAKE_COMPILER          = portland_cc
 
 QMAKE_CC                = pgcc
@@ -67,5 +69,4 @@ QMAKE_OBJCOPY           = objcopy
 QMAKE_NM                = nm -P
 QMAKE_RANLIB            =
 
-include(../common/unix.conf)
 load(qt_config)
diff --git a/mkspecs/lynxos-g++/qmake.conf b/mkspecs/lynxos-g++/qmake.conf
index a53d6a8ec7..91bcc6b85d 100644
--- a/mkspecs/lynxos-g++/qmake.conf
+++ b/mkspecs/lynxos-g++/qmake.conf
@@ -9,6 +9,8 @@ QMAKE_PLATFORM          = lynxos
 CONFIG                 += incremental
 QMAKE_INCREMENTAL_STYLE = sublib
 
+include(../common/unix.conf)
+
 QMAKE_COMPILER          = gcc
 
 QMAKE_CC                = gcc
@@ -74,5 +76,4 @@ QMAKE_RANLIB            =
 QMAKE_STRIP             = strip
 QMAKE_STRIPFLAGS_LIB   += --strip-unneeded
 
-include(../common/unix.conf)
 load(qt_config)
diff --git a/mkspecs/macx-clang-32/qmake.conf b/mkspecs/macx-clang-32/qmake.conf
index 87c601ee74..ec33c02e93 100644
--- a/mkspecs/macx-clang-32/qmake.conf
+++ b/mkspecs/macx-clang-32/qmake.conf
@@ -14,7 +14,6 @@ include(../common/clang-mac.conf)
 QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.7
 
 QMAKE_CFLAGS           += -arch i386
-QMAKE_OBJECTIVE_CFLAGS += -arch i386
 QMAKE_CXXFLAGS         += -arch i386
 QMAKE_LFLAGS           += -arch i386
 
diff --git a/mkspecs/macx-g++-32/qmake.conf b/mkspecs/macx-g++-32/qmake.conf
index 2a8197ebbd..af6fe5689e 100644
--- a/mkspecs/macx-g++-32/qmake.conf
+++ b/mkspecs/macx-g++-32/qmake.conf
@@ -17,7 +17,6 @@ include(../common/g++-macx.conf)
 QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.7
 
 QMAKE_CFLAGS           += -arch i386
-QMAKE_OBJECTIVE_CFLAGS += -arch i386
 QMAKE_CXXFLAGS         += -arch i386
 QMAKE_LFLAGS           += -arch i386
 
diff --git a/mkspecs/macx-icc/qmake.conf b/mkspecs/macx-icc/qmake.conf
index 4d2dd736b1..35e55f799e 100644
--- a/mkspecs/macx-icc/qmake.conf
+++ b/mkspecs/macx-icc/qmake.conf
@@ -41,14 +41,6 @@ QMAKE_CFLAGS_AVX512DQ  += -xCORE-AVX512
 QMAKE_CFLAGS_AVX512BW  += -xCORE-AVX512
 QMAKE_CFLAGS_AVX512VL  += -xCORE-AVX512
 
-QMAKE_OBJECTIVE_CC      = clang
-QMAKE_OBJECTIVE_CFLAGS          = -pipe
-QMAKE_OBJECTIVE_CFLAGS_WARN_ON  = -Wall -W
-QMAKE_OBJECTIVE_CFLAGS_WARN_OFF = -w
-QMAKE_OBJECTIVE_CFLAGS_RELEASE  = -Os
-QMAKE_OBJECTIVE_CFLAGS_DEBUG    = -g
-QMAKE_OBJECTIVE_CFLAGS_HIDESYMS = -fvisibility=hidden
-
 QMAKE_CXX               = icpc
 QMAKE_CXXFLAGS          = $$QMAKE_CFLAGS
 QMAKE_CXXFLAGS_DEPS     = $$QMAKE_CFLAGS_DEPS
diff --git a/mkspecs/macx-ios-clang/features/default_post.prf b/mkspecs/macx-ios-clang/features/default_post.prf
index 5266c88f16..40e7a893de 100644
--- a/mkspecs/macx-ios-clang/features/default_post.prf
+++ b/mkspecs/macx-ios-clang/features/default_post.prf
@@ -93,6 +93,5 @@ macx-xcode {
 
     QMAKE_CFLAGS           += $$arch_flags
     QMAKE_CXXFLAGS         += $$arch_flags
-    QMAKE_OBJECTIVE_CFLAGS += $$arch_flags
     QMAKE_LFLAGS           += $$arch_flags
 }
diff --git a/mkspecs/macx-xcode/default.xcscheme b/mkspecs/macx-xcode/default.xcscheme
index 4a16fefca0..ab2f6a8ab7 100644
--- a/mkspecs/macx-xcode/default.xcscheme
+++ b/mkspecs/macx-xcode/default.xcscheme
@@ -73,6 +73,13 @@
             ReferencedContainer = "container:@QMAKE_ORIG_TARGET@.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>
+      <EnvironmentVariables>
+         <EnvironmentVariable
+            key = "DYLD_IMAGE_SUFFIX"
+            value = "$(QT_LIBRARY_SUFFIX)"
+            isEnabled = "YES">
+         </EnvironmentVariable>
+      </EnvironmentVariables>
       <AdditionalOptions>
       </AdditionalOptions>
    </LaunchAction>
diff --git a/mkspecs/netbsd-g++/qmake.conf b/mkspecs/netbsd-g++/qmake.conf
index 6cb24d9bf9..04c675da24 100644
--- a/mkspecs/netbsd-g++/qmake.conf
+++ b/mkspecs/netbsd-g++/qmake.conf
@@ -5,6 +5,8 @@
 MAKEFILE_GENERATOR      = UNIX
 QMAKE_PLATFORM          = netbsd bsd
 
+include(../common/unix.conf)
+
 QMAKE_COMPILER          = gcc
 
 QMAKE_CC                = gcc
@@ -68,5 +70,4 @@ QMAKE_OBJCOPY           = objcopy
 QMAKE_NM                = nm -P
 QMAKE_RANLIB            = ranlib
 
-include(../common/unix.conf)
 load(qt_config)
diff --git a/mkspecs/openbsd-g++/qmake.conf b/mkspecs/openbsd-g++/qmake.conf
index 2fdbd2c469..10330bc081 100644
--- a/mkspecs/openbsd-g++/qmake.conf
+++ b/mkspecs/openbsd-g++/qmake.conf
@@ -5,6 +5,8 @@
 MAKEFILE_GENERATOR      = UNIX
 QMAKE_PLATFORM          = openbsd bsd
 
+include(../common/unix.conf)
+
 QMAKE_COMPILER          = gcc
 
 QMAKE_CC                = gcc
@@ -69,5 +71,4 @@ QMAKE_OBJCOPY           = objcopy
 QMAKE_NM                = nm -P
 QMAKE_RANLIB            = ranlib
 
-include(../common/unix.conf)
 load(qt_config)
diff --git a/mkspecs/sco-g++/qmake.conf b/mkspecs/sco-g++/qmake.conf
index ebf60a3954..27fc1cffe3 100644
--- a/mkspecs/sco-g++/qmake.conf
+++ b/mkspecs/sco-g++/qmake.conf
@@ -7,6 +7,8 @@
 MAKEFILE_GENERATOR      = UNIX
 QMAKE_PLATFORM          = sco
 
+include(../common/unix.conf)
+
 QMAKE_COMPILER          = gcc
 
 QMAKE_CC                = gcc
@@ -65,5 +67,4 @@ QMAKE_OBJCOPY           = objcopy
 QMAKE_NM                = nm -P
 QMAKE_RANLIB            =
 
-include(../common/unix.conf)
 load(qt_config)
diff --git a/mkspecs/solaris-cc-64/qmake.conf b/mkspecs/solaris-cc-64/qmake.conf
index 6e1d35ef43..1c7b43c29c 100644
--- a/mkspecs/solaris-cc-64/qmake.conf
+++ b/mkspecs/solaris-cc-64/qmake.conf
@@ -24,6 +24,8 @@
 MAKEFILE_GENERATOR      = UNIX
 QMAKE_PLATFORM          = solaris
 
+include(../common/unix.conf)
+
 QMAKE_COMPILER          = sun_cc
 
 QMAKE_CC                = cc
@@ -90,5 +92,4 @@ QMAKE_RANLIB            =
 
 QMAKE_CLEAN             = -r $(OBJECTS_DIR)Templates.DB $(OBJECTS_DIR)SunWS_cache
 
-include(../common/unix.conf)
 load(qt_config)
diff --git a/mkspecs/solaris-cc/qmake.conf b/mkspecs/solaris-cc/qmake.conf
index 23814135b6..045ab033dd 100644
--- a/mkspecs/solaris-cc/qmake.conf
+++ b/mkspecs/solaris-cc/qmake.conf
@@ -7,6 +7,8 @@
 MAKEFILE_GENERATOR      = UNIX
 QMAKE_PLATFORM          = solaris
 
+include(../common/unix.conf)
+
 QMAKE_COMPILER          = sun_cc
 
 QMAKE_CC                = cc
@@ -73,5 +75,4 @@ QMAKE_RANLIB            =
 
 QMAKE_CLEAN             = -r $(OBJECTS_DIR)Templates.DB $(OBJECTS_DIR)SunWS_cache
 
-include(../common/unix.conf)
 load(qt_config)
diff --git a/mkspecs/solaris-g++-64/qmake.conf b/mkspecs/solaris-g++-64/qmake.conf
index 34fd044f3e..91ffb9193e 100644
--- a/mkspecs/solaris-g++-64/qmake.conf
+++ b/mkspecs/solaris-g++-64/qmake.conf
@@ -28,6 +28,8 @@
 MAKEFILE_GENERATOR      = UNIX
 QMAKE_PLATFORM          = solaris
 
+include(../common/unix.conf)
+
 QMAKE_COMPILER          = gcc
 
 QMAKE_CC                = gcc
@@ -92,5 +94,4 @@ QMAKE_OBJCOPY           = objcopy
 QMAKE_NM                = nm -P
 QMAKE_RANLIB            =
 
-include(../common/unix.conf)
 load(qt_config)
diff --git a/mkspecs/solaris-g++/qmake.conf b/mkspecs/solaris-g++/qmake.conf
index ccc178395b..594646353d 100644
--- a/mkspecs/solaris-g++/qmake.conf
+++ b/mkspecs/solaris-g++/qmake.conf
@@ -11,6 +11,8 @@
 MAKEFILE_GENERATOR      = UNIX
 QMAKE_PLATFORM          = solaris
 
+include(../common/unix.conf)
+
 QMAKE_COMPILER          = gcc
 
 QMAKE_CC                = gcc
@@ -75,5 +77,4 @@ QMAKE_OBJCOPY           = objcopy
 QMAKE_NM                = nm -P
 QMAKE_RANLIB            =
 
-include(../common/unix.conf)
 load(qt_config)
diff --git a/mkspecs/tru64-cxx/qmake.conf b/mkspecs/tru64-cxx/qmake.conf
index a2e0112623..024590bf91 100644
--- a/mkspecs/tru64-cxx/qmake.conf
+++ b/mkspecs/tru64-cxx/qmake.conf
@@ -6,6 +6,8 @@ MAKEFILE_GENERATOR      = UNIX
 QMAKE_PLATFORM          = tru64
 CONFIG                 += plugin_no_soname
 
+include(../common/unix.conf)
+
 QMAKE_COMPILER          = dec_cc
 
 QMAKE_CC                = cc
@@ -65,5 +67,4 @@ QMAKE_OBJCOPY           = objcopy
 QMAKE_NM                = nm -P
 QMAKE_RANLIB            =
 
-include(../common/unix.conf)
 load(qt_config)
diff --git a/mkspecs/tru64-g++/qmake.conf b/mkspecs/tru64-g++/qmake.conf
index dd7eb6c9c3..193e2694ea 100644
--- a/mkspecs/tru64-g++/qmake.conf
+++ b/mkspecs/tru64-g++/qmake.conf
@@ -6,6 +6,8 @@ MAKEFILE_GENERATOR      = UNIX
 QMAKE_PLATFORM          = tru64
 CONFIG                 += plugin_no_soname
 
+include(../common/unix.conf)
+
 QMAKE_COMPILER          = gcc
 
 QMAKE_CC                = gcc
@@ -67,5 +69,4 @@ QMAKE_OBJCOPY           = objcopy
 QMAKE_NM                = nm -P
 QMAKE_RANLIB            =
 
-include(../common/unix.conf)
 load(qt_config)
diff --git a/mkspecs/unixware-cc/qmake.conf b/mkspecs/unixware-cc/qmake.conf
index 483b8c0bb3..1a36a3e76b 100644
--- a/mkspecs/unixware-cc/qmake.conf
+++ b/mkspecs/unixware-cc/qmake.conf
@@ -10,6 +10,8 @@
 MAKEFILE_GENERATOR      = UNIX
 QMAKE_PLATFORM          = unixware
 
+include(../common/unix.conf)
+
 QMAKE_COMPILER          = sco_cc
 
 QMAKE_CC                = cc
@@ -69,5 +71,4 @@ QMAKE_OBJCOPY           = objcopy
 QMAKE_NM                = nm -P
 QMAKE_RANLIB            =
 
-include(../common/unix.conf)
 load(qt_config)
diff --git a/mkspecs/unixware-g++/qmake.conf b/mkspecs/unixware-g++/qmake.conf
index feca5a4c9e..abe2773deb 100644
--- a/mkspecs/unixware-g++/qmake.conf
+++ b/mkspecs/unixware-g++/qmake.conf
@@ -7,6 +7,8 @@
 MAKEFILE_GENERATOR      = UNIX
 QMAKE_PLATFORM          = unixware
 
+include(../common/unix.conf)
+
 QMAKE_COMPILER          = gcc
 
 QMAKE_CC                = gcc
@@ -68,5 +70,4 @@ QMAKE_OBJCOPY           = objcopy
 QMAKE_NM                = nm -P
 QMAKE_RANLIB            =
 
-include(../common/unix.conf)
 load(qt_config)
diff --git a/mkspecs/unsupported/freebsd-clang/qmake.conf b/mkspecs/unsupported/freebsd-clang/qmake.conf
index 92b7c47590..9d9815a7b3 100644
--- a/mkspecs/unsupported/freebsd-clang/qmake.conf
+++ b/mkspecs/unsupported/freebsd-clang/qmake.conf
@@ -5,6 +5,8 @@
 MAKEFILE_GENERATOR      = UNIX
 QMAKE_PLATFORM          = freebsd bsd
 
+include(../common/unix.conf)
+
 QMAKE_CFLAGS_THREAD     = -pthread -D_THREAD_SAFE
 
 QMAKE_CXXFLAGS_THREAD   = $$QMAKE_CFLAGS_THREAD
@@ -28,7 +30,7 @@ QMAKE_OBJCOPY           = objcopy
 QMAKE_NM                = nm -P
 QMAKE_RANLIB            =
 
-include(../../common/unix.conf)
 include(../../common/gcc-base-unix.conf)
 include(../../common/clang.conf)
+
 load(qt_config)
diff --git a/mkspecs/unsupported/linux-armcc/qmake.conf b/mkspecs/unsupported/linux-armcc/qmake.conf
deleted file mode 100644
index 2c7eb7c2d8..0000000000
--- a/mkspecs/unsupported/linux-armcc/qmake.conf
+++ /dev/null
@@ -1,29 +0,0 @@
-#
-# qmake configuration for linux-armcc
-#
-
-MAKEFILE_GENERATOR      = UNIX
-CONFIG                 += incremental armcc_linker
-QMAKE_INCREMENTAL_STYLE = sublib
-
-include(../../common/linux.conf)
-include(../../common/armcc.conf)
-load(qt_config)
-
-# use armcc for linking since armlink doesn't understand the arm_linux_config_file option
-QMAKE_LINK              = armcc
-QMAKE_LINK_SHLIB        = armcc
-QMAKE_LINK_C            = armcc
-QMAKE_LINK_C_SHLIB      = armcc
-
-QMAKE_LFLAGS_SHLIB     += --apcs=/fpic --shared
-QMAKE_LFLAGS_PLUGIN     = $$QMAKE_LFLAGS_SHLIB
-
-QMAKE_LIBS             += libstdc++.so librt.so
-
-CONFIG                 -= rvct_linker
-
-QMAKE_CFLAGS           += --gnu --arm_linux --dllimport_runtime --thumb --cpu Cortex-A9 --arm_linux_config_file="$(HOME)/qt_rvct_config" --arm-linux-paths --apcs=/interwork --visibility_inlines_hidden --diag_suppress 1300,2523
-QMAKE_CXXFLAGS         += $$QMAKE_CFLAGS --cpp
-
-QMAKE_LFLAGS           += --diag_suppress 6331,6780,6439 --arm_linux_config_file="$(HOME)/qt_rvct_config" --arm-linux-paths
diff --git a/mkspecs/unsupported/linux-host-g++/qmake.conf b/mkspecs/unsupported/linux-host-g++/qmake.conf
index 546ff21349..3aa7520776 100644
--- a/mkspecs/unsupported/linux-host-g++/qmake.conf
+++ b/mkspecs/unsupported/linux-host-g++/qmake.conf
@@ -17,6 +17,8 @@ QMAKE_PLATFORM          = linux
 CONFIG                 += incremental
 QMAKE_INCREMENTAL_STYLE = sublib
 
+include(../common/unix.conf)
+
 #
 # qmake configuration for common gcc
 #
@@ -111,5 +113,4 @@ QMAKE_RANLIB            =
 QMAKE_STRIP             = host-strip
 QMAKE_STRIPFLAGS_LIB   += --strip-unneeded
 
-include(../../common/unix.conf)
 load(qt_config)
diff --git a/mkspecs/unsupported/qnx-X11-g++/qmake.conf b/mkspecs/unsupported/qnx-X11-g++/qmake.conf
index 8d2c63f330..79a5609dbf 100644
--- a/mkspecs/unsupported/qnx-X11-g++/qmake.conf
+++ b/mkspecs/unsupported/qnx-X11-g++/qmake.conf
@@ -7,9 +7,9 @@
 MAKEFILE_GENERATOR      = UNIX
 QMAKE_PLATFORM          = qnx
 
+include(../common/unix.conf)
 include(../common/gcc-base-unix.conf)
 include(../common/g++-unix.conf)
-include(../common/unix.conf)
 
 QMAKE_CFLAGS_THREAD     = -D_REENTRANT
 QMAKE_CXXFLAGS_THREAD   = $$QMAKE_CLFAGS_THREAD
diff --git a/mkspecs/unsupported/vxworks-ppc-dcc/qmake.conf b/mkspecs/unsupported/vxworks-ppc-dcc/qmake.conf
index a4cf23df9c..16e3127803 100644
--- a/mkspecs/unsupported/vxworks-ppc-dcc/qmake.conf
+++ b/mkspecs/unsupported/vxworks-ppc-dcc/qmake.conf
@@ -7,6 +7,8 @@ QMAKE_PLATFORM          = vxworks
 CONFIG                 += incremental
 QMAKE_INCREMENTAL_STYLE = sublib
 
+include(../common/unix.conf)
+
 VXWORKS_ARCH            = ppc
 VXWORKS_CPU             = PPC32
 VXWORKS_DIAB_SPEC       = -tPPC7400FV:vxworks66
@@ -88,6 +90,5 @@ QMAKE_RANLIB            =
 QMAKE_STRIP             = strip
 QMAKE_STRIPFLAGS_LIB   += --strip-unneeded
 
-include(../../common/unix.conf)
 load(qt_config)
 
diff --git a/mkspecs/unsupported/vxworks-ppc-g++/qmake.conf b/mkspecs/unsupported/vxworks-ppc-g++/qmake.conf
index 1d3e9f4eb4..49cacdba43 100644
--- a/mkspecs/unsupported/vxworks-ppc-g++/qmake.conf
+++ b/mkspecs/unsupported/vxworks-ppc-g++/qmake.conf
@@ -8,13 +8,14 @@ CONFIG                 += incremental
 QMAKE_INCREMENTAL_STYLE = sublib
 DEFINES                += VXWORKS
 
+include(../../common/linux.conf)
+
 VXWORKS_ARCH            = ppc
 VXWORKS_CPU             = PPC32
 VXWORKS_ARCH_MUNCH      = ppc
 
 include(../../common/gcc-base-unix.conf)
 include(../../common/g++-unix.conf)
-include(../../common/linux.conf)
 
 QMAKE_CC                = cc$$VXWORKS_ARCH_MUNCH
 QMAKE_CFLAGS            = -fno-builtin -I$(WIND_BASE)/target/h -I$(WIND_BASE)/target/h/wrn/coreip -DCPU=$$upper($$VXWORKS_ARCH) -DVX_CPU_FAMILY=$$VXWORKS_ARCH -DTOOL_FAMILY=gnu -DTOOL=gnu -D_WRS_KERNEL -D_VSB_CONFIG_FILE=\'<../lib/h/config/vsbConfig.h>\'
diff --git a/mkspecs/unsupported/vxworks-simpentium-dcc/qmake.conf b/mkspecs/unsupported/vxworks-simpentium-dcc/qmake.conf
index 49f0c21d4a..44e39a8a8c 100644
--- a/mkspecs/unsupported/vxworks-simpentium-dcc/qmake.conf
+++ b/mkspecs/unsupported/vxworks-simpentium-dcc/qmake.conf
@@ -7,6 +7,8 @@ QMAKE_PLATFORM          = vxworks
 CONFIG                 += incremental
 QMAKE_INCREMENTAL_STYLE = sublib
 
+include(../common/unix.conf)
+
 VXWORKS_ARCH            = simlinux
 VXWORKS_CPU             = SIMLINUX
 VXWORKS_DIAB_SPEC       = -tX86LH:vxworks66
@@ -87,6 +89,5 @@ QMAKE_RANLIB            =
 QMAKE_STRIP             = strip
 QMAKE_STRIPFLAGS_LIB   += --strip-unneeded
 
-include(../../common/unix.conf)
 load(qt_config)
 
diff --git a/mkspecs/unsupported/vxworks-simpentium-g++/qmake.conf b/mkspecs/unsupported/vxworks-simpentium-g++/qmake.conf
index 3c8fd12d4a..4d5cc97fad 100644
--- a/mkspecs/unsupported/vxworks-simpentium-g++/qmake.conf
+++ b/mkspecs/unsupported/vxworks-simpentium-g++/qmake.conf
@@ -8,13 +8,14 @@ CONFIG                 += incremental
 QMAKE_INCREMENTAL_STYLE = sublib
 DEFINES                += VXWORKS
 
+include(../../common/linux.conf)
+
 VXWORKS_ARCH            = simlinux
 VXWORKS_CPU             = SIMLINUX
 VXWORKS_ARCH_MUNCH      = pentium
 
 include(../../common/gcc-base-unix.conf)
 include(../../common/g++-unix.conf)
-include(../../common/linux.conf)
 
 QMAKE_CC                = cc$$VXWORKS_ARCH_MUNCH
 QMAKE_CFLAGS            = -fno-builtin -I$(WIND_BASE)/target/h -I$(WIND_BASE)/target/h/wrn/coreip -DCPU=$$upper($$VXWORKS_ARCH) -DVX_CPU_FAMILY=$$VXWORKS_ARCH -DTOOL_FAMILY=gnu -DTOOL=gnu -D_WRS_KERNEL -D_VSB_CONFIG_FILE=\'<../lib/h/config/vsbConfig.h>\'
diff --git a/mkspecs/win32-g++/qmake.conf b/mkspecs/win32-g++/qmake.conf
index 388d697b58..c00b4cd5ff 100644
--- a/mkspecs/win32-g++/qmake.conf
+++ b/mkspecs/win32-g++/qmake.conf
@@ -87,8 +87,11 @@ QMAKE_LFLAGS_GCSECTIONS = -Wl,--gc-sections
 QMAKE_LFLAGS_USE_GOLD   = -fuse-ld=gold
 QMAKE_LINK_OBJECT_MAX   = 10
 QMAKE_LINK_OBJECT_SCRIPT = object_script
+QMAKE_PREFIX_SHLIB      =
+QMAKE_EXTENSION_SHLIB   = dll
 QMAKE_PREFIX_STATICLIB  = lib
 QMAKE_EXTENSION_STATICLIB = a
+QMAKE_LIB_EXTENSIONS    = a dll.a
 
 QMAKE_LIBS              =
 QMAKE_LIBS_CORE         = -lole32 -luuid -lws2_32 -ladvapi32 -lshell32 -luser32 -lkernel32
diff --git a/mkspecs/win32-g++/qplatformdefs.h b/mkspecs/win32-g++/qplatformdefs.h
index b4ba092d3b..ef3c518262 100644
--- a/mkspecs/win32-g++/qplatformdefs.h
+++ b/mkspecs/win32-g++/qplatformdefs.h
@@ -52,7 +52,6 @@
 #include <errno.h>
 #include <sys/stat.h>
 #include <stdlib.h>
-#include <qt_windows.h>
 #include <limits.h>
 
 #if !defined(_WIN32_WINNT) || (_WIN32_WINNT-0 < 0x0500)
diff --git a/mkspecs/win32-icc/qmake.conf b/mkspecs/win32-icc/qmake.conf
index 0e6a2cbba4..c9f6748b6c 100644
--- a/mkspecs/win32-icc/qmake.conf
+++ b/mkspecs/win32-icc/qmake.conf
@@ -77,6 +77,9 @@ QMAKE_LFLAGS_CONSOLE    = /SUBSYSTEM:console
 QMAKE_LFLAGS_WINDOWS    = /SUBSYSTEM:windows
 QMAKE_LFLAGS_DLL        = /DLL
 QMAKE_LFLAGS_LTCG       = $$QMAKE_CFLAGS_LTCG
+QMAKE_PREFIX_SHLIB      =
+QMAKE_EXTENSION_SHLIB   = dll
+QMAKE_PREFIX_STATICLIB  =
 QMAKE_EXTENSION_STATICLIB = lib
 
 QMAKE_LIBS              =
author	Liang Qi <liang.qi@theqtcompany.com>	2015-10-14 15:45:35 +0200
committer	Liang Qi <liang.qi@theqtcompany.com>	2015-10-14 15:45:35 +0200
commit	4456984da780b14572e1ec0f079a4d349ab299bd (patch)
tree	f586a281a81c57c91c49e83a5d3ec6c7eece0578 /mkspecs
parent	e824abd987d77efaa085fe1f9fb514d270798d55 (diff)
parent	281121697340084f7d385eab530f41916789b94d (diff)