Changeset 844 for branches/vendor/nokia/qt/current/config.tests

Timestamp:

May 3, 2011, 4:49:08 PM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

vendor: Imported qt-everywhere-opensource-src-4.7.2 from Nokia (excluding doc/html and doc/qch dirs generated from doc/src, and imports and templates dirs which are emtpy).

Location:

branches/vendor/nokia/qt/current/config.tests

Files:

• mac/corewlan (added)
• mac/corewlan/corewlan.pro (added)
• mac/corewlan/corewlantest.mm (added)
• mac/crc.test (modified) (1 diff)
• mac/crc/main.cpp (modified) (1 diff)
• mac/xcodeversion.cpp (modified) (1 diff)
• qws/ahi/ahi.cpp (modified) (1 diff)
• qws/directfb/directfb.cpp (modified) (1 diff)
• qws/sound/sound.cpp (modified) (1 diff)
• qws/svgalib/svgalib.cpp (modified) (1 diff)
• symbian (added)
• symbian/audio (added)
• symbian/audio/audio.cpp (added)
• symbian/audio/audio.pro (added)
• symbian/compile.test (added)
• symbian/simple (added)
• symbian/simple/main.cpp (added)
• symbian/simple/simple.pro (added)
• unix/3dnow/3dnow.cpp (modified) (1 diff)
• unix/alsa/alsatest.cpp (modified) (1 diff)
• unix/avx (added)
• unix/avx/avx.cpp (added)
• unix/avx/avx.pro (added)
• unix/bsymbolic_functions.test (modified) (1 diff)
• unix/clock-gettime/clock-gettime.cpp (modified) (1 diff)
• unix/clock-monotonic/clock-monotonic.cpp (modified) (1 diff)
• unix/compile.test (modified) (2 diffs)
• unix/cups/cups.cpp (modified) (1 diff)
• unix/db2/db2.cpp (modified) (1 diff)
• unix/dbus/dbus.cpp (modified) (1 diff)
• unix/doubleformat.test (modified) (1 diff)
• unix/doubleformat/doubleformattest.cpp (modified) (2 diffs)
• unix/egl/egl.cpp (modified) (1 diff)
• unix/egl4gles1/egl4gles1.cpp (modified) (1 diff)
• unix/endian.test (modified) (1 diff)
• unix/endian/endiantest.cpp (modified) (1 diff)
• unix/floatmath/floatmath.cpp (modified) (1 diff)
• unix/freetype/freetype.cpp (modified) (1 diff)
• unix/fvisibility.test (modified) (3 diffs)
• unix/getaddrinfo/getaddrinfotest.cpp (modified) (2 diffs)
• unix/getifaddrs/getifaddrs.cpp (modified) (1 diff)
• unix/glib/glib.cpp (modified) (1 diff)
• unix/gnu-libiconv/gnu-libiconv.cpp (modified) (1 diff)
• unix/gstreamer/gstreamer.cpp (modified) (1 diff)
• unix/ibase/ibase.cpp (modified) (1 diff)
• unix/icd (added)
• unix/icd/icd.cpp (added)
• unix/icd/icd.pro (added)
• unix/iconv/iconv.cpp (modified) (1 diff)
• unix/iconv/iconv.pro (modified) (1 diff)
• unix/inotify/inotifytest.cpp (modified) (1 diff)
• unix/iodbc/iodbc.cpp (modified) (1 diff)
• unix/ipv6/ipv6test.cpp (modified) (2 diffs)
• unix/ipv6ifname/ipv6ifname.cpp (modified) (1 diff)
• unix/iwmmxt/iwmmxt.cpp (modified) (1 diff)
• unix/javascriptcore-jit/hwcap_test.cpp (modified) (1 diff)
• unix/largefile (deleted)
• unix/libjpeg/libjpeg.cpp (modified) (1 diff)
• unix/libmng/libmng.cpp (modified) (1 diff)
• unix/libpng/libpng.cpp (modified) (1 diff)
• unix/libtiff/libtiff.cpp (modified) (1 diff)
• unix/mmx/mmx.cpp (modified) (1 diff)
• unix/mremap/mremap.cpp (modified) (1 diff)
• unix/mysql/mysql.cpp (modified) (1 diff)
• unix/neon/neon.cpp (modified) (1 diff)
• unix/nis/nis.cpp (modified) (1 diff)
• unix/oci/oci.cpp (modified) (1 diff)
• unix/odbc/odbc.cpp (modified) (2 diffs)
• unix/odbc/odbc.pro (modified) (1 diff)
• unix/opengles1/opengles1.cpp (modified) (1 diff)
• unix/opengles1cl (deleted)
• unix/opengles2/opengles2.cpp (modified) (1 diff)
• unix/openssl/openssl.cpp (modified) (1 diff)
• unix/openvg/openvg.cpp (modified) (1 diff)
• unix/psql/psql.cpp (modified) (1 diff)
• unix/psql/psql.pro (modified) (1 diff)
• unix/ptrsize.test (modified) (1 diff)
• unix/ptrsize/ptrsizetest.cpp (modified) (1 diff)
• unix/pulseaudio (added)
• unix/pulseaudio/pulseaudio.cpp (added)
• unix/pulseaudio/pulseaudio.pro (added)
• unix/shivavg/shivavg.cpp (modified) (1 diff)
• unix/sqlite/sqlite.cpp (modified) (1 diff)
• unix/sqlite2/sqlite2.cpp (modified) (1 diff)
• unix/sse/sse.cpp (modified) (1 diff)
• unix/sse2/sse2.cpp (modified) (1 diff)
• unix/sse3 (added)
• unix/sse3/sse3.cpp (added)
• unix/sse3/sse3.pro (added)
• unix/sse4_1 (added)
• unix/sse4_1/sse4_1.cpp (added)
• unix/sse4_1/sse4_1.pro (added)
• unix/sse4_2 (added)
• unix/sse4_2/sse4_2.cpp (added)
• unix/sse4_2/sse4_2.pro (added)
• unix/ssse3 (added)
• unix/ssse3/ssse3.cpp (added)
• unix/ssse3/ssse3.pro (added)
• unix/stdint/main.cpp (modified) (1 diff)
• unix/stl/stltest.cpp (modified) (2 diffs)
• unix/sun-libiconv (added)
• unix/sun-libiconv/sun-libiconv.pro (added)
• unix/tds/tds.cpp (modified) (1 diff)
• unix/tslib/tslib.cpp (modified) (1 diff)
• unix/zlib/zlib.cpp (modified) (1 diff)
• x11/fontconfig/fontconfig.cpp (modified) (1 diff)
• x11/glxfbconfig/glxfbconfig.cpp (modified) (1 diff)
• x11/mitshm/mitshm.cpp (modified) (1 diff)
• x11/notype.test (modified) (1 diff)
• x11/notype/notypetest.cpp (modified) (1 diff)
• x11/opengl/opengl.cpp (modified) (1 diff)
• x11/opengl/opengl.pro (modified) (1 diff)
• x11/sm/sm.cpp (modified) (1 diff)
• x11/xcursor/xcursor.cpp (modified) (1 diff)
• x11/xfixes/xfixes.cpp (modified) (1 diff)
• x11/xinerama/xinerama.cpp (modified) (1 diff)
• x11/xinput/xinput.cpp (modified) (1 diff)
• x11/xkb/xkb.cpp (modified) (1 diff)
• x11/xlib/xlib.cpp (modified) (1 diff)
• x11/xrandr/xrandr.cpp (modified) (1 diff)
• x11/xrender/xrender.cpp (modified) (1 diff)
• x11/xshape/xshape.cpp (modified) (1 diff)
• x11/xsync/xsync.cpp (modified) (1 diff)
• x11/xvideo (added)
• x11/xvideo/xvideo.cpp (added)
• x11/xvideo/xvideo.pro (added)

branches/vendor/nokia/qt/current/config.tests/mac/crc.test

@@ -54 +54 @@
 
 $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" "$SRCDIR/$TEST/$EXE.pro" -o "$OUTDIR/$TEST/Makefile"
 
 if [ "$VERBOSE" = "yes" ]; then

branches/vendor/nokia/qt/current/config.tests/mac/crc/main.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/config.tests/mac/xcodeversion.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/config.tests/qws/ahi/ahi.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/config.tests/qws/directfb/directfb.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/config.tests/qws/sound/sound.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/config.tests/qws/svgalib/svgalib.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/config.tests/unix/3dnow/3dnow.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/config.tests/unix/alsa/alsatest.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/config.tests/unix/bsymbolic_functions.test

@@ -5 +5 @@
 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
+ -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
 

branches/vendor/nokia/qt/current/config.tests/unix/clock-gettime/clock-gettime.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/config.tests/unix/clock-monotonic/clock-monotonic.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/config.tests/unix/compile.test

@@ -66 +66 @@
 
 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" "$SRCDIR/$TEST/$EXE.pro" -o "$OUTDIR/$TEST/Makefile"
+"$OUTDIR/bin/qmake" -nocache -spec "$QMKSPEC" "CONFIG+=$QMAKE_CONFIG" "" "$SRCDIR/$TEST/$EXE.pro" -o "$OUTDIR/$TEST/Makefile"
 
 if [ "$VERBOSE" = "yes" ]; then
