Merge master into api_changes

Change-Id: I93551e4d13a1b0815b359b9415060e9089477db1

8 files changed, 26 insertions, 16 deletions

diff --git a/config.tests/arch/arch.cpp b/config.tests/arch/arch.cpp
index f942d0adc7..1a96fb982f 100644
--- a/config.tests/arch/arch.cpp
+++ b/config.tests/arch/arch.cpp
@@ -55,29 +55,29 @@
 #undef sparc
 #undef unknown
 #if defined(Q_PROCESSOR_ALPHA)
-alpha
+Architecture: alpha
 #elif defined(Q_PROCESSOR_ARM)
-arm
+Architecture: arm
 #elif defined(Q_PROCESSOR_AVR32)
-avr32
+Architecture: avr32
 #elif defined(Q_PROCESSOR_BLACKFIN)
-bfin
+Architecture: bfin
 #elif defined(Q_PROCESSOR_X86_32)
-i386
+Architecture: i386
 #elif defined(Q_PROCESSOR_X86_64)
-x86_64
+Architecture: x86_64
 #elif defined(Q_PROCESSOR_IA64)
-ia64
+Architecture: ia64
 #elif defined(Q_PROCESSOR_MIPS)
-mips
+Architecture: mips
 #elif defined(Q_PROCESSOR_POWER)
-power
+Architecture: power
 #elif defined(Q_PROCESSOR_S390)
-s390
+Architecture: s390
 #elif defined(Q_PROCESSOR_SH)
-sh
+Architecture: sh
 #elif defined(Q_PROCESSOR_SPARC)
-sparc
+Architecture: sparc
 #else
-unknown
+Architecture: unknown
 #endif
diff --git a/config.tests/arch/arch.pro b/config.tests/arch/arch.pro
index 108f262a55..ea85a52b97 100644
--- a/config.tests/arch/arch.pro
+++ b/config.tests/arch/arch.pro
@@ -1,7 +1,7 @@
 CONFIG -= qt debug_and_release
 # Detect target by preprocessing a file that uses Q_PROCESSOR_* macros from qprocessordetection.h
 COMMAND = $$QMAKE_CXX $$QMAKE_CXXFLAGS -E $$PWD/arch.cpp
-# 'false' as second argument to system() prevents qmake from stripping newlines
-COMPILER_ARCH = $$system($$COMMAND, false)
+# system function converts newline in output into spaces
+COMPILER_ARCH = $$system($$COMMAND)
 # Message back to configure so that it can set QT_ARCH and QT_HOST_ARCH
 message($$COMPILER_ARCH)
diff --git a/config.tests/unix/egl/egl.cpp b/config.tests/qpa/egl/egl.cpp
index d196a457a5..d196a457a5 100644
--- a/config.tests/unix/egl/egl.cpp
+++ b/config.tests/qpa/egl/egl.cpp
diff --git a/config.tests/unix/egl/egl.pro b/config.tests/qpa/egl/egl.pro
index f04d053543..f04d053543 100644
--- a/config.tests/unix/egl/egl.pro
+++ b/config.tests/qpa/egl/egl.pro
diff --git a/config.tests/qpa/xcb/xcb.cpp b/config.tests/qpa/xcb/xcb.cpp
index c594d4f38b..6037f15e82 100644
--- a/config.tests/qpa/xcb/xcb.cpp
+++ b/config.tests/qpa/xcb/xcb.cpp
@@ -58,5 +58,8 @@ int main(int, char **)
 
     xcb_connection_t *connection = xcb_connect("", &primaryScreen);
 
+    // This won't compile unless libxcb >= 1.5 which defines XCB_ATOM_PRIMARY.
+    int xcbAtomPrimary = XCB_ATOM_PRIMARY;
+
     return 0;
 }
diff --git a/config.tests/unix/bsymbolic_functions.test b/config.tests/unix/bsymbolic_functions.test
index 70720b04ac..d495e56bef 100755
--- a/config.tests/unix/bsymbolic_functions.test
+++ b/config.tests/unix/bsymbolic_functions.test
@@ -9,7 +9,12 @@ cat >>bsymbolic_functions.c << EOF
 int main() { return 0; }
 EOF
 
-$COMPILER $SYSROOT_FLAG -o libtest.so -shared -Wl,-Bsymbolic-functions -fPIC bsymbolic_functions.c >/dev/null 2>&1 && BSYMBOLIC_FUNCTIONS_SUPPORT=yes
+if [ "$VERBOSE" = "yes" ] ; then
+    echo $COMPILER $SYSROOT_FLAG -o libtest.so -shared -Wl,-Bsymbolic-functions -fPIC bsymbolic_functions.c
+    $COMPILER $SYSROOT_FLAG -o libtest.so -shared -Wl,-Bsymbolic-functions -fPIC bsymbolic_functions.c && BSYMBOLIC_FUNCTIONS_SUPPORT=yes
+else
+    $COMPILER $SYSROOT_FLAG -o libtest.so -shared -Wl,-Bsymbolic-functions -fPIC bsymbolic_functions.c >/dev/null 2>&1 && BSYMBOLIC_FUNCTIONS_SUPPORT=yes
+fi
 rm -f bsymbolic_functions.c libtest.so
 
 # done
diff --git a/config.tests/unix/fvisibility.test b/config.tests/unix/fvisibility.test
index 6e56410075..890f473d10 100755
--- a/config.tests/unix/fvisibility.test
+++ b/config.tests/unix/fvisibility.test
@@ -25,6 +25,7 @@ __global void blah();
 EOF
 
     if [ "$VERBOSE" = "yes" ] ; then
+        echo $COMPILER -c $CMDLINE fvisibility.c
         $COMPILER -c $CMDLINE fvisibility.c && FVISIBILITY_SUPPORT=yes
     else
         $COMPILER -c $CMDLINE fvisibility.c >/dev/null 2>&1 && FVISIBILITY_SUPPORT=yes
diff --git a/config.tests/unix/stl/stltest.cpp b/config.tests/unix/stl/stltest.cpp
index e17c7cbba7..5134c623c3 100644
--- a/config.tests/unix/stl/stltest.cpp
+++ b/config.tests/unix/stl/stltest.cpp
@@ -49,6 +49,7 @@ templates for common STL container classes.
 #include <vector>
 #include <algorithm>
 #include <iostream>
+#include <cstddef>
 
 // something mean to see if the compiler and C++ standard lib are good enough
 template<class K, class T>