Index: trunk/config.tests/mac/corewlan/corewlan.pro
===================================================================
--- trunk/config.tests/mac/corewlan/corewlan.pro	(revision 846)
+++ trunk/config.tests/mac/corewlan/corewlan.pro	(revision 846)
@@ -0,0 +1,3 @@
+SOURCES = corewlantest.mm
+LIBS += -framework CoreWLAN -framework Foundation
+CONFIG -= app_bundle qt
Index: trunk/config.tests/mac/corewlan/corewlantest.mm
===================================================================
--- trunk/config.tests/mac/corewlan/corewlantest.mm	(revision 846)
+++ trunk/config.tests/mac/corewlan/corewlantest.mm	(revision 846)
@@ -0,0 +1,49 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the config.tests of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
+**
+** 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, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia 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.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <CoreWLAN/CoreWLAN.h>
+#include <CoreWLAN/CWInterface.h>
+
+int main()
+{
+    [CWInterface interfaceWithName:@"en2"];
+    return 0;
+}
Index: trunk/config.tests/mac/crc.test
===================================================================
--- trunk/config.tests/mac/crc.test	(revision 651)
+++ trunk/config.tests/mac/crc.test	(revision 846)
@@ -54,5 +54,5 @@
 
 $MAKE distclean >/dev/null 2>&1
-"$OUTDIR/bin/qmake" -nocache -spec "$QMKSPEC" "CONFIG+=$QMAKE_CONFIG" "LIBS*=$LFLAGS" "INCLUDEPATH*=$INCLUDEPATH" "QMAKE_CXXFLAGS*=$CXXFLAGS" "$SRCDIR/$TEST/$EXE.pro" -o "$OUTDIR/$TEST/Makefile"
+"$OUTDIR/bin/qmake" -nocache -spec "$QMKSPEC" "CONFIG+=$QMAKE_CONFIG" "LIBS*=$LFLAGS" "INCLUDEPATH*=$INCLUDEPATH" "QMAKE_CXXFLAGS*=$CXXFLAGS" "QT_BUILD_TREE=$OUTDIR" "$SRCDIR/$TEST/$EXE.pro" -o "$OUTDIR/$TEST/Makefile"
 
 if [ "$VERBOSE" = "yes" ]; then
Index: trunk/config.tests/mac/crc/main.cpp
===================================================================
--- trunk/config.tests/mac/crc/main.cpp	(revision 651)
+++ trunk/config.tests/mac/crc/main.cpp	(revision 846)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
Index: trunk/config.tests/mac/xcodeversion.cpp
===================================================================
--- trunk/config.tests/mac/xcodeversion.cpp	(revision 651)
+++ trunk/config.tests/mac/xcodeversion.cpp	(revision 846)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
Index: trunk/config.tests/qws/ahi/ahi.cpp
===================================================================
--- trunk/config.tests/qws/ahi/ahi.cpp	(revision 651)
+++ trunk/config.tests/qws/ahi/ahi.cpp	(revision 846)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
Index: trunk/config.tests/qws/directfb/directfb.cpp
===================================================================
--- trunk/config.tests/qws/directfb/directfb.cpp	(revision 651)
+++ trunk/config.tests/qws/directfb/directfb.cpp	(revision 846)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
Index: trunk/config.tests/qws/sound/sound.cpp
===================================================================
--- trunk/config.tests/qws/sound/sound.cpp	(revision 651)
+++ trunk/config.tests/qws/sound/sound.cpp	(revision 846)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
Index: trunk/config.tests/qws/svgalib/svgalib.cpp
===================================================================
--- trunk/config.tests/qws/svgalib/svgalib.cpp	(revision 651)
+++ trunk/config.tests/qws/svgalib/svgalib.cpp	(revision 846)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
Index: trunk/config.tests/symbian/audio/audio.cpp
===================================================================
--- trunk/config.tests/symbian/audio/audio.cpp	(revision 846)
+++ trunk/config.tests/symbian/audio/audio.cpp	(revision 846)
@@ -0,0 +1,47 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the config.tests of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
+**
+** 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, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia 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.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <sounddevice.h>
+
+int main(int argc, char **argv)
+{
+    return 0;
+}
Index: trunk/config.tests/symbian/audio/audio.pro
===================================================================
--- trunk/config.tests/symbian/audio/audio.pro	(revision 846)
+++ trunk/config.tests/symbian/audio/audio.pro	(revision 846)
@@ -0,0 +1,10 @@
+TARGET = audio
+SOURCES = audio.cpp
+
+INCLUDEPATH += $${EPOCROOT}epoc32/include/mmf/server
+INCLUDEPATH += $${EPOCROOT}epoc32/include/mmf/common
+INCLUDEPATH += $${EPOCROOT}epoc32/include/platform
+
+LIBS += -lmmfdevsound
+CONFIG -= qt
+QT =
Index: trunk/config.tests/symbian/compile.test
===================================================================
--- trunk/config.tests/symbian/compile.test	(revision 846)
+++ trunk/config.tests/symbian/compile.test	(revision 846)
@@ -0,0 +1,46 @@
+#!/bin/sh
+
+SUCCESS=no
+QMKSPEC=$1
+XPLATFORM=`basename "$1"`
+QMAKE_CONFIG=$2
+VERBOSE=$3
+SRCDIR=$4
+OUTDIR=$5
+TEST=$6
+EXE=`basename "$6"`
+DESCRIPTION=$7
+shift 7
+LFLAGS=""
+INCLUDEPATH=""
+CXXFLAGS=""
+MAC_ARCH_CXXFLAGS=""
+MAC_ARCH_LFLAGS=""
+
+# debuggery
+[ "$VERBOSE" = "yes" ] && echo "$DESCRIPTION auto-detection... ($*)"
+
+test -d "$OUTDIR/$TEST" || mkdir -p "$OUTDIR/$TEST"
+
+cd "$OUTDIR/$TEST"
+
+test -r Makefile && $MAKE distclean >/dev/null 2>&1
+
+"$OUTDIR/bin/qmake" -nocache -spec "$QMKSPEC" "CONFIG+=$QMAKE_CONFIG" "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
+    $MAKE
+else
+    $MAKE >/dev/null 2>&1
+fi
+
+[ -x "$EXE.exe" ] && SUCCESS=yes
+
+# done
+if [ "$SUCCESS" != "yes" ]; then
+    [ "$VERBOSE" = "yes" ] && echo "$DESCRIPTION disabled."
+    exit 1
+else
+    [ "$VERBOSE" = "yes" ] && echo "$DESCRIPTION enabled."
+    exit 0
+fi
Index: trunk/config.tests/symbian/simple/main.cpp
===================================================================
--- trunk/config.tests/symbian/simple/main.cpp	(revision 846)
+++ trunk/config.tests/symbian/simple/main.cpp	(revision 846)
@@ -0,0 +1,46 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the config.tests of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
+**
+** 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, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia 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.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+#include <stdio.h>
+
+int main(int, char **) {
+    printf("test\n");
+    return 0;
+}
Index: trunk/config.tests/symbian/simple/simple.pro
===================================================================
--- trunk/config.tests/symbian/simple/simple.pro	(revision 846)
+++ trunk/config.tests/symbian/simple/simple.pro	(revision 846)
@@ -0,0 +1,5 @@
+TEMPLATE = app
+CONFIG -= qt
+QT = 
+SOURCES += main.cpp
+
Index: trunk/config.tests/unix/3dnow/3dnow.cpp
===================================================================
--- trunk/config.tests/unix/3dnow/3dnow.cpp	(revision 651)
+++ trunk/config.tests/unix/3dnow/3dnow.cpp	(revision 846)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
Index: trunk/config.tests/unix/alsa/alsatest.cpp
===================================================================
--- trunk/config.tests/unix/alsa/alsatest.cpp	(revision 651)
+++ trunk/config.tests/unix/alsa/alsatest.cpp	(revision 846)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
Index: trunk/config.tests/unix/avx/avx.cpp
===================================================================
--- trunk/config.tests/unix/avx/avx.cpp	(revision 846)
+++ trunk/config.tests/unix/avx/avx.cpp	(revision 846)
@@ -0,0 +1,51 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the config.tests of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
+**
+** 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, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia 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.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <immintrin.h>
+
+int main(int, char**)
+{
+    volatile __m256d a = _mm256_setzero_pd();
+    volatile __m256d b = _mm256_set1_pd(42.42);
+    volatile __m256d result = _mm256_add_pd(a, b);
+    (void)result;
+    return 0;
+}
Index: trunk/config.tests/unix/avx/avx.pro
===================================================================
--- trunk/config.tests/unix/avx/avx.pro	(revision 846)
+++ trunk/config.tests/unix/avx/avx.pro	(revision 846)
@@ -0,0 +1,3 @@
+SOURCES = avx.cpp
+CONFIG -= x11 qt
+mac:CONFIG -= app_bundle
Index: trunk/config.tests/unix/bsymbolic_functions.test
===================================================================
--- trunk/config.tests/unix/bsymbolic_functions.test	(revision 651)
+++ trunk/config.tests/unix/bsymbolic_functions.test	(revision 846)
@@ -5,9 +5,10 @@
 VERBOSE=$2
 
