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

For the conflicts in msvc_nmake.cpp the ifdefs are extended since we
need to support windows phone in the target branch while it is not there
in the current stable branch (as of Qt 5.2).

Conflicts:
	configure
	qmake/generators/win32/msvc_nmake.cpp
	src/3rdparty/angle/src/libEGL/Surface.cpp
	src/angle/src/common/common.pri
	src/corelib/global/qglobal.h
	src/corelib/io/qstandardpaths.cpp
	src/plugins/platforms/qnx/qqnxintegration.cpp
	src/plugins/platforms/qnx/qqnxscreeneventhandler.h
	src/plugins/platforms/xcb/qglxintegration.h
	src/widgets/kernel/win.pri
	tests/auto/corelib/thread/qreadwritelock/tst_qreadwritelock.cpp
	tests/auto/corelib/tools/qdatetime/tst_qdatetime.cpp
	tests/auto/gui/text/qtextdocument/tst_qtextdocument.cpp
	tools/configure/configureapp.cpp

Change-Id: I00b579eefebaf61d26ab9b00046d2b5bd5958812

6 files changed, 37 insertions, 24 deletions

diff --git a/config.tests/.qmake.conf b/config.tests/.qmake.conf
new file mode 100644
index 0000000000..71e6817656
--- /dev/null
+++ b/config.tests/.qmake.conf
@@ -0,0 +1,6 @@
+mingw {
+    TMPPATH = $$(INCLUDE)
+    QMAKE_INCDIR_POST += $$split(TMPPATH, $$QMAKE_DIRLIST_SEP)
+    TMPPATH = $$(LIB)
+    QMAKE_LIBDIR_POST += $$split(TMPPATH, $$QMAKE_DIRLIST_SEP)
+}
diff --git a/config.tests/unix/gstreamer/gstreamer.pro b/config.tests/unix/gstreamer/gstreamer.pro
deleted file mode 100644
index 7d4aa8e2e5..0000000000
--- a/config.tests/unix/gstreamer/gstreamer.pro
+++ /dev/null
@@ -1,3 +0,0 @@
-SOURCES = gstreamer.cpp
-CONFIG -= qt
-LIBS += -lgstinterfaces-0.10 -lgstvideo-0.10 -lgstbase-0.10
diff --git a/config.tests/unix/icu/icu.pro b/config.tests/unix/icu/icu.pro
index 002c4840d5..2c1b431f92 100644
--- a/config.tests/unix/icu/icu.pro
+++ b/config.tests/unix/icu/icu.pro
@@ -1,4 +1,16 @@
 SOURCES = icu.cpp
+CONFIG += console
 CONFIG -= qt dylib
-unix:LIBS += -licuuc -licui18n
-win32:LIBS += -licuin
+win32 {
+    CONFIG(static, static|shared) {
+        CONFIG(debug, debug|release) {
+            LIBS += -lsicuind -lsicuucd -lsicudtd
+        } else {
+            LIBS += -lsicuin -lsicuuc -lsicudt
+        }
+    } else {
+        LIBS += -licuin -licuuc
+    }
+} else {
+    LIBS += -licui18n -licuuc
+}
diff --git a/config.tests/unix/makeabs b/config.tests/unix/makeabs
index 4df26f769f..d2f65d19e9 100755
--- a/config.tests/unix/makeabs
+++ b/config.tests/unix/makeabs
@@ -15,13 +15,13 @@ elif [ "$OSTYPE" = "msys" -a -z "${FILE##[a-zA-Z]:[/\\]*}" ]; then
     true
 else
     RES="$PWD/$FILE"
-    test -d "$RES" && RES="$RES/"
-    RES=`echo "$RES" | sed "s,/\(\./\)*,/,g"`
-
-# note: this will only strip 1 /path/../ from RES, i.e. given /a/b/c/../../../, it returns /a/b/../../
-    RES=`echo "$RES" | sed "s,\(/[^/]*/\)\.\./,/,g"` 
-
-    RES=`echo "$RES" | sed "s,//,/,g" | sed "s,/$,,"`
 fi
+RES=$RES/
+while true; do
+    nres=`echo "$RES" | sed "s,/[^/][^/]*/\.\./,/,g; s,/\./,/,g"`
+    test x"$nres" = x"$RES" && break
+    RES=$nres
+done
+RES=`echo "$RES" | sed "s,//,/,g; s,/$,,"`
 echo $RES #return
 
diff --git a/config.tests/unix/gstreamer/gstreamer.cpp b/config.tests/unix/pps/pps.cpp
index 3864cdcb9f..3f00509973 100644
--- a/config.tests/unix/gstreamer/gstreamer.cpp
+++ b/config.tests/unix/pps/pps.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 BlackBerry Limited. All rights reserved.
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the config.tests of the Qt Toolkit.
@@ -39,17 +39,12 @@
 **
 ****************************************************************************/
 
-#include <gst/gst.h>
-#include <gst/interfaces/propertyprobe.h>
-#include <gst/interfaces/xoverlay.h>
+#include <sys/pps.h>
 
-#if !defined(GST_VERSION_MAJOR) \
-    || !defined(GST_VERSION_MINOR)
-#  error "No GST_VERSION_* macros"
-#elif GST_VERION_MAJOR != 0 && GST_VERSION_MINOR != 10
-#  error "Incompatible version of GStreamer found (Version 0.10.x is required)."
-#endif
-
-int main(int argc, char **argv)
+int main(int, char **)
 {
+    pps_decoder_t decoder;
+
+    pps_decoder_initialize(&decoder, NULL);
+    return 0;
 }
diff --git a/config.tests/unix/pps/pps.pro b/config.tests/unix/pps/pps.pro
new file mode 100644
index 0000000000..21bdeedbfb
--- /dev/null
+++ b/config.tests/unix/pps/pps.pro
@@ -0,0 +1,3 @@
+SOURCES = pps.cpp
+CONFIG -= qt
+LIBS += -lpps