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

Conflicts:
	src/corelib/global/qglobal.cpp
	src/corelib/global/qglobal.h
	src/corelib/global/qsysinfo.h
	src/corelib/global/qsystemdetection.h
	src/corelib/kernel/qobjectdefs.h
	src/plugins/plugins.pro
	tests/auto/widgets/itemviews/qlistview/qlistview.pro

Change-Id: Ib55aa79d707c4c1453fb9d697f6cf92211ed665c

7 files changed, 24 insertions, 15 deletions

diff --git a/mkspecs/common/ios/clang.conf b/mkspecs/common/ios/clang.conf
index 8da555e6fa..36cb655229 100644
--- a/mkspecs/common/ios/clang.conf
+++ b/mkspecs/common/ios/clang.conf
@@ -6,7 +6,6 @@
 QMAKE_IOS_CFLAGS       += -fvisibility=hidden -fpascal-strings -fmessage-length=0
 QMAKE_IOS_CFLAGS       += -Wno-trigraphs -Wreturn-type -Wparentheses -Wswitch -Wno-unused-parameter -Wunused-variable -Wunused-value -Wno-shorten-64-to-32 -Wno-sign-conversion
 QMAKE_IOS_CXXFLAGS     += -fvisibility-inlines-hidden
-QMAKE_IOS_OBJ_CFLAGS   += -Wno-arc-abi
 
 # Based on the following information, http://clang.llvm.org/doxygen/ObjCRuntime_8h_source.html,
 # we can conclude that it's safe to always pass the following flags
diff --git a/mkspecs/features/default_post.prf b/mkspecs/features/default_post.prf
index 8e68b95dd5..bcaddc8363 100644
--- a/mkspecs/features/default_post.prf
+++ b/mkspecs/features/default_post.prf
@@ -62,8 +62,11 @@ debug {
     QMAKE_LIBFLAGS += $$QMAKE_LIBFLAGS_RELEASE
 }
 
-use_gold_linker: QMAKE_LFLAGS += $$QMAKE_LFLAGS_USE_GOLD
-enable_new_dtags: QMAKE_LFLAGS += $$QMAKE_LFLAGS_NEW_DTAGS
+# disable special linker flags for host builds (no proper test for host support yet)
+!host_build {
+    use_gold_linker: QMAKE_LFLAGS += $$QMAKE_LFLAGS_USE_GOLD
+    enable_new_dtags: QMAKE_LFLAGS += $$QMAKE_LFLAGS_NEW_DTAGS
+}
 
 dll:win32: QMAKE_LFLAGS += $$QMAKE_LFLAGS_DLL
 static:mac: QMAKE_LFLAGS += $$QMAKE_LFLAGS_STATIC_LIB
diff --git a/mkspecs/features/mac/default_post.prf b/mkspecs/features/mac/default_post.prf
index 246c9c60e6..b459389c72 100644
--- a/mkspecs/features/mac/default_post.prf
+++ b/mkspecs/features/mac/default_post.prf
@@ -40,15 +40,13 @@ qt:!isEmpty(QT_CONFIG) {
     # libraries. This applies only to apps, since all loaded libraries inherit
     # rpaths from current process executable.
     else:!if(host_build:force_bootstrap):equals(TEMPLATE, app):!defined(QMAKE_RPATHDIR, var):contains(QT_CONFIG, rpath) {
-        # If app is outside of Qt SDK prefix use absolute path to Qt libraries,
-        # otherwise make it relative, so all SDK tools and examples work when
-        # relocated.
-        # Tests are an exception, since they are launched in their build not
-        # install location by CI, so we cannot use relative rpaths there.
-        if(!contains(target.path, "$$re_escape($$[QT_INSTALL_PREFIX])/.*")|\
-            contains(target.path, "$$re_escape($$[QT_INSTALL_TESTS])/.*")) {
-            QMAKE_RPATHDIR = $$[QT_INSTALL_LIBS]
-        } else {
+        # If app is expected to be installed into the Qt prefix build, use
+        # relative path, so all SDK tools and examples work when relocated.
+        prefix_build:defined(target.path, var):\
+            contains(target.path, "$$re_escape($$[QT_INSTALL_PREFIX])/.*"):\
+            # Tests are an exception, since they are launched in their build not
+            # install location by CI, so we cannot use relative rpaths there.
+            !contains(target.path, "$$re_escape($$[QT_INSTALL_TESTS])/.*") {
             app_bundle {
                 ios:  binpath = $$target.path/$${TARGET}.app
                 else: binpath = $$target.path/$${TARGET}.app/Contents/MacOS
@@ -57,6 +55,9 @@ qt:!isEmpty(QT_CONFIG) {
             }
             QMAKE_RPATHDIR = @loader_path/$$relative_path($$[QT_INSTALL_LIBS], $$binpath)
             unset(binpath)
+        } else {
+             # Otherwise, use absolute path to Qt libraries
+             QMAKE_RPATHDIR = $$[QT_INSTALL_LIBS]
         }
     }
 }
diff --git a/mkspecs/features/qml_plugin.prf b/mkspecs/features/qml_plugin.prf
index 5ae4c08227..a639ac2969 100644
--- a/mkspecs/features/qml_plugin.prf
+++ b/mkspecs/features/qml_plugin.prf
@@ -25,6 +25,12 @@ if(win32|mac):!macx-xcode {
 }
 isEmpty(TARGETPATH): TARGETPATH = $$eval(QT.$${CXX_MODULE}.name)
 
+!no_cxx_module:win32:CONFIG(shared, static|shared) {
+    # Embed a VERSIONINFO resource into the plugin's DLL.
+    isEmpty(VERSION): VERSION = $$MODULE_VERSION
+    CONFIG += skip_target_version_ext
+}
+
 # Insert the plugins URI into its meta data to enable usage
 # of static plugins in QtDeclarative:
 URI = $$replace(TARGETPATH, "/", ".")
diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf
index eac5c1e445..ce93105f4b 100644
--- a/mkspecs/features/qt.prf
+++ b/mkspecs/features/qt.prf
@@ -67,7 +67,7 @@ qtAddModules(QT_PRIVATE, LIBS_PRIVATE)
 }
 qtAddRpathLink($$QT $$QT_PRIVATE)
 
-wince*:static:gui {
+wince:static:gui {
    QTLIB += qmenu_wce.res
 }
 
diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf
index 5412f3778a..c89b6d2793 100644
--- a/mkspecs/features/qt_module.prf
+++ b/mkspecs/features/qt_module.prf
@@ -67,7 +67,7 @@ header_module {
     TEMPLATE     = lib
 }
 DESTDIR          = $$MODULE_BASE_OUTDIR/lib
-win32:!wince*:!prefix_build: DLLDESTDIR = $$MODULE_BASE_OUTDIR/bin
+win32:!wince:!prefix_build: DLLDESTDIR = $$MODULE_BASE_OUTDIR/bin
 
 CONFIG          += qmake_cache target_qt
 
diff --git a/mkspecs/features/qt_plugin.prf b/mkspecs/features/qt_plugin.prf
index 004eee551e..17748e518a 100644
--- a/mkspecs/features/qt_plugin.prf
+++ b/mkspecs/features/qt_plugin.prf
@@ -89,5 +89,5 @@ CONFIG += create_cmake
 load(qt_targets)
 load(qt_common)
 
-wince*:LIBS += $$QMAKE_LIBS_GUI
+wince: LIBS += $$QMAKE_LIBS_GUI
 QMAKE_LFLAGS += $$QMAKE_LFLAGS_NOUNDEF