@@ -75 +77 @@
 fi
 
-[ -x "$EXE" ] && SUCCESS=yes
+ && SUCCESS=yes
 
 # done

branches/vendor/nokia/qt/current/config.tests/unix/cups/cups.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/config.tests/unix/db2/db2.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/config.tests/unix/dbus/dbus.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/config.tests/unix/doubleformat.test

@@ -11 +11 @@
 # 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" "$SRCDIR/config.tests/unix/doubleformat/doubleformattest.pro" -o "$OUTDIR/config.tests/unix/doubleformat/Makefile" >/dev/null 2>&1
 cd "$OUTDIR/config.tests/unix/doubleformat"
 

branches/vendor/nokia/qt/current/config.tests/unix/doubleformat/doubleformattest.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])
@@ -45 +45 @@
 BE: strings | grep DCBA3210DCBA3210
 
-LE arm-swaped-dword-order: strings | grep ABCD0123ABCD0123
-BE arm-swaped-dword-order: strings | grep 3210DCBA3210DCBA (untested)
+LE arm-swaped-dword-order: strings | grep ABCD0123ABCD0123
+BE arm-swaped-dword-order: strings | grep 3210DCBA3210DCBA (untested)
 
 tested on x86, arm-le (gp), aix

branches/vendor/nokia/qt/current/config.tests/unix/egl/egl.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/config.tests/unix/egl4gles1/egl4gles1.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/config.tests/unix/endian.test

@@ -11 +11 @@
 # 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" "$SRCDIR/config.tests/unix/endian/endiantest.pro" -o "$OUTDIR/config.tests/unix/endian/Makefile" >/dev/null 2>&1
 cd "$OUTDIR/config.tests/unix/endian"
 

branches/vendor/nokia/qt/current/config.tests/unix/endian/endiantest.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/config.tests/unix/floatmath/floatmath.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/config.tests/unix/freetype/freetype.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/config.tests/unix/fvisibility.test

@@ -5 +5 @@
 VERBOSE=$2
 
+
+
+
 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  fvisibility.c && FVISIBILITY_SUPPORT=yes
     else
-        "$COMPILER" -c -fvisibility=hidden fvisibility.c >/dev/null 2>&1 && FVISIBILITY_SUPPORT=yes
+        "$COMPILER" -c  fvisibility.c >/dev/null 2>&1 && FVISIBILITY_SUPPORT=yes
     fi
     rm -f fvisibility.c fvisibility.o
 }
 
+
 case "$COMPILER" in
+
+
+
+
+
 aCC*)
     ;;
@@ -35 +51 @@
     *)
         # the compile test works for the intel compiler because it mimics gcc's behavior
+
         RunCompileTest
         ;;
@@ -40 +57 @@
     ;;
 
-    *)
-    RunCompileTest
-    ;;
+CC)
+   # This should be SunStudio.  If not, it'll get caught.
+   CMDLINE="-xldscope=hidden"
+   RunCompileTest
+   ;;
 esac
 

branches/vendor/nokia/qt/current/config.tests/unix/getaddrinfo/getaddrinfotest.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])
@@ -43 +43 @@
      platform. we check for all structures and functions required. */
 
+
+
+
+
+
+
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netdb.h>
+
 
 int main()

branches/vendor/nokia/qt/current/config.tests/unix/getifaddrs/getifaddrs.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/config.tests/unix/glib/glib.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/config.tests/unix/gnu-libiconv/gnu-libiconv.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/config.tests/unix/gstreamer/gstreamer.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/config.tests/unix/ibase/ibase.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/config.tests/unix/iconv/iconv.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/config.tests/unix/iconv/iconv.pro

@@ -1 +1 @@
 SOURCES = iconv.cpp
 CONFIG -= qt dylib app_bundle
-mac:LIBS += -liconv
+mac:LIBS += -liconv

branches/vendor/nokia/qt/current/config.tests/unix/inotify/inotifytest.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/config.tests/unix/iodbc/iodbc.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/config.tests/unix/ipv6/ipv6test.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])
@@ -47 +47 @@
 #endif
 