+
 cat >>bsymbolic_functions.c << EOF
 int main() { return 0; }
 EOF
 
-"$COMPILER" -o libtest.so -shared -Wl,-Bsymbolic-functions -fPIC bsymbolic_functions.c >/dev/null 2>&1 && BSYMBOLIC_FUNCTIONS_SUPPORT=yes
+$COMPILER -o libtest.so -shared -Wl,-Bsymbolic-functions -fPIC bsymbolic_functions.c >/dev/null 2>&1 && BSYMBOLIC_FUNCTIONS_SUPPORT=yes
 rm -f bsymbolic_functions.c libtest.so
 
Index: trunk/config.tests/unix/clock-gettime/clock-gettime.cpp
===================================================================
--- trunk/config.tests/unix/clock-gettime/clock-gettime.cpp	(revision 651)
+++ trunk/config.tests/unix/clock-gettime/clock-gettime.cpp	(revision 846)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
Index: trunk/config.tests/unix/clock-monotonic/clock-monotonic.cpp
===================================================================
--- trunk/config.tests/unix/clock-monotonic/clock-monotonic.cpp	(revision 651)
+++ trunk/config.tests/unix/clock-monotonic/clock-monotonic.cpp	(revision 846)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
Index: trunk/config.tests/unix/compile.test
===================================================================
--- trunk/config.tests/unix/compile.test	(revision 651)
+++ trunk/config.tests/unix/compile.test	(revision 846)
@@ -66,6 +66,8 @@
 
 test -r Makefile && $MAKE distclean >/dev/null 2>&1
+# Make sure output from possible previous tests is gone
+rm -f "$EXE" "${EXE}.exe"
 
-"$OUTDIR/bin/qmake" -nocache -spec "$QMKSPEC" "CONFIG+=$QMAKE_CONFIG" "LIBS*=$LFLAGS" "LIBS+=$MAC_ARCH_LFLAGS" "INCLUDEPATH*=$INCLUDEPATH" "QMAKE_CXXFLAGS*=$CXXFLAGS" "QMAKE_CXXFLAGS+=$MAC_ARCH_CXXFLAGS" "$SRCDIR/$TEST/$EXE.pro" -o "$OUTDIR/$TEST/Makefile"
+"$OUTDIR/bin/qmake" -nocache -spec "$QMKSPEC" "CONFIG+=$QMAKE_CONFIG" "CONFIG-=debug_and_release" "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
@@ -75,5 +77,5 @@
 fi
 
-[ -x "$EXE" ] && SUCCESS=yes
+( [ -x "$EXE" ] || [ -x "${EXE}.exe" ] ) && SUCCESS=yes
 
 # done
Index: trunk/config.tests/unix/cups/cups.cpp
===================================================================
--- trunk/config.tests/unix/cups/cups.cpp	(revision 651)
+++ trunk/config.tests/unix/cups/cups.cpp	(revision 846)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
Index: trunk/config.tests/unix/db2/db2.cpp
===================================================================
--- trunk/config.tests/unix/db2/db2.cpp	(revision 651)
+++ trunk/config.tests/unix/db2/db2.cpp	(revision 846)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
Index: trunk/config.tests/unix/dbus/dbus.cpp
===================================================================
--- trunk/config.tests/unix/dbus/dbus.cpp	(revision 651)
+++ trunk/config.tests/unix/dbus/dbus.cpp	(revision 846)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
Index: trunk/config.tests/unix/doubleformat.test
===================================================================
--- trunk/config.tests/unix/doubleformat.test	(revision 651)
+++ trunk/config.tests/unix/doubleformat.test	(revision 846)
@@ -11,5 +11,5 @@
 # build and run a test program
 test -d "$OUTDIR/config.tests/unix/doubleformat" || mkdir -p "$OUTDIR/config.tests/unix/doubleformat"
-"$OUTDIR/bin/qmake" -nocache -spec "$QMKSPEC" "$SRCDIR/config.tests/unix/doubleformat/doubleformattest.pro" -o "$OUTDIR/config.tests/unix/doubleformat/Makefile" >/dev/null 2>&1
+"$OUTDIR/bin/qmake" -nocache -spec "$QMKSPEC" "QT_BUILD_TREE=$OUTDIR" "$SRCDIR/config.tests/unix/doubleformat/doubleformattest.pro" -o "$OUTDIR/config.tests/unix/doubleformat/Makefile" >/dev/null 2>&1
 cd "$OUTDIR/config.tests/unix/doubleformat"
 
Index: trunk/config.tests/unix/doubleformat/doubleformattest.cpp
===================================================================
--- trunk/config.tests/unix/doubleformat/doubleformattest.cpp	(revision 651)
+++ trunk/config.tests/unix/doubleformat/doubleformattest.cpp	(revision 846)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
@@ -45,6 +45,6 @@
 BE: strings | grep DCBA3210DCBA3210
 
-LE arm-swaped-dword-order: strings | grep ABCD0123ABCD0123
-BE arm-swaped-dword-order: strings | grep 3210DCBA3210DCBA (untested)
+LE arm-swapped-dword-order: strings | grep ABCD0123ABCD0123
+BE arm-swapped-dword-order: strings | grep 3210DCBA3210DCBA (untested)
 
 tested on x86, arm-le (gp), aix
Index: trunk/config.tests/unix/egl/egl.cpp
===================================================================
--- trunk/config.tests/unix/egl/egl.cpp	(revision 651)
+++ trunk/config.tests/unix/egl/egl.cpp	(revision 846)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
Index: trunk/config.tests/unix/egl4gles1/egl4gles1.cpp
===================================================================
--- trunk/config.tests/unix/egl4gles1/egl4gles1.cpp	(revision 651)
+++ trunk/config.tests/unix/egl4gles1/egl4gles1.cpp	(revision 846)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
Index: trunk/config.tests/unix/endian.test
===================================================================
--- trunk/config.tests/unix/endian.test	(revision 651)
+++ trunk/config.tests/unix/endian.test	(revision 846)
@@ -11,5 +11,5 @@
 # build and run a test program
 test -d "$OUTDIR/config.tests/unix/endian" || mkdir -p "$OUTDIR/config.tests/unix/endian"
-"$OUTDIR/bin/qmake" -nocache -spec "$QMKSPEC" "$SRCDIR/config.tests/unix/endian/endiantest.pro" -o "$OUTDIR/config.tests/unix/endian/Makefile" >/dev/null 2>&1
+"$OUTDIR/bin/qmake" -nocache -spec "$QMKSPEC" "QT_BUILD_TREE=$OUTDIR" "$SRCDIR/config.tests/unix/endian/endiantest.pro" -o "$OUTDIR/config.tests/unix/endian/Makefile" >/dev/null 2>&1
 cd "$OUTDIR/config.tests/unix/endian"
 
Index: trunk/config.tests/unix/endian/endiantest.cpp
===================================================================
--- trunk/config.tests/unix/endian/endiantest.cpp	(revision 651)
+++ trunk/config.tests/unix/endian/endiantest.cpp	(revision 846)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
Index: trunk/config.tests/unix/floatmath/floatmath.cpp
===================================================================
--- trunk/config.tests/unix/floatmath/floatmath.cpp	(revision 651)
+++ trunk/config.tests/unix/floatmath/floatmath.cpp	(revision 846)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
Index: trunk/config.tests/unix/freetype/freetype.cpp
===================================================================
--- trunk/config.tests/unix/freetype/freetype.cpp	(revision 651)
+++ trunk/config.tests/unix/freetype/freetype.cpp	(revision 846)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
Index: trunk/config.tests/unix/fvisibility.test
===================================================================
--- trunk/config.tests/unix/fvisibility.test	(revision 651)
+++ trunk/config.tests/unix/fvisibility.test	(revision 846)
@@ -5,23 +5,39 @@
 VERBOSE=$2
 
