summaryrefslogtreecommitdiffstats
path: root/tools/linguist
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@nokia.com>2009-08-28 09:40:53 (GMT)
committerThiago Macieira <thiago.macieira@nokia.com>2009-08-28 09:40:53 (GMT)
commitc065a7e1d26dc434cfe33177332473797db74152 (patch)
tree1aeac068c7e7aad86b5edf9dc49cdfb5eaa08d4c /tools/linguist
parent2d668d870d4acd90e0ee4ff27e65e92fd311ce22 (diff)
parent802d8c02eaa0aa9cd8d0c6cbd18cd814e6337bc6 (diff)
downloadQt-c065a7e1d26dc434cfe33177332473797db74152.zip
Qt-c065a7e1d26dc434cfe33177332473797db74152.tar.gz
Qt-c065a7e1d26dc434cfe33177332473797db74152.tar.bz2
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
Diffstat (limited to 'tools/linguist')
-rw-r--r--tools/linguist/tests/data/main.cpp2
-rw-r--r--tools/linguist/tests/tst_linguist.cpp2
-rw-r--r--tools/linguist/tests/tst_lupdate.cpp2
-rw-r--r--tools/linguist/tests/tst_simtexth.cpp2
4 files changed, 4 insertions, 4 deletions
diff --git a/tools/linguist/tests/data/main.cpp b/tools/linguist/tests/data/main.cpp
index 6e09e3e..59c3075 100644
--- a/tools/linguist/tests/data/main.cpp
+++ b/tools/linguist/tests/data/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 test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** No Commercial Usage
diff --git a/tools/linguist/tests/tst_linguist.cpp b/tools/linguist/tests/tst_linguist.cpp
index c3f4eb6..5961db2 100644
--- a/tools/linguist/tests/tst_linguist.cpp
+++ b/tools/linguist/tests/tst_linguist.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 test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** No Commercial Usage
diff --git a/tools/linguist/tests/tst_lupdate.cpp b/tools/linguist/tests/tst_lupdate.cpp
index 4114bf9..9ef00b3 100644
--- a/tools/linguist/tests/tst_lupdate.cpp
+++ b/tools/linguist/tests/tst_lupdate.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 QtXmlPatterns module of the Qt Toolkit.
+** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** No Commercial Usage
diff --git a/tools/linguist/tests/tst_simtexth.cpp b/tools/linguist/tests/tst_simtexth.cpp
index b71896c..b332bb1 100644
--- a/tools/linguist/tests/tst_simtexth.cpp
+++ b/tools/linguist/tests/tst_simtexth.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 test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** No Commercial Usage