Merge branch '4.5' into 4.6

Conflicts:
	config.tests/unix/opengles2/opengles2.cpp
	tests/auto/linguist/lupdate/testdata/recursivescan/bar.ts.result
	tests/auto/linguist/lupdate/testdata/recursivescan/foo.ts.result
	tests/auto/linguist/lupdate/testdata/recursivescan/project.ui
	tests/auto/linguist/lupdate/testdata/recursivescan/sub/finddialog.cpp
	tests/auto/windowsmobile/test/ddhelper.cpp
	tests/auto/windowsmobile/testQMenuBar/main.cpp
	tests/auto/xmlpatternsxqts/lib/ASTItem.cpp
	tests/auto/xmlpatternsxqts/lib/DebugExpressionFactory.cpp
	tests/auto/xmlpatternsxqts/lib/ErrorHandler.cpp
	tests/auto/xmlpatternsxqts/lib/ErrorItem.cpp
	tests/auto/xmlpatternsxqts/lib/ExpressionInfo.cpp
	tests/auto/xmlpatternsxqts/lib/ExpressionNamer.cpp
	tests/auto/xmlpatternsxqts/lib/ExternalSourceLoader.cpp
	tests/auto/xmlpatternsxqts/lib/Global.cpp
	tests/auto/xmlpatternsxqts/lib/ResultThreader.cpp
	tests/auto/xmlpatternsxqts/lib/TestBaseLine.cpp
	tests/auto/xmlpatternsxqts/lib/TestCase.cpp
	tests/auto/xmlpatternsxqts/lib/TestContainer.cpp
	tests/auto/xmlpatternsxqts/lib/TestGroup.cpp
	tests/auto/xmlpatternsxqts/lib/TestResult.cpp
	tests/auto/xmlpatternsxqts/lib/TestResultHandler.cpp
	tests/auto/xmlpatternsxqts/lib/TestSuite.cpp
	tests/auto/xmlpatternsxqts/lib/TestSuiteHandler.cpp
	tests/auto/xmlpatternsxqts/lib/TestSuiteResult.cpp
	tests/auto/xmlpatternsxqts/lib/TreeItem.cpp
	tests/auto/xmlpatternsxqts/lib/TreeModel.cpp
	tests/auto/xmlpatternsxqts/lib/Worker.cpp
	tests/auto/xmlpatternsxqts/lib/XMLWriter.cpp
	tests/auto/xmlpatternsxqts/lib/XQTSTestCase.cpp
	tests/auto/xmlpatternsxqts/lib/XSLTTestSuiteHandler.cpp
	tests/benchmarks/qgraphicswidget/tst_qgraphicswidget.cpp
	tools/linguist/tests/data/main.cpp
	tools/linguist/tests/tst_linguist.cpp
	tools/linguist/tests/tst_lupdate.cpp
	tools/linguist/tests/tst_simtexth.cpp
	util/qlalr/examples/dummy-xml/ll/dummy-xml-ll.cpp
	util/qlalr/examples/lambda/main.cpp
	util/qlalr/examples/qparser/qparser.cpp

1 files changed, 41 insertions, 0 deletions

diff --git a/config.tests/x11/mitshm/mitshm.cpp b/config.tests/x11/mitshm/mitshm.cpp
index b9be2e0..812c8cc 100644
--- a/config.tests/x11/mitshm/mitshm.cpp
+++ b/config.tests/x11/mitshm/mitshm.cpp
@@ -1,3 +1,44 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the config.tests of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at http://qt.nokia.com/contact.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
 #ifdef Q_OS_HPUX
 #error "MITSHM not supported on HP-UX."
 #else