+CMDLINE=
+
+
 RunCompileTest() {
     cat >>fvisibility.c << EOF
-__attribute__((visibility("default"))) void blah();
-#if !defined(__GNUC__)
-# error "Visiblility support requires GCC"
-#elif __GNUC__ < 4
-# error "GCC3 with backported visibility patch is known to miscompile Qt"
+#if defined(__GNUC__)
+#   if (__GNUC__ < 4)
+#      error "GCC3 with backported visibility patch is known to miscompile Qt"
+#   endif
+__attribute((visibility("default"))) void blah();
+#elif defined(__SUNPRO_CC)
+#   if (__SUNPRO_CC < 0x0550)
+#      error "SunStudio 8 or later is required for ELF visibility"
+#   endif
+__global void blah();
+#else
+#   error "GCC4+ or SunStudio 8+ are required to support ELF visibility"
 #endif
 EOF
 
     if [ "$VERBOSE" = "yes" ] ; then
-        "$COMPILER" -c -fvisibility=hidden fvisibility.c && FVISIBILITY_SUPPORT=yes
+        "$COMPILER" -c $CMDLINE fvisibility.c && FVISIBILITY_SUPPORT=yes
     else
-        "$COMPILER" -c -fvisibility=hidden fvisibility.c >/dev/null 2>&1 && FVISIBILITY_SUPPORT=yes
+        "$COMPILER" -c $CMDLINE fvisibility.c >/dev/null 2>&1 && FVISIBILITY_SUPPORT=yes
     fi
     rm -f fvisibility.c fvisibility.o
 }
 
+
 case "$COMPILER" in
+*g++*|*c++*)
+    CMDLINE="-fvisibility=hidden"
+    RunCompileTest
+   ;;
+
 aCC*)
     ;;
@@ -35,4 +51,5 @@
     *)
         # the compile test works for the intel compiler because it mimics gcc's behavior
+        CMDLINE="-fvisibility=hidden"
         RunCompileTest
         ;;
@@ -40,7 +57,9 @@
     ;;
 
-    *)
-    RunCompileTest
-    ;;
+CC)
+   # This should be SunStudio.  If not, it'll get caught.
+   CMDLINE="-xldscope=hidden"
+   RunCompileTest
+   ;;
 esac
 
Index: trunk/config.tests/unix/getaddrinfo/getaddrinfotest.cpp
===================================================================
--- trunk/config.tests/unix/getaddrinfo/getaddrinfotest.cpp	(revision 651)
+++ trunk/config.tests/unix/getaddrinfo/getaddrinfotest.cpp	(revision 846)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
@@ -43,7 +43,14 @@
      platform. we check for all structures and functions required. */
 
+#include <stdio.h>
+#include <stdlib.h>
+#ifdef __MINGW32__
+#include <winsock2.h>
+#include <ws2tcpip.h>
+#else
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netdb.h>
+#endif
 
 int main()
Index: trunk/config.tests/unix/getifaddrs/getifaddrs.cpp
===================================================================
--- trunk/config.tests/unix/getifaddrs/getifaddrs.cpp	(revision 651)
+++ trunk/config.tests/unix/getifaddrs/getifaddrs.cpp	(revision 846)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
Index: trunk/config.tests/unix/glib/glib.cpp
===================================================================
--- trunk/config.tests/unix/glib/glib.cpp	(revision 651)
+++ trunk/config.tests/unix/glib/glib.cpp	(revision 846)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
Index: trunk/config.tests/unix/gnu-libiconv/gnu-libiconv.cpp
===================================================================
--- trunk/config.tests/unix/gnu-libiconv/gnu-libiconv.cpp	(revision 651)
+++ trunk/config.tests/unix/gnu-libiconv/gnu-libiconv.cpp	(revision 846)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
Index: trunk/config.tests/unix/gstreamer/gstreamer.cpp
===================================================================
--- trunk/config.tests/unix/gstreamer/gstreamer.cpp	(revision 651)
+++ trunk/config.tests/unix/gstreamer/gstreamer.cpp	(revision 846)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
Index: trunk/config.tests/unix/ibase/ibase.cpp
===================================================================
--- trunk/config.tests/unix/ibase/ibase.cpp	(revision 651)
+++ trunk/config.tests/unix/ibase/ibase.cpp	(revision 846)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
Index: trunk/config.tests/unix/icd/icd.cpp
===================================================================
--- trunk/config.tests/unix/icd/icd.cpp	(revision 846)
+++ trunk/config.tests/unix/icd/icd.cpp	(revision 846)
@@ -0,0 +1,55 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the config.tests of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
+**
+** 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, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia 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.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <wlancond.h>
+
+#include <icd/dbus_api.h>
+#include <icd/network_api_defines.h>
+
+#include <icd/osso-ic.h>
+#include <icd/osso-ic-dbus.h>
+
+#include <conn_settings.h>
+
+int main(int, char **)
+{
+    return 0;
+}
Index: trunk/config.tests/unix/icd/icd.pro
===================================================================
--- trunk/config.tests/unix/icd/icd.pro	(revision 846)
+++ trunk/config.tests/unix/icd/icd.pro	(revision 846)
@@ -0,0 +1,3 @@
+SOURCES = icd.cpp
+CONFIG -= qt
+mac:CONFIG -= app_bundle
Index: trunk/config.tests/unix/iconv/iconv.cpp
===================================================================
--- trunk/config.tests/unix/iconv/iconv.cpp	(revision 651)
+++ trunk/config.tests/unix/iconv/iconv.cpp	(revision 846)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
Index: trunk/config.tests/unix/iconv/iconv.pro
===================================================================
--- trunk/config.tests/unix/iconv/iconv.pro	(revision 651)
+++ trunk/config.tests/unix/iconv/iconv.pro	(revision 846)
@@ -1,3 +1,3 @@
 SOURCES = iconv.cpp
 CONFIG -= qt dylib app_bundle
-mac:LIBS += -liconv
+mac|win32-g++*:LIBS += -liconv
Index: trunk/config.tests/unix/inotify/inotifytest.cpp
===================================================================
--- trunk/config.tests/unix/inotify/inotifytest.cpp	(revision 651)
+++ trunk/config.tests/unix/inotify/inotifytest.cpp	(revision 846)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
Index: trunk/config.tests/unix/iodbc/iodbc.cpp
===================================================================
--- trunk/config.tests/unix/iodbc/iodbc.cpp	(revision 651)
+++ trunk/config.tests/unix/iodbc/iodbc.cpp	(revision 846)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
Index: trunk/config.tests/unix/ipv6/ipv6test.cpp
===================================================================
--- trunk/config.tests/unix/ipv6/ipv6test.cpp	(revision 651)
+++ trunk/config.tests/unix/ipv6/ipv6test.cpp	(revision 846)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
@@ -47,7 +47,12 @@
 #endif
 
+#ifdef __MINGW32__
+#include <winsock2.h>
+#include <ws2tcpip.h>
+#else
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
+#endif
 
 int main()
Index: trunk/config.tests/unix/ipv6ifname/ipv6ifname.cpp
===================================================================
--- trunk/config.tests/unix/ipv6ifname/ipv6ifname.cpp	(revision 651)
+++ trunk/config.tests/unix/ipv6ifname/ipv6ifname.cpp	(revision 846)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
Index: trunk/config.tests/unix/iwmmxt/iwmmxt.cpp
===================================================================
--- trunk/config.tests/unix/iwmmxt/iwmmxt.cpp	(revision 651)
+++ trunk/config.tests/unix/iwmmxt/iwmmxt.cpp	(revision 846)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
Index: trunk/config.tests/unix/javascriptcore-jit/hwcap_test.cpp
===================================================================
--- trunk/config.tests/unix/javascriptcore-jit/hwcap_test.cpp	(revision 651)
+++ trunk/config.tests/unix/javascriptcore-jit/hwcap_test.cpp	(revision 846)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
Index: trunk/config.tests/unix/libjpeg/libjpeg.cpp
===================================================================
--- trunk/config.tests/unix/libjpeg/libjpeg.cpp	(revision 651)
+++ trunk/config.tests/unix/libjpeg/libjpeg.cpp	(revision 846)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
Index: trunk/config.tests/unix/libmng/libmng.cpp
===================================================================
--- trunk/config.tests/unix/libmng/libmng.cpp	(revision 651)
+++ trunk/config.tests/unix/libmng/libmng.cpp	(revision 846)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
Index: trunk/config.tests/unix/libpng/libpng.cpp
===================================================================
--- trunk/config.tests/unix/libpng/libpng.cpp	(revision 651)
+++ trunk/config.tests/unix/libpng/libpng.cpp	(revision 846)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
Index: trunk/config.tests/unix/libtiff/libtiff.cpp
===================================================================
--- trunk/config.tests/unix/libtiff/libtiff.cpp	(revision 651)
+++ trunk/config.tests/unix/libtiff/libtiff.cpp	(revision 846)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
Index: trunk/config.tests/unix/mmx/mmx.cpp
===================================================================
--- trunk/config.tests/unix/mmx/mmx.cpp	(revision 651)
+++ trunk/config.tests/unix/mmx/mmx.cpp	(revision 846)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
Index: trunk/config.tests/unix/mremap/mremap.cpp
===================================================================
--- trunk/config.tests/unix/mremap/mremap.cpp	(revision 651)
+++ trunk/config.tests/unix/mremap/mremap.cpp	(revision 846)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
Index: trunk/config.tests/unix/mysql/mysql.cpp
===================================================================
--- trunk/config.tests/unix/mysql/mysql.cpp	(revision 651)
+++ trunk/config.tests/unix/mysql/mysql.cpp	(revision 846)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
Index: trunk/config.tests/unix/neon/neon.cpp
===================================================================
--- trunk/config.tests/unix/neon/neon.cpp	(revision 651)
+++ trunk/config.tests/unix/neon/neon.cpp	(revision 846)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
Index: trunk/config.tests/unix/nis/nis.cpp
===================================================================
--- trunk/config.tests/unix/nis/nis.cpp	(revision 651)
+++ trunk/config.tests/unix/nis/nis.cpp	(revision 846)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
Index: trunk/config.tests/unix/oci/oci.cpp
===================================================================
--- trunk/config.tests/unix/oci/oci.cpp	(revision 651)
+++ trunk/config.tests/unix/oci/oci.cpp	(revision 846)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
Index: trunk/config.tests/unix/odbc/odbc.cpp
===================================================================
--- trunk/config.tests/unix/odbc/odbc.cpp	(revision 651)
+++ trunk/config.tests/unix/odbc/odbc.cpp	(revision 846)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
@@ -40,4 +40,7 @@
 ****************************************************************************/
 
+#ifdef __MINGW32__
+#include <windows.h>
+#endif
 #include <sql.h>
 #include <sqlext.h>
Index: trunk/config.tests/unix/odbc/odbc.pro
===================================================================
--- trunk/config.tests/unix/odbc/odbc.pro	(revision 651)
+++ trunk/config.tests/unix/odbc/odbc.pro	(revision 846)
@@ -2,3 +2,4 @@
 CONFIG -= qt dylib
 mac:CONFIG -= app_bundle
-LIBS += -lodbc
+win32-g++*:LIBS += -lodbc32
+else:LIBS += -lodbc
Index: trunk/config.tests/unix/opengles1/opengles1.cpp
===================================================================
--- trunk/config.tests/unix/opengles1/opengles1.cpp	(revision 651)
+++ trunk/config.tests/unix/opengles1/opengles1.cpp	(revision 846)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
Index: trunk/config.tests/unix/opengles2/opengles2.cpp
===================================================================
--- trunk/config.tests/unix/opengles2/opengles2.cpp	(revision 651)
+++ trunk/config.tests/unix/opengles2/opengles2.cpp	(revision 846)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
Index: trunk/config.tests/unix/openssl/openssl.cpp
===================================================================
--- trunk/config.tests/unix/openssl/openssl.cpp	(revision 651)
+++ trunk/config.tests/unix/openssl/openssl.cpp	(revision 846)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
Index: trunk/config.tests/unix/openvg/openvg.cpp
===================================================================
--- trunk/config.tests/unix/openvg/openvg.cpp	(revision 651)
+++ trunk/config.tests/unix/openvg/openvg.cpp	(revision 846)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
Index: trunk/config.tests/unix/psql/psql.cpp
===================================================================
--- trunk/config.tests/unix/psql/psql.cpp	(revision 651)
+++ trunk/config.tests/unix/psql/psql.cpp	(revision 846)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
Index: trunk/config.tests/unix/psql/psql.pro
===================================================================
--- trunk/config.tests/unix/psql/psql.pro	(revision 651)
+++ trunk/config.tests/unix/psql/psql.pro	(revision 846)
@@ -2,3 +2,3 @@
 CONFIG -= qt dylib
 mac:CONFIG -= app_bundle
-LIBS += -lpq
+LIBS *= -lpq
Index: trunk/config.tests/unix/ptrsize.test
===================================================================
--- trunk/config.tests/unix/ptrsize.test	(revision 651)
+++ trunk/config.tests/unix/ptrsize.test	(revision 846)
@@ -11,5 +11,5 @@
 # build and run a test program
 test -d "$OUTDIR/config.tests/unix/ptrsize" || mkdir -p "$OUTDIR/config.tests/unix/ptrsize"
-"$OUTDIR/bin/qmake" -nocache -spec "$QMKSPEC" "$SRCDIR/config.tests/unix/ptrsize/ptrsizetest.pro" -o "$OUTDIR/config.tests/unix/ptrsize/Makefile" >/dev/null 2>&1
+"$OUTDIR/bin/qmake" -nocache -spec "$QMKSPEC" "QT_BUILD_TREE=$OUTDIR" "$SRCDIR/config.tests/unix/ptrsize/ptrsizetest.pro" -o "$OUTDIR/config.tests/unix/ptrsize/Makefile" >/dev/null 2>&1
 cd "$OUTDIR/config.tests/unix/ptrsize"
 
Index: trunk/config.tests/unix/ptrsize/ptrsizetest.cpp
===================================================================
--- trunk/config.tests/unix/ptrsize/ptrsizetest.cpp	(revision 651)
+++ trunk/config.tests/unix/ptrsize/ptrsizetest.cpp	(revision 846)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
Index: trunk/config.tests/unix/pulseaudio/pulseaudio.cpp
===================================================================
--- trunk/config.tests/unix/pulseaudio/pulseaudio.cpp	(revision 846)
+++ trunk/config.tests/unix/pulseaudio/pulseaudio.cpp	(revision 846)
@@ -0,0 +1,58 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the config.tests of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
+**
+** 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, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia 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.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <pulse/pulseaudio.h>
+#include <pulse/glib-mainloop.h>
+
+#if !defined(PA_API_VERSION) || PA_API_VERSION-0 != 12
+# error "Incompatible PulseAudio API version"
+#endif
+#if !PA_CHECK_VERSION(0,9,0)
+# error "PulseAudio version too old"
+#endif
+
+int main(int, char **)
+{
+    const char *headers = pa_get_headers_version();
+    const char *library = pa_get_library_version();
+    pa_glib_mainloop_new(0);
+    return (headers - library) * 0;
+}
Index: trunk/config.tests/unix/pulseaudio/pulseaudio.pro
===================================================================
--- trunk/config.tests/unix/pulseaudio/pulseaudio.pro	(revision 846)
+++ trunk/config.tests/unix/pulseaudio/pulseaudio.pro	(revision 846)
@@ -0,0 +1,3 @@
+SOURCES = pulseaudio.cpp
+CONFIG -= qt
+LIBS +=
Index: trunk/config.tests/unix/shivavg/shivavg.cpp
===================================================================
--- trunk/config.tests/unix/shivavg/shivavg.cpp	(revision 651)
+++ trunk/config.tests/unix/shivavg/shivavg.cpp	(revision 846)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
Index: trunk/config.tests/unix/sqlite/sqlite.cpp
===================================================================
--- trunk/config.tests/unix/sqlite/sqlite.cpp	(revision 651)
+++ trunk/config.tests/unix/sqlite/sqlite.cpp	(revision 846)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
Index: trunk/config.tests/unix/sqlite2/sqlite2.cpp
===================================================================
--- trunk/config.tests/unix/sqlite2/sqlite2.cpp	(revision 651)
+++ trunk/config.tests/unix/sqlite2/sqlite2.cpp	(revision 846)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
Index: trunk/config.tests/unix/sse/sse.cpp
===================================================================
--- trunk/config.tests/unix/sse/sse.cpp	(revision 651)
+++ trunk/config.tests/unix/sse/sse.cpp	(revision 846)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
Index: trunk/config.tests/unix/sse2/sse2.cpp
===================================================================
--- trunk/config.tests/unix/sse2/sse2.cpp	(revision 651)
+++ trunk/config.tests/unix/sse2/sse2.cpp	(revision 846)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
Index: trunk/config.tests/unix/sse3/sse3.cpp
===================================================================
--- trunk/config.tests/unix/sse3/sse3.cpp	(revision 846)
+++ trunk/config.tests/unix/sse3/sse3.cpp	(revision 846)
@@ -0,0 +1,51 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the config.tests of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
+**
+** 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, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia 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.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <pmmintrin.h>
+
+int main(int, char**)
+{
+    volatile __m128d a = _mm_set1_pd(6.28);
+    volatile __m128d b = _mm_set1_pd(3.14);
+    volatile __m128d result = _mm_addsub_pd(a, b);
+    result = _mm_movedup_pd(result);
+    return 0;
+}
Index: trunk/config.tests/unix/sse3/sse3.pro
===================================================================
--- trunk/config.tests/unix/sse3/sse3.pro	(revision 846)
+++ trunk/config.tests/unix/sse3/sse3.pro	(revision 846)
@@ -0,0 +1,3 @@
+SOURCES = sse3.cpp
+CONFIG -= x11 qt
+mac:CONFIG -= app_bundle
Index: trunk/config.tests/unix/sse4_1/sse4_1.cpp
===================================================================
--- trunk/config.tests/unix/sse4_1/sse4_1.cpp	(revision 846)
+++ trunk/config.tests/unix/sse4_1/sse4_1.cpp	(revision 846)
@@ -0,0 +1,51 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the config.tests of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
+**
+** 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, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia 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.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <smmintrin.h>
+
+int main(int, char**)
+{
+    volatile __m128 a = _mm_setzero_ps();
+    _mm_ceil_ps(a);
+    volatile __m128i result = _mm_mullo_epi32(_mm_set1_epi32(42), _mm_set1_epi32(64));
+    (void)result;
+    return 0;
+}
Index: trunk/config.tests/unix/sse4_1/sse4_1.pro
===================================================================
--- trunk/config.tests/unix/sse4_1/sse4_1.pro	(revision 846)
+++ trunk/config.tests/unix/sse4_1/sse4_1.pro	(revision 846)
@@ -0,0 +1,3 @@
+SOURCES = sse4_1.cpp
+CONFIG -= x11 qt
+mac:CONFIG -= app_bundle
Index: trunk/config.tests/unix/sse4_2/sse4_2.cpp
===================================================================
--- trunk/config.tests/unix/sse4_2/sse4_2.cpp	(revision 846)
+++ trunk/config.tests/unix/sse4_2/sse4_2.cpp	(revision 846)
@@ -0,0 +1,51 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the config.tests of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
+**
+** 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, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia 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.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <smmintrin.h>
+
+int main(int, char**)
+{
+    volatile __m128i a = _mm_setzero_si128();
+    volatile __m128i b = _mm_set1_epi32(42);
+    volatile __m128i result = _mm_cmpestrm(a, 16, b, 16, 0);
+    (void)result;
+    return 0;
+}
Index: trunk/config.tests/unix/sse4_2/sse4_2.pro
===================================================================
--- trunk/config.tests/unix/sse4_2/sse4_2.pro	(revision 846)
+++ trunk/config.tests/unix/sse4_2/sse4_2.pro	(revision 846)
@@ -0,0 +1,3 @@
+SOURCES = sse4_2.cpp
+CONFIG -= x11 qt
+mac:CONFIG -= app_bundle
Index: trunk/config.tests/unix/ssse3/ssse3.cpp
===================================================================
--- trunk/config.tests/unix/ssse3/ssse3.cpp	(revision 846)
+++ trunk/config.tests/unix/ssse3/ssse3.cpp	(revision 846)
@@ -0,0 +1,51 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the config.tests of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
+**
+** 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, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia 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.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <tmmintrin.h>
+
+int main(int, char**)
+{
+    volatile __m128i a = _mm_set1_epi32(42);
+    _mm_abs_epi8(a);
+    volatile __m128i result = _mm_sign_epi16(a, _mm_set1_epi32(64));
+    (void)result;
+    return 0;
+}
Index: trunk/config.tests/unix/ssse3/ssse3.pro
===================================================================
--- trunk/config.tests/unix/ssse3/ssse3.pro	(revision 846)
+++ trunk/config.tests/unix/ssse3/ssse3.pro	(revision 846)
@@ -0,0 +1,3 @@
+SOURCES = ssse3.cpp
+CONFIG -= x11 qt
+mac:CONFIG -= app_bundle
Index: trunk/config.tests/unix/stdint/main.cpp
===================================================================
--- trunk/config.tests/unix/stdint/main.cpp	(revision 651)
+++ trunk/config.tests/unix/stdint/main.cpp	(revision 846)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
Index: trunk/config.tests/unix/stl/stltest.cpp
===================================================================
--- trunk/config.tests/unix/stl/stltest.cpp	(revision 651)
+++ trunk/config.tests/unix/stl/stltest.cpp	(revision 846)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
@@ -70,5 +70,5 @@
         T *i;
         typedef std::random_access_iterator_tag  iterator_category;
-        typedef ptrdiff_t difference_type;
+        typedef std::ptrdiff_t difference_type;
         typedef T value_type;
         typedef T *pointer;
Index: trunk/config.tests/unix/sun-libiconv/sun-libiconv.pro
===================================================================
--- trunk/config.tests/unix/sun-libiconv/sun-libiconv.pro	(revision 846)
+++ trunk/config.tests/unix/sun-libiconv/sun-libiconv.pro	(revision 846)
@@ -0,0 +1,2 @@
+SOURCES = ../gnu-libiconv/gnu-libiconv.cpp
+CONFIG -= qt dylib app_bundle
Index: trunk/config.tests/unix/tds/tds.cpp
===================================================================
--- trunk/config.tests/unix/tds/tds.cpp	(revision 651)
+++ trunk/config.tests/unix/tds/tds.cpp	(revision 846)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
Index: trunk/config.tests/unix/tslib/tslib.cpp
===================================================================
--- trunk/config.tests/unix/tslib/tslib.cpp	(revision 651)
+++ trunk/config.tests/unix/tslib/tslib.cpp	(revision 846)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
Index: trunk/config.tests/unix/zlib/zlib.cpp
===================================================================
--- trunk/config.tests/unix/zlib/zlib.cpp	(revision 651)
+++ trunk/config.tests/unix/zlib/zlib.cpp	(revision 846)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
Index: trunk/config.tests/x11/fontconfig/fontconfig.cpp
===================================================================
--- trunk/config.tests/x11/fontconfig/fontconfig.cpp	(revision 651)
+++ trunk/config.tests/x11/fontconfig/fontconfig.cpp	(revision 846)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
Index: trunk/config.tests/x11/glxfbconfig/glxfbconfig.cpp
===================================================================
--- trunk/config.tests/x11/glxfbconfig/glxfbconfig.cpp	(revision 651)
+++ trunk/config.tests/x11/glxfbconfig/glxfbconfig.cpp	(revision 846)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
Index: trunk/config.tests/x11/mitshm/mitshm.cpp
===================================================================
--- trunk/config.tests/x11/mitshm/mitshm.cpp	(revision 651)
+++ trunk/config.tests/x11/mitshm/mitshm.cpp	(revision 846)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
Index: trunk/config.tests/x11/notype.test
===================================================================
--- trunk/config.tests/x11/notype.test	(revision 651)
+++ trunk/config.tests/x11/notype.test	(revision 846)
@@ -28,5 +28,5 @@
 
     test -d "$OUTDIR/config.tests/x11/notype" || mkdir -p "$OUTDIR/config.tests/x11/notype"