+
+
+
+
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
+
 
 int main()

branches/vendor/nokia/qt/current/config.tests/unix/ipv6ifname/ipv6ifname.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/config.tests/unix/iwmmxt/iwmmxt.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/config.tests/unix/javascriptcore-jit/hwcap_test.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/config.tests/unix/libjpeg/libjpeg.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/config.tests/unix/libmng/libmng.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/config.tests/unix/libpng/libpng.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/config.tests/unix/libtiff/libtiff.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/config.tests/unix/mmx/mmx.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/config.tests/unix/mremap/mremap.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/config.tests/unix/mysql/mysql.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/config.tests/unix/neon/neon.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/config.tests/unix/nis/nis.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/config.tests/unix/oci/oci.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/config.tests/unix/odbc/odbc.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])
@@ -40 +40 @@
 ****************************************************************************/
 
+
+
+
 #include <sql.h>
 #include <sqlext.h>

branches/vendor/nokia/qt/current/config.tests/unix/odbc/odbc.pro

@@ -2 +2 @@
 CONFIG -= qt dylib
 mac:CONFIG -= app_bundle
-LIBS += -lodbc
+win32-g++*:LIBS += -lodbc32
+else:LIBS += -lodbc

branches/vendor/nokia/qt/current/config.tests/unix/opengles1/opengles1.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/config.tests/unix/opengles2/opengles2.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/config.tests/unix/openssl/openssl.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/config.tests/unix/openvg/openvg.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/config.tests/unix/psql/psql.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/config.tests/unix/psql/psql.pro

@@ -2 +2 @@
 CONFIG -= qt dylib
 mac:CONFIG -= app_bundle
-LIBS += -lpq
+LIBS = -lpq

branches/vendor/nokia/qt/current/config.tests/unix/ptrsize.test

@@ -11 +11 @@
 # 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" "$SRCDIR/config.tests/unix/ptrsize/ptrsizetest.pro" -o "$OUTDIR/config.tests/unix/ptrsize/Makefile" >/dev/null 2>&1
 cd "$OUTDIR/config.tests/unix/ptrsize"
 

branches/vendor/nokia/qt/current/config.tests/unix/ptrsize/ptrsizetest.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/config.tests/unix/shivavg/shivavg.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/config.tests/unix/sqlite/sqlite.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/config.tests/unix/sqlite2/sqlite2.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/config.tests/unix/sse/sse.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/config.tests/unix/sse2/sse2.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/config.tests/unix/stdint/main.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/config.tests/unix/stl/stltest.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])
@@ -70 +70 @@
         T *i;
         typedef std::random_access_iterator_tag  iterator_category;
-        typedef ptrdiff_t difference_type;
+        typedef ptrdiff_t difference_type;
         typedef T value_type;
         typedef T *pointer;

branches/vendor/nokia/qt/current/config.tests/unix/tds/tds.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/config.tests/unix/tslib/tslib.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/config.tests/unix/zlib/zlib.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/config.tests/x11/fontconfig/fontconfig.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/config.tests/x11/glxfbconfig/glxfbconfig.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/config.tests/x11/mitshm/mitshm.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/config.tests/x11/notype.test

@@ -28 +28 @@
 
     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" "$SRCDIR/config.tests/x11/notype/notypetest.pro" -o "$OUTDIR/config.tests/x11/notype/Makefile" >/dev/null 2>&1
     cd "$OUTDIR/config.tests/x11/notype"
 

branches/vendor/nokia/qt/current/config.tests/x11/notype/notypetest.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/config.tests/x11/opengl/opengl.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/config.tests/x11/opengl/opengl.pro

@@ -8 +8 @@
 
 CONFIG -= qt
-LIBS += -lGL -lGLU
+win32-g++*:LIBS += -lopengl32
+else:LIBS += -lGL -lGLU

branches/vendor/nokia/qt/current/config.tests/x11/sm/sm.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/config.tests/x11/xcursor/xcursor.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/config.tests/x11/xfixes/xfixes.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/config.tests/x11/xinerama/xinerama.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/config.tests/x11/xinput/xinput.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/config.tests/x11/xkb/xkb.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/config.tests/x11/xlib/xlib.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/config.tests/x11/xrandr/xrandr.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/config.tests/x11/xrender/xrender.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/config.tests/x11/xshape/xshape.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/config.tests/x11/xsync/xsync.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])