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

Conflicts:
	mkspecs/qnx-x86-qcc/qplatformdefs.h
	src/corelib/global/qglobal.h
	src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
	src/opengl/qgl.cpp
	src/opengl/qglpixelbuffer.cpp
	src/opengl/qglshaderprogram.cpp
	tests/auto/opengl/qglthreads/tst_qglthreads.cpp

Change-Id: Iaba137884d3526a139000ca26fee02bb27b5cdb5

5 files changed, 54 insertions, 37 deletions

diff --git a/config.tests/unix/compile.test b/config.tests/unix/compile.test
index 22064b85e9..f99237cb50 100755
--- a/config.tests/unix/compile.test
+++ b/config.tests/unix/compile.test
@@ -69,15 +69,11 @@ rm -f "$EXE" "${EXE}.exe"
 
 set -- "$OUTDIR/bin/qmake" -nocache -spec "$QMKSPEC" "CONFIG+=$QMAKE_CONFIG" "CONFIG+=android_app" "CONFIG-=debug_and_release app_bundle lib_bundle" "LIBS*=$LFLAGS" "LIBS+=$MAC_ARCH_LFLAGS" "INCLUDEPATH*=$INCLUDEPATH" "QMAKE_CXXFLAGS*=$CXXFLAGS" "QMAKE_CXXFLAGS+=$MAC_ARCH_CXXFLAGS" "QT_BUILD_TREE=$OUTDIR" "$SRCDIR/$TEST/$EXE.pro" -o "$OUTDIR/$TEST/Makefile"
 if [ "$VERBOSE" = "yes" ]; then
-    OUTDIR=$OUTDIR "$@"
-    $MAKE
+    OUTDIR=$OUTDIR "$@" && $MAKE && SUCCESS=yes
 else
-    OUTDIR=$OUTDIR "$@" >/dev/null 2>&1
-    $MAKE >/dev/null 2>&1
+    OUTDIR=$OUTDIR "$@" >/dev/null 2>&1 && $MAKE >/dev/null 2>&1 && SUCCESS=yes
 fi
 
-( [ -f "$EXE" ] || [ -f "${EXE}.exe" ] ) && SUCCESS=yes
-
 # done
 if [ "$SUCCESS" != "yes" ]; then
     [ "$VERBOSE" = "yes" ] && echo "$DESCRIPTION disabled."
diff --git a/config.tests/unix/icu/icu.pro b/config.tests/unix/icu/icu.pro
index 2c1b431f92..16267ff827 100644
--- a/config.tests/unix/icu/icu.pro
+++ b/config.tests/unix/icu/icu.pro
@@ -1,6 +1,7 @@
 SOURCES = icu.cpp
 CONFIG += console
 CONFIG -= qt dylib
+
 win32 {
     CONFIG(static, static|shared) {
         CONFIG(debug, debug|release) {
@@ -9,8 +10,8 @@ win32 {
             LIBS += -lsicuin -lsicuuc -lsicudt
         }
     } else {
-        LIBS += -licuin -licuuc
+        LIBS += -licuin -licuuc -licudt
     }
 } else {
-    LIBS += -licui18n -licuuc
+    LIBS += -licui18n -licuuc -licudata
 }
diff --git a/config.tests/unix/objcopy.test b/config.tests/unix/objcopy.test
deleted file mode 100755
index 9eb6e22ab0..0000000000
--- a/config.tests/unix/objcopy.test
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/sh
-
-TEST_PATH=`dirname "$0"`
-SEP_DEBUG_SUPPORT=no
-COMPILER=$1
-QMAKE_OBJCOPY=$2
-VERBOSE=$3
-
-if [ -n "$QMAKE_OBJCOPY" ]; then
-    echo "int main() { return 0; }" > objcopy_test.cpp
-    if $TEST_PATH/which.test "$QMAKE_OBJCOPY" >/dev/null 2>&1 && $COMPILER $SYSROOT_FLAG -g -o objcopy_test objcopy_test.cpp >/dev/null 2>&1; then
-        "$QMAKE_OBJCOPY" --only-keep-debug objcopy_test objcopy_test.debug >/dev/null 2>&1 \
-            && "$QMAKE_OBJCOPY" --strip-debug objcopy_test >/dev/null 2>&1 \
-            && "$QMAKE_OBJCOPY" --add-gnu-debuglink=objcopy_test.debug objcopy_test >/dev/null 2>&1 \
-            && SEP_DEBUG_SUPPORT=yes 
-    fi
-    rm -f objcopy_test objcopy_test.debug objcopy_test.cpp
-else
-    [ "$VERBOSE" = "yes" ] && echo "Separate debug info check skipped, QMAKE_OBJCOPY is unset.";
-fi
-
-# done
-if [ "$SEP_DEBUG_SUPPORT" != "yes" ]; then
-    [ "$VERBOSE" = "yes" ] && echo "Separate debug info support disabled."
-    exit 0
-else
-    [ "$VERBOSE" = "yes" ] && echo "Separate debug info support enabled."
-    exit 1
-fi
diff --git a/config.tests/unix/objcopy/objcopy.cpp b/config.tests/unix/objcopy/objcopy.cpp
new file mode 100644
index 0000000000..66b261bd6d
--- /dev/null
+++ b/config.tests/unix/objcopy/objcopy.cpp
@@ -0,0 +1,45 @@
+/****************************************************************************
+**
+** Copyright (C) 2014 BlackBerry Limited. All rights reserved.
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the config.tests 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 Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/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 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Digia gives you certain additional
+** rights.  These rights are described in the Digia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+int main()
+{
+    return 0;
+}
diff --git a/config.tests/unix/objcopy/objcopy.pro b/config.tests/unix/objcopy/objcopy.pro
new file mode 100644
index 0000000000..3c28b89ef3
--- /dev/null
+++ b/config.tests/unix/objcopy/objcopy.pro
@@ -0,0 +1,4 @@
+SOURCES = objcopy.cpp
+CONFIG -= qt
+
+QMAKE_POST_LINK += $$QMAKE_OBJCOPY --only-keep-debug objcopy objcopy.debug && $$QMAKE_OBJCOPY --strip-debug objcopy && $$QMAKE_OBJCOPY --add-gnu-debuglink=objcopy.debug objcopy