-    "$OUTDIR/bin/qmake" -nocache -spec "$QMKSPEC" "$SRCDIR/config.tests/x11/notype/notypetest.pro" -o "$OUTDIR/config.tests/x11/notype/Makefile" >/dev/null 2>&1
+    "$OUTDIR/bin/qmake" -nocache -spec "$QMKSPEC" "QT_BUILD_TREE=$OUTDIR" "$SRCDIR/config.tests/x11/notype/notypetest.pro" -o "$OUTDIR/config.tests/x11/notype/Makefile" >/dev/null 2>&1
     cd "$OUTDIR/config.tests/x11/notype"
 
Index: trunk/config.tests/x11/notype/notypetest.cpp
===================================================================
--- trunk/config.tests/x11/notype/notypetest.cpp	(revision 651)
+++ trunk/config.tests/x11/notype/notypetest.cpp	(revision 846)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
Index: trunk/config.tests/x11/opengl/opengl.cpp
===================================================================
--- trunk/config.tests/x11/opengl/opengl.cpp	(revision 651)
+++ trunk/config.tests/x11/opengl/opengl.cpp	(revision 846)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
Index: trunk/config.tests/x11/opengl/opengl.pro
===================================================================
--- trunk/config.tests/x11/opengl/opengl.pro	(revision 651)
+++ trunk/config.tests/x11/opengl/opengl.pro	(revision 846)
@@ -8,3 +8,4 @@
 
 CONFIG -= qt
-LIBS += -lGL -lGLU
+win32-g++*:LIBS += -lopengl32
+else:LIBS += -lGL -lGLU
Index: trunk/config.tests/x11/sm/sm.cpp
===================================================================
--- trunk/config.tests/x11/sm/sm.cpp	(revision 651)
+++ trunk/config.tests/x11/sm/sm.cpp	(revision 846)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
Index: trunk/config.tests/x11/xcursor/xcursor.cpp
===================================================================
--- trunk/config.tests/x11/xcursor/xcursor.cpp	(revision 651)
+++ trunk/config.tests/x11/xcursor/xcursor.cpp	(revision 846)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
Index: trunk/config.tests/x11/xfixes/xfixes.cpp
===================================================================
--- trunk/config.tests/x11/xfixes/xfixes.cpp	(revision 651)
+++ trunk/config.tests/x11/xfixes/xfixes.cpp	(revision 846)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
Index: trunk/config.tests/x11/xinerama/xinerama.cpp
===================================================================
--- trunk/config.tests/x11/xinerama/xinerama.cpp	(revision 651)
+++ trunk/config.tests/x11/xinerama/xinerama.cpp	(revision 846)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
Index: trunk/config.tests/x11/xinput/xinput.cpp
===================================================================
--- trunk/config.tests/x11/xinput/xinput.cpp	(revision 651)
+++ trunk/config.tests/x11/xinput/xinput.cpp	(revision 846)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
Index: trunk/config.tests/x11/xkb/xkb.cpp
===================================================================
--- trunk/config.tests/x11/xkb/xkb.cpp	(revision 651)
+++ trunk/config.tests/x11/xkb/xkb.cpp	(revision 846)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
Index: trunk/config.tests/x11/xlib/xlib.cpp
===================================================================
--- trunk/config.tests/x11/xlib/xlib.cpp	(revision 651)
+++ trunk/config.tests/x11/xlib/xlib.cpp	(revision 846)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
Index: trunk/config.tests/x11/xrandr/xrandr.cpp
===================================================================
--- trunk/config.tests/x11/xrandr/xrandr.cpp	(revision 651)
+++ trunk/config.tests/x11/xrandr/xrandr.cpp	(revision 846)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
Index: trunk/config.tests/x11/xrender/xrender.cpp
===================================================================
--- trunk/config.tests/x11/xrender/xrender.cpp	(revision 651)
+++ trunk/config.tests/x11/xrender/xrender.cpp	(revision 846)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
Index: trunk/config.tests/x11/xshape/xshape.cpp
===================================================================
--- trunk/config.tests/x11/xshape/xshape.cpp	(revision 651)
+++ trunk/config.tests/x11/xshape/xshape.cpp	(revision 846)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
Index: trunk/config.tests/x11/xsync/xsync.cpp
===================================================================
--- trunk/config.tests/x11/xsync/xsync.cpp	(revision 651)
+++ trunk/config.tests/x11/xsync/xsync.cpp	(revision 846)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
Index: trunk/config.tests/x11/xvideo/xvideo.cpp
===================================================================
--- trunk/config.tests/x11/xvideo/xvideo.cpp	(revision 846)
+++ trunk/config.tests/x11/xvideo/xvideo.cpp	(revision 846)
@@ -0,0 +1,52 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the FOO module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
+**
+** 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, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia 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.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <X11/Xlib.h>
+#include <X11/extensions/Xv.h>
+#include <X11/extensions/Xvlib.h>
+
+int main(int argc, char** argv)
+{
+    unsigned int count = 0;
+    XvAdaptorInfo *adaptors = 0;
+    XvQueryAdaptors(0, 0, &count, &adaptors);
+    return 0;
+}
Index: trunk/config.tests/x11/xvideo/xvideo.pro
===================================================================
--- trunk/config.tests/x11/xvideo/xvideo.pro	(revision 846)
+++ trunk/config.tests/x11/xvideo/xvideo.pro	(revision 846)
@@ -0,0 +1,4 @@
+CONFIG += x11
+CONFIG -= qt
+SOURCES = xvideo.cpp
+LIBS += -lXv
