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

branches/vendor/nokia/qt/current/config.tests/mac/corewlan/corewlan.pro

r844	r1156
1		SOURCES = corewlantest.mm
	1	SOURCES = corewlantest.mm
2	2	LIBS += -framework CoreWLAN -framework Foundation
3	3	CONFIG -= app_bundle qt

branches/vendor/nokia/qt/current/config.tests/mac/corewlan/corewlantest.mm

-              r844
+              r1156
 /****************************************************************************
 **
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
 **
 ** 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
+** Commercial Usage
+** Licensees holding valid  licenses may use this file in
+** accordance with the greement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
 **
 ** GNU Lesser General Public License Usage
 …
 ** 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
+** In addition, as a special exception, ia gives you certain additional
+** rights.  These rights are described in the ia Qt LGPL Exception
 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
+** If you have questions regarding the use of this file, please contact
+** Nokia at [email protected].
+**
 ** $QT_END_LICENSE$
 **

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

-              r844
+              r1156
 INCLUDEPATH=""
 CXXFLAGS=""
 while [ "$#" -gt 0 ]; do
     PARAM=$1
 …
     -framework)
         LFLAGS="$LFLAGS -framework \"$2\""
         shift
         ;;
 …
 $MAKE distclean >/dev/null 2>&1
 "$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"
+"$OUTDIR/bin/qmake" -nocache -spec "$QMKSPEC" "CONFIG+=$QMAKE_CONFIG" "LIBS*=$LFLAGS" "CXXFLAGS" "QT_BUILD_TREE=$OUTDIR" "$SRCDIR/$TEST/$EXE.pro" -o "$OUTDIR/$TEST/Makefile"
 if [ "$VERBOSE" = "yes" ]; then

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

-              r844
+              r1156
 /****************************************************************************
 **
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
 **
 ** 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
+** Commercial Usage
+** Licensees holding valid  licenses may use this file in
+** accordance with the greement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
 **
 ** GNU Lesser General Public License Usage
 …
 ** 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
+** In addition, as a special exception, ia gives you certain additional
+** rights.  These rights are described in the ia Qt LGPL Exception
 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
+** If you have questions regarding the use of this file, please contact
+** Nokia at [email protected].
+**
 ** $QT_END_LICENSE$
 **

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

-              r2
+              r1156
 WORKDIR=$3
 touch dwarf2.c
 if "$COMPILER" -c dwarf2.c -Werror -gdwarf-2 2>/dev/null 1>&2; then
     if "$COMPILER" -c dwarf2.c -Werror -gdwarf-2  2>&1 | grep "unsupported" >/dev/null ; then
+if "$COMPILER" -c dwarf2.c -Werror -gdwarf-2 2>/dev/null 1>&2; then
+    if "$COMPILER" -c dwarf2.c -Werror -gdwarf-2  2>&1 | grep "unsupported" >/dev/null ; then
         true
     else
 …
 # Test for xcode 2.4.0, which has a broken implementation of DWARF
 "$COMPILER" $WORKDIR/xcodeversion.cpp -o xcodeversion -framework Carbon;
+"$COMPILER" $WORKDIR/xcodeversion.cpp -o xcodeversion -framework Carbon;
 ./xcodeversion

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

-              r844
+              r1156
 /****************************************************************************
 **
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
 **
 ** 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
+** Commercial Usage
+** Licensees holding valid  licenses may use this file in
+** accordance with the greement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
 **
 ** GNU Lesser General Public License Usage
 …
 ** 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
+** In addition, as a special exception, ia gives you certain additional
+** rights.  These rights are described in the ia Qt LGPL Exception
 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
+** If you have questions regarding the use of this file, please contact
+** Nokia at [email protected].
+**
 ** $QT_END_LICENSE$
 **
 …
 //    ptr = fail1;
 //    printf ("string: %s\n", ptr);
     int length = strlen(ptr);
     if (length < 3) // expect "x.y" at least
 …
     if (ptr[4] < '1')
         return fail;
     return success;
+}

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

-              r844
+              r1156
 /****************************************************************************
 **
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
 **
 ** 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
+** Commercial Usage
+** Licensees holding valid  licenses may use this file in
+** accordance with the greement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
 **
 ** GNU Lesser General Public License Usage
 …
 ** 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
+** In addition, as a special exception, ia gives you certain additional
+** rights.  These rights are described in the ia Qt LGPL Exception
 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
+** If you have questions regarding the use of this file, please contact
+** Nokia at [email protected].
+**
 ** $QT_END_LICENSE$
 **

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

-              r844
+              r1156
 /****************************************************************************
 **
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
 **
 ** 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
+** Commercial Usage
+** Licensees holding valid  licenses may use this file in
+** accordance with the greement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
 **
 ** GNU Lesser General Public License Usage
 …
 ** 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
+** In addition, as a special exception, ia gives you certain additional
+** rights.  These rights are described in the ia Qt LGPL Exception
 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
+** If you have questions regarding the use of this file, please contact
+** Nokia at [email protected].
+**
 ** $QT_END_LICENSE$
 **

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

-              r844
+              r1156
 /****************************************************************************
 **
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
 **
 ** 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
+** Commercial Usage
+** Licensees holding valid  licenses may use this file in
+** accordance with the greement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
 **
 ** GNU Lesser General Public License Usage
 …
 ** 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
+** In addition, as a special exception, ia gives you certain additional
+** rights.  These rights are described in the ia Qt LGPL Exception
 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
+** If you have questions regarding the use of this file, please contact
+** Nokia at [email protected].
+**
 ** $QT_END_LICENSE$
 **

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

-              r844
+              r1156
 /****************************************************************************
 **
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
 **
 ** 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
+** Commercial Usage
+** Licensees holding valid  licenses may use this file in
+** accordance with the greement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
 **
 ** GNU Lesser General Public License Usage
 …
 ** 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
+** In addition, as a special exception, ia gives you certain additional
+** rights.  These rights are described in the ia Qt LGPL Exception
 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
+** If you have questions regarding the use of this file, please contact
+** Nokia at [email protected].
+**
 ** $QT_END_LICENSE$
 **

branches/vendor/nokia/qt/current/config.tests/symbian/audio/audio.cpp

-              r844
+              r1156
 /****************************************************************************
 **
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
 **
 ** 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
+** Commercial Usage
+** Licensees holding valid  licenses may use this file in
+** accordance with the greement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
 **
 ** GNU Lesser General Public License Usage
 …
 ** 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
+** In addition, as a special exception, ia gives you certain additional
+** rights.  These rights are described in the ia Qt LGPL Exception
 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
+** If you have questions regarding the use of this file, please contact
+** Nokia at [email protected].
+**
 ** $QT_END_LICENSE$
 **

branches/vendor/nokia/qt/current/config.tests/symbian/simple/main.cpp

-              r844
+              r1156
 /****************************************************************************
 **
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
 **
 ** 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
+** Commercial Usage
+** Licensees holding valid  licenses may use this file in
+** accordance with the greement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
 **
 ** GNU Lesser General Public License Usage
 …
 ** 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
+** In addition, as a special exception, ia gives you certain additional
+** rights.  These rights are described in the ia Qt LGPL Exception
 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
+** If you have questions regarding the use of this file, please contact
+** Nokia at [email protected].
+**
 ** $QT_END_LICENSE$
 **

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

-              r844
+              r1156
 /****************************************************************************
 **
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
 **
 ** 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
+** Commercial Usage
+** Licensees holding valid  licenses may use this file in
+** accordance with the greement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
 **
 ** GNU Lesser General Public License Usage
 …
 ** 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
+** In addition, as a special exception, ia gives you certain additional
+** rights.  These rights are described in the ia Qt LGPL Exception
 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
+** If you have questions regarding the use of this file, please contact
+** Nokia at [email protected].
+**
 ** $QT_END_LICENSE$
 **

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

-              r844
+              r1156
 /****************************************************************************
 **
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the documentation 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
+** Commercial Usage
+** Licensees holding valid  licenses may use this file in
+** accordance with the greement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
 **
 ** GNU Lesser General Public License Usage
 …
 ** 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
+** In addition, as a special exception, ia gives you certain additional
+** rights.  These rights are described in the ia Qt LGPL Exception
 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
+** If you have questions regarding the use of this file, please contact
+** Nokia at [email protected].
+**
 ** $QT_END_LICENSE$
 **

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

-              r844
+              r1156
 /****************************************************************************
 **
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
 **
 ** 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
+** Commercial Usage
+** Licensees holding valid  licenses may use this file in
+** accordance with the greement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
 **
 ** GNU Lesser General Public License Usage
 …
 ** 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
+** In addition, as a special exception, ia gives you certain additional
+** rights.  These rights are described in the ia Qt LGPL Exception
 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
+** If you have questions regarding the use of this file, please contact
+** Nokia at [email protected].
+**
 ** $QT_END_LICENSE$
 **

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

-              r844
+              r1156
 /****************************************************************************
 **
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
 **
 ** 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
+** Commercial Usage
+** Licensees holding valid  licenses may use this file in
+** accordance with the greement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
 **
 ** GNU Lesser General Public License Usage
 …
 ** 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
+** In addition, as a special exception, ia gives you certain additional
+** rights.  These rights are described in the ia Qt LGPL Exception
 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
+** If you have questions regarding the use of this file, please contact
+** Nokia at [email protected].
+**
 ** $QT_END_LICENSE$
 **

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

-              r844
+              r1156
 /****************************************************************************
 **
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
 **
 ** 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
+** Commercial Usage
+** Licensees holding valid  licenses may use this file in
+** accordance with the greement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
 **
 ** GNU Lesser General Public License Usage
 …
 ** 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
+** In addition, as a special exception, ia gives you certain additional
+** rights.  These rights are described in the ia Qt LGPL Exception
 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
+** If you have questions regarding the use of this file, please contact
+** Nokia at [email protected].
+**
 ** $QT_END_LICENSE$
 **

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

-              r844
+              r1156
 DESCRIPTION=$7
 shift 7
 LFLAGS=""
+LFLAGS=""
 INCLUDEPATH=""
 CXXFLAGS=""
+CXXFLAGS=""
 MAC_ARCH_CXXFLAGS=""
 MAC_ARCH_LFLAGS=""
 …
     PARAM=$1
     case $PARAM in
     -framework)
         LFLAGS="$LFLAGS -framework \"$2\""
 …
 rm -f "$EXE" "${EXE}.exe"
+"$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"
+echo "QT_BUILD_TREE = $OUTDIR" > "$OUTDIR/$TEST/.qmake.cache"
+"$OUTDIR/bin/qmake" -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" "$SRCDIR/$TEST/$EXE.pro" -o "$OUTDIR/$TEST/Makefile"
 if [ "$VERBOSE" = "yes" ]; then

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

-              r844
+              r1156
 /****************************************************************************
 **
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
 **
 ** 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
+** Commercial Usage
+** Licensees holding valid  licenses may use this file in
+** accordance with the greement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
 **
 ** GNU Lesser General Public License Usage
 …
 ** 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
+** In addition, as a special exception, ia gives you certain additional
+** rights.  These rights are described in the ia Qt LGPL Exception
 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
+** If you have questions regarding the use of this file, please contact
+** Nokia at [email protected].
+**
 ** $QT_END_LICENSE$
 **

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

-              r844
+              r1156
 /****************************************************************************
 **
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
 **
 ** 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
+** Commercial Usage
+** Licensees holding valid  licenses may use this file in
+** accordance with the greement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
 **
 ** GNU Lesser General Public License Usage
 …
 ** 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
+** In addition, as a special exception, ia gives you certain additional
+** rights.  These rights are described in the ia Qt LGPL Exception
 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
+** If you have questions regarding the use of this file, please contact
+** Nokia at [email protected].
+**
 ** $QT_END_LICENSE$
 **

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

-              r844
+              r1156
 /****************************************************************************
 **
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
 **
 ** 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
+** Commercial Usage
+** Licensees holding valid  licenses may use this file in
+** accordance with the greement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
 **
 ** GNU Lesser General Public License Usage
 …
 ** 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
+** In addition, as a special exception, ia gives you certain additional
+** rights.  These rights are described in the ia Qt LGPL Exception
 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
+** If you have questions regarding the use of this file, please contact
+** Nokia at [email protected].
+**
 ** $QT_END_LICENSE$
 **

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

-              r844
+              r1156
 /****************************************************************************
 **
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
 **
 ** 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
+** Commercial Usage
+** Licensees holding valid  licenses may use this file in
+** accordance with the greement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
 **
 ** GNU Lesser General Public License Usage
 …
 ** 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
+** In addition, as a special exception, ia gives you certain additional
+** rights.  These rights are described in the ia Qt LGPL Exception
 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
+** If you have questions regarding the use of this file, please contact
+** Nokia at [email protected].
+**
 ** $QT_END_LICENSE$
 **
 …
 // equals static char c [] = "0123ABCD0123ABCD\0\0\0\0\0\0\0"
 static  double d [] = { 710524581542275055616.0, 710524581542275055616.0};
+static };
 int main(int argc, char **argv)

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

-              r844
+              r1156
 /****************************************************************************
 **
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
 **
 ** 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
+** Commercial Usage
+** Licensees holding valid  licenses may use this file in
+** accordance with the greement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
 **
 ** GNU Lesser General Public License Usage
 …
 ** 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
+** In addition, as a special exception, ia gives you certain additional
+** rights.  These rights are described in the ia Qt LGPL Exception
 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
+** If you have questions regarding the use of this file, please contact
+** Nokia at [email protected].
+**
 ** $QT_END_LICENSE$
 **

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

-              r844
+              r1156
 /****************************************************************************
 **
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
 **
 ** 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
+** Commercial Usage
+** Licensees holding valid  licenses may use this file in
+** accordance with the greement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
 **
 ** GNU Lesser General Public License Usage
 …
 ** 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
+** In addition, as a special exception, ia gives you certain additional
+** rights.  These rights are described in the ia Qt LGPL Exception
 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
+** If you have questions regarding the use of this file, please contact
+** Nokia at [email protected].
+**
 ** $QT_END_LICENSE$
 **

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

-              r844
+              r1156
 SRCDIR=$3
 OUTDIR=$4
 # debuggery
 …
 # 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" "QT_BUILD_TREE=$OUTDIR" "$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"

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

-              r844
+              r1156
 /****************************************************************************
 **
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
 **
 ** 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
+** Commercial Usage
+** Licensees holding valid  licenses may use this file in
+** accordance with the greement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
 **
 ** GNU Lesser General Public License Usage
 …
 ** 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
+** In addition, as a special exception, ia gives you certain additional
+** rights.  These rights are described in the ia Qt LGPL Exception
 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
+** If you have questions regarding the use of this file, please contact
+** Nokia at [email protected].
+**
 ** $QT_END_LICENSE$
 **
 …
+{
     // make sure the linker doesn't throw away the arrays
     char *msb_bigendian_string = (char *) msb_bigendian;
     char *lsb_littleendian_string = (char *) lsb_littleendian;
     (void) msb_bigendian_string;
     (void) lsb_littleendian_string;
+    msb_bigendian;
+    lsb_littleendian;
+    (void);
+    (void);
     return msb_bigendian[1] == lsb_littleendian[1];
+}

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

-              r844
+              r1156
 /****************************************************************************
 **
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
 **
 ** 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
+** Commercial Usage
+** Licensees holding valid  licenses may use this file in
+** accordance with the greement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
 **
 ** GNU Lesser General Public License Usage
 …
 ** 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
+** In addition, as a special exception, ia gives you certain additional
+** rights.  These rights are described in the ia Qt LGPL Exception
 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
+** If you have questions regarding the use of this file, please contact
+** Nokia at [email protected].
+**
 ** $QT_END_LICENSE$
 **

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

-              r844
+              r1156
 /****************************************************************************
 **
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
 **
 ** 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
+** Commercial Usage
+** Licensees holding valid  licenses may use this file in
+** accordance with the greement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
 **
 ** GNU Lesser General Public License Usage
 …
 ** 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
+** In addition, as a special exception, ia gives you certain additional
+** rights.  These rights are described in the ia Qt LGPL Exception
 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
+** If you have questions regarding the use of this file, please contact
+** Nokia at [email protected].
+**
 ** $QT_END_LICENSE$
 **

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

-              r844
+              r1156
     if [ "$VERBOSE" = "yes" ] ; then
         "$COMPILER" -c $CMDLINE fvisibility.c && FVISIBILITY_SUPPORT=yes
+         -c $CMDLINE fvisibility.c && FVISIBILITY_SUPPORT=yes
     else
         "$COMPILER" -c $CMDLINE fvisibility.c >/dev/null 2>&1 && FVISIBILITY_SUPPORT=yes
+         -c $CMDLINE fvisibility.c >/dev/null 2>&1 && FVISIBILITY_SUPPORT=yes
     fi
     rm -f fvisibility.c fvisibility.o
 …
 case "$COMPILER" in
 *g++*|*c++*)
+*g++*|*c++*)
     CMDLINE="-fvisibility=hidden"
     RunCompileTest

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

-              r844
+              r1156
 /****************************************************************************
 **
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
 **
 ** 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
+** Commercial Usage
+** Licensees holding valid  licenses may use this file in
+** accordance with the greement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
 **
 ** GNU Lesser General Public License Usage
 …
 ** 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
+** In addition, as a special exception, ia gives you certain additional
+** rights.  These rights are described in the ia Qt LGPL Exception
 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
+** If you have questions regarding the use of this file, please contact
+** Nokia at [email protected].
+**
 ** $QT_END_LICENSE$
 **

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

-              r844
+              r1156
 /****************************************************************************
 **
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
 **
 ** 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
+** Commercial Usage
+** Licensees holding valid  licenses may use this file in
+** accordance with the greement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
 **
 ** GNU Lesser General Public License Usage
 …
 ** 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
+** In addition, as a special exception, ia gives you certain additional
+** rights.  These rights are described in the ia Qt LGPL Exception
 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
+** If you have questions regarding the use of this file, please contact
+** Nokia at [email protected].
+**
 ** $QT_END_LICENSE$
 **

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

-              r844
+              r1156
 /****************************************************************************
 **
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
 **
 ** 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
+** Commercial Usage
+** Licensees holding valid  licenses may use this file in
+** accordance with the greement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
 **
 ** GNU Lesser General Public License Usage
 …
 ** 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
+** In addition, as a special exception, ia gives you certain additional
+** rights.  These rights are described in the ia Qt LGPL Exception
 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
+** If you have questions regarding the use of this file, please contact
+** Nokia at [email protected].
+**
 ** $QT_END_LICENSE$
 **

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

-              r844
+              r1156
 /****************************************************************************
 **
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
 **
 ** 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
+** Commercial Usage
+** Licensees holding valid  licenses may use this file in
+** accordance with the greement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
 **
 ** GNU Lesser General Public License Usage
 …
 ** 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
+** In addition, as a special exception, ia gives you certain additional
+** rights.  These rights are described in the ia Qt LGPL Exception
 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
+** If you have questions regarding the use of this file, please contact
+** Nokia at [email protected].
+**
 ** $QT_END_LICENSE$
 **

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

-              r844
+              r1156
 /****************************************************************************
 **
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
 **
 ** 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
+** Commercial Usage
+** Licensees holding valid  licenses may use this file in
+** accordance with the greement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
 **
 ** GNU Lesser General Public License Usage
 …
 ** 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
+** In addition, as a special exception, ia gives you certain additional
+** rights.  These rights are described in the ia Qt LGPL Exception
 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
+** If you have questions regarding the use of this file, please contact
+** Nokia at [email protected].
+**
 ** $QT_END_LICENSE$
 **

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

-              r844
+              r1156
 /****************************************************************************
 **
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
 **
 ** 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
+** Commercial Usage
+** Licensees holding valid  licenses may use this file in
+** accordance with the greement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
 **
 ** GNU Lesser General Public License Usage
 …
 ** 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
+** In addition, as a special exception, ia gives you certain additional
+** rights.  These rights are described in the ia Qt LGPL Exception
 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
+** If you have questions regarding the use of this file, please contact
+** Nokia at [email protected].
+**
 ** $QT_END_LICENSE$
 **

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

-              r844
+              r1156
 /****************************************************************************
 **
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
 **
 ** 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
+** Commercial Usage
+** Licensees holding valid  licenses may use this file in
+** accordance with the greement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
 **
 ** GNU Lesser General Public License Usage
 …
 ** 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
+** In addition, as a special exception, ia gives you certain additional
+** rights.  These rights are described in the ia Qt LGPL Exception
 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
+** If you have questions regarding the use of this file, please contact
+** Nokia at [email protected].
+**
 ** $QT_END_LICENSE$
 **

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

-              r844
+              r1156
 /****************************************************************************
 **
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
 **
 ** 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
+** Commercial Usage
+** Licensees holding valid  licenses may use this file in
+** accordance with the greement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
 **
 ** GNU Lesser General Public License Usage
 …
 ** 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
+** In addition, as a special exception, ia gives you certain additional
+** rights.  These rights are described in the ia Qt LGPL Exception
 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
+** If you have questions regarding the use of this file, please contact
+** Nokia at [email protected].
+**
 ** $QT_END_LICENSE$
 **

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

r844	r1156
1	1	SOURCES = iconv.cpp
2	2	CONFIG -= qt dylib app_bundle
3		mac\|win32-g++*:LIBS += -liconv
	3	mac\|win32-g++*:LIBS += -liconv

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

-              r844
+              r1156
 /****************************************************************************
 **
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
 **
 ** 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
+** Commercial Usage
+** Licensees holding valid  licenses may use this file in
+** accordance with the greement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
 **
 ** GNU Lesser General Public License Usage
 …
 ** 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
+** In addition, as a special exception, ia gives you certain additional
+** rights.  These rights are described in the ia Qt LGPL Exception
 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
+** If you have questions regarding the use of this file, please contact
+** Nokia at [email protected].
+**
 ** $QT_END_LICENSE$
 **

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

-              r844
+              r1156
 /****************************************************************************
 **
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the documentation 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
+** Commercial Usage
+** Licensees holding valid  licenses may use this file in
+** accordance with the greement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
 **
 ** GNU Lesser General Public License Usage
 …
 ** 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
+** In addition, as a special exception, ia gives you certain additional
+** rights.  These rights are described in the ia Qt LGPL Exception
 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
+** If you have questions regarding the use of this file, please contact
+** Nokia at [email protected].
+**
 ** $QT_END_LICENSE$
 **

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

-              r844
+              r1156
 /****************************************************************************
 **
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
 **
 ** 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
+** Commercial Usage
+** Licensees holding valid  licenses may use this file in
+** accordance with the greement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
 **
 ** GNU Lesser General Public License Usage
 …
 ** 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
+** In addition, as a special exception, ia gives you certain additional
+** rights.  These rights are described in the ia Qt LGPL Exception
 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
+** If you have questions regarding the use of this file, please contact
+** Nokia at [email protected].
+**
 ** $QT_END_LICENSE$
 **

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

-              r844
+              r1156
 /****************************************************************************
 **
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
 **
 ** 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
+** Commercial Usage
+** Licensees holding valid  licenses may use this file in
+** accordance with the greement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
 **
 ** GNU Lesser General Public License Usage
 …
 ** 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
+** In addition, as a special exception, ia gives you certain additional
+** rights.  These rights are described in the ia Qt LGPL Exception
 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
+** If you have questions regarding the use of this file, please contact
+** Nokia at [email protected].
+**
 ** $QT_END_LICENSE$
 **

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

-              r844
+              r1156
 /****************************************************************************
 **
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
 **
 ** 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
+** Commercial Usage
+** Licensees holding valid  licenses may use this file in
+** accordance with the greement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
 **
 ** GNU Lesser General Public License Usage
 …
 ** 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
+** In addition, as a special exception, ia gives you certain additional
+** rights.  These rights are described in the ia Qt LGPL Exception
 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
+** If you have questions regarding the use of this file, please contact
+** Nokia at [email protected].
+**
 ** $QT_END_LICENSE$
 **

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

-              r844
+              r1156
 /****************************************************************************
 **
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the documentation 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
+** Commercial Usage
+** Licensees holding valid  licenses may use this file in
+** accordance with the greement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
 **
 ** GNU Lesser General Public License Usage
 …
 ** 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
+** In addition, as a special exception, ia gives you certain additional
+** rights.  These rights are described in the ia Qt LGPL Exception
 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
+** If you have questions regarding the use of this file, please contact
+** Nokia at [email protected].
+**
 ** $QT_END_LICENSE$
 **

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

-              r844
+              r1156
 /****************************************************************************
 **
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
 **
 ** 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
+** Commercial Usage
+** Licensees holding valid  licenses may use this file in
+** accordance with the greement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
 **
 ** GNU Lesser General Public License Usage
 …
 ** 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
+** In addition, as a special exception, ia gives you certain additional
+** rights.  These rights are described in the ia Qt LGPL Exception
 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
+** If you have questions regarding the use of this file, please contact
+** Nokia at [email protected].
+**
 ** $QT_END_LICENSE$
 **

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

-              r844
+              r1156
 /****************************************************************************
 **
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
 **
 ** 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
+** Commercial Usage
+** Licensees holding valid  licenses may use this file in
+** accordance with the greement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
 **
 ** GNU Lesser General Public License Usage
 …
 ** 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
+** In addition, as a special exception, ia gives you certain additional
+** rights.  These rights are described in the ia Qt LGPL Exception
 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
+** If you have questions regarding the use of this file, please contact
+** Nokia at [email protected].
+**
 ** $QT_END_LICENSE$
 **
 …
     mng_cleanup(&hMNG);
 #if MNG_VERSION_MAJOR < 1 || (MNG_VERSION_MAJOR == 1 && MNG_VERSION_MINOR == 0 && MNG_VERSION_RELEASE < 9)
 #error System libmng version is less than 1.0.9; using built-in version instead.
 #endif

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

-              r844
+              r1156
 /****************************************************************************
 **
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
 **
 ** 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
+** Commercial Usage
+** Licensees holding valid  licenses may use this file in
+** accordance with the greement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
 **
 ** GNU Lesser General Public License Usage
 …
 ** 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
+** In addition, as a special exception, ia gives you certain additional
+** rights.  These rights are described in the ia Qt LGPL Exception
 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
+** If you have questions regarding the use of this file, please contact
+** Nokia at [email protected].
+**
 ** $QT_END_LICENSE$
 **

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

-              r844
+              r1156
 /****************************************************************************
 **
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
 **
 ** 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
+** Commercial Usage
+** Licensees holding valid  licenses may use this file in
+** accordance with the greement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
 **
 ** GNU Lesser General Public License Usage
 …
 ** 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
+** In addition, as a special exception, ia gives you certain additional
+** rights.  These rights are described in the ia Qt LGPL Exception
 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
+** If you have questions regarding the use of this file, please contact
+** Nokia at [email protected].
+**
 ** $QT_END_LICENSE$
 **

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

-              r844
+              r1156
 /****************************************************************************
 **
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
 **
 ** 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
+** Commercial Usage
+** Licensees holding valid  licenses may use this file in
+** accordance with the greement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
 **
 ** GNU Lesser General Public License Usage
 …
 ** 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
+** In addition, as a special exception, ia gives you certain additional
+** rights.  These rights are described in the ia Qt LGPL Exception
 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
+** If you have questions regarding the use of this file, please contact
+** Nokia at [email protected].
+**
 ** $QT_END_LICENSE$
 **

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

-              r844
+              r1156
 /****************************************************************************
 **
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
 **
 ** 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
+** Commercial Usage
+** Licensees holding valid  licenses may use this file in
+** accordance with the greement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
 **
 ** GNU Lesser General Public License Usage
 …
 ** 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
+** In addition, as a special exception, ia gives you certain additional
+** rights.  These rights are described in the ia Qt LGPL Exception
 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
+** If you have questions regarding the use of this file, please contact
+** Nokia at [email protected].
+**
 ** $QT_END_LICENSE$
 **

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

-              r844
+              r1156
 /****************************************************************************
 **
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
 **
 ** 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
+** Commercial Usage
+** Licensees holding valid  licenses may use this file in
+** accordance with the greement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
 **
 ** GNU Lesser General Public License Usage
 …
 ** 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
+** In addition, as a special exception, ia gives you certain additional
+** rights.  These rights are described in the ia Qt LGPL Exception
 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
+** If you have questions regarding the use of this file, please contact
+** Nokia at [email protected].
+**
 ** $QT_END_LICENSE$
 **

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

-              r844
+              r1156
 /****************************************************************************
 **
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
 **
 ** 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
+** Commercial Usage
+** Licensees holding valid  licenses may use this file in
+** accordance with the greement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
 **
 ** GNU Lesser General Public License Usage
 …
 ** 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
+** In addition, as a special exception, ia gives you certain additional
+** rights.  These rights are described in the ia Qt LGPL Exception
 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
+** If you have questions regarding the use of this file, please contact
+** Nokia at [email protected].
+**
 ** $QT_END_LICENSE$
 **

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

-              r844
+              r1156
 /****************************************************************************
 **
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
 **
 ** 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
+** Commercial Usage
+** Licensees holding valid  licenses may use this file in
+** accordance with the greement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
 **
 ** GNU Lesser General Public License Usage
 …
 ** 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
+** In addition, as a special exception, ia gives you certain additional
+** rights.  These rights are described in the ia Qt LGPL Exception
 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
+** If you have questions regarding the use of this file, please contact
+** Nokia at [email protected].
+**
 ** $QT_END_LICENSE$
 **

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

-              r844
+              r1156
 /****************************************************************************
 **
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
 **
 ** 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
+** Commercial Usage
+** Licensees holding valid  licenses may use this file in
+** accordance with the greement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
 **
 ** GNU Lesser General Public License Usage
 …
 ** 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
+** In addition, as a special exception, ia gives you certain additional
+** rights.  These rights are described in the ia Qt LGPL Exception
 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
+** If you have questions regarding the use of this file, please contact
+** Nokia at [email protected].
+**
 ** $QT_END_LICENSE$
 **

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

-              r844
+              r1156
 /****************************************************************************
 **
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
 **
 ** 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
+** Commercial Usage
+** Licensees holding valid  licenses may use this file in
+** accordance with the greement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
 **
 ** GNU Lesser General Public License Usage
 …
 ** 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
+** In addition, as a special exception, ia gives you certain additional
+** rights.  These rights are described in the ia Qt LGPL Exception
 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
+** If you have questions regarding the use of this file, please contact
+** Nokia at [email protected].
+**
 ** $QT_END_LICENSE$
 **

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

-              r844
+              r1156
 /****************************************************************************
 **
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
 **
 ** 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
+** Commercial Usage
+** Licensees holding valid  licenses may use this file in
+** accordance with the greement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
 **
 ** GNU Lesser General Public License Usage
 …
 ** 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
+** In addition, as a special exception, ia gives you certain additional
+** rights.  These rights are described in the ia Qt LGPL Exception
 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
+** If you have questions regarding the use of this file, please contact
+** Nokia at [email protected].
+**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
+#include <GLES/gl.h>
+#ifdef BUILD_ON_MAC
+  #include <OpenGLES/ES1/gl.h>
+#else
+  #include <GLES/gl.h>
+#endif
 int main(int, char **)

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

r556	r1156
8	8	CONFIG -= qt
9	9	LIBS += $$QMAKE_LIBS_OPENGL_ES1
	10
	11
	12
	13

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

-              r844
+              r1156
 /****************************************************************************
 **
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
 **
 ** 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
+** Commercial Usage
+** Licensees holding valid  licenses may use this file in
+** accordance with the greement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
 **
 ** GNU Lesser General Public License Usage
 …
 ** 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
+** In addition, as a special exception, ia gives you certain additional
+** rights.  These rights are described in the ia Qt LGPL Exception
 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
+** If you have questions regarding the use of this file, please contact
+** Nokia at [email protected].
+**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
+#include <GLES2/gl2.h>
+#ifdef BUILD_ON_MAC
+  #include <OpenGLES/ES2/gl.h>
+#else
+  #include <GLES2/gl2.h>
+#endif
 int main(int, char **)

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

r556	r1156
8	8	CONFIG -= qt
9	9	LIBS += $$QMAKE_LIBS_OPENGL_ES2
	10
	11
	12
	13

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

-              r844
+              r1156
 /****************************************************************************
 **
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
 **
 ** 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
+** Commercial Usage
+** Licensees holding valid  licenses may use this file in
+** accordance with the greement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
 **
 ** GNU Lesser General Public License Usage
 …
 ** 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
+** In addition, as a special exception, ia gives you certain additional
+** rights.  These rights are described in the ia Qt LGPL Exception
 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
+** If you have questions regarding the use of this file, please contact
+** Nokia at [email protected].
+**
 ** $QT_END_LICENSE$
 **

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

-              r844
+              r1156
 /****************************************************************************
 **
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the documentation 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
+** Commercial Usage
+** Licensees holding valid  licenses may use this file in
+** accordance with the greement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
 **
 ** GNU Lesser General Public License Usage
 …
 ** 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
+** In addition, as a special exception, ia gives you certain additional
+** rights.  These rights are described in the ia Qt LGPL Exception
 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
+** If you have questions regarding the use of this file, please contact
+** Nokia at [email protected].
+**
 ** $QT_END_LICENSE$
 **

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

r2	r1156
28	28	;;
29	29
30		g++\|c++)
	30	g++\|c++)
31	31	case `"$COMPILER" -dumpversion 2>/dev/null` in
32	32	3.*)

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

-              r844
+              r1156
 /****************************************************************************
 **
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
 **
 ** 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
+** Commercial Usage
+** Licensees holding valid  licenses may use this file in
+** accordance with the greement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
 **
 ** GNU Lesser General Public License Usage
 …
 ** 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
+** In addition, as a special exception, ia gives you certain additional
+** rights.  These rights are described in the ia Qt LGPL Exception
 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
+** If you have questions regarding the use of this file, please contact
+** Nokia at [email protected].
+**
 ** $QT_END_LICENSE$
 **

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

-              r844
+              r1156
 /****************************************************************************
 **
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
 **
 ** 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
+** Commercial Usage
+** Licensees holding valid  licenses may use this file in
+** accordance with the greement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
 **
 ** GNU Lesser General Public License Usage
 …
 ** 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
+** In addition, as a special exception, ia gives you certain additional
+** rights.  These rights are described in the ia Qt LGPL Exception
 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
+** If you have questions regarding the use of this file, please contact
+** Nokia at [email protected].
+**
 ** $QT_END_LICENSE$
 **

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

-              r844
+              r1156
 /****************************************************************************
 **
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
 **
 ** 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
+** Commercial Usage
+** Licensees holding valid  licenses may use this file in
+** accordance with the greement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
 **
 ** GNU Lesser General Public License Usage
 …
 ** 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
+** In addition, as a special exception, ia gives you certain additional
+** rights.  These rights are described in the ia Qt LGPL Exception
 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
+** If you have questions regarding the use of this file, please contact
+** Nokia at [email protected].
+**
 ** $QT_END_LICENSE$
 **

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

-              r844
+              r1156
 /****************************************************************************
 **
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
 **
 ** 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
+** Commercial Usage
+** Licensees holding valid  licenses may use this file in
+** accordance with the greement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
 **
 ** GNU Lesser General Public License Usage
 …
 ** 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
+** In addition, as a special exception, ia gives you certain additional
+** rights.  These rights are described in the ia Qt LGPL Exception
 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
+** If you have questions regarding the use of this file, please contact
+** Nokia at [email protected].
+**
 ** $QT_END_LICENSE$
 **

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

-              r844
+              r1156
 /****************************************************************************
 **
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
 **
 ** 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
+** Commercial Usage
+** Licensees holding valid  licenses may use this file in
+** accordance with the greement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
 **
 ** GNU Lesser General Public License Usage
 …
 ** 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
+** In addition, as a special exception, ia gives you certain additional
+** rights.  These rights are described in the ia Qt LGPL Exception
 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
+** If you have questions regarding the use of this file, please contact
+** Nokia at [email protected].
+**
 ** $QT_END_LICENSE$
 **

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

-              r844
+              r1156
 /****************************************************************************
 **
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
 **
 ** 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
+** Commercial Usage
+** Licensees holding valid  licenses may use this file in
+** accordance with the greement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
 **
 ** GNU Lesser General Public License Usage
 …
 ** 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
+** In addition, as a special exception, ia gives you certain additional
+** rights.  These rights are described in the ia Qt LGPL Exception
 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
+** If you have questions regarding the use of this file, please contact
+** Nokia at [email protected].
+**
 ** $QT_END_LICENSE$
 **

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

-              r844
+              r1156
 /****************************************************************************
 **
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
 **
 ** 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
+** Commercial Usage
+** Licensees holding valid  licenses may use this file in
+** accordance with the greement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
 **
 ** GNU Lesser General Public License Usage
 …
 ** 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
+** In addition, as a special exception, ia gives you certain additional
+** rights.  These rights are described in the ia Qt LGPL Exception
 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
+** If you have questions regarding the use of this file, please contact
+** Nokia at [email protected].
+**
 ** $QT_END_LICENSE$
 **

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

-              r844
+              r1156
 /****************************************************************************
 **
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
 **
 ** 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
+** Commercial Usage
+** Licensees holding valid  licenses may use this file in
+** accordance with the greement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
 **
 ** GNU Lesser General Public License Usage
 …
 ** 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
+** In addition, as a special exception, ia gives you certain additional
+** rights.  These rights are described in the ia Qt LGPL Exception
 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
+** If you have questions regarding the use of this file, please contact
+** Nokia at [email protected].
+**
 ** $QT_END_LICENSE$
 **

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

-              r844
+              r1156
 /****************************************************************************
 **
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
 **
 ** 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
+** Commercial Usage
+** Licensees holding valid  licenses may use this file in
+** accordance with the greement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
 **
 ** GNU Lesser General Public License Usage
 …
 ** 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
+** In addition, as a special exception, ia gives you certain additional
+** rights.  These rights are described in the ia Qt LGPL Exception
 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
+** If you have questions regarding the use of this file, please contact
+** Nokia at [email protected].
+**
 ** $QT_END_LICENSE$
 **

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

-              r844
+              r1156
 /****************************************************************************
 **
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
 **
 ** 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
+** Commercial Usage
+** Licensees holding valid  licenses may use this file in
+** accordance with the greement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
 **
 ** GNU Lesser General Public License Usage
 …
 ** 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
+** In addition, as a special exception, ia gives you certain additional
+** rights.  These rights are described in the ia Qt LGPL Exception
 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
+** If you have questions regarding the use of this file, please contact
+** Nokia at [email protected].
+**
 ** $QT_END_LICENSE$
 **

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

-              r844
+              r1156
 /****************************************************************************
 **
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
 **
 ** 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
+** Commercial Usage
+** Licensees holding valid  licenses may use this file in
+** accordance with the greement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
 **
 ** GNU Lesser General Public License Usage
 …
 ** 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
+** In addition, as a special exception, ia gives you certain additional
+** rights.  These rights are described in the ia Qt LGPL Exception
 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
+** If you have questions regarding the use of this file, please contact
+** Nokia at [email protected].
+**
 ** $QT_END_LICENSE$
 **

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

-              r844
+              r1156
 /****************************************************************************
 **
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
 **
 ** 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
+** Commercial Usage
+** Licensees holding valid  licenses may use this file in
+** accordance with the greement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
 **
 ** GNU Lesser General Public License Usage
 …
 ** 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
+** In addition, as a special exception, ia gives you certain additional
+** rights.  These rights are described in the ia Qt LGPL Exception
 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
+** If you have questions regarding the use of this file, please contact
+** Nokia at [email protected].
+**
 ** $QT_END_LICENSE$
 **

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

-              r844
+              r1156
 /****************************************************************************
 **
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
 **
 ** 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
+** Commercial Usage
+** Licensees holding valid  licenses may use this file in
+** accordance with the greement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
 **
 ** GNU Lesser General Public License Usage
 …
 ** 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
+** In addition, as a special exception, ia gives you certain additional
+** rights.  These rights are described in the ia Qt LGPL Exception
 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
+** If you have questions regarding the use of this file, please contact
+** Nokia at [email protected].
+**
 ** $QT_END_LICENSE$
 **

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

-              r844
+              r1156
 /****************************************************************************
 **
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
 **
 ** 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
+** Commercial Usage
+** Licensees holding valid  licenses may use this file in
+** accordance with the greement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
 **
 ** GNU Lesser General Public License Usage
 …
 ** 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
+** In addition, as a special exception, ia gives you certain additional
+** rights.  These rights are described in the ia Qt LGPL Exception
 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
+** If you have questions regarding the use of this file, please contact
+** Nokia at [email protected].
+**
 ** $QT_END_LICENSE$
 **

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

-              r844
+              r1156
 /****************************************************************************
 **
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
 **
 ** 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
+** Commercial Usage
+** Licensees holding valid  licenses may use this file in
+** accordance with the greement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
 **
 ** GNU Lesser General Public License Usage
 …
 ** 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
+** In addition, as a special exception, ia gives you certain additional
+** rights.  These rights are described in the ia Qt LGPL Exception
 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
+** If you have questions regarding the use of this file, please contact
+** Nokia at [email protected].
+**
 ** $QT_END_LICENSE$
 **

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

-              r844
+              r1156
 /****************************************************************************
 **
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
 **
 ** 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
+** Commercial Usage
+** Licensees holding valid  licenses may use this file in
+** accordance with the greement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
 **
 ** GNU Lesser General Public License Usage
 …
 ** 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
+** In addition, as a special exception, ia gives you certain additional
+** rights.  These rights are described in the ia Qt LGPL Exception
 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
+** If you have questions regarding the use of this file, please contact
+** Nokia at [email protected].
+**
 ** $QT_END_LICENSE$
 **

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

-              r844
+              r1156
 /****************************************************************************
 **
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
 **
 ** 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
+** Commercial Usage
+** Licensees holding valid  licenses may use this file in
+** accordance with the greement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
 **
 ** GNU Lesser General Public License Usage
 …
 ** 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
+** In addition, as a special exception, ia gives you certain additional
+** rights.  These rights are described in the ia Qt LGPL Exception
 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
+** If you have questions regarding the use of this file, please contact
+** Nokia at [email protected].
+**
 ** $QT_END_LICENSE$
 **

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

-              r844
+              r1156
 /****************************************************************************
 **
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
 **
 ** 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
+** Commercial Usage
+** Licensees holding valid  licenses may use this file in
+** accordance with the greement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
 **
 ** GNU Lesser General Public License Usage
 …
 ** 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
+** In addition, as a special exception, ia gives you certain additional
+** rights.  These rights are described in the ia Qt LGPL Exception
 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
+** If you have questions regarding the use of this file, please contact
+** Nokia at [email protected].
+**
 ** $QT_END_LICENSE$
 **

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

-              r844
+              r1156
 /****************************************************************************
 **
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
 **
 ** 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
+** Commercial Usage
+** Licensees holding valid  licenses may use this file in
+** accordance with the greement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
 **
 ** GNU Lesser General Public License Usage
 …
 ** 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
+** In addition, as a special exception, ia gives you certain additional
+** rights.  These rights are described in the ia Qt LGPL Exception
 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
+** If you have questions regarding the use of this file, please contact
+** Nokia at [email protected].
+**
 ** $QT_END_LICENSE$
 **

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

r2	r1156
8	8
9	9	CONFIG -= qt
10		LIBS += -lGL ~~-lGLU~~
	10	LIBS += -lGL

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

-              r844
+              r1156
 /****************************************************************************
 **
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
 **
 ** 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
+** Commercial Usage
+** Licensees holding valid  licenses may use this file in
+** accordance with the greement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
 **
 ** GNU Lesser General Public License Usage
 …
 ** 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
+** In addition, as a special exception, ia gives you certain additional
+** rights.  These rights are described in the ia Qt LGPL Exception
 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
+** If you have questions regarding the use of this file, please contact
+** Nokia at [email protected].
+**
 ** $QT_END_LICENSE$
 **

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

-              r844
+              r1156
 /****************************************************************************
 **
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
 **
 ** 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
+** Commercial Usage
+** Licensees holding valid  licenses may use this file in
+** accordance with the greement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
 **
 ** GNU Lesser General Public License Usage
 …
 ** 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
+** In addition, as a special exception, ia gives you certain additional
+** rights.  These rights are described in the ia Qt LGPL Exception
 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
+** If you have questions regarding the use of this file, please contact
+** Nokia at [email protected].
+**
 ** $QT_END_LICENSE$
 **

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

-              r844
+              r1156
 /****************************************************************************
 **
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
 **
 ** 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
+** Commercial Usage
+** Licensees holding valid  licenses may use this file in
+** accordance with the greement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
 **
 ** GNU Lesser General Public License Usage
 …
 ** 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
+** In addition, as a special exception, ia gives you certain additional
+** rights.  These rights are described in the ia Qt LGPL Exception
 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
+** If you have questions regarding the use of this file, please contact
+** Nokia at [email protected].
+**
 ** $QT_END_LICENSE$
 **
 …
 #include <GL/gl.h>
-#include <GL/glu.h>
-#ifndef GLU_VERSION_1_2
-#  error "Required GLU version 1.2 not found."
-#endif
 int main(int, char **)

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

r844	r1156
9	9	CONFIG -= qt
10	10	win32-g++*:LIBS += -lopengl32
11		else:LIBS += -lGL ~~-lGLU~~
	11	else:LIBS += -lGL

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

-              r844
+              r1156
 /****************************************************************************
 **
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
 **
 ** 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
+** Commercial Usage
+** Licensees holding valid  licenses may use this file in
+** accordance with the greement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
 **
 ** GNU Lesser General Public License Usage
 …
 ** 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
+** In addition, as a special exception, ia gives you certain additional
+** rights.  These rights are described in the ia Qt LGPL Exception
 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
+** If you have questions regarding the use of this file, please contact
+** Nokia at [email protected].
+**
 ** $QT_END_LICENSE$
 **

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

-              r844
+              r1156
 /****************************************************************************
 **
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
 **
 ** 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
+** Commercial Usage
+** Licensees holding valid  licenses may use this file in
+** accordance with the greement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
 **
 ** GNU Lesser General Public License Usage
 …
 ** 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
+** In addition, as a special exception, ia gives you certain additional
+** rights.  These rights are described in the ia Qt LGPL Exception
 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
+** If you have questions regarding the use of this file, please contact
+** Nokia at [email protected].
+**
 ** $QT_END_LICENSE$
 **

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

-              r844
+              r1156
 /****************************************************************************
 **
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
 **
 ** 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
+** Commercial Usage
+** Licensees holding valid  licenses may use this file in
+** accordance with the greement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
 **
 ** GNU Lesser General Public License Usage
 …
 ** 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
+** In addition, as a special exception, ia gives you certain additional
+** rights.  These rights are described in the ia Qt LGPL Exception
 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
+** If you have questions regarding the use of this file, please contact
+** Nokia at [email protected].
+**
 ** $QT_END_LICENSE$
 **

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

-              r844
+              r1156
 /****************************************************************************
 **
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
 **
 ** 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
+** Commercial Usage
+** Licensees holding valid  licenses may use this file in
+** accordance with the greement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
 **
 ** GNU Lesser General Public License Usage
 …
 ** 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
+** In addition, as a special exception, ia gives you certain additional
+** rights.  These rights are described in the ia Qt LGPL Exception
 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
+** If you have questions regarding the use of this file, please contact
+** Nokia at [email protected].
+**
 ** $QT_END_LICENSE$
 **

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

-              r844
+              r1156
 /****************************************************************************
 **
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
 **
 ** 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
+** Commercial Usage
+** Licensees holding valid  licenses may use this file in
+** accordance with the greement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
 **
 ** GNU Lesser General Public License Usage
 …
 ** 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
+** In addition, as a special exception, ia gives you certain additional
+** rights.  These rights are described in the ia Qt LGPL Exception
 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
+** If you have questions regarding the use of this file, please contact
+** Nokia at [email protected].
+**
 ** $QT_END_LICENSE$
 **

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

-              r844
+              r1156
 /****************************************************************************
 **
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
 **
 ** 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
+** Commercial Usage
+** Licensees holding valid  licenses may use this file in
+** accordance with the greement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
 **
 ** GNU Lesser General Public License Usage
 …
 ** 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
+** In addition, as a special exception, ia gives you certain additional
+** rights.  These rights are described in the ia Qt LGPL Exception
 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
+** If you have questions regarding the use of this file, please contact
+** Nokia at [email protected].
+**
 ** $QT_END_LICENSE$
 **

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

-              r844
+              r1156
 /****************************************************************************
 **
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
 **
 ** 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
+** Commercial Usage
+** Licensees holding valid  licenses may use this file in
+** accordance with the greement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
 **
 ** GNU Lesser General Public License Usage
 …
 ** 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
+** In addition, as a special exception, ia gives you certain additional
+** rights.  These rights are described in the ia Qt LGPL Exception
 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
+** If you have questions regarding the use of this file, please contact
+** Nokia at [email protected].
+**
 ** $QT_END_LICENSE$
 **

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

-              r844
+              r1156
 /****************************************************************************
 **
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
 **
 ** 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
+** Commercial Usage
+** Licensees holding valid  licenses may use this file in
+** accordance with the greement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
 **
 ** GNU Lesser General Public License Usage
 …
 ** 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
+** In addition, as a special exception, ia gives you certain additional
+** rights.  These rights are described in the ia Qt LGPL Exception
 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
+** If you have questions regarding the use of this file, please contact
+** Nokia at [email protected].
+**
 ** $QT_END_LICENSE$
 **

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

-              r844
+              r1156
 /****************************************************************************
 **
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
 **
 ** 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
+** Commercial Usage
+** Licensees holding valid  licenses may use this file in
+** accordance with the greement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
 **
 ** GNU Lesser General Public License Usage
 …
 ** 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
+** In addition, as a special exception, ia gives you certain additional
+** rights.  These rights are described in the ia Qt LGPL Exception
 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
+** If you have questions regarding the use of this file, please contact
+** Nokia at [email protected].
+**
 ** $QT_END_LICENSE$
 **

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

-              r844
+              r1156
 /****************************************************************************
 **
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
 **
 ** 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
+** Commercial Usage
+** Licensees holding valid  licenses may use this file in
+** accordance with the greement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
 **
 ** GNU Lesser General Public License Usage
 …
 ** 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
+** In addition, as a special exception, ia gives you certain additional
+** rights.  These rights are described in the ia Qt LGPL Exception
 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
+** If you have questions regarding the use of this file, please contact
+** Nokia at [email protected].
+**
 ** $QT_END_LICENSE$
 **

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

-              r844
+              r1156
 /****************************************************************************
 **
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
 **
 ** 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
+** Commercial Usage
+** Licensees holding valid  licenses may use this file in
+** accordance with the greement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
 **
 ** GNU Lesser General Public License Usage
 …
 ** 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
+** In addition, as a special exception, ia gives you certain additional
+** rights.  These rights are described in the ia Qt LGPL Exception
 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
+** If you have questions regarding the use of this file, please contact
+** Nokia at [email protected].
+**
 ** $QT_END_LICENSE$
 **

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

-              r844
+              r1156
 /****************************************************************************
 **
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
 **
 ** 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
+** Commercial Usage
+** Licensees holding valid  licenses may use this file in
+** accordance with the greement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
 **
 ** GNU Lesser General Public License Usage
 …
 ** 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
+** In addition, as a special exception, ia gives you certain additional
+** rights.  These rights are described in the ia Qt LGPL Exception
 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
+** If you have questions regarding the use of this file, please contact
+** Nokia at [email protected].
+**
 ** $QT_END_LICENSE$
 **

Context Navigation

Legend:

Download in other formats: