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

3 files changed, 3 insertions, 4 deletions

diff --git a/util/qlalr/examples/dummy-xml/ll/dummy-xml-ll.cpp b/util/qlalr/examples/dummy-xml/ll/dummy-xml-ll.cpp
index b60e7e2..56f0e4f 100644
--- a/util/qlalr/examples/dummy-xml/ll/dummy-xml-ll.cpp
+++ b/util/qlalr/examples/dummy-xml/ll/dummy-xml-ll.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the test suite module of the Qt Toolkit.
+** This file is part of the QLALR module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
diff --git a/util/qlalr/examples/lambda/main.cpp b/util/qlalr/examples/lambda/main.cpp
index bfae333..1e0adb4 100644
--- a/util/qlalr/examples/lambda/main.cpp
+++ b/util/qlalr/examples/lambda/main.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the test suite module of the Qt Toolkit.
+** This file is part of the QLALR module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
@@ -41,7 +41,6 @@
 
 #include "lambda.h"
 
-
 #include <cstdio>
 #include <cstdlib>
 #include <cstring>
diff --git a/util/qlalr/examples/qparser/qparser.cpp b/util/qlalr/examples/qparser/qparser.cpp
index 4e58e14..30b5b0a 100644
--- a/util/qlalr/examples/qparser/qparser.cpp
+++ b/util/qlalr/examples/qparser/qparser.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the utils module of the Qt Toolkit.
+** This file is part of the QLALR module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage