Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui

194 files changed, 6180 insertions, 2140 deletions

diff --git a/tests/arthur/lance/main.cpp b/tests/arthur/lance/main.cpp
index 8bf10eb..534e15d 100644
--- a/tests/arthur/lance/main.cpp
+++ b/tests/arthur/lance/main.cpp
@@ -380,7 +380,7 @@ int main(int argc, char **argv)
                 QString script = textFile.readAll();
                 content = script.split("\n", QString::SkipEmptyParts);
             } else {
-                printf("failed to read file: '%s'\n", qPrintable(fileName));
+                printf("failed to read file: '%s'\n", qPrintable(fileinfo.absoluteFilePath()));
                 continue;
             }
             pcmd.setContents(content);
diff --git a/tests/auto/atwrapper/scruffy.ini b/tests/auto/atwrapper/scruffy.ini
index 1a99f89..329f537 100644
--- a/tests/auto/atwrapper/scruffy.ini
+++ b/tests/auto/atwrapper/scruffy.ini
@@ -1,7 +1,7 @@
 [General]
 framework=data/framework.ini
 ftpBaseDir=/arthurtest
-ftpHost=kramer.troll.no
+ftpHost=kramer.nokia.troll.no
 ftpPass=anonymouspass
 ftpUser=anonymous
 output=testresults
diff --git a/tests/auto/gestures/customgesturerecognizer.h b/tests/auto/gestures/customgesturerecognizer.h
index 519aba8..83e85b1 100644
--- a/tests/auto/gestures/customgesturerecognizer.h
+++ b/tests/auto/gestures/customgesturerecognizer.h
@@ -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 test suite 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$
+**
+****************************************************************************/
+
 #ifndef CUSTOMGESTURERECOGNIZER_H
 #define CUSTOMGESTURERECOGNIZER_H
 
diff --git a/tests/auto/linguist/lupdate/testdata/good/backslashes/src/main.cpp b/tests/auto/linguist/lupdate/testdata/good/backslashes/src/main.cpp
index 348a6be..805e87a 100644
--- a/tests/auto/linguist/lupdate/testdata/good/backslashes/src/main.cpp
+++ b/tests/auto/linguist/lupdate/testdata/good/backslashes/src/main.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 test suite 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$
+**
+****************************************************************************/
+
 // IMPORTANT!!!! If you want to add testdata to this file,
 // always add it to the end in order to not change the linenumbers of translations!!!
 //
diff --git a/tests/auto/linguist/lupdate/testdata/good/codecforsrc/main.cpp b/tests/auto/linguist/lupdate/testdata/good/codecforsrc/main.cpp
index 2573fbb..c6275ca 100644
--- a/tests/auto/linguist/lupdate/testdata/good/codecforsrc/main.cpp
+++ b/tests/auto/linguist/lupdate/testdata/good/codecforsrc/main.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 test suite 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$
+**
+****************************************************************************/
+
 #include <QApplication>
 #include <QtGui>
 #include <QtCore>
diff --git a/tests/auto/linguist/lupdate/testdata/good/codecforsrc/project.ts.result b/tests/auto/linguist/lupdate/testdata/good/codecforsrc/project.ts.result
index e746c7e..bc0d9bb 100644
--- a/tests/auto/linguist/lupdate/testdata/good/codecforsrc/project.ts.result
+++ b/tests/auto/linguist/lupdate/testdata/good/codecforsrc/project.ts.result
@@ -5,13 +5,13 @@
 <context>
     <name>QObject</name>
     <message>
-        <location filename="main.cpp" line="10"/>
+        <location filename="main.cpp" line="51"/>
         <source>abc</source>
         <comment>ascii</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main.cpp" line="11"/>
+        <location filename="main.cpp" line="52"/>
         <source>æøå</source>
         <comment>utf-8</comment>
         <translation type="unfinished"></translation>
diff --git a/tests/auto/linguist/lupdate/testdata/good/codecfortr/main.cpp b/tests/auto/linguist/lupdate/testdata/good/codecfortr/main.cpp
index 79b0503..91b3678 100644
--- a/tests/auto/linguist/lupdate/testdata/good/codecfortr/main.cpp
+++ b/tests/auto/linguist/lupdate/testdata/good/codecfortr/main.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 test suite 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$
+**
+****************************************************************************/
+
 #include <QApplication>
 #include <QtGui>
 #include <QtCore>
diff --git a/tests/auto/linguist/lupdate/testdata/good/codecfortr/project.ts.result b/tests/auto/linguist/lupdate/testdata/good/codecfortr/project.ts.result
index 9a082ef..91da744 100644
--- a/tests/auto/linguist/lupdate/testdata/good/codecfortr/project.ts.result
+++ b/tests/auto/linguist/lupdate/testdata/good/codecfortr/project.ts.result
@@ -5,7 +5,7 @@
 <context>
     <name>QObject</name>
     <message>
-        <location filename="main.cpp" line="20"/>
+        <location filename="main.cpp" line="61"/>
         <source>Á</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/tests/auto/linguist/lupdate/testdata/good/codecfortr1/main.cpp b/tests/auto/linguist/lupdate/testdata/good/codecfortr1/main.cpp
index 91af165..daabfe1 100644
--- a/tests/auto/linguist/lupdate/testdata/good/codecfortr1/main.cpp
+++ b/tests/auto/linguist/lupdate/testdata/good/codecfortr1/main.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 test suite 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$
+**
+****************************************************************************/
+
 #include <QtCore>
 
 class FooBar : QObject
diff --git a/tests/auto/linguist/lupdate/testdata/good/codecfortr1/project.ts.result b/tests/auto/linguist/lupdate/testdata/good/codecfortr1/project.ts.result
index 5ffa2f3..26eb245 100644
--- a/tests/auto/linguist/lupdate/testdata/good/codecfortr1/project.ts.result
+++ b/tests/auto/linguist/lupdate/testdata/good/codecfortr1/project.ts.result
@@ -5,22 +5,22 @@
 <context>
     <name>FooBar</name>
     <message>
-        <location filename="main.cpp" line="10"/>
+        <location filename="main.cpp" line="51"/>
         <source>random ascii only</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main.cpp" line="11"/>
+        <location filename="main.cpp" line="52"/>
         <source>this contains an umlaut ü &amp;uuml;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main.cpp" line="12"/>
+        <location filename="main.cpp" line="53"/>
         <source>random ascii only in utf8</source>
         <translation type="unfinished"></translation>
     </message>
     <message utf8="true">
-        <location filename="main.cpp" line="13"/>
+        <location filename="main.cpp" line="54"/>
         <source>umlaut ü &amp;uuml; in utf8</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/tests/auto/linguist/lupdate/testdata/good/codecfortr2/main.cpp b/tests/auto/linguist/lupdate/testdata/good/codecfortr2/main.cpp
index 91af165..daabfe1 100644
--- a/tests/auto/linguist/lupdate/testdata/good/codecfortr2/main.cpp
+++ b/tests/auto/linguist/lupdate/testdata/good/codecfortr2/main.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 test suite 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$
+**
+****************************************************************************/
+
 #include <QtCore>
 
 class FooBar : QObject
diff --git a/tests/auto/linguist/lupdate/testdata/good/codecfortr2/project.ts.result b/tests/auto/linguist/lupdate/testdata/good/codecfortr2/project.ts.result
index 0ebdbfd..e27c157 100644
--- a/tests/auto/linguist/lupdate/testdata/good/codecfortr2/project.ts.result
+++ b/tests/auto/linguist/lupdate/testdata/good/codecfortr2/project.ts.result
@@ -5,22 +5,22 @@
 <context>
     <name>FooBar</name>
     <message>
-        <location filename="main.cpp" line="10"/>
+        <location filename="main.cpp" line="51"/>
         <source>random ascii only</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main.cpp" line="11"/>
+        <location filename="main.cpp" line="52"/>
         <source>this contains an umlaut ü &amp;uuml;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main.cpp" line="12"/>
+        <location filename="main.cpp" line="53"/>
         <source>random ascii only in utf8</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main.cpp" line="13"/>
+        <location filename="main.cpp" line="54"/>
         <source>umlaut ü &amp;uuml; in utf8</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/tests/auto/linguist/lupdate/testdata/good/lacksqobject/main.cpp b/tests/auto/linguist/lupdate/testdata/good/lacksqobject/main.cpp
index 0e42d52..d30a10e 100644
--- a/tests/auto/linguist/lupdate/testdata/good/lacksqobject/main.cpp
+++ b/tests/auto/linguist/lupdate/testdata/good/lacksqobject/main.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 test suite 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$
+**
+****************************************************************************/
+
 // IMPORTANT!!!! If you want to add testdata to this file,
 // always add it to the end in order to not change the linenumbers of translations!!!
 
diff --git a/tests/auto/linguist/lupdate/testdata/good/lacksqobject/project.ts.result b/tests/auto/linguist/lupdate/testdata/good/lacksqobject/project.ts.result
index bab0881..bc876cd 100644
--- a/tests/auto/linguist/lupdate/testdata/good/lacksqobject/project.ts.result
+++ b/tests/auto/linguist/lupdate/testdata/good/lacksqobject/project.ts.result
@@ -4,7 +4,7 @@
 <context>
     <name>B</name>
     <message>
-        <location filename="main.cpp" line="17"/>
+        <location filename="main.cpp" line="58"/>
         <source>Bla</source>
         <comment>::B</comment>
         <translation type="unfinished"></translation>
@@ -13,7 +13,7 @@
 <context>
     <name>C</name>
     <message>
-        <location filename="main.cpp" line="24"/>
+        <location filename="main.cpp" line="65"/>
         <source>Bla</source>
         <comment>::C</comment>
         <translation type="unfinished"></translation>
@@ -22,7 +22,7 @@
 <context>
     <name>nsB::B</name>
     <message>
-        <location filename="main.cpp" line="37"/>
+        <location filename="main.cpp" line="78"/>
         <source>Bla</source>
         <comment>nsB::B</comment>
         <translation type="unfinished"></translation>
@@ -31,7 +31,7 @@
 <context>
     <name>nsB::C</name>
     <message>
-        <location filename="main.cpp" line="43"/>
+        <location filename="main.cpp" line="84"/>
         <source>Bla</source>
         <comment>nsB::C</comment>
         <translation type="unfinished"></translation>
diff --git a/tests/auto/linguist/lupdate/testdata/good/merge_ordering/foo.cpp b/tests/auto/linguist/lupdate/testdata/good/merge_ordering/foo.cpp
index af8534d..91484bf 100644
--- a/tests/auto/linguist/lupdate/testdata/good/merge_ordering/foo.cpp
+++ b/tests/auto/linguist/lupdate/testdata/good/merge_ordering/foo.cpp
@@ -1,3 +1,43 @@
+/****************************************************************************
+**
+** 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 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$
+**
+****************************************************************************/
 
 // The first line in this file should always be empty, its part of the test!!
 class Foo : public QObject
diff --git a/tests/auto/linguist/lupdate/testdata/good/merge_ordering/project.ts.before b/tests/auto/linguist/lupdate/testdata/good/merge_ordering/project.ts.before
index d70193f..1762cc7 100644
--- a/tests/auto/linguist/lupdate/testdata/good/merge_ordering/project.ts.before
+++ b/tests/auto/linguist/lupdate/testdata/good/merge_ordering/project.ts.before
@@ -3,22 +3,22 @@
 <context>
     <name>Bar</name>
     <message>
-        <location filename="bar1.cpp" line="13"/>
+        <location filename="bar1.cpp" line="54"/>
         <source>Another alien.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="bar1.cpp" line="14"/>
+        <location filename="bar1.cpp" line="55"/>
         <source>They are coming!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="bar1.cpp" line="16"/>
+        <location filename="bar1.cpp" line="57"/>
         <source>They are everywhere!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="bar1.cpp" line="18"/>
+        <location filename="bar1.cpp" line="59"/>
         <source>This one moved in from another file.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -26,47 +26,47 @@
 <context>
     <name>Foo</name>
     <message>
-        <location filename="foo1.cpp" line="13"/>
+        <location filename="foo1.cpp" line="54"/>
         <source>This is the first entry.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="foo1.cpp" line="14"/>
+        <location filename="foo1.cpp" line="55"/>
         <source>A second message.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="foo1.cpp" line="15"/>
+        <location filename="foo1.cpp" line="56"/>
         <source>Now again one which is just where it was.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="foo1.cpp" line="16"/>
+        <location filename="foo1.cpp" line="57"/>
         <source>Just as this one.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="foo1.cpp" line="17"/>
+        <location filename="foo1.cpp" line="58"/>
         <source>An earthling again.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="foo1.cpp" line="18"/>
+        <location filename="foo1.cpp" line="59"/>
         <source>This is from the bottom, too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="foo1.cpp" line="19"/>
+        <location filename="foo1.cpp" line="60"/>
         <source>Third string from the bottom.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="foo1.cpp" line="20"/>
+        <location filename="foo1.cpp" line="61"/>
         <source>Fourth one!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="foo1.cpp" line="21"/>
+        <location filename="foo1.cpp" line="62"/>
         <source>This string did move from the bottom.</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/tests/auto/linguist/lupdate/testdata/good/merge_ordering/project.ts.result b/tests/auto/linguist/lupdate/testdata/good/merge_ordering/project.ts.result
index 2027efd..5104860 100644
--- a/tests/auto/linguist/lupdate/testdata/good/merge_ordering/project.ts.result
+++ b/tests/auto/linguist/lupdate/testdata/good/merge_ordering/project.ts.result
@@ -4,7 +4,7 @@
 <context>
     <name>Foo</name>
     <message>
-        <location filename="foo.cpp" line="+13"/>
+        <location filename="foo.cpp" line="+54"/>
         <source>This is the first entry.</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/tests/auto/linguist/lupdate/testdata/good/merge_whitespace/main.cpp b/tests/auto/linguist/lupdate/testdata/good/merge_whitespace/main.cpp
index e058da0..4dddace 100644
--- a/tests/auto/linguist/lupdate/testdata/good/merge_whitespace/main.cpp
+++ b/tests/auto/linguist/lupdate/testdata/good/merge_whitespace/main.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 test suite 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$
+**
+****************************************************************************/
+
 #include <QApplication>
 #include <QDebug>
 
diff --git a/tests/auto/linguist/lupdate/testdata/good/merge_whitespace/project.ts.before b/tests/auto/linguist/lupdate/testdata/good/merge_whitespace/project.ts.before
index 3acae3e..0f84fed 100644
--- a/tests/auto/linguist/lupdate/testdata/good/merge_whitespace/project.ts.before
+++ b/tests/auto/linguist/lupdate/testdata/good/merge_whitespace/project.ts.before
@@ -10,57 +10,57 @@ newline at the start</source>
 NEWLINE AT THE START</translation>
     </message>
     <message>
-        <location filename="main.cpp" line="8"/>
+        <location filename="main.cpp" line="49"/>
         <source>newline at the end
 </source>
         <translation>NEWLINE AT THE END
 </translation>
     </message>
     <message>
-        <location filename="main.cpp" line="9"/>
+        <location filename="main.cpp" line="50"/>
         <source>newline and space at the end
  </source>
         <translation>NEWLINE AND SPACE AT THE END
  </translation>
     </message>
     <message>
-        <location filename="main.cpp" line="10"/>
+        <location filename="main.cpp" line="51"/>
         <source>space and newline at the end 
 </source>
         <translation>SPACE AND NEWLINE AT THE END 
 </translation>
     </message>
     <message>
-        <location filename="main.cpp" line="11"/>
+        <location filename="main.cpp" line="52"/>
         <source><byte value="x9"/>Tab at the start and newline at the end
 </source>
         <translation><byte value="x9"/>TAB AT THE START AND NEWLINE AT THE END
 </translation>
     </message>
     <message>
-        <location filename="main.cpp" line="12"/>
+        <location filename="main.cpp" line="53"/>
         <source>
 <byte value="x9"/>newline and tab at the start</source>
         <translation>
 <byte value="x9"/>NEWLINE AND TAB AT THE START</translation>
     </message>
     <message>
-        <location filename="main.cpp" line="13"/>
+        <location filename="main.cpp" line="54"/>
         <source> <byte value="x9"/>space and tab at the start</source>
         <translation> <byte value="x9"/>SPACE AND TAB AT THE START</translation>
     </message>
     <message>
-        <location filename="main.cpp" line="14"/>
+        <location filename="main.cpp" line="55"/>
         <source> space_first</source>
         <translation> SPACE_FIRST</translation>
     </message>
     <message>
-        <location filename="main.cpp" line="15"/>
+        <location filename="main.cpp" line="56"/>
         <source>space_last </source>
         <translation>SPACE_LAST </translation>
     </message>
     <message>
-        <location filename="main.cpp" line="21"/>
+        <location filename="main.cpp" line="62"/>
         <source>carriage return and line feed last<byte value="xd"/>
 </source>
         <translation type="unfinished">CARRIAGE RETURN AND LINE FEED LAST<byte value="xd"/>
diff --git a/tests/auto/linguist/lupdate/testdata/good/merge_whitespace/project.ts.result b/tests/auto/linguist/lupdate/testdata/good/merge_whitespace/project.ts.result
index 6d6b469..776238d 100644
--- a/tests/auto/linguist/lupdate/testdata/good/merge_whitespace/project.ts.result
+++ b/tests/auto/linguist/lupdate/testdata/good/merge_whitespace/project.ts.result
@@ -4,64 +4,64 @@
 <context>
     <name>QObject</name>
     <message>
-        <location filename="main.cpp" line="12"/>
+        <location filename="main.cpp" line="53"/>
         <source>
 newline at the start</source>
         <translation>
 NEWLINE AT THE START</translation>
     </message>
     <message>
-        <location filename="main.cpp" line="13"/>
+        <location filename="main.cpp" line="54"/>
         <source>newline at the end
 </source>
         <translation>NEWLINE AT THE END
 </translation>
     </message>
     <message>
-        <location filename="main.cpp" line="14"/>
+        <location filename="main.cpp" line="55"/>
         <source>newline and space at the end
  </source>
         <translation>NEWLINE AND SPACE AT THE END
  </translation>
     </message>
     <message>
-        <location filename="main.cpp" line="15"/>
+        <location filename="main.cpp" line="56"/>
         <source>space and newline at the end 
 </source>
         <translation>SPACE AND NEWLINE AT THE END 
 </translation>
     </message>
     <message>
-        <location filename="main.cpp" line="16"/>
+        <location filename="main.cpp" line="57"/>
         <source>	Tab at the start and newline at the end
 </source>
         <translation>	TAB AT THE START AND NEWLINE AT THE END
 </translation>
     </message>
     <message>
-        <location filename="main.cpp" line="17"/>
+        <location filename="main.cpp" line="58"/>
         <source>
 	newline and tab at the start</source>
         <translation>
 	NEWLINE AND TAB AT THE START</translation>
     </message>
     <message>
-        <location filename="main.cpp" line="18"/>
+        <location filename="main.cpp" line="59"/>
         <source> 	space and tab at the start</source>
         <translation> 	SPACE AND TAB AT THE START</translation>
     </message>
     <message>
-        <location filename="main.cpp" line="19"/>
+        <location filename="main.cpp" line="60"/>
         <source> space_first</source>
         <translation> SPACE_FIRST</translation>
     </message>
     <message>
-        <location filename="main.cpp" line="20"/>
+        <location filename="main.cpp" line="61"/>
         <source>space_last </source>
         <translation>SPACE_LAST </translation>
     </message>
     <message>
-        <location filename="main.cpp" line="21"/>
+        <location filename="main.cpp" line="62"/>
         <source>carriage return and line feed last
 </source>
         <translation type="unfinished">CARRIAGE RETURN AND LINE FEED LAST
diff --git a/tests/auto/linguist/lupdate/testdata/good/mergecpp/finddialog.cpp b/tests/auto/linguist/lupdate/testdata/good/mergecpp/finddialog.cpp
index 7edb923..ce35e5b 100644
--- a/tests/auto/linguist/lupdate/testdata/good/mergecpp/finddialog.cpp
+++ b/tests/auto/linguist/lupdate/testdata/good/mergecpp/finddialog.cpp
@@ -1,5 +1,47 @@
 
 // The first line in this file should always be empty, its part of the test!!
+
+/****************************************************************************
+**
+** 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 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$
+**
+****************************************************************************/
+
 class FindDialog : public QDialog
 {
     Q_OBJECT
diff --git a/tests/auto/linguist/lupdate/testdata/good/mergecpp/project.ts.before b/tests/auto/linguist/lupdate/testdata/good/mergecpp/project.ts.before
index 474444f..d06252c 100644
--- a/tests/auto/linguist/lupdate/testdata/good/mergecpp/project.ts.before
+++ b/tests/auto/linguist/lupdate/testdata/good/mergecpp/project.ts.before
@@ -9,27 +9,27 @@
         <translation></translation>
     </message>
     <message>
-        <location filename="finddialog.cpp" line="14"/>
+        <location filename="finddialog.cpp" line="56"/>
         <source>Enter the text you want to find.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="finddialog.cpp" line="15"/>
+        <location filename="finddialog.cpp" line="57"/>
         <source>Search reached end of the document</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="finddialog.cpp" line="16"/>
+        <location filename="finddialog.cpp" line="58"/>
         <source>Search reached start of the document</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="finddialog.cpp" line="17"/>
+        <location filename="finddialog.cpp" line="59"/>
         <source>Text not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message numerus="yes">
-        <location filename="finddialog.cpp" line="22"/>
+        <location filename="finddialog.cpp" line="64"/>
         <source>%n item(s)</source>
         <comment>merge from singular to plural form</comment>
         <translation type="unfinished">
@@ -37,7 +37,7 @@
         </translation>
     </message>
     <message numerus="yes">
-        <location filename="finddialog.cpp" line="23"/>
+        <location filename="finddialog.cpp" line="65"/>
         <source>%n item(s)</source>
         <comment>merge from a finished singular form to an unfinished plural form</comment>
         <translation type="unfinished">
diff --git a/tests/auto/linguist/lupdate/testdata/good/mergecpp/project.ts.result b/tests/auto/linguist/lupdate/testdata/good/mergecpp/project.ts.result
index 152b568..be4e02e 100644
--- a/tests/auto/linguist/lupdate/testdata/good/mergecpp/project.ts.result
+++ b/tests/auto/linguist/lupdate/testdata/good/mergecpp/project.ts.result
@@ -10,27 +10,27 @@
         <translation></translation>
     </message>
     <message>
-        <location filename="finddialog.cpp" line="14"/>
+        <location filename="finddialog.cpp" line="56"/>
         <source>Enter the text you want to find.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="finddialog.cpp" line="15"/>
+        <location filename="finddialog.cpp" line="57"/>
         <source>Search reached end of the document</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="finddialog.cpp" line="16"/>
+        <location filename="finddialog.cpp" line="58"/>
         <source>Search reached start of the document</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="finddialog.cpp" line="17"/>
+        <location filename="finddialog.cpp" line="59"/>
         <source>Text not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message numerus="yes">
-        <location filename="finddialog.cpp" line="22"/>
+        <location filename="finddialog.cpp" line="64"/>
         <source>%n item(s)</source>
         <comment>merge from singular to plural form</comment>
         <translation type="unfinished">
@@ -38,7 +38,7 @@
         </translation>
     </message>
     <message numerus="yes">
-        <location filename="finddialog.cpp" line="23"/>
+        <location filename="finddialog.cpp" line="65"/>
         <source>%n item(s)</source>
         <comment>merge from a finished singular form to an unfinished plural form</comment>
         <translation type="unfinished">
diff --git a/tests/auto/linguist/lupdate/testdata/good/mergecpp_noobsolete/finddialog.cpp b/tests/auto/linguist/lupdate/testdata/good/mergecpp_noobsolete/finddialog.cpp
index 7215ebe..528e795 100644
--- a/tests/auto/linguist/lupdate/testdata/good/mergecpp_noobsolete/finddialog.cpp
+++ b/tests/auto/linguist/lupdate/testdata/good/mergecpp_noobsolete/finddialog.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 test suite 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$
+**
+****************************************************************************/
+
 #include "finddialog.h"
 #include "mainwindow.h"
 #include "tabbedbrowser.h"
@@ -10,18 +51,83 @@
 #include <QDateTime>
 #include <QGridLayout>
 
+CaseSensitiveModel::CaseSensitiveModel(int rows, int columns, QObject *parent)
+    : QStandardItemModel(rows, columns, parent)
+{}
+QModelIndexList CaseSensitiveModel::match(const QModelIndex &start, int role, const QVariant &value,
+                                          int hits, Qt::MatchFlags flags) const
+{
+    if (flags == Qt::MatchFlags(Qt::MatchStartsWith|Qt::MatchWrap))
+        flags |= Qt::MatchCaseSensitive;
+
+    return QStandardItemModel::match(start, role, value, hits, flags);
+}
+
 FindDialog::FindDialog(MainWindow *parent)
     : QDialog(parent)
 {
+    contentsWidget = new QWidget(this);
+    ui.setupUi(contentsWidget);
+    ui.comboFind->setModel(new CaseSensitiveModel(0, 1, ui.comboFind));
+
+    QVBoxLayout *l = new QVBoxLayout(this);
+    l->setMargin(0);
+    l->setSpacing(0);
+    l->addWidget(contentsWidget);
+
+    lastBrowser = 0;
+    onceFound = false;
+    findExpr.clear();
+
     sb = new QStatusBar(this);
     l->addWidget(sb);
 
     sb->showMessage(tr("Enter the text you want to find."));
 
+    connect(ui.findButton, SIGNAL(clicked()), this, SLOT(findButtonClicked()));
+    connect(ui.closeButton, SIGNAL(clicked()), this, SLOT(reject()));
+}
+
+FindDialog::~FindDialog()
+{
+}
+
+void FindDialog::findButtonClicked()
+{
+    doFind(ui.radioForward->isChecked());
 }
 
 void FindDialog::doFind(bool forward)
 {
+    QTextBrowser *browser = static_cast<QTextBrowser*>(mainWindow()->browsers()->currentBrowser());
+    sb->clearMessage();
+
+    if (ui.comboFind->currentText() != findExpr || lastBrowser != browser)
+        onceFound = false;
+    findExpr = ui.comboFind->currentText();
+
+    QTextDocument::FindFlags flags = 0;
+
+    if (ui.checkCase->isChecked())
+        flags |= QTextDocument::FindCaseSensitively;
+
+    if (ui.checkWords->isChecked())
+        flags |= QTextDocument::FindWholeWords;
+
+    QTextCursor c = browser->textCursor();
+    if (!c.hasSelection()) {
+        if (forward)
+            c.movePosition(QTextCursor::Start);
+        else
+            c.movePosition(QTextCursor::End);
+
+        browser->setTextCursor(c);
+    }
+
+    QTextDocument::FindFlags options;
+    if (forward == false)
+        flags |= QTextDocument::FindBackward;
+
     QTextCursor found = browser->document()->find(findExpr, c, flags);
     if (found.isNull()) {
         if (onceFound) {
@@ -35,6 +141,8 @@ void FindDialog::doFind(bool forward)
     } else {
         browser->setTextCursor(found);
     }
+    onceFound |= !found.isNull();
+    lastBrowser = browser;
 }
 
 bool FindDialog::hasFindExpression() const
diff --git a/tests/auto/linguist/lupdate/testdata/good/mergecpp_noobsolete/project.ts.before b/tests/auto/linguist/lupdate/testdata/good/mergecpp_noobsolete/project.ts.before
index 12e30b5..834f512 100644
--- a/tests/auto/linguist/lupdate/testdata/good/mergecpp_noobsolete/project.ts.before
+++ b/tests/auto/linguist/lupdate/testdata/good/mergecpp_noobsolete/project.ts.before
@@ -3,27 +3,27 @@
 <context>
     <name>FindDialog</name>
     <message>
-        <location filename="finddialog.cpp" line="57"/>
+        <location filename="finddialog.cpp" line="85"/>
         <source>Enter the text you want to find.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="finddialog.cpp" line="107"/>
+        <location filename="finddialog.cpp" line="135"/>
         <source>Search reached end of the document</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="finddialog.cpp" line="109"/>
+        <location filename="finddialog.cpp" line="137"/>
         <source>Search reached start of the document</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="finddialog.cpp" line="111"/>
+        <location filename="finddialog.cpp" line="139"/>
         <source>Text not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="finddialog.cpp" line="122"/>
+        <location filename="finddialog.cpp" line="150"/>
         <source>Should be obsolete</source>
         <translation type="unfinished">SHOULD BE OBSOLETE</translation>
     </message>
diff --git a/tests/auto/linguist/lupdate/testdata/good/mergecpp_obsolete/finddialog.cpp b/tests/auto/linguist/lupdate/testdata/good/mergecpp_obsolete/finddialog.cpp
index 756c9a3..4abbda9 100644
--- a/tests/auto/linguist/lupdate/testdata/good/mergecpp_obsolete/finddialog.cpp
+++ b/tests/auto/linguist/lupdate/testdata/good/mergecpp_obsolete/finddialog.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 test suite 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$
+**
+****************************************************************************/
+
 #include "finddialog.h"
 #include "mainwindow.h"
 #include "tabbedbrowser.h"
@@ -10,17 +51,86 @@
 #include <QDateTime>
 #include <QGridLayout>
 
+CaseSensitiveModel::CaseSensitiveModel(int rows, int columns, QObject *parent)
+    : QStandardItemModel(rows, columns, parent)
+{}
+QModelIndexList CaseSensitiveModel::match(const QModelIndex &start, int role, const QVariant &value,
+                                          int hits, Qt::MatchFlags flags) const
+{
+    if (flags == Qt::MatchFlags(Qt::MatchStartsWith|Qt::MatchWrap))
+        flags |= Qt::MatchCaseSensitive;
+
+    return QStandardItemModel::match(start, role, value, hits, flags);
+}
+
 FindDialog::FindDialog(MainWindow *parent)
     : QDialog(parent)
 {
+    contentsWidget = new QWidget(this);
+    ui.setupUi(contentsWidget);
+    ui.comboFind->setModel(new CaseSensitiveModel(0, 1, ui.comboFind));
+
+    QVBoxLayout *l = new QVBoxLayout(this);
+    l->setMargin(0);
+    l->setSpacing(0);
+    l->addWidget(contentsWidget);
+
+    lastBrowser = 0;
+    onceFound = false;
+    findExpr.clear();
+
+    sb = new QStatusBar(this);
+    l->addWidget(sb);
+
+
     // Move it to another line and change the text,
     // then lupdate should add this one as a new one, and mark the old one as obsolete.
     sb->showMessage(tr("Enter the text you want to find."));
 
+    connect(ui.findButton, SIGNAL(clicked()), this, SLOT(findButtonClicked()));
+    connect(ui.closeButton, SIGNAL(clicked()), this, SLOT(reject()));
+}
+
+FindDialog::~FindDialog()
+{
+}
+
+void FindDialog::findButtonClicked()
+{
+    doFind(ui.radioForward->isChecked());
 }
 
 void FindDialog::doFind(bool forward)
 {
+    QTextBrowser *browser = static_cast<QTextBrowser*>(mainWindow()->browsers()->currentBrowser());
+    sb->clearMessage();
+
+    if (ui.comboFind->currentText() != findExpr || lastBrowser != browser)
+        onceFound = false;
+    findExpr = ui.comboFind->currentText();
+
+    QTextDocument::FindFlags flags = 0;
+
+    if (ui.checkCase->isChecked())
+        flags |= QTextDocument::FindCaseSensitively;
+
+    if (ui.checkWords->isChecked())
+        flags |= QTextDocument::FindWholeWords;
+
+    QTextCursor c = browser->textCursor();
+    if (!c.hasSelection()) {
+        if (forward)
+            c.movePosition(QTextCursor::Start);
+        else
+            c.movePosition(QTextCursor::End);
+
+        browser->setTextCursor(c);
+    }
+
+    QTextDocument::FindFlags options;
+    if (forward == false)
+        flags |= QTextDocument::FindBackward;
+
     QTextCursor found = browser->document()->find(findExpr, c, flags);
     if (found.isNull()) {
         if (onceFound) {
@@ -34,4 +144,31 @@ void FindDialog::doFind(bool forward)
     } else {
         browser->setTextCursor(found);
     }
+    onceFound |= !found.isNull();
+    lastBrowser = browser;
+}
+
+bool FindDialog::hasFindExpression() const
+{
+    return !findExpr.isEmpty();
+}
+
+void FindDialog::statusMessage(const QString &message)
+{
+    if (isVisible())
+        sb->showMessage(message);
+    else
+        static_cast<MainWindow*>(parent())->statusBar()->showMessage(message, 2000);
+}
+
+MainWindow *FindDialog::mainWindow() const
+{
+    return static_cast<MainWindow*>(parentWidget());
+}
+
+void FindDialog::reset()
+{
+    ui.comboFind->setFocus();
+    ui.comboFind->lineEdit()->setSelection(
+        0, ui.comboFind->lineEdit()->text().length());
 }
diff --git a/tests/auto/linguist/lupdate/testdata/good/mergecpp_obsolete/project.ts.before b/tests/auto/linguist/lupdate/testdata/good/mergecpp_obsolete/project.ts.before
index 271cc39..1fa0fd3 100644
--- a/tests/auto/linguist/lupdate/testdata/good/mergecpp_obsolete/project.ts.before
+++ b/tests/auto/linguist/lupdate/testdata/good/mergecpp_obsolete/project.ts.before
@@ -3,22 +3,22 @@
 <context>
     <name>FindDialog</name>
     <message>
-        <location filename="finddialog.cpp" line="57"/>
+        <location filename="finddialog.cpp" line="85"/>
         <source>Enter the text you are looking for.</source>
         <translation type="unfinished">Skriv inn teksten du soker etter</translation>
     </message>
     <message>
-        <location filename="finddialog.cpp" line="107"/>
+        <location filename="finddialog.cpp" line="135"/>
         <source>Search reached end of the document</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="finddialog.cpp" line="109"/>
+        <location filename="finddialog.cpp" line="137"/>
         <source>Search reached start of the document</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="finddialog.cpp" line="111"/>
+        <location filename="finddialog.cpp" line="139"/>
         <source>Text not found</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/tests/auto/linguist/lupdate/testdata/good/multiple_locations/finddialog.cpp b/tests/auto/linguist/lupdate/testdata/good/multiple_locations/finddialog.cpp
index c3881d3..5a69326 100644
--- a/tests/auto/linguist/lupdate/testdata/good/multiple_locations/finddialog.cpp
+++ b/tests/auto/linguist/lupdate/testdata/good/multiple_locations/finddialog.cpp
@@ -1,3 +1,43 @@
+/****************************************************************************
+**
+** 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 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$
+**
+****************************************************************************/
 
 QT_TRANSLATE_NOOP("context", "just a message")
 
diff --git a/tests/auto/linguist/lupdate/testdata/good/multiple_locations/main.cpp b/tests/auto/linguist/lupdate/testdata/good/multiple_locations/main.cpp
index 71d9085..e14b638 100644
--- a/tests/auto/linguist/lupdate/testdata/good/multiple_locations/main.cpp
+++ b/tests/auto/linguist/lupdate/testdata/good/multiple_locations/main.cpp
@@ -1,3 +1,43 @@
+/****************************************************************************
+**
+** 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 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$
+**
+****************************************************************************/
 
 
 
diff --git a/tests/auto/linguist/lupdate/testdata/good/multiple_locations/project.ts.result b/tests/auto/linguist/lupdate/testdata/good/multiple_locations/project.ts.result
index dd013fa..ec1f02f 100644
--- a/tests/auto/linguist/lupdate/testdata/good/multiple_locations/project.ts.result
+++ b/tests/auto/linguist/lupdate/testdata/good/multiple_locations/project.ts.result
@@ -4,9 +4,9 @@
 <context>
     <name>context</name>
     <message>
-        <location filename="finddialog.cpp" line="2"/>
-        <location filename="finddialog.cpp" line="7"/>
-        <location filename="main.cpp" line="6"/>
+        <location filename="finddialog.cpp" line="43"/>
+        <location filename="finddialog.cpp" line="48"/>
+        <location filename="main.cpp" line="47"/>
         <source>just a message</source>
         <extracomment>This is one comment
 ----------
diff --git a/tests/auto/linguist/lupdate/testdata/good/namespaces/main.cpp b/tests/auto/linguist/lupdate/testdata/good/namespaces/main.cpp
index 9f5a98c..62b306f 100644
--- a/tests/auto/linguist/lupdate/testdata/good/namespaces/main.cpp
+++ b/tests/auto/linguist/lupdate/testdata/good/namespaces/main.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 test suite 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$
+**
+****************************************************************************/
+
 #include <QtCore>
 
 class Class : public QObject
diff --git a/tests/auto/linguist/lupdate/testdata/good/namespaces/project.ts.result b/tests/auto/linguist/lupdate/testdata/good/namespaces/project.ts.result
index d1193d3..bb5b739 100644
--- a/tests/auto/linguist/lupdate/testdata/good/namespaces/project.ts.result
+++ b/tests/auto/linguist/lupdate/testdata/good/namespaces/project.ts.result
@@ -4,17 +4,17 @@
 <context>
     <name>Class</name>
     <message>
-        <location filename="main.cpp" line="11"/>
+        <location filename="main.cpp" line="52"/>
         <source>nested class context</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main.cpp" line="17"/>
+        <location filename="main.cpp" line="58"/>
         <source>just class context</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main.cpp" line="77"/>
+        <location filename="main.cpp" line="118"/>
         <source>outestmost class</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22,7 +22,7 @@
 <context>
     <name>Outer::Class</name>
     <message>
-        <location filename="main.cpp" line="78"/>
+        <location filename="main.cpp" line="119"/>
         <source>outer class</source>
         <translation type="unfinished"></translation>
     </message>
@@ -30,7 +30,7 @@
 <context>
     <name>Outer::Middle1::Different</name>
     <message>
-        <location filename="main.cpp" line="65"/>
+        <location filename="main.cpp" line="106/>
         <source>different namespaced class def</source>
         <translation type="unfinished"></translation>
     </message>
@@ -38,22 +38,22 @@
 <context>
     <name>Outer::Middle1::Inner1::Class</name>
     <message>
-        <location filename="main.cpp" line="79"/>
+        <location filename="main.cpp" line="120"/>
         <source>innermost one</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main.cpp" line="80"/>
+        <location filename="main.cpp" line="121"/>
         <source>innermost two</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main.cpp" line="81"/>
+        <location filename="main.cpp" line="122"/>
         <source>innermost three</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main.cpp" line="83"/>
+        <location filename="main.cpp" line="124"/>
         <source>innermost four</source>
         <translation type="unfinished"></translation>
     </message>
@@ -61,12 +61,12 @@
 <context>
     <name>Outer::Middle1::Something</name>
     <message>
-        <location filename="main.cpp" line="90"/>
+        <location filename="main.cpp" line="131"/>
         <source>namespaced class def</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main.cpp" line="93"/>
+        <location filename="main.cpp" line="134"/>
         <source>namespaced class def 2</source>
         <translation type="unfinished"></translation>
     </message>
@@ -74,7 +74,7 @@
 <context>
     <name>Outer::Middle2::Inner2::Class</name>
     <message>
-        <location filename="main.cpp" line="82"/>
+        <location filename="main.cpp" line="123"/>
         <source>innermost three b</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/tests/auto/linguist/lupdate/testdata/good/parse_special_chars/main.cpp b/tests/auto/linguist/lupdate/testdata/good/parse_special_chars/main.cpp
index 72a1590..c64c111 100644
--- a/tests/auto/linguist/lupdate/testdata/good/parse_special_chars/main.cpp
+++ b/tests/auto/linguist/lupdate/testdata/good/parse_special_chars/main.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 test suite 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$
+**
+****************************************************************************/
+
 // IMPORTANT!!!! If you want to add testdata to this file,
 // always add it to the end in order to not change the linenumbers of translations!!!
 
diff --git a/tests/auto/linguist/lupdate/testdata/good/parse_special_chars/project.ts.result b/tests/auto/linguist/lupdate/testdata/good/parse_special_chars/project.ts.result
index a49b47a..0394bea 100644
--- a/tests/auto/linguist/lupdate/testdata/good/parse_special_chars/project.ts.result
+++ b/tests/auto/linguist/lupdate/testdata/good/parse_special_chars/project.ts.result
@@ -4,12 +4,12 @@
 <context>
     <name>Dialog2</name>
     <message>
-        <location filename="main.cpp" line="13"/>
+        <location filename="main.cpp" line="54"/>
         <source>catégorie</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main.cpp" line="15"/>
+        <location filename="main.cpp" line="56"/>
         <source>Für Èlise</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/tests/auto/linguist/lupdate/testdata/good/parsecontexts/main.cpp b/tests/auto/linguist/lupdate/testdata/good/parsecontexts/main.cpp
index 65eeed5..c2eba71 100644
--- a/tests/auto/linguist/lupdate/testdata/good/parsecontexts/main.cpp
+++ b/tests/auto/linguist/lupdate/testdata/good/parsecontexts/main.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 test suite 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$
+**
+****************************************************************************/
+
 // IMPORTANT!!!! If you want to add testdata to this file,
 // always add it to the end in order to not change the linenumbers of translations!!!
 #include <QtCore>
diff --git a/tests/auto/linguist/lupdate/testdata/good/parsecontexts/project.ts.result b/tests/auto/linguist/lupdate/testdata/good/parsecontexts/project.ts.result
index 04bb3ae..9b00d53 100644
--- a/tests/auto/linguist/lupdate/testdata/good/parsecontexts/project.ts.result
+++ b/tests/auto/linguist/lupdate/testdata/good/parsecontexts/project.ts.result
@@ -4,7 +4,7 @@
 <context>
     <name>A1::AB</name>
     <message>
-        <location filename="main.cpp" line="137"/>
+        <location filename="main.cpp" line="178"/>
         <source>inlineFuncAfterFriendDeclaration</source>
         <comment>A1::AB</comment>
         <translation type="unfinished"></translation>
@@ -13,7 +13,7 @@
 <context>
     <name>A1::B</name>
     <message>
-        <location filename="main.cpp" line="143"/>
+        <location filename="main.cpp" line="184"/>
         <source>foo</source>
         <comment>A1::B</comment>
         <translation type="unfinished"></translation>
@@ -22,19 +22,19 @@
 <context>
     <name>A1::B2</name>
     <message>
-        <location filename="main.cpp" line="188"/>
+        <location filename="main.cpp" line="229"/>
         <source>test TRANSLATOR comment (2)</source>
         <comment>A1::B2</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main.cpp" line="194"/>
+        <location filename="main.cpp" line="235"/>
         <source>test TRANSLATOR comment (4)</source>
         <comment>A1::B2</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main.cpp" line="203"/>
+        <location filename="main.cpp" line="244"/>
         <source>test TRANSLATOR comment (5)</source>
         <comment>A1::B2</comment>
         <translation type="unfinished"></translation>
@@ -43,7 +43,7 @@
 <context>
     <name>A1::B3::C2</name>
     <message>
-        <location filename="main.cpp" line="220"/>
+        <location filename="main.cpp" line="261"/>
         <source>test TRANSLATOR comment (6)</source>
         <comment>A1::B3::C2</comment>
         <translation type="unfinished"></translation>
@@ -52,7 +52,7 @@
 <context>
     <name>A1::V</name>
     <message>
-        <location filename="main.cpp" line="150"/>
+        <location filename="main.cpp" line="191"/>
         <source>bar</source>
         <comment>A1::V</comment>
         <translation type="unfinished"></translation>
@@ -61,7 +61,7 @@
 <context>
     <name>A1::W</name>
     <message>
-        <location filename="main.cpp" line="156"/>
+        <location filename="main.cpp" line="197"/>
         <source>baz</source>
         <comment>A1::W</comment>
         <translation type="unfinished"></translation>
@@ -70,14 +70,14 @@
 <context>
     <name>A::C</name>
     <message>
-        <location filename="main.cpp" line="28"/>
-        <location filename="main.cpp" line="32"/>
+        <location filename="main.cpp" line="69"/>
+        <location filename="main.cpp" line="73"/>
         <source>Bla</source>
         <comment>A::C</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main.cpp" line="37"/>
+        <location filename="main.cpp" line="78"/>
         <source>Bla 2</source>
         <comment>A::C</comment>
         <translation type="unfinished"></translation>
@@ -86,7 +86,7 @@
 <context>
     <name>B1</name>
     <message>
-        <location filename="main.cpp" line="178"/>
+        <location filename="main.cpp" line="219"/>
         <source>test TRANSLATOR comment (1)</source>
         <comment>B1</comment>
         <translation type="unfinished"></translation>
@@ -95,7 +95,7 @@
 <context>
     <name>B2</name>
     <message>
-        <location filename="main.cpp" line="197"/>
+        <location filename="main.cpp" line="238"/>
         <source></source>
         <comment>This is a comment to the translator.</comment>
         <translation type="unfinished"></translation>
@@ -104,7 +104,7 @@
 <context>
     <name>C1</name>
     <message>
-        <location filename="main.cpp" line="189"/>
+        <location filename="main.cpp" line="230"/>
         <source>test TRANSLATOR comment (3)</source>
         <comment>C1</comment>
         <translation type="unfinished"></translation>
@@ -113,7 +113,7 @@
 <context>
     <name>D</name>
     <message>
-        <location filename="main.cpp" line="14"/>
+        <location filename="main.cpp" line="55"/>
         <source>test</source>
         <comment>D</comment>
         <translation type="unfinished"></translation>
@@ -122,7 +122,7 @@
 <context>
     <name>Gui::MainWindow</name>
     <message>
-        <location filename="main.cpp" line="122"/>
+        <location filename="main.cpp" line="163"/>
         <source>More bla</source>
         <comment>Gui::MainWindow</comment>
         <translation type="unfinished"></translation>
@@ -131,7 +131,7 @@
 <context>
     <name>QObject</name>
     <message>
-        <location filename="main.cpp" line="100"/>
+        <location filename="main.cpp" line="141"/>
         <source>task 161186</source>
         <comment>QObject</comment>
         <translation type="unfinished"></translation>
@@ -140,13 +140,13 @@
 <context>
     <name>X::D</name>
     <message>
-        <location filename="main.cpp" line="54"/>
+        <location filename="main.cpp" line="95"/>
         <source>foo</source>
         <comment>D</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main.cpp" line="74"/>
+        <location filename="main.cpp" line="115"/>
         <source>Bla</source>
         <comment>X::D</comment>
         <translation type="unfinished"></translation>
@@ -155,7 +155,7 @@
 <context>
     <name>X::F</name>
     <message>
-        <location filename="main.cpp" line="87"/>
+        <location filename="main.cpp" line="128"/>
         <source>inline function</source>
         <comment>X::F</comment>
         <translation type="unfinished"></translation>
@@ -164,7 +164,7 @@
 <context>
     <name>X::Y::C</name>
     <message>
-        <location filename="main.cpp" line="70"/>
+        <location filename="main.cpp" line="111"/>
         <source>Bla</source>
         <comment>X::Y::C</comment>
         <translation type="unfinished"></translation>
@@ -173,8 +173,8 @@
 <context>
     <name>X::Y::E</name>
     <message>
-        <location filename="main.cpp" line="78"/>
-        <location filename="main.cpp" line="79"/>
+        <location filename="main.cpp" line="119"/>
+        <location filename="main.cpp" line="120"/>
         <source>Bla</source>
         <comment>X::Y::E</comment>
         <translation type="unfinished"></translation>
@@ -183,7 +183,7 @@
 <context>
     <name>ico::foo::A</name>
     <message>
-        <location filename="main.cpp" line="99"/>
+        <location filename="main.cpp" line="140"/>
         <source>myfoo</source>
         <comment>ico::foo::A</comment>
         <translation type="unfinished"></translation>
diff --git a/tests/auto/linguist/lupdate/testdata/good/parsecpp/main.cpp b/tests/auto/linguist/lupdate/testdata/good/parsecpp/main.cpp
index 735e4cd..50b835b 100644
--- a/tests/auto/linguist/lupdate/testdata/good/parsecpp/main.cpp
+++ b/tests/auto/linguist/lupdate/testdata/good/parsecpp/main.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 test suite 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$
+**
+****************************************************************************/
+
 // IMPORTANT!!!! If you want to add testdata to this file,
 // always add it to the end in order to not change the linenumbers of translations!!!
 int main(char **argv, int argc)
diff --git a/tests/auto/linguist/lupdate/testdata/good/parsecpp/project.ts.result b/tests/auto/linguist/lupdate/testdata/good/parsecpp/project.ts.result
index 8c48245..9e4e319 100644
--- a/tests/auto/linguist/lupdate/testdata/good/parsecpp/project.ts.result
+++ b/tests/auto/linguist/lupdate/testdata/good/parsecpp/project.ts.result
@@ -22,7 +22,7 @@ backslashed \ stuff.</source>
 <context>
     <name>Dialog2</name>
     <message numerus="yes">
-        <location filename="main.cpp" line="29"/>
+        <location filename="main.cpp" line="70"/>
         <source>%n files</source>
         <comment>plural form</comment>
         <translation type="unfinished">
@@ -30,40 +30,40 @@ backslashed \ stuff.</source>
         </translation>
     </message>
     <message numerus="yes">
-        <location filename="main.cpp" line="30"/>
+        <location filename="main.cpp" line="71"/>
         <source>%n cars</source>
         <translation type="unfinished">
             <numerusform></numerusform>
         </translation>
     </message>
     <message numerus="yes">
-        <location filename="main.cpp" line="31"/>
+        <location filename="main.cpp" line="72"/>
         <source>&amp;Find %n cars</source>
         <translation type="unfinished">
             <numerusform></numerusform>
         </translation>
     </message>
     <message numerus="yes">
-        <location filename="main.cpp" line="32"/>
+        <location filename="main.cpp" line="73"/>
         <source>Search in %n items?</source>
         <translation type="unfinished">
             <numerusform></numerusform>
         </translation>
     </message>
     <message numerus="yes">
-        <location filename="main.cpp" line="33"/>
+        <location filename="main.cpp" line="74"/>
         <source>%1. Search in %n items?</source>
         <translation type="unfinished">
             <numerusform></numerusform>
         </translation>
     </message>
     <message>
-        <location filename="main.cpp" line="34"/>
+        <location filename="main.cpp" line="75"/>
         <source>Age: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message numerus="yes">
-        <location filename="main.cpp" line="35"/>
+        <location filename="main.cpp" line="76"/>
         <source>There are %n house(s)</source>
         <comment>Plurals and function call</comment>
         <translation type="unfinished">
@@ -71,7 +71,7 @@ backslashed \ stuff.</source>
         </translation>
     </message>
     <message>
-        <location filename="main.cpp" line="102"/>
+        <location filename="main.cpp" line="143"/>
         <source>func3</source>
         <translation type="unfinished"></translation>
     </message>
@@ -115,7 +115,7 @@ backslashed \ stuff.</source>
 <context>
     <name>Plurals, QCoreApplication</name>
     <message numerus="yes">
-        <location filename="main.cpp" line="40"/>
+        <location filename="main.cpp" line="81"/>
         <source>%n house(s)</source>
         <comment>Plurals and identifier</comment>
         <translation type="unfinished">
@@ -123,7 +123,7 @@ backslashed \ stuff.</source>
         </translation>
     </message>
     <message numerus="yes">
-        <location filename="main.cpp" line="41"/>
+        <location filename="main.cpp" line="82"/>
         <source>%n car(s)</source>
         <comment>Plurals and literal number</comment>
         <translation type="unfinished">
@@ -131,7 +131,7 @@ backslashed \ stuff.</source>
         </translation>
     </message>
     <message numerus="yes">
-        <location filename="main.cpp" line="42"/>
+        <location filename="main.cpp" line="83"/>
         <source>%n horse(s)</source>
         <comment>Plurals and function call</comment>
         <translation type="unfinished">
@@ -142,7 +142,7 @@ backslashed \ stuff.</source>
 <context>
     <name>QApplication</name>
     <message>
-        <location filename="main.cpp" line="10"/>
+        <location filename="main.cpp" line="51"/>
         <source>QT_LAYOUT_DIRECTION</source>
         <comment>Translate this string to the string &apos;LTR&apos; in left-to-right languages or to &apos;RTL&apos; in right-to-left languages (such as Hebrew and Arabic) to get proper widget layout.</comment>
         <translation type="unfinished"></translation>
@@ -180,26 +180,26 @@ backslashed \ stuff.</source>
 <context>
     <name>QTranslator</name>
     <message>
-        <location filename="main.cpp" line="52"/>
-        <location filename="main.cpp" line="53"/>
+        <location filename="main.cpp" line="93"/>
+        <location filename="main.cpp" line="94"/>
         <source>Simple</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main.cpp" line="54"/>
+        <location filename="main.cpp" line="95"/>
         <source>Simple with comment</source>
         <comment>with comment</comment>
         <translation type="unfinished"></translation>
     </message>
     <message numerus="yes">
-        <location filename="main.cpp" line="55"/>
+        <location filename="main.cpp" line="96"/>
         <source>Plural without comment</source>
         <translation type="unfinished">
             <numerusform></numerusform>
         </translation>
     </message>
     <message numerus="yes">
-        <location filename="main.cpp" line="56"/>
+        <location filename="main.cpp" line="97"/>
         <source>Plural with comment</source>
         <comment>comment 1</comment>
         <translation type="unfinished">
@@ -207,7 +207,7 @@ backslashed \ stuff.</source>
         </translation>
     </message>
     <message numerus="yes">
-        <location filename="main.cpp" line="57"/>
+        <location filename="main.cpp" line="98"/>
         <source>Plural with comment</source>
         <comment>comment 2</comment>
         <translation type="unfinished">
@@ -218,19 +218,19 @@ backslashed \ stuff.</source>
 <context>
     <name>TestClass</name>
     <message>
-        <location filename="main.cpp" line="116"/>
+        <location filename="main.cpp" line="157"/>
         <source>inline function</source>
         <comment>TestClass</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main.cpp" line="120"/>
+        <location filename="main.cpp" line="161"/>
         <source>inline function 2</source>
         <comment>TestClass</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main.cpp" line="124"/>
+        <location filename="main.cpp" line="165"/>
         <source>static inline function</source>
         <comment>TestClass</comment>
         <translation type="unfinished"></translation>
@@ -239,18 +239,18 @@ backslashed \ stuff.</source>
 <context>
     <name>Testing</name>
     <message>
-        <location filename="main.cpp" line="141"/>
+        <location filename="main.cpp" line="182"/>
         <source>extra-commented string</source>
         <extracomment>this is an extra comment for the translator</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main.cpp" line="142"/>
+        <location filename="main.cpp" line="183"/>
         <source>not extra-commented string</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main.cpp" line="144"/>
+        <location filename="main.cpp" line="185"/>
         <source>another extra-commented string</source>
         <extracomment>another extra-comment</extracomment>
         <translation type="unfinished"></translation>
@@ -280,7 +280,7 @@ backslashed \ stuff.</source>
 <context>
     <name>scope</name>
     <message numerus="yes">
-        <location filename="main.cpp" line="146"/>
+        <location filename="main.cpp" line="187"/>
         <source>works in translate, too</source>
         <comment>blabb</comment>
         <extracomment>blah!</extracomment>
@@ -289,20 +289,20 @@ backslashed \ stuff.</source>
         </translation>
     </message>
     <message>
-        <location filename="main.cpp" line="153"/>
+        <location filename="main.cpp" line="194"/>
         <source>string</source>
         <extracomment>extra comment for NOOP which spans multiple lines</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main.cpp" line="155"/>
+        <location filename="main.cpp" line="196"/>
         <source>string</source>
         <comment>comment</comment>
         <extracomment>extra comment for NOOP3</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main.cpp" line="157"/>
+        <location filename="main.cpp" line="198"/>
         <source>string continuation on next line</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/tests/auto/linguist/lupdate/testdata/good/parsejava/main.java b/tests/auto/linguist/lupdate/testdata/good/parsejava/main.java
index 07681d2..1167e87 100644
--- a/tests/auto/linguist/lupdate/testdata/good/parsejava/main.java
+++ b/tests/auto/linguist/lupdate/testdata/good/parsejava/main.java
@@ -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 test suite 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$
+**
+****************************************************************************/
+
 // IMPORTANT!!!! If you want to add testdata to this file,
 // always add it to the end in order to not change the linenumbers of translations!!!
 
diff --git a/tests/auto/linguist/lupdate/testdata/good/parsejava/project.ts.result b/tests/auto/linguist/lupdate/testdata/good/parsejava/project.ts.result
index 69c0a00..0ce600c 100644
--- a/tests/auto/linguist/lupdate/testdata/good/parsejava/project.ts.result
+++ b/tests/auto/linguist/lupdate/testdata/good/parsejava/project.ts.result
@@ -4,7 +4,7 @@
 <context>
     <name>Plurals, QCoreApplication</name>
     <message numerus="yes">
-        <location filename="main.java" line="47"/>
+        <location filename="main.java" line="88"/>
         <source>%n house(s)</source>
         <comment>Plurals and identifier</comment>
         <extracomment>with extra comment!</extracomment>
@@ -16,26 +16,26 @@
 <context>
     <name>QTranslator</name>
     <message>
-        <location filename="main.java" line="39"/>
-        <location filename="main.java" line="40"/>
+        <location filename="main.java" line="80"/>
+        <location filename="main.java" line="81"/>
         <source>Simple</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main.java" line="41"/>
+        <location filename="main.java" line="82"/>
         <source>Simple with comment</source>
         <comment>with comment</comment>
         <translation type="unfinished"></translation>
     </message>
     <message numerus="yes">
-        <location filename="main.java" line="42"/>
+        <location filename="main.java" line="83"/>
         <source>Plural without comment</source>
         <translation type="unfinished">
             <numerusform></numerusform>
         </translation>
     </message>
     <message numerus="yes">
-        <location filename="main.java" line="43"/>
+        <location filename="main.java" line="84"/>
         <source>Plural with comment</source>
         <comment>comment 1</comment>
         <translation type="unfinished">
@@ -43,7 +43,7 @@
         </translation>
     </message>
     <message numerus="yes">
-        <location filename="main.java" line="44"/>
+        <location filename="main.java" line="85"/>
         <source>Plural with comment</source>
         <comment>comment 2</comment>
         <translation type="unfinished">
@@ -54,18 +54,18 @@
 <context>
     <name>com.trolltech.examples.I18N</name>
     <message>
-        <location filename="main.java" line="26"/>
+        <location filename="main.java" line="67"/>
         <source>pack class method</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main.java" line="31"/>
+        <location filename="main.java" line="72"/>
         <source>QT_LAYOUT_DIRECTION</source>
         <comment>Translate this string to the string &apos;LTR&apos; in left-to-right languages or to &apos;RTL&apos; in right-to-left languages (such as Hebrew and Arabic) to get proper widget layout.</comment>
         <translation type="unfinished"></translation>
     </message>
     <message numerus="yes">
-        <location filename="main.java" line="33"/>
+        <location filename="main.java" line="74"/>
         <source>%n files</source>
         <comment>plural form</comment>
         <translation type="unfinished">
@@ -73,19 +73,19 @@
         </translation>
     </message>
     <message numerus="yes">
-        <location filename="main.java" line="34"/>
+        <location filename="main.java" line="75"/>
         <source>%n cars</source>
         <translation type="unfinished">
             <numerusform></numerusform>
         </translation>
     </message>
     <message>
-        <location filename="main.java" line="35"/>
+        <location filename="main.java" line="76"/>
         <source>Age: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message numerus="yes">
-        <location filename="main.java" line="36"/>
+        <location filename="main.java" line="77"/>
         <source>There are %n house(s)</source>
         <comment>Plurals and function call</comment>
         <translation type="unfinished">
@@ -96,18 +96,18 @@
 <context>
     <name>com.trolltech.examples.I18N$MainWindow</name>
     <message>
-        <location filename="main.java" line="9"/>
+        <location filename="main.java" line="50"/>
         <source>pack class class</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main.java" line="12"/>
+        <location filename="main.java" line="53"/>
         <source>pack class class extra</source>
         <extracomment>extra comment for t-tor</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main.java" line="18"/>
+        <location filename="main.java" line="59"/>
         <source>pack class class method</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/tests/auto/linguist/lupdate/testdata/good/prefix/main.cpp b/tests/auto/linguist/lupdate/testdata/good/prefix/main.cpp
index d845853..7ad8407 100644
--- a/tests/auto/linguist/lupdate/testdata/good/prefix/main.cpp
+++ b/tests/auto/linguist/lupdate/testdata/good/prefix/main.cpp
@@ -1,4 +1,43 @@
-
+/****************************************************************************
+**
+** 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 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$
+**
+****************************************************************************/
 
 
 QString foo()
diff --git a/tests/auto/linguist/lupdate/testdata/good/prefix/project.ts.result b/tests/auto/linguist/lupdate/testdata/good/prefix/project.ts.result
index 5ced00d..c15b986 100644
--- a/tests/auto/linguist/lupdate/testdata/good/prefix/project.ts.result
+++ b/tests/auto/linguist/lupdate/testdata/good/prefix/project.ts.result
@@ -4,18 +4,18 @@
 <context>
     <name>Foo</name>
     <message>
-        <location filename="main.cpp" line="6"/>
+        <location filename="main.cpp" line="46"/>
         <source>XXX</source>
         <comment>YYY</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main.cpp" line="11"/>
+        <location filename="main.cpp" line="51"/>
         <source>CTOR</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main.cpp" line="16"/>
+        <location filename="main.cpp" line="56"/>
         <source>BAR</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/tests/auto/linguist/lupdate/testdata/good/preprocess/main.cpp b/tests/auto/linguist/lupdate/testdata/good/preprocess/main.cpp
index 9abfa5e..c4f67a8 100644
--- a/tests/auto/linguist/lupdate/testdata/good/preprocess/main.cpp
+++ b/tests/auto/linguist/lupdate/testdata/good/preprocess/main.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 test suite 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$
+**
+****************************************************************************/
+
 // IMPORTANT!!!! If you want to add testdata to this file,
 // always add it to the end in order to not change the linenumbers of translations!!!
 
diff --git a/tests/auto/linguist/lupdate/testdata/good/preprocess/project.ts.result b/tests/auto/linguist/lupdate/testdata/good/preprocess/project.ts.result
index 3aec045..4d695e8 100644
--- a/tests/auto/linguist/lupdate/testdata/good/preprocess/project.ts.result
+++ b/tests/auto/linguist/lupdate/testdata/good/preprocess/project.ts.result
@@ -4,30 +4,30 @@
 <context>
     <name>QApplication</name>
     <message>
-        <location filename="main.cpp" line="6"/>
+        <location filename="main.cpp" line="47"/>
         <source>Hello world</source>
         <comment>Platform-independent file</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main.cpp" line="14"/>
+        <location filename="main.cpp" line="55"/>
         <source>Kind</source>
         <comment>Windows only, see Type</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main.cpp" line="16"/>
+        <location filename="main.cpp" line="57"/>
         <source>Type</source>
         <comment>Not used on windows, see Kind</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main.cpp" line="25"/>
+        <location filename="main.cpp" line="66"/>
         <source>One string, three lines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main.cpp" line="29"/>
+        <location filename="main.cpp" line="70"/>
         <source>a backslash followed by newline should be ignored and the next line should be syntactically considered to be on the same line</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/tests/auto/linguist/lupdate/testdata/good/proparsing/main.cpp b/tests/auto/linguist/lupdate/testdata/good/proparsing/main.cpp
index 236bbe7..9064b56 100644
--- a/tests/auto/linguist/lupdate/testdata/good/proparsing/main.cpp
+++ b/tests/auto/linguist/lupdate/testdata/good/proparsing/main.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 test suite 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$
+**
+****************************************************************************/
+
 // IMPORTANT!!!! If you want to add testdata to this file,
 // always add it to the end in order to not change the linenumbers of translations!!!
 
diff --git a/tests/auto/linguist/lupdate/testdata/good/proparsing/main_mac.cpp b/tests/auto/linguist/lupdate/testdata/good/proparsing/main_mac.cpp
index 845aaa6..4cfec14 100644
--- a/tests/auto/linguist/lupdate/testdata/good/proparsing/main_mac.cpp
+++ b/tests/auto/linguist/lupdate/testdata/good/proparsing/main_mac.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 test suite 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$
+**
+****************************************************************************/
+
 // IMPORTANT!!!! If you want to add testdata to this file,
 // always add it to the end in order to not change the linenumbers of translations!!!
 
diff --git a/tests/auto/linguist/lupdate/testdata/good/proparsing/main_unix.cpp b/tests/auto/linguist/lupdate/testdata/good/proparsing/main_unix.cpp
index 229e154..c15c2f7 100644
--- a/tests/auto/linguist/lupdate/testdata/good/proparsing/main_unix.cpp
+++ b/tests/auto/linguist/lupdate/testdata/good/proparsing/main_unix.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 test suite 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$
+**
+****************************************************************************/
+
 // IMPORTANT!!!! If you want to add testdata to this file,
 // always add it to the end in order to not change the linenumbers of translations!!!
 
diff --git a/tests/auto/linguist/lupdate/testdata/good/proparsing/main_win.cpp b/tests/auto/linguist/lupdate/testdata/good/proparsing/main_win.cpp
index 4eb39f7..b879aa7 100644
--- a/tests/auto/linguist/lupdate/testdata/good/proparsing/main_win.cpp
+++ b/tests/auto/linguist/lupdate/testdata/good/proparsing/main_win.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 test suite 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$
+**
+****************************************************************************/
+
 // IMPORTANT!!!! If you want to add testdata to this file,
 // always add it to the end in order to not change the linenumbers of translations!!!
 
diff --git a/tests/auto/linguist/lupdate/testdata/good/proparsing/project.ts.result b/tests/auto/linguist/lupdate/testdata/good/proparsing/project.ts.result
index ef98596..556ca07 100644
--- a/tests/auto/linguist/lupdate/testdata/good/proparsing/project.ts.result
+++ b/tests/auto/linguist/lupdate/testdata/good/proparsing/project.ts.result
@@ -4,49 +4,49 @@
 <context>
     <name>QApplication</name>
     <message>
-        <location filename="main.cpp" line="6"/>
+        <location filename="main.cpp" line="47"/>
         <source>Hello world</source>
         <comment>Platform-independent file</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main_mac.cpp" line="6"/>
+        <location filename="main_mac.cpp" line="47"/>
         <source>Hello macworld</source>
         <comment>mac-only file</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main_unix.cpp" line="6"/>
+        <location filename="main_unix.cpp" line="47"/>
         <source>Hello unixworld</source>
         <comment>unix-only file</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main_win.cpp" line="6"/>
+        <location filename="main_win.cpp" line="47"/>
         <source>Hello windowsworld</source>
         <comment>Windows-only file</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="wildcard/main1.cpp" line="6"/>
+        <location filename="wildcard/main1.cpp" line="47"/>
         <source>Hello world</source>
         <comment>wildcard/main1.cpp</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="wildcard/mainfile.cpp" line="6"/>
+        <location filename="wildcard/mainfile.cpp" line="47"/>
         <source>Hello world</source>
         <comment>wildcard/main2.cpp</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="wildcard1.cpp" line="6"/>
+        <location filename="wildcard1.cpp" line="47"/>
         <source>Hello world</source>
         <comment>wildcard1.cpp</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="wildcard99.cpp" line="6"/>
+        <location filename="wildcard99.cpp" line="47"/>
         <source>Hello world</source>
         <comment>wildcard99.cpp</comment>
         <translation type="unfinished"></translation>
@@ -55,7 +55,7 @@
 <context>
     <name>QCoreApplication</name>
     <message>
-        <location filename="vpaths/dependpath/main_dependpath.cpp" line="7"/>
+        <location filename="vpaths/dependpath/main_dependpath.cpp" line="48"/>
         <source>Hello from a DEPENDPATH</source>
         <comment>See if the DEPENDPATH thing works</comment>
         <translation type="unfinished"></translation>
diff --git a/tests/auto/linguist/lupdate/testdata/good/proparsing/vpaths/dependpath/main_dependpath.cpp b/tests/auto/linguist/lupdate/testdata/good/proparsing/vpaths/dependpath/main_dependpath.cpp
index f019c79..f12ce98 100644
--- a/tests/auto/linguist/lupdate/testdata/good/proparsing/vpaths/dependpath/main_dependpath.cpp
+++ b/tests/auto/linguist/lupdate/testdata/good/proparsing/vpaths/dependpath/main_dependpath.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 test suite 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$
+**
+****************************************************************************/
+
 // IMPORTANT!!!! If you want to add testdata to this file,
 // always add it to the end in order to not change the linenumbers of translations!!!
 
diff --git a/tests/auto/linguist/lupdate/testdata/good/proparsing/wildcard/main1.cpp b/tests/auto/linguist/lupdate/testdata/good/proparsing/wildcard/main1.cpp
index 506ae42..fdc5ca4 100644
--- a/tests/auto/linguist/lupdate/testdata/good/proparsing/wildcard/main1.cpp
+++ b/tests/auto/linguist/lupdate/testdata/good/proparsing/wildcard/main1.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 test suite 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$
+**
+****************************************************************************/
+
 // IMPORTANT!!!! If you want to add testdata to this file,
 // always add it to the end in order to not change the linenumbers of translations!!!
 
diff --git a/tests/auto/linguist/lupdate/testdata/good/proparsing/wildcard/mainfile.cpp b/tests/auto/linguist/lupdate/testdata/good/proparsing/wildcard/mainfile.cpp
index f4cd00a..a5d5783 100644
--- a/tests/auto/linguist/lupdate/testdata/good/proparsing/wildcard/mainfile.cpp
+++ b/tests/auto/linguist/lupdate/testdata/good/proparsing/wildcard/mainfile.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 test suite 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$
+**
+****************************************************************************/
+
 // IMPORTANT!!!! If you want to add testdata to this file,
 // always add it to the end in order to not change the linenumbers of translations!!!
 
diff --git a/tests/auto/linguist/lupdate/testdata/good/proparsing/wildcard1.cpp b/tests/auto/linguist/lupdate/testdata/good/proparsing/wildcard1.cpp
index c7790c5..bfe651c 100644
--- a/tests/auto/linguist/lupdate/testdata/good/proparsing/wildcard1.cpp
+++ b/tests/auto/linguist/lupdate/testdata/good/proparsing/wildcard1.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 test suite 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$
+**
+****************************************************************************/
+
 // IMPORTANT!!!! If you want to add testdata to this file,
 // always add it to the end in order to not change the linenumbers of translations!!!
 
diff --git a/tests/auto/linguist/lupdate/testdata/good/proparsing/wildcard99.cpp b/tests/auto/linguist/lupdate/testdata/good/proparsing/wildcard99.cpp
index 93febda..9f7e3cd 100644
--- a/tests/auto/linguist/lupdate/testdata/good/proparsing/wildcard99.cpp
+++ b/tests/auto/linguist/lupdate/testdata/good/proparsing/wildcard99.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 test suite 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$
+**
+****************************************************************************/
+
 // IMPORTANT!!!! If you want to add testdata to this file,
 // always add it to the end in order to not change the linenumbers of translations!!!
 
diff --git a/tests/auto/linguist/lupdate/testdata/good/proparsing2/a b/tests/auto/linguist/lupdate/testdata/good/proparsing2/a
index 5966392..d3abf47 100644
--- a/tests/auto/linguist/lupdate/testdata/good/proparsing2/a
+++ b/tests/auto/linguist/lupdate/testdata/good/proparsing2/a
@@ -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 test suite 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$
+**
+****************************************************************************/
+
 QString func()
 {
     return QLineEdit::tr("a");
diff --git a/tests/auto/linguist/lupdate/testdata/good/proparsing2/a.cpp b/tests/auto/linguist/lupdate/testdata/good/proparsing2/a.cpp
index 1d80ed3..5f0f7ef 100644
--- a/tests/auto/linguist/lupdate/testdata/good/proparsing2/a.cpp
+++ b/tests/auto/linguist/lupdate/testdata/good/proparsing2/a.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 test suite 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$
+**
+****************************************************************************/
+
 QString func()
 {
     return QLineEdit::tr("a.cpp");
diff --git a/tests/auto/linguist/lupdate/testdata/good/proparsing2/b b/tests/auto/linguist/lupdate/testdata/good/proparsing2/b
index d0fe066..40ab4f4 100644
--- a/tests/auto/linguist/lupdate/testdata/good/proparsing2/b
+++ b/tests/auto/linguist/lupdate/testdata/good/proparsing2/b
@@ -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 test suite 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$
+**
+****************************************************************************/
+
 QString func()
 {
     return QLineEdit::tr("b");
diff --git a/tests/auto/linguist/lupdate/testdata/good/proparsing2/b.cpp b/tests/auto/linguist/lupdate/testdata/good/proparsing2/b.cpp
index a5c386d..5feb1e7 100644
--- a/tests/auto/linguist/lupdate/testdata/good/proparsing2/b.cpp
+++ b/tests/auto/linguist/lupdate/testdata/good/proparsing2/b.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 test suite 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$
+**
+****************************************************************************/
+
 QString func()
 {
     return QLineEdit::tr("b.cpp");
diff --git a/tests/auto/linguist/lupdate/testdata/good/proparsing2/e b/tests/auto/linguist/lupdate/testdata/good/proparsing2/e
index 66e89a8..ffb7dd6 100644
--- a/tests/auto/linguist/lupdate/testdata/good/proparsing2/e
+++ b/tests/auto/linguist/lupdate/testdata/good/proparsing2/e
@@ -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 test suite 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$
+**
+****************************************************************************/
+
 QString func()
 {
     return QLineEdit::tr("e");
diff --git a/tests/auto/linguist/lupdate/testdata/good/proparsing2/f/g.cpp b/tests/auto/linguist/lupdate/testdata/good/proparsing2/f/g.cpp
index d86bee2..1eeac23 100644
--- a/tests/auto/linguist/lupdate/testdata/good/proparsing2/f/g.cpp
+++ b/tests/auto/linguist/lupdate/testdata/good/proparsing2/f/g.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 test suite 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$
+**
+****************************************************************************/
+
 QString func()
 {
     return QLineEdit::tr("f/g.cpp");
diff --git a/tests/auto/linguist/lupdate/testdata/good/proparsing2/project.ts.result b/tests/auto/linguist/lupdate/testdata/good/proparsing2/project.ts.result
index 2e60696..3714d9b 100644
--- a/tests/auto/linguist/lupdate/testdata/good/proparsing2/project.ts.result
+++ b/tests/auto/linguist/lupdate/testdata/good/proparsing2/project.ts.result
@@ -4,57 +4,57 @@
 <context>
     <name>QLineEdit</name>
     <message>
-        <location filename="a" line="3"/>
+        <location filename="a" line="44"/>
         <source>a</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="a.cpp" line="3"/>
+        <location filename="a.cpp" line="44"/>
         <source>a.cpp</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="b" line="3"/>
+        <location filename="b" line="44"/>
         <source>b</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="b.cpp" line="3"/>
+        <location filename="b.cpp" line="44"/>
         <source>b.cpp</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="e" line="3"/>
+        <location filename="e" line="44"/>
         <source>e</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="f/g.cpp" line="3"/>
+        <location filename="f/g.cpp" line="44"/>
         <source>f/g.cpp</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="spaces/z" line="3"/>
+        <location filename="spaces/z" line="44"/>
         <source>spaces/z</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="variable_with_spaces" line="3"/>
+        <location filename="variable_with_spaces" line="44"/>
         <source>variable with spaces</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="with" line="3"/>
+        <location filename="with" line="44"/>
         <source>with</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="x/d" line="3"/>
+        <location filename="x/d" line="44"/>
         <source>x/d</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="x/variable" line="3"/>
+        <location filename="x/variable" line="44"/>
         <source>x/variable</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/tests/auto/linguist/lupdate/testdata/good/proparsing2/spaces/z b/tests/auto/linguist/lupdate/testdata/good/proparsing2/spaces/z
index 34364d6..4b237dc 100644
--- a/tests/auto/linguist/lupdate/testdata/good/proparsing2/spaces/z
+++ b/tests/auto/linguist/lupdate/testdata/good/proparsing2/spaces/z
@@ -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 test suite 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$
+**
+****************************************************************************/
+
 QString func()
 {
     return QLineEdit::tr("spaces/z");
diff --git a/tests/auto/linguist/lupdate/testdata/good/proparsing2/variable_with_spaces b/tests/auto/linguist/lupdate/testdata/good/proparsing2/variable_with_spaces
index cf56fc4..6ce9ff0 100644
--- a/tests/auto/linguist/lupdate/testdata/good/proparsing2/variable_with_spaces
+++ b/tests/auto/linguist/lupdate/testdata/good/proparsing2/variable_with_spaces
@@ -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 test suite 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$
+**
+****************************************************************************/
+
 QString func()
 {
     return QLineEdit::tr("variable with spaces");
diff --git a/tests/auto/linguist/lupdate/testdata/good/proparsing2/with b/tests/auto/linguist/lupdate/testdata/good/proparsing2/with
index a156ca1..b2a1e57 100644
--- a/tests/auto/linguist/lupdate/testdata/good/proparsing2/with
+++ b/tests/auto/linguist/lupdate/testdata/good/proparsing2/with
@@ -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 test suite 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$
+**
+****************************************************************************/
+
 QString func()
 {
     return QLineEdit::tr("with");
diff --git a/tests/auto/linguist/lupdate/testdata/good/proparsing2/x/d b/tests/auto/linguist/lupdate/testdata/good/proparsing2/x/d
index e2effde..30ab25a 100644
--- a/tests/auto/linguist/lupdate/testdata/good/proparsing2/x/d
+++ b/tests/auto/linguist/lupdate/testdata/good/proparsing2/x/d
@@ -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 test suite 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$
+**
+****************************************************************************/
+
 QString func()
 {
     return QLineEdit::tr("x/d");
diff --git a/tests/auto/linguist/lupdate/testdata/good/proparsing2/x/variable b/tests/auto/linguist/lupdate/testdata/good/proparsing2/x/variable
index a86e387..a6093aa 100644
--- a/tests/auto/linguist/lupdate/testdata/good/proparsing2/x/variable
+++ b/tests/auto/linguist/lupdate/testdata/good/proparsing2/x/variable
@@ -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 test suite 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$
+**
+****************************************************************************/
+
 QString func()
 {
     return QLineEdit::tr("x/variable");
diff --git a/tests/auto/linguist/lupdate/testdata/good/proparsingpaths/file1.cpp b/tests/auto/linguist/lupdate/testdata/good/proparsingpaths/file1.cpp
index ad87e70..e1876c8 100644
--- a/tests/auto/linguist/lupdate/testdata/good/proparsingpaths/file1.cpp
+++ b/tests/auto/linguist/lupdate/testdata/good/proparsingpaths/file1.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 test suite 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$
+**
+****************************************************************************/
+
 // IMPORTANT!!!! If you want to add testdata to this file,
 // always add it to the end in order to not change the linenumbers of translations!!!
 
diff --git a/tests/auto/linguist/lupdate/testdata/good/proparsingpaths/filter.cpp b/tests/auto/linguist/lupdate/testdata/good/proparsingpaths/filter.cpp
index 912963d..2e40b44 100644
--- a/tests/auto/linguist/lupdate/testdata/good/proparsingpaths/filter.cpp
+++ b/tests/auto/linguist/lupdate/testdata/good/proparsingpaths/filter.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 test suite 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$
+**
+****************************************************************************/
+
 // IMPORTANT!!!! If you want to add testdata to this file,
 // always add it to the end in order to not change the linenumbers of translations!!!
 
diff --git a/tests/auto/linguist/lupdate/testdata/good/proparsingpaths/project.ts.result b/tests/auto/linguist/lupdate/testdata/good/proparsingpaths/project.ts.result
index 470d6eb..edc2fcb 100644
--- a/tests/auto/linguist/lupdate/testdata/good/proparsingpaths/project.ts.result
+++ b/tests/auto/linguist/lupdate/testdata/good/proparsingpaths/project.ts.result
@@ -4,25 +4,25 @@
 <context>
     <name>QApplication</name>
     <message>
-        <location filename="file1.cpp" line="6"/>
+        <location filename="file1.cpp" line="47"/>
         <source>Hello world</source>
         <comment>top-level wildcard</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="filter.cpp" line="6"/>
+        <location filename="filter.cpp" line="47"/>
         <source>Hello world</source>
         <comment>top-level direct</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sub/subfile1.cpp" line="6"/>
+        <location filename="sub/subfile1.cpp" line="47"/>
         <source>Hello world</source>
         <comment>nested wildcard</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sub/subfilter.cpp" line="6"/>
+        <location filename="sub/subfilter.cpp" line="47"/>
         <source>Hello world</source>
         <comment>nested direct</comment>
         <translation type="unfinished"></translation>
diff --git a/tests/auto/linguist/lupdate/testdata/good/proparsingpaths/sub/subfile1.cpp b/tests/auto/linguist/lupdate/testdata/good/proparsingpaths/sub/subfile1.cpp
index 807d296..91fe89e 100644
--- a/tests/auto/linguist/lupdate/testdata/good/proparsingpaths/sub/subfile1.cpp
+++ b/tests/auto/linguist/lupdate/testdata/good/proparsingpaths/sub/subfile1.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 test suite 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$
+**
+****************************************************************************/
+
 // IMPORTANT!!!! If you want to add testdata to this file,
 // always add it to the end in order to not change the linenumbers of translations!!!
 
diff --git a/tests/auto/linguist/lupdate/testdata/good/proparsingpaths/sub/subfilter.cpp b/tests/auto/linguist/lupdate/testdata/good/proparsingpaths/sub/subfilter.cpp
index 6e5dd25..b72253f 100644
--- a/tests/auto/linguist/lupdate/testdata/good/proparsingpaths/sub/subfilter.cpp
+++ b/tests/auto/linguist/lupdate/testdata/good/proparsingpaths/sub/subfilter.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 test suite 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$
+**
+****************************************************************************/
+
 // IMPORTANT!!!! If you want to add testdata to this file,
 // always add it to the end in order to not change the linenumbers of translations!!!
 
diff --git a/tests/auto/linguist/lupdate/testdata/good/proparsingpri/common/main.cpp b/tests/auto/linguist/lupdate/testdata/good/proparsingpri/common/main.cpp
index 236bbe7..9064b56 100644
--- a/tests/auto/linguist/lupdate/testdata/good/proparsingpri/common/main.cpp
+++ b/tests/auto/linguist/lupdate/testdata/good/proparsingpri/common/main.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 test suite 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$
+**
+****************************************************************************/
+
 // IMPORTANT!!!! If you want to add testdata to this file,
 // always add it to the end in order to not change the linenumbers of translations!!!
 
diff --git a/tests/auto/linguist/lupdate/testdata/good/proparsingpri/mac/main_mac.cpp b/tests/auto/linguist/lupdate/testdata/good/proparsingpri/mac/main_mac.cpp
index 845aaa6..4cfec14 100644
--- a/tests/auto/linguist/lupdate/testdata/good/proparsingpri/mac/main_mac.cpp
+++ b/tests/auto/linguist/lupdate/testdata/good/proparsingpri/mac/main_mac.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 test suite 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$
+**
+****************************************************************************/
+
 // IMPORTANT!!!! If you want to add testdata to this file,
 // always add it to the end in order to not change the linenumbers of translations!!!
 
diff --git a/tests/auto/linguist/lupdate/testdata/good/proparsingpri/project.ts.result b/tests/auto/linguist/lupdate/testdata/good/proparsingpri/project.ts.result
index c64ba82..e01c533 100644
--- a/tests/auto/linguist/lupdate/testdata/good/proparsingpri/project.ts.result
+++ b/tests/auto/linguist/lupdate/testdata/good/proparsingpri/project.ts.result
@@ -4,31 +4,31 @@
 <context>
     <name>QApplication</name>
     <message>
-        <location filename="common/main.cpp" line="6"/>
+        <location filename="common/main.cpp" line="47"/>
         <source>Hello world</source>
         <comment>Platform-independent file</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mac/main_mac.cpp" line="6"/>
+        <location filename="mac/main_mac.cpp" line="47"/>
         <source>Hello macworld</source>
         <comment>mac-only file</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="relativity/relativity.cpp" line="6"/>
+        <location filename="relativity/relativity.cpp" line="47"/>
         <source>relativity.pri</source>
         <comment>Platform-independent file</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="unix/main_unix.cpp" line="6"/>
+        <location filename="unix/main_unix.cpp" line="47"/>
         <source>Hello unixworld</source>
         <comment>unix-only file</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="win/main_win.cpp" line="6"/>
+        <location filename="win/main_win.cpp" line="47"/>
         <source>Hello windowsworld</source>
         <comment>Windows-only file</comment>
         <translation type="unfinished"></translation>
diff --git a/tests/auto/linguist/lupdate/testdata/good/proparsingpri/relativity/relativity.cpp b/tests/auto/linguist/lupdate/testdata/good/proparsingpri/relativity/relativity.cpp
index 83ae7d5..a23e65a 100644
--- a/tests/auto/linguist/lupdate/testdata/good/proparsingpri/relativity/relativity.cpp
+++ b/tests/auto/linguist/lupdate/testdata/good/proparsingpri/relativity/relativity.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 test suite 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$
+**
+****************************************************************************/
+
 // IMPORTANT!!!! If you want to add testdata to this file,
 // always add it to the end in order to not change the linenumbers of translations!!!
 
diff --git a/tests/auto/linguist/lupdate/testdata/good/proparsingpri/unix/main_unix.cpp b/tests/auto/linguist/lupdate/testdata/good/proparsingpri/unix/main_unix.cpp
index 229e154..c15c2f7 100644
--- a/tests/auto/linguist/lupdate/testdata/good/proparsingpri/unix/main_unix.cpp
+++ b/tests/auto/linguist/lupdate/testdata/good/proparsingpri/unix/main_unix.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 test suite 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$
+**
+****************************************************************************/
+
 // IMPORTANT!!!! If you want to add testdata to this file,
 // always add it to the end in order to not change the linenumbers of translations!!!
 
diff --git a/tests/auto/linguist/lupdate/testdata/good/proparsingpri/win/main_win.cpp b/tests/auto/linguist/lupdate/testdata/good/proparsingpri/win/main_win.cpp
index 4eb39f7..b879aa7 100644
--- a/tests/auto/linguist/lupdate/testdata/good/proparsingpri/win/main_win.cpp
+++ b/tests/auto/linguist/lupdate/testdata/good/proparsingpri/win/main_win.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 test suite 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$
+**
+****************************************************************************/
+
 // IMPORTANT!!!! If you want to add testdata to this file,
 // always add it to the end in order to not change the linenumbers of translations!!!
 
diff --git a/tests/auto/linguist/lupdate/testdata/good/proparsingsubdirs/project.ts.result b/tests/auto/linguist/lupdate/testdata/good/proparsingsubdirs/project.ts.result
index 5914d0b..a6972bd 100644
--- a/tests/auto/linguist/lupdate/testdata/good/proparsingsubdirs/project.ts.result
+++ b/tests/auto/linguist/lupdate/testdata/good/proparsingsubdirs/project.ts.result
@@ -4,7 +4,7 @@
 <context>
     <name>QApplication</name>
     <message>
-        <location filename="sub1/main.cpp" line="6"/>
+        <location filename="sub1/main.cpp" line="47"/>
         <source>Hello world</source>
         <comment>Platform-independent file</comment>
         <translation type="unfinished"></translation>
diff --git a/tests/auto/linguist/lupdate/testdata/good/proparsingsubdirs/sub1/main.cpp b/tests/auto/linguist/lupdate/testdata/good/proparsingsubdirs/sub1/main.cpp
index 236bbe7..9064b56 100644
--- a/tests/auto/linguist/lupdate/testdata/good/proparsingsubdirs/sub1/main.cpp
+++ b/tests/auto/linguist/lupdate/testdata/good/proparsingsubdirs/sub1/main.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 test suite 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$
+**
+****************************************************************************/
+
 // IMPORTANT!!!! If you want to add testdata to this file,
 // always add it to the end in order to not change the linenumbers of translations!!!
 
diff --git a/tests/auto/linguist/lupdate/testdata/good/proparsingsubs/common/main.cpp b/tests/auto/linguist/lupdate/testdata/good/proparsingsubs/common/main.cpp
index 236bbe7..9064b56 100644
--- a/tests/auto/linguist/lupdate/testdata/good/proparsingsubs/common/main.cpp
+++ b/tests/auto/linguist/lupdate/testdata/good/proparsingsubs/common/main.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 test suite 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$
+**
+****************************************************************************/
+
 // IMPORTANT!!!! If you want to add testdata to this file,
 // always add it to the end in order to not change the linenumbers of translations!!!
 
diff --git a/tests/auto/linguist/lupdate/testdata/good/proparsingsubs/mac/main_mac.cpp b/tests/auto/linguist/lupdate/testdata/good/proparsingsubs/mac/main_mac.cpp
index 845aaa6..4cfec14 100644
--- a/tests/auto/linguist/lupdate/testdata/good/proparsingsubs/mac/main_mac.cpp
+++ b/tests/auto/linguist/lupdate/testdata/good/proparsingsubs/mac/main_mac.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 test suite 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$
+**
+****************************************************************************/
+
 // IMPORTANT!!!! If you want to add testdata to this file,
 // always add it to the end in order to not change the linenumbers of translations!!!
 
diff --git a/tests/auto/linguist/lupdate/testdata/good/proparsingsubs/project.ts.result b/tests/auto/linguist/lupdate/testdata/good/proparsingsubs/project.ts.result
index c0352fb..6621de9 100644
--- a/tests/auto/linguist/lupdate/testdata/good/proparsingsubs/project.ts.result
+++ b/tests/auto/linguist/lupdate/testdata/good/proparsingsubs/project.ts.result
@@ -4,25 +4,25 @@
 <context>
     <name>QApplication</name>
     <message>
-        <location filename="win/main_win.cpp" line="6"/>
+        <location filename="win/main_win.cpp" line="47"/>
         <source>Hello windowsworld</source>
         <comment>Windows-only file</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mac/main_mac.cpp" line="6"/>
+        <location filename="mac/main_mac.cpp" line="47"/>
         <source>Hello macworld</source>
         <comment>mac-only file</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="unix/main_unix.cpp" line="6"/>
+        <location filename="unix/main_unix.cpp" line="47"/>
         <source>Hello unixworld</source>
         <comment>unix-only file</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="common/main.cpp" line="6"/>
+        <location filename="common/main.cpp" line="47"/>
         <source>Hello world</source>
         <comment>Platform-independent file</comment>
         <translation type="unfinished"></translation>
diff --git a/tests/auto/linguist/lupdate/testdata/good/proparsingsubs/unix/main_unix.cpp b/tests/auto/linguist/lupdate/testdata/good/proparsingsubs/unix/main_unix.cpp
index 229e154..c15c2f7 100644
--- a/tests/auto/linguist/lupdate/testdata/good/proparsingsubs/unix/main_unix.cpp
+++ b/tests/auto/linguist/lupdate/testdata/good/proparsingsubs/unix/main_unix.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 test suite 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$
+**
+****************************************************************************/
+
 // IMPORTANT!!!! If you want to add testdata to this file,
 // always add it to the end in order to not change the linenumbers of translations!!!
 
diff --git a/tests/auto/linguist/lupdate/testdata/good/proparsingsubs/win/main_win.cpp b/tests/auto/linguist/lupdate/testdata/good/proparsingsubs/win/main_win.cpp
index 4eb39f7..b879aa7 100644
--- a/tests/auto/linguist/lupdate/testdata/good/proparsingsubs/win/main_win.cpp
+++ b/tests/auto/linguist/lupdate/testdata/good/proparsingsubs/win/main_win.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 test suite 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$
+**
+****************************************************************************/
+
 // IMPORTANT!!!! If you want to add testdata to this file,
 // always add it to the end in order to not change the linenumbers of translations!!!
 
diff --git a/tests/auto/linguist/lupdate/testdata/output_ts/project.ts.result b/tests/auto/linguist/lupdate/testdata/output_ts/project.ts.result
index 7fde820..e398701 100644
--- a/tests/auto/linguist/lupdate/testdata/output_ts/project.ts.result
+++ b/tests/auto/linguist/lupdate/testdata/output_ts/project.ts.result
@@ -4,7 +4,7 @@
 <context>
     <name>QApplication</name>
     <message>
-        <location filename="../main.cpp" line="6"/>
+        <location filename="../main.cpp" line="47"/>
         <source>Hello world</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/tests/auto/linguist/lupdate/testdata/output_ts/toplevel/library/tools/main.cpp b/tests/auto/linguist/lupdate/testdata/output_ts/toplevel/library/tools/main.cpp
index 477f5ec..28c6373 100644
--- a/tests/auto/linguist/lupdate/testdata/output_ts/toplevel/library/tools/main.cpp
+++ b/tests/auto/linguist/lupdate/testdata/output_ts/toplevel/library/tools/main.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 test suite 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$
+**
+****************************************************************************/
+
 // IMPORTANT!!!! If you want to add testdata to this file,
 // always add it to the end in order to not change the linenumbers of translations!!!
 
diff --git a/tests/auto/linguist/lupdate/testdata/recursivescan/bar.ts.result b/tests/auto/linguist/lupdate/testdata/recursivescan/bar.ts.result
index f6415bf..b86edae 100644
--- a/tests/auto/linguist/lupdate/testdata/recursivescan/bar.ts.result
+++ b/tests/auto/linguist/lupdate/testdata/recursivescan/bar.ts.result
@@ -4,22 +4,22 @@
 <context>
     <name>FindDialog</name>
     <message>
-        <location filename="sub/finddialog.cpp" line="16"/>
+        <location filename="sub/finddialog.cpp" line="85"/>
         <source>Enter the text you want to find.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sub/finddialog.cpp" line="25"/>
+        <location filename="sub/finddialog.cpp" line="135"/>
         <source>Search reached end of the document</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sub/finddialog.cpp" line="27"/>
+        <location filename="sub/finddialog.cpp" line="137"/>
         <source>Search reached start of the document</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sub/finddialog.cpp" line="29"/>
+        <location filename="sub/finddialog.cpp" line="139"/>
         <source>Text not found</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/tests/auto/linguist/lupdate/testdata/recursivescan/foo.ts.result b/tests/auto/linguist/lupdate/testdata/recursivescan/foo.ts.result
index 581e4b6..835b3e0 100644
--- a/tests/auto/linguist/lupdate/testdata/recursivescan/foo.ts.result
+++ b/tests/auto/linguist/lupdate/testdata/recursivescan/foo.ts.result
@@ -4,32 +4,32 @@
 <context>
     <name>FindDialog</name>
     <message>
-        <location filename="project.ui" line="15"/>
+        <location filename="project.ui" line="55"/>
         <source>Qt Assistant - Finn text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="project.ui" line="18"/>
+        <location filename="project.ui" line="58"/>
         <source>Finn tekst</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sub/finddialog.cpp" line="16"/>
+        <location filename="sub/finddialog.cpp" line="85"/>
         <source>Enter the text you want to find.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sub/finddialog.cpp" line="25"/>
+        <location filename="sub/finddialog.cpp" line="135"/>
         <source>Search reached end of the document</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sub/finddialog.cpp" line="27"/>
+        <location filename="sub/finddialog.cpp" line="137"/>
         <source>Search reached start of the document</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sub/finddialog.cpp" line="29"/>
+        <location filename="sub/finddialog.cpp" line="139"/>
         <source>Text not found</source>
         <translation type="unfinished"></translation>
     </message>
@@ -37,53 +37,53 @@
 <context>
     <name>QObject</name>
     <message>
-        <location filename="main.cpp" line="12"/>
+        <location filename="main.cpp" line="53"/>
         <source>
 newline at the start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main.cpp" line="13"/>
+        <location filename="main.cpp" line="54"/>
         <source>newline at the end
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main.cpp" line="14"/>
+        <location filename="main.cpp" line="55"/>
         <source>newline and space at the end
  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main.cpp" line="15"/>
+        <location filename="main.cpp" line="56"/>
         <source>space and newline at the end 
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main.cpp" line="16"/>
+        <location filename="main.cpp" line="57"/>
         <source>	Tab at the start and newline at the end
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main.cpp" line="17"/>
+        <location filename="main.cpp" line="58"/>
         <source>
 	newline and tab at the start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main.cpp" line="18"/>
+        <location filename="main.cpp" line="59"/>
         <source> 	space and tab at the start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main.cpp" line="19"/>
+        <location filename="main.cpp" line="60"/>
         <source> space_first</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main.cpp" line="20"/>
+        <location filename="main.cpp" line="61"/>
         <source>space_last </source>
         <translation type="unfinished"></translation>
     </message>
@@ -91,7 +91,7 @@ newline at the start</source>
 <context>
     <name>text/c++</name>
     <message>
-        <location filename="sub/filetypes/main.c++" line="6"/>
+        <location filename="sub/filetypes/main.c++" line="47"/>
         <source>test</source>
         <translation type="unfinished"></translation>
     </message>
@@ -99,7 +99,7 @@ newline at the start</source>
 <context>
     <name>text/cpp</name>
     <message>
-        <location filename="sub/filetypes/main.cpp" line="6"/>
+        <location filename="sub/filetypes/main.cpp" line="47"/>
         <source>test</source>
         <translation type="unfinished"></translation>
     </message>
@@ -107,7 +107,7 @@ newline at the start</source>
 <context>
     <name>text/cxx</name>
     <message>
-        <location filename="sub/filetypes/main.cxx" line="6"/>
+        <location filename="sub/filetypes/main.cxx" line="47"/>
         <source>test</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/tests/auto/linguist/lupdate/testdata/recursivescan/main.cpp b/tests/auto/linguist/lupdate/testdata/recursivescan/main.cpp
index 905cccd..e028d95 100644
--- a/tests/auto/linguist/lupdate/testdata/recursivescan/main.cpp
+++ b/tests/auto/linguist/lupdate/testdata/recursivescan/main.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 test suite 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$
+**
+****************************************************************************/
+
 #include <QApplication>
 #include <QDebug>
 
diff --git a/tests/auto/linguist/lupdate/testdata/recursivescan/project.ui b/tests/auto/linguist/lupdate/testdata/recursivescan/project.ui
index 8dea10b..6da2699 100644
--- a/tests/auto/linguist/lupdate/testdata/recursivescan/project.ui
+++ b/tests/auto/linguist/lupdate/testdata/recursivescan/project.ui
@@ -1,5 +1,38 @@
 <ui version="4.0" >
  <author></author>
+** 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 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$
  <exportmacro></exportmacro>
  <class>FindDialog</class>
  <widget class="QWidget" name="FindDialog" >
diff --git a/tests/auto/linguist/lupdate/testdata/recursivescan/sub/filetypes/main.c++ b/tests/auto/linguist/lupdate/testdata/recursivescan/sub/filetypes/main.c++
index 4da3ded..e6d0460 100644
--- a/tests/auto/linguist/lupdate/testdata/recursivescan/sub/filetypes/main.c++
+++ b/tests/auto/linguist/lupdate/testdata/recursivescan/sub/filetypes/main.c++
@@ -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 test suite 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$
+**
+****************************************************************************/
+
 #include <QApplication>
 
 int main(int argc, char **argv)
diff --git a/tests/auto/linguist/lupdate/testdata/recursivescan/sub/filetypes/main.cpp b/tests/auto/linguist/lupdate/testdata/recursivescan/sub/filetypes/main.cpp
index 9b3207d..0bbe233 100644
--- a/tests/auto/linguist/lupdate/testdata/recursivescan/sub/filetypes/main.cpp
+++ b/tests/auto/linguist/lupdate/testdata/recursivescan/sub/filetypes/main.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 test suite 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$
+**
+****************************************************************************/
+
 #include <QApplication>
 
 int main(int argc, char **argv)
diff --git a/tests/auto/linguist/lupdate/testdata/recursivescan/sub/filetypes/main.cxx b/tests/auto/linguist/lupdate/testdata/recursivescan/sub/filetypes/main.cxx
index b741ff0..2093042 100644
--- a/tests/auto/linguist/lupdate/testdata/recursivescan/sub/filetypes/main.cxx
+++ b/tests/auto/linguist/lupdate/testdata/recursivescan/sub/filetypes/main.cxx
@@ -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 test suite 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$
+**
+****************************************************************************/
+
 #include <QApplication>
 
 int main(int argc, char **argv)
diff --git a/tests/auto/linguist/lupdate/testdata/recursivescan/sub/finddialog.cpp b/tests/auto/linguist/lupdate/testdata/recursivescan/sub/finddialog.cpp
index 3875473..3aa483e 100644
--- a/tests/auto/linguist/lupdate/testdata/recursivescan/sub/finddialog.cpp
+++ b/tests/auto/linguist/lupdate/testdata/recursivescan/sub/finddialog.cpp
@@ -1,3 +1,36 @@
+** 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 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$
 #include "finddialog.h"
 #include "mainwindow.h"
 #include "tabbedbrowser.h"
diff --git a/tests/auto/mediaobject/dummy/audiooutput.h b/tests/auto/mediaobject/dummy/audiooutput.h
index 39efb55..47fb9f0 100644
--- a/tests/auto/mediaobject/dummy/audiooutput.h
+++ b/tests/auto/mediaobject/dummy/audiooutput.h
@@ -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 test suite 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$
+**
+****************************************************************************/
+
 #ifndef PHONON_DUMMY_AUDIOOUTPUT_H
 #define PHONON_DUMMY_AUDIOOUTPUT_H
 
diff --git a/tests/auto/mediaobject/dummy/backend.h b/tests/auto/mediaobject/dummy/backend.h
index 20af216..b7302dd 100644
--- a/tests/auto/mediaobject/dummy/backend.h
+++ b/tests/auto/mediaobject/dummy/backend.h
@@ -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 test suite 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$
+**
+****************************************************************************/
+
 #ifndef PHONON_DUMMY_BACKEND_H
 #define PHONON_DUMMY_BACKEND_H
 
diff --git a/tests/auto/mediaobject/dummy/mediaobject.h b/tests/auto/mediaobject/dummy/mediaobject.h
index a87b32f..e4c7978 100644
--- a/tests/auto/mediaobject/dummy/mediaobject.h
+++ b/tests/auto/mediaobject/dummy/mediaobject.h
@@ -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 test suite 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$
+**
+****************************************************************************/
+
 #ifndef PHONON_DUMMY_MEDIAOBJECT_H
 #define PHONON_DUMMY_MEDIAOBJECT_H
 
diff --git a/tests/auto/mediaobject/dummy/videowidget.h b/tests/auto/mediaobject/dummy/videowidget.h
index 2e5a2b8..a8416f9 100644
--- a/tests/auto/mediaobject/dummy/videowidget.h
+++ b/tests/auto/mediaobject/dummy/videowidget.h
@@ -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 test sutie 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$
+**
+****************************************************************************/
+
 #ifndef PHONON_DUMMY_VIDEOWIDGET_H
 #define PHONON_DUMMY_VIDEOWIDGET_H
 
diff --git a/tests/auto/qabstractitemmodel/dynamictreemodel.cpp b/tests/auto/qabstractitemmodel/dynamictreemodel.cpp
new file mode 100644
index 0000000..374b7db
--- /dev/null
+++ b/tests/auto/qabstractitemmodel/dynamictreemodel.cpp
@@ -0,0 +1,309 @@
+/*
+    Copyright (c) 2009 Stephen Kelly <steveire@gmail.com>
+
+    This library is free software; you can redistribute it and/or modify it
+    under the terms of the GNU Library General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    This library is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
+    License for more details.
+
+    You should have received a copy of the GNU Library General Public License
+    along with this library; see the file COPYING.LIB.  If not, write to the
+    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+    02110-1301, USA.
+*/
+
+#include "dynamictreemodel.h"
+
+#include <QHash>
+#include <QList>
+#include <QTimer>
+
+#include <QDebug>
+
+#include <kdebug.h>
+
+DynamicTreeModel::DynamicTreeModel(QObject *parent)
+  : QAbstractItemModel(parent),
+    nextId(1)
+{
+}
+
+QModelIndex DynamicTreeModel::index(int row, int column, const QModelIndex &parent) const
+{
+//   if (column != 0)
+//     return QModelIndex();
+
+
+  if ( column < 0 || row < 0 )
+    return QModelIndex();
+
+  QList<QList<qint64> > childIdColumns = m_childItems.value(parent.internalId());
+
+
+  if (childIdColumns.size() == 0)
+    return QModelIndex();
+
+  if (column >= childIdColumns.size())
+    return QModelIndex();
+
+  QList<qint64> rowIds = childIdColumns.at(column);
+
+  if ( row >= rowIds.size())
+    return QModelIndex();
+
+  qint64 id = rowIds.at(row);
+
+  return createIndex(row, column, reinterpret_cast<void *>(id));
+
+}
+
+qint64 DynamicTreeModel::findParentId(qint64 searchId) const
+{
+  if (searchId <= 0)
+    return -1;
+
+  QHashIterator<qint64, QList<QList<qint64> > > i(m_childItems);
+  while (i.hasNext())
+  {
+    i.next();
+    QListIterator<QList<qint64> > j(i.value());
+    while (j.hasNext())
+    {
+      QList<qint64> l = j.next();
+      if (l.contains(searchId))
+      {
+        return i.key();
+      }
+    }
+  }
+  return -1;
+}
+
+QModelIndex DynamicTreeModel::parent(const QModelIndex &index) const
+{
+  if (!index.isValid())
+    return QModelIndex();
+
+  qint64 searchId = index.internalId();
+  qint64 parentId = findParentId(searchId);
+  // Will never happen for valid index, but what the hey...
+  if (parentId <= 0)
+    return QModelIndex();
+
+  qint64 grandParentId = findParentId(parentId);
+  if (grandParentId < 0)
+    grandParentId = 0;
+
+  int column = 0;
+  QList<qint64> childList = m_childItems.value(grandParentId).at(column);
+
+  int row = childList.indexOf(parentId);
+
+  return createIndex(row, column, reinterpret_cast<void *>(parentId));
+
+}
+
+int DynamicTreeModel::rowCount(const QModelIndex &index ) const
+{
+  QList<QList<qint64> > cols = m_childItems.value(index.internalId());
+
+  if (cols.size() == 0 )
+    return 0;
+
+  if (index.column() > 0)
+    return 0;
+
+  return cols.at(0).size();
+}
+
+int DynamicTreeModel::columnCount(const QModelIndex &index ) const
+{
+//   Q_UNUSED(index);
+  return m_childItems.value(index.internalId()).size();
+}
+
+QVariant DynamicTreeModel::data(const QModelIndex &index, int role) const
+{
+  if (!index.isValid())
+    return QVariant();
+
+  if (Qt::DisplayRole == role)
+  {
+    return m_items.value(index.internalId());
+  }
+  return QVariant();
+}
+
+void DynamicTreeModel::clear()
+{
+  m_items.clear();
+  m_childItems.clear();
+  nextId = 1;
+  reset();
+}
+
+
+ModelChangeCommand::ModelChangeCommand( DynamicTreeModel *model, QObject *parent )
+    : QObject(parent), m_model(model), m_numCols(1), m_startRow(-1), m_endRow(-1)
+{
+
+}
+
+QModelIndex ModelChangeCommand::findIndex(QList<int> rows)
+{
+  const int col = 0;
+  QModelIndex parent = QModelIndex();
+  QListIterator<int> i(rows);
+  while (i.hasNext())
+  {
+    parent = m_model->index(i.next(), col, parent);
+    Q_ASSERT(parent.isValid());
+  }
+  return parent;
+}
+
+ModelInsertCommand::ModelInsertCommand(DynamicTreeModel *model, QObject *parent )
+    : ModelChangeCommand(model, parent)
+{
+
+}
+
+void ModelInsertCommand::doCommand()
+{
+  QModelIndex parent = findIndex(m_rowNumbers);
+  m_model->beginInsertRows(parent, m_startRow, m_endRow);
+  qint64 parentId = parent.internalId();
+  for (int row = m_startRow; row <= m_endRow; row++)
+  {
+    for(int col = 0; col < m_numCols; col++ )
+    {
+      if (m_model->m_childItems[parentId].size() <= col)
+      {
+        m_model->m_childItems[parentId].append(QList<qint64>());
+      }
+//       QString name = QUuid::createUuid().toString();
+      qint64 id = m_model->newId();
+      QString name = QString::number(id);
+
+      m_model->m_items.insert(id, name);
+      m_model->m_childItems[parentId][col].insert(row, id);
+
+    }
+  }
+  m_model->endInsertRows();
+}
+
+
+ModelMoveCommand::ModelMoveCommand(DynamicTreeModel *model, QObject *parent)
+  : ModelChangeCommand(model, parent)
+{
+
+}
+bool ModelMoveCommand::emitPreSignal(const QModelIndex &srcParent, int srcStart, int srcEnd, const QModelIndex &destParent, int destRow)
+{
+  return m_model->beginMoveRows(srcParent, srcStart, srcEnd, destParent, destRow);
+}
+
+void ModelMoveCommand::doCommand()
+{
+    QModelIndex srcParent = findIndex(m_rowNumbers);
+    QModelIndex destParent = findIndex(m_destRowNumbers);
+
+    if (!emitPreSignal(srcParent, m_startRow, m_endRow, destParent, m_destRow))
+    {
+        return;
+    }
+
+    for (int column = 0; column < m_numCols; ++column)
+    {
+        QList<qint64> l = m_model->m_childItems.value(srcParent.internalId())[column].mid(m_startRow, m_endRow - m_startRow + 1 );
+
+        for (int i = m_startRow; i <= m_endRow ; i++)
+        {
+            m_model->m_childItems[srcParent.internalId()][column].removeAt(m_startRow);
+        }
+        int d;
+        if (m_destRow < m_startRow)
+            d = m_destRow;
+        else
+        {
+            if (srcParent == destParent)
+                d = m_destRow - (m_endRow - m_startRow + 1);
+            else
+                d = m_destRow - (m_endRow - m_startRow) + 1;
+        }
+
+        foreach(const qint64 id, l)
+        {
+            m_model->m_childItems[destParent.internalId()][column].insert(d++, id);
+        }
+    }
+
+    emitPostSignal();
+}
+
+void ModelMoveCommand::emitPostSignal()
+{
+    m_model->endMoveRows();
+}
+
+ModelResetCommand::ModelResetCommand(DynamicTreeModel* model, QObject* parent)
+  : ModelMoveCommand(model, parent)
+{
+
+}
+
+ModelResetCommand::~ModelResetCommand()
+{
+
+}
+
+bool ModelResetCommand::emitPreSignal(const QModelIndex &srcParent, int srcStart, int srcEnd, const QModelIndex &destParent, int destRow)
+{
+    Q_UNUSED(srcParent);
+    Q_UNUSED(srcStart);
+    Q_UNUSED(srcEnd);
+    Q_UNUSED(destParent);
+    Q_UNUSED(destRow);
+
+    return true;
+}
+
+void ModelResetCommand::emitPostSignal()
+{
+    m_model->reset();
+}
+
+ModelResetCommandFixed::ModelResetCommandFixed(DynamicTreeModel* model, QObject* parent)
+  : ModelMoveCommand(model, parent)
+{
+
+}
+
+ModelResetCommandFixed::~ModelResetCommandFixed()
+{
+
+}
+
+bool ModelResetCommandFixed::emitPreSignal(const QModelIndex &srcParent, int srcStart, int srcEnd, const QModelIndex &destParent, int destRow)
+{
+    Q_UNUSED(srcParent);
+    Q_UNUSED(srcStart);
+    Q_UNUSED(srcEnd);
+    Q_UNUSED(destParent);
+    Q_UNUSED(destRow);
+
+    m_model->beginResetModel();
+    return true;
+}
+
+void ModelResetCommandFixed::emitPostSignal()
+{
+    m_model->endResetModel();
+}
+
diff --git a/tests/auto/qabstractitemmodel/dynamictreemodel.h b/tests/auto/qabstractitemmodel/dynamictreemodel.h
new file mode 100644
index 0000000..c19ed9d
--- /dev/null
+++ b/tests/auto/qabstractitemmodel/dynamictreemodel.h
@@ -0,0 +1,180 @@
+/*
+    Copyright (c) 2009 Stephen Kelly <steveire@gmail.com>
+
+    This library is free software; you can redistribute it and/or modify it
+    under the terms of the GNU Library General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    This library is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
+    License for more details.
+
+    You should have received a copy of the GNU Library General Public License
+    along with this library; see the file COPYING.LIB.  If not, write to the
+    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+    02110-1301, USA.
+*/
+
+#ifndef DYNAMICTREEMODEL_H
+#define DYNAMICTREEMODEL_H
+
+#include <QAbstractItemModel>
+
+#include <QHash>
+#include <QList>
+
+#include <QDebug>
+
+#include <kdebug.h>
+
+template<typename T> class QList;
+
+class DynamicTreeModel : public QAbstractItemModel
+{
+  Q_OBJECT
+
+public:
+  DynamicTreeModel(QObject *parent = 0);
+
+  QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const;
+  QModelIndex parent(const QModelIndex &index) const;
+  int rowCount(const QModelIndex &index = QModelIndex()) const;
+  int columnCount(const QModelIndex &index = QModelIndex()) const;
+
+  QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;
+
+  void clear();
+
+protected slots:
+
+  /**
+  Finds the parent id of the string with id @p searchId.
+
+  Returns -1 if not found.
+  */
+  qint64 findParentId(qint64 searchId) const;
+
+private:
+  QHash<qint64, QString> m_items;
+  QHash<qint64, QList<QList<qint64> > > m_childItems;
+  qint64 nextId;
+  qint64 newId() { return nextId++; };
+
+  QModelIndex m_nextParentIndex;
+  int m_nextRow;
+
+  int m_depth;
+  int maxDepth;
+
+  friend class ModelInsertCommand;
+  friend class ModelMoveCommand;
+  friend class ModelResetCommand;
+  friend class ModelResetCommandFixed;
+
+};
+
+
+class ModelChangeCommand : public QObject
+{
+  Q_OBJECT
+public:
+
+  ModelChangeCommand( DynamicTreeModel *model, QObject *parent = 0 );
+
+  virtual ~ModelChangeCommand() {}
+
+  void setAncestorRowNumbers(QList<int> rowNumbers) { m_rowNumbers = rowNumbers; }
+
+  QModelIndex findIndex(QList<int> rows);
+
+  void setStartRow(int row) { m_startRow = row; }
+
+  void setEndRow(int row) { m_endRow = row; }
+
+  void setNumCols(int cols) { m_numCols = cols; }
+
+  virtual void doCommand() = 0;
+
+protected:
+  DynamicTreeModel* m_model;
+  QList<int> m_rowNumbers;
+  int m_numCols;
+  int m_startRow;
+  int m_endRow;
+
+};
+
+typedef QList<ModelChangeCommand*> ModelChangeCommandList;
+
+class ModelInsertCommand : public ModelChangeCommand
+{
+  Q_OBJECT
+
+public:
+
+  ModelInsertCommand(DynamicTreeModel *model, QObject *parent = 0 );
+  virtual ~ModelInsertCommand() {}
+
+  virtual void doCommand();
+};
+
+
+class ModelMoveCommand : public ModelChangeCommand
+{
+  Q_OBJECT
+public:
+  ModelMoveCommand(DynamicTreeModel *model, QObject *parent);
+
+  virtual ~ModelMoveCommand() {}
+
+  virtual bool emitPreSignal(const QModelIndex &srcParent, int srcStart, int srcEnd, const QModelIndex &destParent, int destRow);
+
+  virtual void doCommand();
+
+  virtual void emitPostSignal();
+
+  void setDestAncestors( QList<int> rows ) { m_destRowNumbers = rows; }
+
+  void setDestRow(int row) { m_destRow = row; }
+
+protected:
+  QList<int> m_destRowNumbers;
+  int m_destRow;
+};
+
+/**
+  A command which does a move and emits a reset signal.
+*/
+class ModelResetCommand : public ModelMoveCommand
+{
+  Q_OBJECT
+public:
+  ModelResetCommand(DynamicTreeModel* model, QObject* parent = 0);
+
+  virtual ~ModelResetCommand();
+
+  virtual bool emitPreSignal(const QModelIndex &srcParent, int srcStart, int srcEnd, const QModelIndex &destParent, int destRow);
+  virtual void emitPostSignal();
+
+};
+
+/**
+  A command which does a move and emits a beginResetModel and endResetModel signals.
+*/
+class ModelResetCommandFixed : public ModelMoveCommand
+{
+  Q_OBJECT
+public:
+  ModelResetCommandFixed(DynamicTreeModel* model, QObject* parent = 0);
+
+  virtual ~ModelResetCommandFixed();
+
+  virtual bool emitPreSignal(const QModelIndex &srcParent, int srcStart, int srcEnd, const QModelIndex &destParent, int destRow);
+  virtual void emitPostSignal();
+
+};
+
+
+#endif
diff --git a/tests/auto/qabstractitemmodel/qabstractitemmodel.pro b/tests/auto/qabstractitemmodel/qabstractitemmodel.pro
index 5ad1020..84ed5a2 100644
--- a/tests/auto/qabstractitemmodel/qabstractitemmodel.pro
+++ b/tests/auto/qabstractitemmodel/qabstractitemmodel.pro
@@ -1,3 +1,6 @@
 load(qttest_p4)
-SOURCES         += tst_qabstractitemmodel.cpp
+SOURCES         += tst_qabstractitemmodel.cpp dynamictreemodel.cpp
+HEADERS         += dynamictreemodel.h
+
 QT = core
+
diff --git a/tests/auto/qabstractitemmodel/tst_qabstractitemmodel.cpp b/tests/auto/qabstractitemmodel/tst_qabstractitemmodel.cpp
index e99ce06..61eeae7 100644
--- a/tests/auto/qabstractitemmodel/tst_qabstractitemmodel.cpp
+++ b/tests/auto/qabstractitemmodel/tst_qabstractitemmodel.cpp
@@ -43,9 +43,15 @@
 #include <QtTest/QtTest>
 #include <QtCore/QtCore>
 
+#include <QSortFilterProxyModel>
+
 //TESTED_CLASS=QAbstractListModel QAbstractTableModel
 //TESTED_FILES=
 
+#include "dynamictreemodel.h"
+
+Q_DECLARE_METATYPE(QModelIndex)
+
 /*!
     Note that this doesn't test models, but any functionality that QAbstractItemModel shoudl provide
  */
@@ -86,6 +92,32 @@ private slots:
 
     void complexChangesWithPersistent();
 
+    void testMoveSameParentUp_data();
+    void testMoveSameParentUp();
+
+    void testMoveSameParentDown_data();
+    void testMoveSameParentDown();
+
+    void testMoveToGrandParent_data();
+    void testMoveToGrandParent();
+
+    void testMoveToSibling_data();
+    void testMoveToSibling();
+
+    void testMoveToUncle_data();
+    void testMoveToUncle();
+
+    void testMoveToDescendants();
+
+    void testMoveWithinOwnRange_data();
+    void testMoveWithinOwnRange();
+
+    void testReset();
+
+
+private:
+    DynamicTreeModel *m_model;
+
 };
 
 /*!
@@ -242,7 +274,20 @@ void tst_QAbstractItemModel::cleanupTestCase()
 
 void tst_QAbstractItemModel::init()
 {
-
+    m_model = new DynamicTreeModel(this);
+
+    ModelInsertCommand *insertCommand = new ModelInsertCommand(m_model, this);
+    insertCommand->setNumCols(4);
+    insertCommand->setStartRow(0);
+    insertCommand->setEndRow(9);
+    insertCommand->doCommand();
+
+    insertCommand = new ModelInsertCommand(m_model, this);
+    insertCommand->setAncestorRowNumbers(QList<int>() << 5);
+    insertCommand->setNumCols(4);
+    insertCommand->setStartRow(0);
+    insertCommand->setEndRow(9);
+    insertCommand->doCommand();
 }
 
 void tst_QAbstractItemModel::cleanup()
@@ -773,7 +818,7 @@ void tst_QAbstractItemModel::complexChangesWithPersistent()
 
     //remove a bunch of columns
     model.removeColumns(2, 4);
-    
+
     QVERIFY(a == model.index(1, 1, QModelIndex()));
     QVERIFY(b == model.index(9, 3, QModelIndex()));
     QVERIFY(c == model.index(5, 2, QModelIndex()));
@@ -784,7 +829,7 @@ void tst_QAbstractItemModel::complexChangesWithPersistent()
         QVERIFY(!e[i].isValid());
     for (int i=6; i <10 ; i++)
         QVERIFY(e[i] == model.index(2, i-4 , QModelIndex()));
-    
+
     //move some indexes around
     model.setPersistent(model.index(1, 1 , QModelIndex()), model.index(9, 3 , QModelIndex()));
     model.setPersistent(model.index(9, 3 , QModelIndex()), model.index(8, 4 , QModelIndex()));
@@ -815,5 +860,901 @@ void tst_QAbstractItemModel::complexChangesWithPersistent()
 
 }
 
+void tst_QAbstractItemModel::testMoveSameParentDown_data()
+{
+    QTest::addColumn<int>("startRow");
+    QTest::addColumn<int>("endRow");
+    QTest::addColumn<int>("destRow");
+
+    // Move from the start to the middle
+    QTest::newRow("move01") << 0 << 2 << 8;
+    // Move from the start to the end
+    QTest::newRow("move02") << 0 << 2 << 10;
+    // Move from the middle to the middle
+    QTest::newRow("move03") << 3 << 5 << 8;
+    // Move from the middle to the end
+    QTest::newRow("move04") << 3 << 5 << 10;
+}
+
+void tst_QAbstractItemModel::testMoveSameParentDown()
+{
+    QFETCH( int, startRow);
+    QFETCH( int, endRow);
+    QFETCH( int, destRow);
+
+    QList<QPersistentModelIndex> persistentList;
+    QModelIndexList indexList;
+
+    for (int column = 0; column < m_model->columnCount(); ++column)
+    {
+        for (int row= 0; row < m_model->rowCount(); ++row)
+        {
+            QModelIndex idx = m_model->index(row, column);
+            QVERIFY(idx.isValid());
+            indexList << idx;
+            persistentList << QPersistentModelIndex(idx);
+        }
+    }
+
+    QModelIndex parent = m_model->index(5, 0);
+    for (int column = 0; column < m_model->columnCount(); ++column)
+    {
+        for (int row= 0; row < m_model->rowCount(parent); ++row)
+        {
+            QModelIndex idx = m_model->index(row, column, parent);
+            QVERIFY(idx.isValid());
+            indexList << idx;
+            persistentList << QPersistentModelIndex(idx);
+        }
+    }
+
+    QSignalSpy beforeSpy(m_model, SIGNAL(rowsAboutToBeMoved(const QModelIndex &, int, int, const QModelIndex &, int)));
+    QSignalSpy afterSpy(m_model, SIGNAL(rowsMoved(const QModelIndex &, int, int, const QModelIndex &, int)));
+
+    ModelMoveCommand *moveCommand = new ModelMoveCommand(m_model, this);
+    moveCommand->setNumCols(4);
+    moveCommand->setStartRow(startRow);
+    moveCommand->setEndRow(endRow);
+    moveCommand->setDestRow(destRow);
+    moveCommand->doCommand();
+
+    QVariantList beforeSignal = beforeSpy.takeAt(0);
+    QVariantList afterSignal = afterSpy.takeAt(0);
+
+    QCOMPARE(beforeSignal.size(), 5);
+    QCOMPARE(beforeSignal.at(0).value<QModelIndex>(), QModelIndex());
+    QCOMPARE(beforeSignal.at(1).toInt(), startRow);
+    QCOMPARE(beforeSignal.at(2).toInt(), endRow);
+    QCOMPARE(beforeSignal.at(3).value<QModelIndex>(), QModelIndex());
+    QCOMPARE(beforeSignal.at(4).toInt(), destRow);
+
+    QCOMPARE(afterSignal.size(), 5);
+    QCOMPARE(afterSignal.at(0).value<QModelIndex>(), QModelIndex());
+    QCOMPARE(afterSignal.at(1).toInt(), startRow);
+    QCOMPARE(afterSignal.at(2).toInt(), endRow);
+    QCOMPARE(afterSignal.at(3).value<QModelIndex>(), QModelIndex());
+    QCOMPARE(afterSignal.at(4).toInt(), destRow);
+
+    for (int i = 0; i < indexList.size(); i++)
+    {
+        QModelIndex idx = indexList.at(i);
+        QModelIndex persistentIndex = persistentList.at(i);
+        if (idx.parent() == QModelIndex())
+        {
+            int row = idx.row();
+            if ( row >= startRow)
+            {
+                if (row <= endRow)
+                {
+                    QCOMPARE(row + destRow - endRow - 1, persistentIndex.row() );
+                    QCOMPARE(idx.column(), persistentIndex.column());
+                    QCOMPARE(idx.parent(), persistentIndex.parent());
+                    QCOMPARE(idx.model(), persistentIndex.model());
+                } else if ( row < destRow)
+                {
+                    QCOMPARE(row - (endRow - startRow + 1), persistentIndex.row() );
+                    QCOMPARE(idx.column(), persistentIndex.column());
+                    QCOMPARE(idx.parent(), persistentIndex.parent());
+                    QCOMPARE(idx.model(), persistentIndex.model());
+                } else
+                {
+                     QCOMPARE(idx, persistentIndex);
+                }
+            } else
+            {
+                QCOMPARE(idx, persistentIndex);
+            }
+        } else
+        {
+            QCOMPARE(idx, persistentIndex);
+        }
+    }
+}
+
+void tst_QAbstractItemModel::testMoveSameParentUp_data()
+{
+    QTest::addColumn<int>("startRow");
+    QTest::addColumn<int>("endRow");
+    QTest::addColumn<int>("destRow");
+
+    // Move from the middle to the start
+    QTest::newRow("move01") << 5 << 7 << 0;
+    // Move from the end to the start
+    QTest::newRow("move02") << 8 << 9 << 0;
+    // Move from the middle to the middle
+    QTest::newRow("move03") << 5 << 7 << 2;
+    // Move from the end to the middle
+    QTest::newRow("move04") << 8 << 9 << 5;
+}
+
+void tst_QAbstractItemModel::testMoveSameParentUp()
+{
+
+    QFETCH( int, startRow);
+    QFETCH( int, endRow);
+    QFETCH( int, destRow);
+
+    QList<QPersistentModelIndex> persistentList;
+    QModelIndexList indexList;
+
+    for (int column = 0; column < m_model->columnCount(); ++column)
+    {
+        for (int row= 0; row < m_model->rowCount(); ++row)
+        {
+            QModelIndex idx = m_model->index(row, column);
+            QVERIFY(idx.isValid());
+            indexList << idx;
+            persistentList << QPersistentModelIndex(idx);
+        }
+    }
+
+    QModelIndex parent = m_model->index(2, 0);
+    for (int column = 0; column < m_model->columnCount(); ++column)
+    {
+        for (int row= 0; row < m_model->rowCount(parent); ++row)
+        {
+            QModelIndex idx = m_model->index(row, column, parent);
+            QVERIFY(idx.isValid());
+            indexList << idx;
+            persistentList << QPersistentModelIndex(idx);
+        }
+    }
+
+    QSignalSpy beforeSpy(m_model, SIGNAL(rowsAboutToBeMoved(const QModelIndex &, int, int, const QModelIndex &, int)));
+    QSignalSpy afterSpy(m_model, SIGNAL(rowsMoved(const QModelIndex &, int, int, const QModelIndex &, int)));
+
+
+    ModelMoveCommand *moveCommand = new ModelMoveCommand(m_model, this);
+    moveCommand->setNumCols(4);
+    moveCommand->setStartRow(startRow);
+    moveCommand->setEndRow(endRow);
+    moveCommand->setDestRow(destRow);
+    moveCommand->doCommand();
+
+    QVariantList beforeSignal = beforeSpy.takeAt(0);
+    QVariantList afterSignal = afterSpy.takeAt(0);
+
+    QCOMPARE(beforeSignal.size(), 5);
+    QCOMPARE(beforeSignal.at(0).value<QModelIndex>(), QModelIndex());
+    QCOMPARE(beforeSignal.at(1).toInt(), startRow);
+    QCOMPARE(beforeSignal.at(2).toInt(), endRow);
+    QCOMPARE(beforeSignal.at(3).value<QModelIndex>(), QModelIndex());
+    QCOMPARE(beforeSignal.at(4).toInt(), destRow);
+
+    QCOMPARE(afterSignal.size(), 5);
+    QCOMPARE(afterSignal.at(0).value<QModelIndex>(), QModelIndex());
+    QCOMPARE(afterSignal.at(1).toInt(), startRow);
+    QCOMPARE(afterSignal.at(2).toInt(), endRow);
+    QCOMPARE(afterSignal.at(3).value<QModelIndex>(), QModelIndex());
+    QCOMPARE(afterSignal.at(4).toInt(), destRow);
+
+
+    for (int i = 0; i < indexList.size(); i++)
+    {
+        QModelIndex idx = indexList.at(i);
+        QModelIndex persistentIndex = persistentList.at(i);
+        if (idx.parent() == QModelIndex())
+        {
+            int row = idx.row();
+            if ( row >= destRow)
+            {
+                if (row < startRow)
+                {
+                    QCOMPARE(row + endRow - startRow + 1, persistentIndex.row() );
+                    QCOMPARE(idx.column(), persistentIndex.column());
+                    QCOMPARE(idx.parent(), persistentIndex.parent());
+                    QCOMPARE(idx.model(), persistentIndex.model());
+                } else if ( row <= endRow)
+                {
+                    QCOMPARE(row + destRow - startRow, persistentIndex.row() );
+                    QCOMPARE(idx.column(), persistentIndex.column());
+                    QCOMPARE(idx.parent(), persistentIndex.parent());
+                    QCOMPARE(idx.model(), persistentIndex.model());
+                } else
+                {
+                    QCOMPARE(idx, persistentIndex);
+                }
+            } else
+            {
+                QCOMPARE(idx, persistentIndex);
+            }
+        } else
+        {
+            QCOMPARE(idx, persistentIndex);
+        }
+    }
+}
+
+void tst_QAbstractItemModel::testMoveToGrandParent_data()
+{
+    QTest::addColumn<int>("startRow");
+    QTest::addColumn<int>("endRow");
+    QTest::addColumn<int>("destRow");
+
+    // Move from the start to the middle
+    QTest::newRow("move01") << 0 << 2 << 8;
+    // Move from the start to the end
+    QTest::newRow("move02") << 0 << 2 << 10;
+    // Move from the middle to the middle
+    QTest::newRow("move03") << 3 << 5 << 8;
+    // Move from the middle to the end
+    QTest::newRow("move04") << 3 << 5 << 10;
+
+    // Move from the middle to the start
+    QTest::newRow("move05") << 5 << 7 << 0;
+    // Move from the end to the start
+    QTest::newRow("move06") << 8 << 9 << 0;
+    // Move from the middle to the middle
+    QTest::newRow("move07") << 5 << 7 << 2;
+    // Move from the end to the middle
+    QTest::newRow("move08") << 8 << 9 << 5;
+
+    // Moving to the same row in a different parent doesn't confuse things.
+    QTest::newRow("move09") << 8 << 8 << 8;
+
+    // Moving to the row of my parent and its neighbours doesn't confuse things
+    QTest::newRow("move09") << 8 << 8 << 4;
+    QTest::newRow("move10") << 8 << 8 << 5;
+    QTest::newRow("move11") << 8 << 8 << 6;
+
+    // Moving everything from one parent to another
+    QTest::newRow("move12") << 0 << 9 << 10;
+}
+
+void tst_QAbstractItemModel::testMoveToGrandParent()
+{
+
+    QFETCH( int, startRow);
+    QFETCH( int, endRow);
+    QFETCH( int, destRow);
+
+    QList<QPersistentModelIndex> persistentList;
+    QModelIndexList indexList;
+    QModelIndexList parentsList;
+
+    for (int column = 0; column < m_model->columnCount(); ++column)
+    {
+        for (int row= 0; row < m_model->rowCount(); ++row)
+        {
+            QModelIndex idx = m_model->index(row, column);
+            QVERIFY(idx.isValid());
+            indexList << idx;
+            parentsList << idx.parent();
+            persistentList << QPersistentModelIndex(idx);
+        }
+    }
+
+    QModelIndex sourceIndex = m_model->index(5, 0);
+    for (int column = 0; column < m_model->columnCount(); ++column)
+    {
+        for (int row= 0; row < m_model->rowCount(sourceIndex); ++row)
+        {
+            QModelIndex idx = m_model->index(row, column, sourceIndex);
+            QVERIFY(idx.isValid());
+            indexList << idx;
+            parentsList << idx.parent();
+            persistentList << QPersistentModelIndex(idx);
+        }
+    }
+
+    QSignalSpy beforeSpy(m_model, SIGNAL(rowsAboutToBeMoved(const QModelIndex &, int, int, const QModelIndex &, int)));
+    QSignalSpy afterSpy(m_model, SIGNAL(rowsMoved(const QModelIndex &, int, int, const QModelIndex &, int)));
+
+
+    ModelMoveCommand *moveCommand = new ModelMoveCommand(m_model, this);
+    moveCommand->setAncestorRowNumbers(QList<int>() << 5);
+    moveCommand->setNumCols(4);
+    moveCommand->setStartRow(startRow);
+    moveCommand->setEndRow(endRow);
+    moveCommand->setDestRow(destRow);
+    moveCommand->doCommand();
+
+    QVariantList beforeSignal = beforeSpy.takeAt(0);
+    QVariantList afterSignal = afterSpy.takeAt(0);
+
+    QCOMPARE(beforeSignal.size(), 5);
+    QCOMPARE(beforeSignal.at(0).value<QModelIndex>(), sourceIndex);
+    QCOMPARE(beforeSignal.at(1).toInt(), startRow);
+    QCOMPARE(beforeSignal.at(2).toInt(), endRow);
+    QCOMPARE(beforeSignal.at(3).value<QModelIndex>(), QModelIndex());
+    QCOMPARE(beforeSignal.at(4).toInt(), destRow);
+
+    QCOMPARE(afterSignal.size(), 5);
+    QCOMPARE(afterSignal.at(0).value<QModelIndex>(), sourceIndex);
+    QCOMPARE(afterSignal.at(1).toInt(), startRow);
+    QCOMPARE(afterSignal.at(2).toInt(), endRow);
+    QCOMPARE(afterSignal.at(3).value<QModelIndex>(), QModelIndex());
+    QCOMPARE(afterSignal.at(4).toInt(), destRow);
+
+    for (int i = 0; i < indexList.size(); i++)
+    {
+        QModelIndex idx = indexList.at(i);
+        QModelIndex idxParent = parentsList.at(i);
+        QModelIndex persistentIndex = persistentList.at(i);
+        int row = idx.row();
+        if (idxParent == QModelIndex())
+        {
+            if ( row >= destRow)
+            {
+                    QCOMPARE(row + endRow - startRow + 1, persistentIndex.row() );
+                    QCOMPARE(idx.column(), persistentIndex.column());
+                    QCOMPARE(idxParent, persistentIndex.parent());
+                    QCOMPARE(idx.model(), persistentIndex.model());
+            } else
+            {
+                QCOMPARE(idx, persistentIndex);
+            }
+        } else
+        {
+            if (row < startRow)
+            {
+                QCOMPARE(idx, persistentIndex);
+            } else if (row <= endRow)
+            {
+                QCOMPARE(row + destRow - startRow, persistentIndex.row() );
+                QCOMPARE(idx.column(), persistentIndex.column());
+                QCOMPARE(QModelIndex(), persistentIndex.parent());
+                QCOMPARE(idx.model(), persistentIndex.model());
+            } else {
+                QCOMPARE(row - (endRow - startRow + 1), persistentIndex.row() );
+                QCOMPARE(idx.column(), persistentIndex.column());
+
+                if (idxParent.row() >= destRow)
+                {
+                    QModelIndex adjustedParent;
+                    adjustedParent = idxParent.sibling( idxParent.row() + endRow - startRow + 1,    idxParent.column());
+                    QCOMPARE(adjustedParent, persistentIndex.parent());
+                } else
+                {
+                    QCOMPARE(idxParent, persistentIndex.parent());
+                }
+                QCOMPARE(idx.model(), persistentIndex.model());
+            }
+        }
+    }
+}
+
+void tst_QAbstractItemModel::testMoveToSibling_data()
+{
+    QTest::addColumn<int>("startRow");
+    QTest::addColumn<int>("endRow");
+    QTest::addColumn<int>("destRow");
+
+    // Move from the start to the middle
+    QTest::newRow("move01") << 0 << 2 << 8;
+    // Move from the start to the end
+    QTest::newRow("move02") << 0 << 2 << 10;
+    // Move from the middle to the middle
+    QTest::newRow("move03") << 2 << 4 << 8;
+    // Move from the middle to the end
+    QTest::newRow("move04") << 2 << 4 << 10;
+
+    // Move from the middle to the start
+    QTest::newRow("move05") << 8 << 8 << 0;
+    // Move from the end to the start
+    QTest::newRow("move06") << 8 << 9 << 0;
+    // Move from the middle to the middle
+    QTest::newRow("move07") << 6 << 8 << 2;
+    // Move from the end to the middle
+    QTest::newRow("move08") << 8 << 9 << 5;
+
+    // Moving to the same row in a different parent doesn't confuse things.
+    QTest::newRow("move09") << 8 << 8 << 8;
+
+    // Moving to the row of my target and its neighbours doesn't confuse things
+    QTest::newRow("move09") << 8 << 8 << 4;
+    QTest::newRow("move10") << 8 << 8 << 5;
+    QTest::newRow("move11") << 8 << 8 << 6;
+}
+
+void tst_QAbstractItemModel::testMoveToSibling()
+{
+
+    QFETCH( int, startRow);
+    QFETCH( int, endRow);
+    QFETCH( int, destRow);
+
+    QList<QPersistentModelIndex> persistentList;
+    QModelIndexList indexList;
+    QModelIndexList parentsList;
+
+    const int column = 0;
+
+    for (int i= 0; i < m_model->rowCount(); ++i)
+    {
+        QModelIndex idx = m_model->index(i, column);
+        QVERIFY(idx.isValid());
+        indexList << idx;
+        parentsList << idx.parent();
+        persistentList << QPersistentModelIndex(idx);
+    }
+
+    QModelIndex destIndex = m_model->index(5, 0);
+    QModelIndex sourceIndex;
+    for (int i= 0; i < m_model->rowCount(destIndex); ++i)
+    {
+        QModelIndex idx = m_model->index(i, column, destIndex);
+        QVERIFY(idx.isValid());
+        indexList << idx;
+        parentsList << idx.parent();
+        persistentList << QPersistentModelIndex(idx);
+    }
+
+    QSignalSpy beforeSpy(m_model, SIGNAL(rowsAboutToBeMoved(const QModelIndex &, int, int, const QModelIndex &, int)));
+    QSignalSpy afterSpy(m_model, SIGNAL(rowsMoved(const QModelIndex &, int, int, const QModelIndex &, int)));
+
+
+    ModelMoveCommand *moveCommand = new ModelMoveCommand(m_model, this);
+    moveCommand->setNumCols(4);
+    moveCommand->setStartRow(startRow);
+    moveCommand->setEndRow(endRow);
+    moveCommand->setDestAncestors(QList<int>() << 5);
+    moveCommand->setDestRow(destRow);
+    moveCommand->doCommand();
+
+    QVariantList beforeSignal = beforeSpy.takeAt(0);
+    QVariantList afterSignal = afterSpy.takeAt(0);
+
+    QCOMPARE(beforeSignal.size(), 5);
+    QCOMPARE(beforeSignal.at(0).value<QModelIndex>(), sourceIndex);
+    QCOMPARE(beforeSignal.at(1).toInt(), startRow);
+    QCOMPARE(beforeSignal.at(2).toInt(), endRow);
+    QCOMPARE(beforeSignal.at(3).value<QModelIndex>(), destIndex);
+    QCOMPARE(beforeSignal.at(4).toInt(), destRow);
+
+    QCOMPARE(afterSignal.size(), 5);
+    QCOMPARE(afterSignal.at(0).value<QModelIndex>(), sourceIndex);
+    QCOMPARE(afterSignal.at(1).toInt(), startRow);
+    QCOMPARE(afterSignal.at(2).toInt(), endRow);
+    QCOMPARE(afterSignal.at(3).value<QModelIndex>(), destIndex);
+    QCOMPARE(afterSignal.at(4).toInt(), destRow);
+
+    for (int i = 0; i < indexList.size(); i++)
+    {
+        QModelIndex idx = indexList.at(i);
+        QModelIndex idxParent = parentsList.at(i);
+        QModelIndex persistentIndex = persistentList.at(i);
+
+        QModelIndex adjustedDestination = destIndex.sibling(destIndex.row() - (endRow - startRow + 1), destIndex.column());
+        int row = idx.row();
+        if (idxParent == destIndex)
+        {
+            if ( row >= destRow)
+            {
+                    QCOMPARE(row + endRow - startRow + 1, persistentIndex.row() );
+                    QCOMPARE(idx.column(), persistentIndex.column());
+                    if (idxParent.row() > startRow)
+                    {
+                        QCOMPARE(adjustedDestination, persistentIndex.parent());
+                    } else {
+                        QCOMPARE(destIndex, persistentIndex.parent());
+                    }
+                    QCOMPARE(idx.model(), persistentIndex.model());
+            } else
+            {
+                QCOMPARE(idx, persistentIndex);
+            }
+        } else
+        {
+            if (row < startRow)
+            {
+                QCOMPARE(idx, persistentIndex);
+            } else if (row <= endRow)
+            {
+                QCOMPARE(row + destRow - startRow, persistentIndex.row() );
+                QCOMPARE(idx.column(), persistentIndex.column());
+                if (destIndex.row() > startRow)
+                {
+                    QCOMPARE(adjustedDestination, persistentIndex.parent());
+                } else {
+                    QCOMPARE(destIndex, persistentIndex.parent());
+                }
+
+                QCOMPARE(idx.model(), persistentIndex.model());
+
+            } else {
+                QCOMPARE(row - (endRow - startRow + 1), persistentIndex.row() );
+                QCOMPARE(idx.column(), persistentIndex.column());
+                QCOMPARE(idxParent, persistentIndex.parent());
+                QCOMPARE(idx.model(), persistentIndex.model());
+            }
+        }
+    }
+}
+
+void tst_QAbstractItemModel::testMoveToUncle_data()
+{
+
+    QTest::addColumn<int>("startRow");
+    QTest::addColumn<int>("endRow");
+    QTest::addColumn<int>("destRow");
+
+    // Move from the start to the middle
+    QTest::newRow("move01") << 0 << 2 << 8;
+    // Move from the start to the end
+    QTest::newRow("move02") << 0 << 2 << 10;
+    // Move from the middle to the middle
+    QTest::newRow("move03") << 3 << 5 << 8;
+    // Move from the middle to the end
+    QTest::newRow("move04") << 3 << 5 << 10;
+
+    // Move from the middle to the start
+    QTest::newRow("move05") << 5 << 7 << 0;
+    // Move from the end to the start
+    QTest::newRow("move06") << 8 << 9 << 0;
+    // Move from the middle to the middle
+    QTest::newRow("move07") << 5 << 7 << 2;
+    // Move from the end to the middle
+    QTest::newRow("move08") << 8 << 9 << 5;
+
+    // Moving to the same row in a different parent doesn't confuse things.
+    QTest::newRow("move09") << 8 << 8 << 8;
+
+    // Moving to the row of my parent and its neighbours doesn't confuse things
+    QTest::newRow("move09") << 8 << 8 << 4;
+    QTest::newRow("move10") << 8 << 8 << 5;
+    QTest::newRow("move11") << 8 << 8 << 6;
+
+    // Moving everything from one parent to another
+    QTest::newRow("move12") << 0 << 9 << 10;
+}
+
+void tst_QAbstractItemModel::testMoveToUncle()
+{
+    // Need to have some extra rows available.
+    ModelInsertCommand *insertCommand = new ModelInsertCommand(m_model, this);
+    insertCommand->setAncestorRowNumbers(QList<int>() << 9);
+    insertCommand->setNumCols(4);
+    insertCommand->setStartRow(0);
+    insertCommand->setEndRow(9);
+    insertCommand->doCommand();
+
+    QFETCH( int, startRow);
+    QFETCH( int, endRow);
+    QFETCH( int, destRow);
+
+    QList<QPersistentModelIndex> persistentList;
+    QModelIndexList indexList;
+    QModelIndexList parentsList;
+
+    const int column = 0;
+
+    QModelIndex sourceIndex = m_model->index(9, 0);
+    for (int i= 0; i < m_model->rowCount(sourceIndex); ++i)
+    {
+        QModelIndex idx = m_model->index(i, column, sourceIndex);
+        QVERIFY(idx.isValid());
+        indexList << idx;
+        parentsList << idx.parent();
+        persistentList << QPersistentModelIndex(idx);
+    }
+
+    QModelIndex destIndex = m_model->index(5, 0);
+    for (int i= 0; i < m_model->rowCount(destIndex); ++i)
+    {
+        QModelIndex idx = m_model->index(i, column, destIndex);
+        QVERIFY(idx.isValid());
+        indexList << idx;
+        parentsList << idx.parent();
+        persistentList << QPersistentModelIndex(idx);
+    }
+
+    QSignalSpy beforeSpy(m_model, SIGNAL(rowsAboutToBeMoved(const QModelIndex &, int, int, const QModelIndex &, int)));
+    QSignalSpy afterSpy(m_model, SIGNAL(rowsMoved(const QModelIndex &, int, int, const QModelIndex &, int)));
+
+    ModelMoveCommand *moveCommand = new ModelMoveCommand(m_model, this);
+    moveCommand->setAncestorRowNumbers(QList<int>() << 9);
+    moveCommand->setNumCols(4);
+    moveCommand->setStartRow(startRow);
+    moveCommand->setEndRow(endRow);
+    moveCommand->setDestAncestors(QList<int>() << 5);
+    moveCommand->setDestRow(destRow);
+    moveCommand->doCommand();
+
+    QVariantList beforeSignal = beforeSpy.takeAt(0);
+    QVariantList afterSignal = afterSpy.takeAt(0);
+
+    QCOMPARE(beforeSignal.size(), 5);
+    QCOMPARE(beforeSignal.at(0).value<QModelIndex>(), sourceIndex);
+    QCOMPARE(beforeSignal.at(1).toInt(), startRow);
+    QCOMPARE(beforeSignal.at(2).toInt(), endRow);
+    QCOMPARE(beforeSignal.at(3).value<QModelIndex>(), destIndex);
+    QCOMPARE(beforeSignal.at(4).toInt(), destRow);
+
+    QCOMPARE(afterSignal.size(), 5);
+    QCOMPARE(afterSignal.at(0).value<QModelIndex>(), sourceIndex);
+    QCOMPARE(afterSignal.at(1).toInt(), startRow);
+    QCOMPARE(afterSignal.at(2).toInt(), endRow);
+    QCOMPARE(afterSignal.at(3).value<QModelIndex>(), destIndex);
+    QCOMPARE(afterSignal.at(4).toInt(), destRow);
+
+    for (int i = 0; i < indexList.size(); i++)
+    {
+        QModelIndex idx = indexList.at(i);
+        QModelIndex idxParent = parentsList.at(i);
+        QModelIndex persistentIndex = persistentList.at(i);
+
+        int row = idx.row();
+        if (idxParent == destIndex)
+        {
+            if ( row >= destRow)
+            {
+                    QCOMPARE(row + endRow - startRow + 1, persistentIndex.row() );
+                    QCOMPARE(idx.column(), persistentIndex.column());
+                    QCOMPARE(destIndex, persistentIndex.parent());
+                    QCOMPARE(idx.model(), persistentIndex.model());
+            } else
+            {
+                QCOMPARE(idx, persistentIndex);
+            }
+        } else
+        {
+            if (row < startRow)
+            {
+                QCOMPARE(idx, persistentIndex);
+            } else if (row <= endRow)
+            {
+                QCOMPARE(row + destRow - startRow, persistentIndex.row() );
+                QCOMPARE(idx.column(), persistentIndex.column());
+                QCOMPARE(destIndex, persistentIndex.parent());
+                QCOMPARE(idx.model(), persistentIndex.model());
+
+            } else {
+                QCOMPARE(row - (endRow - startRow + 1), persistentIndex.row() );
+                QCOMPARE(idx.column(), persistentIndex.column());
+                QCOMPARE(idxParent, persistentIndex.parent());
+                QCOMPARE(idx.model(), persistentIndex.model());
+            }
+        }
+    }
+}
+
+void tst_QAbstractItemModel::testMoveToDescendants()
+{
+    // Attempt to move a row to its ancestors depth rows deep.
+    const int depth = 6;
+
+    // Need to have some extra rows available in a tree.
+    QList<int> rows;
+    ModelInsertCommand *insertCommand;
+    for (int i = 0; i < depth; i++)
+    {
+        insertCommand = new ModelInsertCommand(m_model, this);
+        insertCommand->setAncestorRowNumbers(rows);
+        insertCommand->setNumCols(4);
+        insertCommand->setStartRow(0);
+        insertCommand->setEndRow(9);
+        insertCommand->doCommand();
+        rows << 9;
+    }
+
+    QList<QPersistentModelIndex> persistentList;
+    QModelIndexList indexList;
+    QModelIndexList parentsList;
+
+    const int column = 0;
+
+    QModelIndex sourceIndex = m_model->index(9, 0);
+    for (int i= 0; i < m_model->rowCount(sourceIndex); ++i)
+    {
+        QModelIndex idx = m_model->index(i, column, sourceIndex);
+        QVERIFY(idx.isValid());
+        indexList << idx;
+        parentsList << idx.parent();
+        persistentList << QPersistentModelIndex(idx);
+    }
+
+    QModelIndex destIndex = m_model->index(5, 0);
+    for (int i= 0; i < m_model->rowCount(destIndex); ++i)
+    {
+        QModelIndex idx = m_model->index(i, column, destIndex);
+        QVERIFY(idx.isValid());
+        indexList << idx;
+        parentsList << idx.parent();
+        persistentList << QPersistentModelIndex(idx);
+    }
+
+    QSignalSpy beforeSpy(m_model, SIGNAL(rowsAboutToBeMoved(const QModelIndex &, int, int, const QModelIndex &, int)));
+    QSignalSpy afterSpy(m_model, SIGNAL(rowsMoved(const QModelIndex &, int, int, const QModelIndex &, int)));
+
+    ModelMoveCommand *moveCommand;
+    QList<int> ancestors;
+    while (ancestors.size() < depth)
+    {
+        ancestors << 9;
+        for (int row = 0; row <= 9; row++)
+        {
+            moveCommand = new ModelMoveCommand(m_model, this);
+            moveCommand->setNumCols(4);
+            moveCommand->setStartRow(9);
+            moveCommand->setEndRow(9);
+            moveCommand->setDestAncestors(ancestors);
+            moveCommand->setDestRow(row);
+            moveCommand->doCommand();
+
+            QVERIFY(beforeSpy.size() == 0);
+            QVERIFY(afterSpy.size() == 0);
+        }
+    }
+}
+
+void tst_QAbstractItemModel::testMoveWithinOwnRange_data()
+{
+    QTest::addColumn<int>("startRow");
+    QTest::addColumn<int>("endRow");
+    QTest::addColumn<int>("destRow");
+
+    QTest::newRow("move01") << 0 << 0 << 0;
+    QTest::newRow("move02") << 0 << 0 << 1;
+    QTest::newRow("move03") << 0 << 5 << 0;
+    QTest::newRow("move04") << 0 << 5 << 1;
+    QTest::newRow("move05") << 0 << 5 << 2;
+    QTest::newRow("move06") << 0 << 5 << 3;
+    QTest::newRow("move07") << 0 << 5 << 4;
+    QTest::newRow("move08") << 0 << 5 << 5;
+    QTest::newRow("move09") << 0 << 5 << 6;
+    QTest::newRow("move08") << 3 << 5 << 5;
+    QTest::newRow("move08") << 3 << 5 << 6;
+    QTest::newRow("move09") << 4 << 5 << 5;
+    QTest::newRow("move10") << 4 << 5 << 6;
+    QTest::newRow("move11") << 5 << 5 << 5;
+    QTest::newRow("move12") << 5 << 5 << 6;
+    QTest::newRow("move13") << 5 << 9 << 9;
+    QTest::newRow("move14") << 5 << 9 << 10;
+    QTest::newRow("move15") << 6 << 9 << 9;
+    QTest::newRow("move16") << 6 << 9 << 10;
+    QTest::newRow("move17") << 7 << 9 << 9;
+    QTest::newRow("move18") << 7 << 9 << 10;
+    QTest::newRow("move19") << 8 << 9 << 9;
+    QTest::newRow("move20") << 8 << 9 << 10;
+    QTest::newRow("move21") << 9 << 9 << 9;
+    QTest::newRow("move22") << 0 << 9 << 10;
+
+}
+
+void tst_QAbstractItemModel::testMoveWithinOwnRange()
+{
+
+    QFETCH( int, startRow);
+    QFETCH( int, endRow);
+    QFETCH( int, destRow);
+
+
+    QSignalSpy beforeSpy(m_model, SIGNAL(rowsAboutToBeMoved(const QModelIndex &, int, int, const QModelIndex &, int)));
+    QSignalSpy afterSpy(m_model, SIGNAL(rowsMoved(const QModelIndex &, int, int, const QModelIndex &, int)));
+
+    ModelMoveCommand *moveCommand = new ModelMoveCommand(m_model, this);
+    moveCommand->setNumCols(4);
+    moveCommand->setStartRow(startRow);
+    moveCommand->setEndRow(endRow);
+    moveCommand->setDestRow(destRow);
+    moveCommand->doCommand();
+
+    QVERIFY(beforeSpy.size() == 0);
+    QVERIFY(afterSpy.size() == 0);
+
+
+}
+
+class ListenerObject : public QObject
+{
+  Q_OBJECT
+public:
+    ListenerObject(QAbstractProxyModel *parent);
+
+protected:
+    void fillIndexStores(const QModelIndex &parent);
+
+public slots:
+    void slotAboutToBeReset();
+    void slotReset();
+
+private:
+    QAbstractProxyModel *m_model;
+    QList<QPersistentModelIndex> m_persistentIndexes;
+    QModelIndexList m_nonPersistentIndexes;
+};
+
+
+ListenerObject::ListenerObject(QAbstractProxyModel *parent)
+    : QObject(parent), m_model(parent)
+{
+    connect(m_model, SIGNAL(modelAboutToBeReset()), SLOT(slotAboutToBeReset()));
+    connect(m_model, SIGNAL(modelReset()), SLOT(slotReset()));
+
+    fillIndexStores(QModelIndex());
+}
+
+void ListenerObject::fillIndexStores(const QModelIndex &parent)
+{
+    const int column = 0;
+    int row = 0;
+    QModelIndex idx = m_model->index(row, column, parent);
+    while (idx.isValid())
+    {
+        m_persistentIndexes << QPersistentModelIndex(idx);
+        m_nonPersistentIndexes << idx;
+        if (m_model->hasChildren(idx))
+        {
+            fillIndexStores(idx);
+        }
+        ++row;
+        idx = m_model->index(row, column, parent);
+    }
+}
+
+void ListenerObject::slotAboutToBeReset()
+{
+    // Nothing has been changed yet. All indexes should be the same.
+    for (int i = 0; i < m_persistentIndexes.size(); ++i)
+    {
+        QModelIndex idx = m_persistentIndexes.at(i);
+        QVERIFY(idx == m_nonPersistentIndexes.at(i));
+        QVERIFY(m_model->mapToSource(idx).isValid());
+    }
+}
+
+void ListenerObject::slotReset()
+{
+    foreach(const QModelIndex &idx, m_persistentIndexes)
+    {
+        QVERIFY(!idx.isValid());
+    }
+}
+
+
+void tst_QAbstractItemModel::testReset()
+{
+    QSignalSpy beforeResetSpy(m_model, SIGNAL(modelAboutToBeReset()));
+    QSignalSpy afterResetSpy(m_model, SIGNAL(modelReset()));
+
+
+    QSortFilterProxyModel *nullProxy = new QSortFilterProxyModel(this);
+    nullProxy->setSourceModel(m_model);
+
+    // Makes sure the model and proxy are in a consistent state. before and after reset.
+    new ListenerObject(nullProxy);
+
+    ModelResetCommandFixed *resetCommand = new ModelResetCommandFixed(m_model, this);
+
+    resetCommand->setNumCols(4);
+    resetCommand->setStartRow(0);
+    resetCommand->setEndRow(0);
+    resetCommand->setDestRow(0);
+    resetCommand->setDestAncestors(QList<int>() << 5);
+    resetCommand->doCommand();
+
+    // Verify that the correct signals were emitted
+    QVERIFY(beforeResetSpy.size() == 1);
+    QVERIFY(afterResetSpy.size() == 1);
+
+    // Verify that the move actually happened.
+    QVERIFY(m_model->rowCount() == 9);
+    QModelIndex destIndex = m_model->index(4, 0);
+    QVERIFY(m_model->rowCount(destIndex) == 11);
+
+}
+
+
 QTEST_MAIN(tst_QAbstractItemModel)
 #include "tst_qabstractitemmodel.moc"
diff --git a/tests/auto/qbytearray/tst_qbytearray.cpp b/tests/auto/qbytearray/tst_qbytearray.cpp
index 4ec02bc..7951864 100644
--- a/tests/auto/qbytearray/tst_qbytearray.cpp
+++ b/tests/auto/qbytearray/tst_qbytearray.cpp
@@ -90,6 +90,8 @@ private slots:
     void split();
     void base64_data();
     void base64();
+    void fromBase64_data();
+    void fromBase64();
     void qvsnprintf();
     void qstrlen();
     void qstrnlen();
@@ -460,6 +462,10 @@ void tst_QByteArray::base64_data()
     for (int i = 0; i < 256; ++i)
         ba[i] = i;
     QTest::newRow("f") << ba << QByteArray("AAECAwQFBgcICQoLDA0ODxAREhMUFRYXGBkaGxwdHh8gISIjJCUmJygpKissLS4vMDEyMzQ1Njc4OTo7PD0+P0BBQkNERUZHSElKS0xNTk9QUVJTVFVWV1hZWltcXV5fYGFiY2RlZmdoaWprbG1ub3BxcnN0dXZ3eHl6e3x9fn+AgYKDhIWGh4iJiouMjY6PkJGSk5SVlpeYmZqbnJ2en6ChoqOkpaanqKmqq6ytrq+wsbKztLW2t7i5uru8vb6/wMHCw8TFxsfIycrLzM3Oz9DR0tPU1dbX2Nna29zd3t/g4eLj5OXm5+jp6uvs7e7v8PHy8/T19vf4+fr7/P3+/w==");
+
+    QTest::newRow("g") << QByteArray("foo\0bar", 7) << QByteArray("Zm9vAGJhcg==");
+    QTest::newRow("h") << QByteArray("f\xd1oo\x9cbar") << QByteArray("ZtFvb7py");
+    QTest::newRow("i") << QByteArray("\"\0\0\0\0\0\0\"", 8) << QByteArray("IgAAAAAAACI=");
 }
 
 
@@ -475,6 +481,54 @@ void tst_QByteArray::base64()
     QCOMPARE(arr64, base64);
 }
 
+//different from the previous test as the input are invalid
+void tst_QByteArray::fromBase64_data()
+{
+    QTest::addColumn<QByteArray>("rawdata");
+    QTest::addColumn<QByteArray>("base64");
+
+    QTest::newRow("1") << QByteArray("") << QByteArray("  ");
+    QTest::newRow("2") << QByteArray("1") << QByteArray("MQ");
+    QTest::newRow("3") << QByteArray("12") << QByteArray("MTI       ");
+    QTest::newRow("4") << QByteArray("123") << QByteArray("M=TIz");
+    QTest::newRow("5") << QByteArray("1234") << QByteArray("MTI zN A ");
+    QTest::newRow("6") << QByteArray("\n") << QByteArray("Cg");
+    QTest::newRow("7") << QByteArray("a\n") << QByteArray("======YQo=");
+    QTest::newRow("8") << QByteArray("ab\n") << QByteArray("Y\nWIK");
+    QTest::newRow("9") << QByteArray("abc\n") << QByteArray("YWJjCg==");
+    QTest::newRow("a") << QByteArray("abcd\n") << QByteArray("YWJ\1j\x9cZAo=");
+    QTest::newRow("b") << QByteArray("abcde\n") << QByteArray("YW JjZ\n G\tUK");
+    QTest::newRow("c") << QByteArray("abcdef\n") << QByteArray("YWJjZGVmCg=");
+    QTest::newRow("d") << QByteArray("abcdefg\n") << QByteArray("YWJ\rjZGVmZwo");
+    QTest::newRow("e") << QByteArray("abcdefgh\n") << QByteArray("YWJjZGVmZ2gK");
+
+    QByteArray ba;
+    ba.resize(256);
+    for (int i = 0; i < 256; ++i)
+        ba[i] = i;
+    QTest::newRow("f") << ba << QByteArray("AAECAwQFBgcICQoLDA0ODxAREhMUFRYXGBkaGxwdHh8gISIjJCUmJygpKissLS4vMDEyMzQ1Nj\n"
+                                           "c4OTo7PD0+P0BBQkNERUZHSElKS0xNTk9QUVJTVFVWV1hZWltcXV5fYGFiY2RlZmdoaWprbG1u\n"
+                                           "b3BxcnN0dXZ3eHl6e3x9fn+AgYKDhIWGh4iJiouMjY6PkJGSk5SVlpeYmZqbnJ2en6ChoqOkpa\n"
+                                           "anqKmqq6ytrq+wsbKztLW2t7i5uru8vb6/wMHCw8TFxsfIycrLzM3Oz9DR0tPU1dbX2Nna29zd\n"
+                                           "3t/g4eLj5OXm5+jp6uvs7e7v8PHy8/T19vf4+fr7/P3+/w==                            ");
+
+
+    QTest::newRow("g") << QByteArray("foo\0bar", 7) << QByteArray("Zm9vAGJhcg");
+    QTest::newRow("h") << QByteArray("f\xd1oo\x9cbar") << QByteArray("ZtFv\0b7py", 9);
+    QTest::newRow("i") << QByteArray("\"\0\0\0\0\0\0\"", 8) << QByteArray("IgAAAAAAACI");
+
+}
+
+
+void tst_QByteArray::fromBase64()
+{
+    QFETCH(QByteArray, rawdata);
+    QFETCH(QByteArray, base64);
+
+    QByteArray arr = QByteArray::fromBase64(base64);
+    QCOMPARE(arr, rawdata);
+}
+
 void tst_QByteArray::qvsnprintf()
 {
     char buf[20];
diff --git a/tests/auto/qcombobox/tst_qcombobox.cpp b/tests/auto/qcombobox/tst_qcombobox.cpp
index b568c60..dac32bb 100644
--- a/tests/auto/qcombobox/tst_qcombobox.cpp
+++ b/tests/auto/qcombobox/tst_qcombobox.cpp
@@ -145,6 +145,8 @@ private slots:
     void noScrollbar();
     void setItemDelegate();
     void task253944_itemDelegateIsReset();
+    void subControlRectsWithOffset_data();
+    void subControlRectsWithOffset();
 
 protected slots:
     void onEditTextChanged( const QString &newString );
@@ -2289,5 +2291,53 @@ void tst_QComboBox::task253944_itemDelegateIsReset()
 }
 
 
+void tst_QComboBox::subControlRectsWithOffset_data()
+{
+    QTest::addColumn<bool>("editable");
+
+    QTest::newRow("editable = true") << true;
+    QTest::newRow("editable = false") << false;
+}
+
+void tst_QComboBox::subControlRectsWithOffset()
+{
+    // The sub control rect relative position should not depends
+    // on the position of the combobox
+
+    class FriendlyCombo : public QComboBox {
+    public:
+        void styleOption(QStyleOptionComboBox *optCombo) {
+            initStyleOption(optCombo);
+        }
+    } combo;
+    QStyleOptionComboBox optCombo;
+    combo.styleOption(&optCombo);
+
+
+    const QRect rectAtOrigin(0, 0, 80, 30);
+    const QPoint offset(25, 50);
+    const QRect rectWithOffset = rectAtOrigin.translated(offset);
+
+    QStyle *style = combo.style();
+
+    QFETCH(bool, editable);
+    optCombo.editable = editable;
+
+    optCombo.rect = rectAtOrigin;
+    QRect editFieldRect = style->subControlRect(QStyle::CC_ComboBox, &optCombo, QStyle::SC_ComboBoxEditField, 0);
+    QRect arrowRect = style->subControlRect(QStyle::CC_ComboBox, &optCombo, QStyle::SC_ComboBoxArrow, 0);
+    QRect listboxRect = style->subControlRect(QStyle::CC_ComboBox, &optCombo, QStyle::SC_ComboBoxListBoxPopup, 0);
+
+    optCombo.rect = rectWithOffset;
+    QRect editFieldRectWithOffset = style->subControlRect(QStyle::CC_ComboBox, &optCombo, QStyle::SC_ComboBoxEditField, 0);
+    QRect arrowRectWithOffset = style->subControlRect(QStyle::CC_ComboBox, &optCombo, QStyle::SC_ComboBoxArrow, 0);
+    QRect listboxRectWithOffset = style->subControlRect(QStyle::CC_ComboBox, &optCombo, QStyle::SC_ComboBoxListBoxPopup, 0);
+
+    QCOMPARE(editFieldRect, editFieldRectWithOffset.translated(-offset));
+    QCOMPARE(arrowRect, arrowRectWithOffset.translated(-offset));
+    QCOMPARE(listboxRect, listboxRectWithOffset.translated(-offset));
+
+}
+
 QTEST_MAIN(tst_QComboBox)
 #include "tst_qcombobox.moc"
diff --git a/tests/auto/qgl/tst_qgl.cpp b/tests/auto/qgl/tst_qgl.cpp
index f92670d..59779b0 100644
--- a/tests/auto/qgl/tst_qgl.cpp
+++ b/tests/auto/qgl/tst_qgl.cpp
@@ -45,10 +45,13 @@
 #include <qcoreapplication.h>
 #include <qdebug.h>
 #include <qgl.h>
+#include <qglpixelbuffer.h>
 #include <qglcolormap.h>
+#include <qpaintengine.h>
 
 #include <QGraphicsView>
 #include <QGraphicsProxyWidget>
+#include <QVBoxLayout>
 
 //TESTED_CLASS=
 //TESTED_FILES=
@@ -67,6 +70,9 @@ private slots:
     void graphicsViewClipping();
     void partialGLWidgetUpdates_data();
     void partialGLWidgetUpdates();
+    void glWidgetRendering();
+    void glPBufferRendering();
+    void glWidgetReparent();
     void colormap();
 };
 
@@ -625,6 +631,147 @@ void tst_QGL::partialGLWidgetUpdates()
         QCOMPARE(widget.paintEventRegion, QRegion(widget.rect()));
 }
 
+
+// This tests that rendering to a QGLPBuffer using QPainter works.
+void tst_QGL::glPBufferRendering()
+{
+    if (!QGLPixelBuffer::hasOpenGLPbuffers())
+        QSKIP("QGLPixelBuffer not supported on this platform", SkipSingle);
+
+    QGLPixelBuffer* pbuf = new QGLPixelBuffer(128, 128);
+
+    QPainter p;
+    bool begun = p.begin(pbuf);
+    QVERIFY(begun);
+
+    QPaintEngine::Type engineType = p.paintEngine()->type();
+    QVERIFY(engineType == QPaintEngine::OpenGL || engineType == QPaintEngine::OpenGL2);
+
+    p.fillRect(0, 0, 128, 128, Qt::red);
+    p.fillRect(32, 32, 64, 64, Qt::blue);
+    p.end();
+
+    QImage fb = pbuf->toImage();
+    delete pbuf;
+
+    QImage reference(128, 128, fb.format());
+    p.begin(&reference);
+    p.fillRect(0, 0, 128, 128, Qt::red);
+    p.fillRect(32, 32, 64, 64, Qt::blue);
+    p.end();
+
+    QCOMPARE(fb, reference);
+}
+
+class GLWidget : public QGLWidget
+{
+public:
+    GLWidget(QWidget* p = 0)
+            : QGLWidget(p), beginOk(false), engineType(QPaintEngine::MaxUser) {}
+    bool beginOk;
+    QPaintEngine::Type engineType;
+    void paintGL()
+    {
+        QPainter p;
+        beginOk = p.begin(this);
+        QPaintEngine* pe = p.paintEngine();
+        engineType = pe->type();
+
+        // This test only ensures it's possible to paint onto a QGLWidget. Full
+        // paint engine feature testing is way out of scope!
+
+        p.fillRect(0, 0, width(), height(), Qt::red);
+        // No p.end() or swap buffers, should be done automatically
+    }
+
+};
+
+void tst_QGL::glWidgetRendering()
+{
+    GLWidget w;
+    w.show();
+
+#ifdef Q_WS_X11
+    qt_x11_wait_for_window_manager(&w);
+#endif
+    QTest::qWait(200);
+
+    QVERIFY(w.beginOk);
+    QVERIFY(w.engineType == QPaintEngine::OpenGL || w.engineType == QPaintEngine::OpenGL2);
+
+    QImage fb = w.grabFrameBuffer(false).convertToFormat(QImage::Format_RGB32);
+    QImage reference(fb.size(), QImage::Format_RGB32);
+    reference.fill(0xffff0000);
+
+    QCOMPARE(fb, reference);
+}
+
+void tst_QGL::glWidgetReparent()
+{
+    // Try it as a top-level first:
+    GLWidget *widget = new GLWidget;
+    widget->setGeometry(0, 0, 200, 30);
+    widget->show();
+
+    QWidget grandParentWidget;
+    grandParentWidget.setPalette(Qt::blue);
+    QVBoxLayout grandParentLayout(&grandParentWidget);
+
+    QWidget parentWidget(&grandParentWidget);
+    grandParentLayout.addWidget(&parentWidget);
+    parentWidget.setPalette(Qt::green);
+    parentWidget.setAutoFillBackground(true);
+    QVBoxLayout parentLayout(&parentWidget);
+
+    grandParentWidget.setGeometry(0, 100, 200, 200);
+    grandParentWidget.show();
+
+#ifdef Q_WS_X11
+    qt_x11_wait_for_window_manager(widget);
+    qt_x11_wait_for_window_manager(&parentWidget);
+#endif
+    QTest::qWait(200);
+
+    QVERIFY(parentWidget.children().count() == 1); // The layout
+
+    // Now both widgets should be created & shown, time to re-parent:
+    parentLayout.addWidget(widget);
+
+#ifdef Q_WS_X11
+    qt_x11_wait_for_window_manager(&parentWidget);
+#endif
+    QTest::qWait(200);
+
+    QVERIFY(parentWidget.children().count() == 2); // Layout & glwidget
+    QVERIFY(parentWidget.children().contains(widget));
+    QVERIFY(widget->height() > 30);
+
+    delete widget;
+
+#ifdef Q_WS_X11
+    qt_x11_wait_for_window_manager(&parentWidget);
+#endif
+    QTest::qWait(200);
+
+    QVERIFY(parentWidget.children().count() == 1); // The layout
+
+    // Now do pretty much the same thing, but don't show the
+    // widget first:
+    widget = new GLWidget;
+    parentLayout.addWidget(widget);
+
+#ifdef Q_WS_X11
+    qt_x11_wait_for_window_manager(&parentWidget);
+#endif
+    QTest::qWait(200);
+
+    QVERIFY(parentWidget.children().count() == 2); // Layout & glwidget
+    QVERIFY(parentWidget.children().contains(widget));
+    QVERIFY(widget->height() > 30);
+
+    delete widget;
+}
+
 class ColormapExtended : public QGLColormap
 {
 public:
diff --git a/tests/auto/qgraphicsanchorlayout/tst_qgraphicsanchorlayout.cpp b/tests/auto/qgraphicsanchorlayout/tst_qgraphicsanchorlayout.cpp
index a579ba5..0d82182 100644
--- a/tests/auto/qgraphicsanchorlayout/tst_qgraphicsanchorlayout.cpp
+++ b/tests/auto/qgraphicsanchorlayout/tst_qgraphicsanchorlayout.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 test suite 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$
+**
+****************************************************************************/
+
 #include <QtTest/QtTest>
 #include <qgraphicsanchorlayout.h>
 #include <qgraphicswidget.h>
diff --git a/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp b/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp
index b1835c8..8223a34 100644
--- a/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp
+++ b/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp
@@ -284,6 +284,8 @@ private slots:
     void focusProxyDeletion();
     void negativeZStacksBehindParent();
     void setGraphicsEffect();
+    void panel();
+    void addPanelToActiveScene();
 
     // task specific tests below me
     void task141694_textItemEnsureVisible();
@@ -2919,7 +2921,7 @@ void tst_QGraphicsItem::hoverEventsGenerateRepaints()
     int npaints = tester->repaints;
     qApp->processEvents();
     qApp->processEvents();
-    QCOMPARE(tester->events.size(), 2); // enter + move
+    QCOMPARE(tester->events.size(), 3); // activate + enter + move
     QCOMPARE(tester->repaints, npaints + 1);
     QCOMPARE(tester->events.last(), QEvent::GraphicsSceneHoverMove);
 
@@ -2933,7 +2935,7 @@ void tst_QGraphicsItem::hoverEventsGenerateRepaints()
     qApp->processEvents();
     qApp->processEvents();
 
-    QCOMPARE(tester->events.size(), 3);
+    QCOMPARE(tester->events.size(), 4);
     QCOMPARE(tester->repaints, npaints + 1);
     QCOMPARE(tester->events.last(), QEvent::GraphicsSceneHoverMove);
 
@@ -2947,7 +2949,7 @@ void tst_QGraphicsItem::hoverEventsGenerateRepaints()
     qApp->processEvents();
     qApp->processEvents();
 
-    QCOMPARE(tester->events.size(), 4);
+    QCOMPARE(tester->events.size(), 5);
     QCOMPARE(tester->repaints, npaints + 2);
     QCOMPARE(tester->events.last(), QEvent::GraphicsSceneHoverLeave);
 }
@@ -7693,5 +7695,181 @@ void tst_QGraphicsItem::setGraphicsEffect()
     delete anotherItem;
 }
 
+void tst_QGraphicsItem::panel()
+{
+    QGraphicsScene scene;
+
+    QGraphicsRectItem *panel1 = new QGraphicsRectItem;
+    QGraphicsRectItem *panel2 = new QGraphicsRectItem;
+    QGraphicsRectItem *panel3 = new QGraphicsRectItem;
+    QGraphicsRectItem *panel4 = new QGraphicsRectItem;
+    QGraphicsRectItem *notPanel1 = new QGraphicsRectItem;
+    QGraphicsRectItem *notPanel2 = new QGraphicsRectItem;
+    panel1->setFlag(QGraphicsItem::ItemIsPanel);
+    panel2->setFlag(QGraphicsItem::ItemIsPanel);
+    panel3->setFlag(QGraphicsItem::ItemIsPanel);
+    panel4->setFlag(QGraphicsItem::ItemIsPanel);
+    scene.addItem(panel1);
+    scene.addItem(panel2);
+    scene.addItem(panel3);
+    scene.addItem(panel4);
+    scene.addItem(notPanel1);
+    scene.addItem(notPanel2);
+
+    EventSpy spy_activate_panel1(&scene, panel1, QEvent::WindowActivate);
+    EventSpy spy_deactivate_panel1(&scene, panel1, QEvent::WindowDeactivate);
+    EventSpy spy_activate_panel2(&scene, panel2, QEvent::WindowActivate);
+    EventSpy spy_deactivate_panel2(&scene, panel2, QEvent::WindowDeactivate);
+    EventSpy spy_activate_panel3(&scene, panel3, QEvent::WindowActivate);
+    EventSpy spy_deactivate_panel3(&scene, panel3, QEvent::WindowDeactivate);
+    EventSpy spy_activate_panel4(&scene, panel4, QEvent::WindowActivate);
+    EventSpy spy_deactivate_panel4(&scene, panel4, QEvent::WindowDeactivate);
+    EventSpy spy_activate_notPanel1(&scene, notPanel1, QEvent::WindowActivate);
+    EventSpy spy_deactivate_notPanel1(&scene, notPanel1, QEvent::WindowDeactivate);
+    EventSpy spy_activate_notPanel2(&scene, notPanel1, QEvent::WindowActivate);
+    EventSpy spy_deactivate_notPanel2(&scene, notPanel1, QEvent::WindowDeactivate);
+
+    QCOMPARE(spy_activate_panel1.count(), 0);
+    QCOMPARE(spy_deactivate_panel1.count(), 0);
+    QCOMPARE(spy_activate_panel2.count(), 0);
+    QCOMPARE(spy_deactivate_panel2.count(), 0);
+    QCOMPARE(spy_activate_panel3.count(), 0);
+    QCOMPARE(spy_deactivate_panel3.count(), 0);
+    QCOMPARE(spy_activate_panel4.count(), 0);
+    QCOMPARE(spy_deactivate_panel4.count(), 0);
+    QCOMPARE(spy_activate_notPanel1.count(), 0);
+    QCOMPARE(spy_deactivate_notPanel1.count(), 0);
+    QCOMPARE(spy_activate_notPanel2.count(), 0);
+    QCOMPARE(spy_deactivate_notPanel2.count(), 0);
+
+    QVERIFY(!scene.activePanel());
+    QVERIFY(!scene.isActive());
+
+    QEvent activate(QEvent::WindowActivate);
+    QEvent deactivate(QEvent::WindowDeactivate);
+    
+    QApplication::sendEvent(&scene, &activate);
+
+    // No previous activation, so the scene is active.
+    QVERIFY(scene.isActive());
+    QVERIFY(!scene.activePanel());
+    QVERIFY(!panel1->isActive());
+    QVERIFY(!panel2->isActive());
+    QVERIFY(!panel3->isActive());
+    QVERIFY(!panel4->isActive());
+    QVERIFY(notPanel1->isActive());
+    QVERIFY(notPanel2->isActive());
+    QCOMPARE(spy_activate_notPanel1.count(), 1);
+    QCOMPARE(spy_activate_notPanel2.count(), 1);
+
+    // Switch to panel1.
+    scene.setActivePanel(panel1);
+    QVERIFY(panel1->isActive());
+    QVERIFY(!panel2->isActive());
+    QVERIFY(!panel3->isActive());
+    QVERIFY(!panel4->isActive());
+    QVERIFY(!notPanel1->isActive());
+    QVERIFY(!notPanel2->isActive());
+    QCOMPARE(spy_deactivate_notPanel1.count(), 1);
+    QCOMPARE(spy_deactivate_notPanel2.count(), 1);
+    QCOMPARE(spy_activate_panel1.count(), 1);
+    QCOMPARE(spy_activate_panel2.count(), 0);
+    QCOMPARE(spy_activate_panel3.count(), 0);
+    QCOMPARE(spy_activate_panel4.count(), 0);
+
+    // Switch back to scene.
+    scene.setActivePanel(0);
+    QVERIFY(!scene.activePanel());
+    QVERIFY(!panel1->isActive());
+    QVERIFY(!panel2->isActive());
+    QVERIFY(!panel3->isActive());
+    QVERIFY(!panel4->isActive());
+    QVERIFY(notPanel1->isActive());
+    QVERIFY(notPanel2->isActive());
+    QCOMPARE(spy_activate_notPanel1.count(), 2);
+    QCOMPARE(spy_activate_notPanel2.count(), 2);
+
+    // Deactivate the scene
+    QApplication::sendEvent(&scene, &deactivate);
+    QVERIFY(!scene.activePanel());
+    QVERIFY(!panel1->isActive());
+    QVERIFY(!panel2->isActive());
+    QVERIFY(!panel3->isActive());
+    QVERIFY(!panel4->isActive());
+    QVERIFY(!notPanel1->isActive());
+    QVERIFY(!notPanel2->isActive());
+    QCOMPARE(spy_deactivate_notPanel1.count(), 2);
+    QCOMPARE(spy_deactivate_notPanel2.count(), 2);
+
+    // Reactivate the scene
+    QApplication::sendEvent(&scene, &activate);
+    QVERIFY(!scene.activePanel());
+    QVERIFY(!panel1->isActive());
+    QVERIFY(!panel2->isActive());
+    QVERIFY(!panel3->isActive());
+    QVERIFY(!panel4->isActive());
+    QVERIFY(notPanel1->isActive());
+    QVERIFY(notPanel2->isActive());
+    QCOMPARE(spy_activate_notPanel1.count(), 3);
+    QCOMPARE(spy_activate_notPanel2.count(), 3);
+
+    // Switch to panel1
+    scene.setActivePanel(panel1);
+    QVERIFY(panel1->isActive());
+    QCOMPARE(spy_deactivate_notPanel1.count(), 3);
+    QCOMPARE(spy_deactivate_notPanel2.count(), 3);
+    QCOMPARE(spy_activate_panel1.count(), 2);
+
+    // Deactivate the scene
+    QApplication::sendEvent(&scene, &deactivate);
+    QVERIFY(!panel1->isActive());
+    QCOMPARE(spy_deactivate_panel1.count(), 2);
+
+    // Reactivate the scene
+    QApplication::sendEvent(&scene, &activate);
+    QVERIFY(panel1->isActive());
+    QCOMPARE(spy_activate_panel1.count(), 3);
+
+    // Deactivate the scene
+    QApplication::sendEvent(&scene, &deactivate);
+    QVERIFY(!panel1->isActive());
+    QVERIFY(!scene.activePanel());
+    scene.setActivePanel(0);
+
+    // Reactivate the scene
+    QApplication::sendEvent(&scene, &activate);
+    QVERIFY(!panel1->isActive());
+}
+
+void tst_QGraphicsItem::addPanelToActiveScene()
+{
+    QGraphicsScene scene;
+    QVERIFY(!scene.isActive());
+
+    QGraphicsRectItem *rect = new QGraphicsRectItem;
+    scene.addItem(rect);
+    QVERIFY(!rect->isActive());
+    scene.removeItem(rect);
+
+    QEvent activate(QEvent::WindowActivate);
+    QEvent deactivate(QEvent::WindowDeactivate);
+
+    QApplication::sendEvent(&scene, &activate);
+    QVERIFY(scene.isActive());
+    scene.addItem(rect);
+    QVERIFY(rect->isActive());
+    scene.removeItem(rect);
+
+    rect->setFlag(QGraphicsItem::ItemIsPanel);
+    scene.addItem(rect);
+    QVERIFY(rect->isActive());
+    QCOMPARE(scene.activePanel(), (QGraphicsItem *)rect);
+
+    QGraphicsRectItem *rect2 = new QGraphicsRectItem;
+    scene.addItem(rect2);
+    QVERIFY(rect->isActive());
+    QCOMPARE(scene.activePanel(), (QGraphicsItem *)rect);
+}
+
 QTEST_MAIN(tst_QGraphicsItem)
 #include "tst_qgraphicsitem.moc"
diff --git a/tests/auto/qgraphicslinearlayout/tst_qgraphicslinearlayout.cpp b/tests/auto/qgraphicslinearlayout/tst_qgraphicslinearlayout.cpp
index 1d81ac8..51c96b1 100644
--- a/tests/auto/qgraphicslinearlayout/tst_qgraphicslinearlayout.cpp
+++ b/tests/auto/qgraphicslinearlayout/tst_qgraphicslinearlayout.cpp
@@ -76,6 +76,7 @@ private slots:
     void invalidate();
     void itemAt_data();
     void itemAt();
+    void itemAt_visualOrder();
     void orientation_data();
     void orientation();
     void removeAt_data();
@@ -537,7 +538,7 @@ void tst_QGraphicsLinearLayout::insertItem()
     QCOMPARE(layout.count(), itemCount + layoutCount + 1);
 
     if (insertItemAt >= 0 && (itemCount + layoutCount >= 0)) {
-        QCOMPARE(layout.itemAt(itemCount + layoutCount), item);
+        QCOMPARE(layout.itemAt(insertItemAt), item);
     }
 
     layout.activate();
@@ -686,6 +687,28 @@ void tst_QGraphicsLinearLayout::itemAt()
     QVERIFY(layout.itemAt(index) != 0);
 }
 
+void tst_QGraphicsLinearLayout::itemAt_visualOrder()
+{
+    QGraphicsLinearLayout *l = new QGraphicsLinearLayout;
+
+    QGraphicsWidget *w1 = new QGraphicsWidget;
+    l->addItem(w1);
+
+    QGraphicsWidget *w3 = new QGraphicsWidget;
+    l->addItem(w3);
+
+    QGraphicsWidget *w0 = new QGraphicsWidget;
+    l->insertItem(0, w0);
+
+    QGraphicsWidget *w2 = new QGraphicsWidget;
+    l->insertItem(2, w2);
+
+    QCOMPARE(l->itemAt(0), w0);
+    QCOMPARE(l->itemAt(1), w1);
+    QCOMPARE(l->itemAt(2), w2);
+    QCOMPARE(l->itemAt(3), w3);
+}
+
 void tst_QGraphicsLinearLayout::orientation_data()
 {
     QTest::addColumn<Qt::Orientation>("orientation");
diff --git a/tests/auto/qgraphicsview/tst_qgraphicsview.cpp b/tests/auto/qgraphicsview/tst_qgraphicsview.cpp
index 505f9a4..afd8668 100644
--- a/tests/auto/qgraphicsview/tst_qgraphicsview.cpp
+++ b/tests/auto/qgraphicsview/tst_qgraphicsview.cpp
@@ -217,6 +217,7 @@ private slots:
     void task245469_itemsAtPointWithClip();
     void task253415_reconnectUpdateSceneOnSceneChanged();
     void task255529_transformationAnchorMouseAndViewportMargins();
+    void task259503_scrollingArtifacts();
 };
 
 void tst_QGraphicsView::initTestCase()
@@ -376,7 +377,7 @@ void tst_QGraphicsView::interactive()
     view.show();
 
     QTestEventLoop::instance().enterLoop(1);
-    QCOMPARE(item->events.size(), 0);
+    QCOMPARE(item->events.size(), 1); // activate
 
     QPoint itemPoint = view.mapFromScene(item->scenePos());
 
@@ -384,16 +385,16 @@ void tst_QGraphicsView::interactive()
 
     for (int i = 0; i < 100; ++i) {
         sendMousePress(view.viewport(), itemPoint);
-        QCOMPARE(item->events.size(), i * 5 + 2);
+        QCOMPARE(item->events.size(), i * 5 + 3);
         QCOMPARE(item->events.at(item->events.size() - 2), QEvent::GrabMouse);
         QCOMPARE(item->events.at(item->events.size() - 1), QEvent::GraphicsSceneMousePress);
         sendMouseRelease(view.viewport(), itemPoint);
-        QCOMPARE(item->events.size(), i * 5 + 4);
+        QCOMPARE(item->events.size(), i * 5 + 5);
         QCOMPARE(item->events.at(item->events.size() - 2), QEvent::GraphicsSceneMouseRelease);
         QCOMPARE(item->events.at(item->events.size() - 1), QEvent::UngrabMouse);
         QContextMenuEvent contextEvent(QContextMenuEvent::Mouse, itemPoint, view.mapToGlobal(itemPoint));
         QApplication::sendEvent(view.viewport(), &contextEvent);
-        QCOMPARE(item->events.size(), i * 5 + 5);
+        QCOMPARE(item->events.size(), i * 5 + 6);
         QCOMPARE(item->events.last(), QEvent::GraphicsSceneContextMenu);
     }
 
@@ -401,14 +402,14 @@ void tst_QGraphicsView::interactive()
 
     for (int i = 0; i < 100; ++i) {
         sendMousePress(view.viewport(), itemPoint);
-        QCOMPARE(item->events.size(), 500);
+        QCOMPARE(item->events.size(), 501);
         QCOMPARE(item->events.last(), QEvent::GraphicsSceneContextMenu);
         sendMouseRelease(view.viewport(), itemPoint);
-        QCOMPARE(item->events.size(), 500);
+        QCOMPARE(item->events.size(), 501);
         QCOMPARE(item->events.last(), QEvent::GraphicsSceneContextMenu);
         QContextMenuEvent contextEvent(QContextMenuEvent::Mouse, itemPoint, view.mapToGlobal(itemPoint));
         QApplication::sendEvent(view.viewport(), &contextEvent);
-        QCOMPARE(item->events.size(), 500);
+        QCOMPARE(item->events.size(), 501);
         QCOMPARE(item->events.last(), QEvent::GraphicsSceneContextMenu);
     }
 }
@@ -1872,32 +1873,32 @@ void tst_QGraphicsView::sendEvent()
     item->setFocus();
 
     QCOMPARE(scene.focusItem(), (QGraphicsItem *)item);
-    QCOMPARE(item->events.size(), 1);
+    QCOMPARE(item->events.size(), 2);
     QCOMPARE(item->events.last(), QEvent::FocusIn);
 
     QPoint itemPoint = view.mapFromScene(item->scenePos());
     sendMousePress(view.viewport(), itemPoint);
-    QCOMPARE(item->events.size(), 3);
+    QCOMPARE(item->events.size(), 4);
     QCOMPARE(item->events.at(item->events.size() - 2), QEvent::GrabMouse);
     QCOMPARE(item->events.at(item->events.size() - 1), QEvent::GraphicsSceneMousePress);
 
     QMouseEvent mouseMoveEvent(QEvent::MouseMove, itemPoint, view.viewport()->mapToGlobal(itemPoint),
                                 Qt::LeftButton, Qt::LeftButton, 0);
     QApplication::sendEvent(view.viewport(), &mouseMoveEvent);
-    QCOMPARE(item->events.size(), 4);
+    QCOMPARE(item->events.size(), 5);
     QCOMPARE(item->events.last(), QEvent::GraphicsSceneMouseMove);
 
     QMouseEvent mouseReleaseEvent(QEvent::MouseButtonRelease, itemPoint,
                                   view.viewport()->mapToGlobal(itemPoint),
                                   Qt::LeftButton, 0, 0);
     QApplication::sendEvent(view.viewport(), &mouseReleaseEvent);
-    QCOMPARE(item->events.size(), 6);
+    QCOMPARE(item->events.size(), 7);
     QCOMPARE(item->events.at(item->events.size() - 2), QEvent::GraphicsSceneMouseRelease);
     QCOMPARE(item->events.at(item->events.size() - 1), QEvent::UngrabMouse);
 
     QKeyEvent keyPress(QEvent::KeyPress, Qt::Key_Space, 0);
     QApplication::sendEvent(view.viewport(), &keyPress);
-    QCOMPARE(item->events.size(), 8);
+    QCOMPARE(item->events.size(), 9);
     QCOMPARE(item->events.at(item->events.size() - 2), QEvent::ShortcutOverride);
     QCOMPARE(item->events.last(), QEvent::KeyPress);
 }
@@ -3663,6 +3664,65 @@ void tst_QGraphicsView::task255529_transformationAnchorMouseAndViewportMargins()
     QVERIFY(qAbs(newMouseScenePos.y() - mouseScenePos.y()) < slack);
 }
 
+void tst_QGraphicsView::task259503_scrollingArtifacts()
+{
+    QGraphicsScene scene(0, 0, 800, 600);
+
+    QGraphicsRectItem card;
+    card.setRect(0, 0, 50, 50);
+    card.setPen(QPen(Qt::darkRed));
+    card.setBrush(QBrush(Qt::cyan));
+    card.setZValue(2.0);
+    card.setPos(300, 300);
+    scene.addItem(&card);
+
+    class SAGraphicsView: public QGraphicsView
+    {
+    public:
+        SAGraphicsView(QGraphicsScene *scene)
+            : QGraphicsView(scene)
+            , itSTimeToTest(false)
+        {
+            setViewportUpdateMode( QGraphicsView::MinimalViewportUpdate );
+            resize(QSize(640, 480));
+        }
+
+        QRegion updateRegion;
+        bool itSTimeToTest;
+
+        void paintEvent(QPaintEvent *event)
+        {
+            QGraphicsView::paintEvent(event);
+
+            if (itSTimeToTest)
+            {
+                qDebug() << event->region();
+                qDebug() << updateRegion;
+                QCOMPARE(event->region(), updateRegion);
+            }
+        }
+    };
+
+    SAGraphicsView view(&scene);
+    view.show();
+#ifdef Q_WS_X11
+    qt_x11_wait_for_window_manager(&view);
+#endif
+
+    int hsbValue = view.horizontalScrollBar()->value();
+    view.horizontalScrollBar()->setValue(hsbValue / 2);
+    QTest::qWait(10);
+    view.horizontalScrollBar()->setValue(0);
+    QTest::qWait(10);
+
+    QRect itemDeviceBoundingRect = card.deviceTransform(view.viewportTransform()).mapRect(card.boundingRect()).toRect();
+    itemDeviceBoundingRect.adjust(-2, -2, 2, 2);
+    view.updateRegion = itemDeviceBoundingRect;
+    view.updateRegion += itemDeviceBoundingRect.translated(-100, 0);
+    view.itSTimeToTest = true;
+    card.setPos(200, 300);
+    QTest::qWait(10);
+}
 
 QTEST_MAIN(tst_QGraphicsView)
 #include "tst_qgraphicsview.moc"
diff --git a/tests/auto/qlineedit/tst_qlineedit.cpp b/tests/auto/qlineedit/tst_qlineedit.cpp
index 1616154..93aa64c 100644
--- a/tests/auto/qlineedit/tst_qlineedit.cpp
+++ b/tests/auto/qlineedit/tst_qlineedit.cpp
@@ -190,6 +190,7 @@ private slots:
 
     void selectedText();
     void hasSelectedText();
+    void deleteSelectedText();
 
     void textChangedAndTextEdited();
     void returnPressed();
@@ -2054,6 +2055,32 @@ void tst_QLineEdit::hasSelectedText()
     DEPENDS_ON("selectedText");
 }
 
+void tst_QLineEdit::deleteSelectedText()
+{
+    const QString text = QString::fromLatin1("bar");
+    QLineEdit edit( text );
+    QCOMPARE(edit.text(), text);
+
+    edit.selectAll();
+
+    QTest::keyClick(&edit, Qt::Key_Delete, 0);
+    QVERIFY(edit.text().isEmpty());
+
+    edit.setText(text);
+    edit.selectAll();
+
+    QMenu *menu = edit.createStandardContextMenu();
+    for (int i = 0; i < menu->actions().count(); ++i) {
+        QAction *current = menu->actions().at(i);
+        if (current->text() == QLineEdit::tr("Delete")) {
+            current->trigger(); //this will delete the whole text selected
+            QVERIFY(edit.text().isEmpty());
+        }
+    }
+
+}
+
+
 void tst_QLineEdit::textChangedAndTextEdited()
 {
     changed_count = 0;
diff --git a/tests/auto/qmainwindow/tst_qmainwindow.cpp b/tests/auto/qmainwindow/tst_qmainwindow.cpp
index e118c65..9156e5e 100644
--- a/tests/auto/qmainwindow/tst_qmainwindow.cpp
+++ b/tests/auto/qmainwindow/tst_qmainwindow.cpp
@@ -106,6 +106,7 @@ private slots:
     void isSeparator();
     void setCursor();
     void addToolbarAfterShow();
+    void centralWidgetSize();
 };
 
 // Testing get/set functions
@@ -1336,6 +1337,19 @@ public:
     }
 };
 
+class MyWidget : public QWidget
+{
+public:
+    MyWidget(QWidget *parent = 0) : QWidget(parent)
+    {
+    }
+
+    QSize sizeHint() const
+    {
+	return QSize(200, 200);
+    }
+};
+
 void tst_QMainWindow::hideBeforeLayout()
 {
     QMainWindow win;
@@ -1650,6 +1664,18 @@ void tst_QMainWindow::addToolbarAfterShow()
     QVERIFY(!toolBar.isHidden());
 }
 
+void tst_QMainWindow::centralWidgetSize()
+{
+    QMainWindow mainWindow;
+    mainWindow.menuBar()->addMenu("menu");
+
+    MyWidget widget;
+    mainWindow.setCentralWidget(&widget);
+
+    mainWindow.show();
+    QTest::qWait(100);
+    QCOMPARE(widget.size(), widget.sizeHint());
+}
 
 
 QTEST_MAIN(tst_QMainWindow)
diff --git a/tests/auto/qmake/testcompiler.cpp b/tests/auto/qmake/testcompiler.cpp
index 8d7c9d2..4e1d9ba 100644
--- a/tests/auto/qmake/testcompiler.cpp
+++ b/tests/auto/qmake/testcompiler.cpp
@@ -261,3 +261,17 @@ bool TestCompiler::removeMakefile( const QString &workPath )
     else
         return true;
 }
+
+QString TestCompiler::commandOutput() const
+{
+#ifndef Q_OS_WIN
+    return testOutput_.join("\n");
+#else
+    return testOutput_.join("\r\n");
+#endif
+}
+
+void TestCompiler::clearCommandOutput()
+{
+   testOutput_.clear();
+}
diff --git a/tests/auto/qmake/testcompiler.h b/tests/auto/qmake/testcompiler.h
index 76d9ee5..026344f 100644
--- a/tests/auto/qmake/testcompiler.h
+++ b/tests/auto/qmake/testcompiler.h
@@ -70,6 +70,10 @@ public:
     bool exists( const QString &destDir, const QString &exeName, BuildType buildType, const QString &version );
     // removes the makefile
     bool removeMakefile( const QString &workPath );
+    // returns each line of stdout of the last command append with a "new line" character(s) to suit the platform
+    QString commandOutput() const;
+    // clear the results of storage of stdout for running previous commands
+    void clearCommandOutput();
 
 private:
     bool runCommand( QString cmdLine );
diff --git a/tests/auto/qmake/testdata/include_function/existing_file.pri b/tests/auto/qmake/testdata/include_function/existing_file.pri
new file mode 100644
index 0000000..8b9aaca
--- /dev/null
+++ b/tests/auto/qmake/testdata/include_function/existing_file.pri
@@ -0,0 +1,3 @@
+QT =
+CONFIG = console
+SOURCES = main.cpp
diff --git a/tests/auto/qmake/testdata/include_function/include_existing_file.pro b/tests/auto/qmake/testdata/include_function/include_existing_file.pro
new file mode 100644
index 0000000..424062a
--- /dev/null
+++ b/tests/auto/qmake/testdata/include_function/include_existing_file.pro
@@ -0,0 +1,7 @@
+# Test to see if include(), by default, succeeds when the specific file 
+#   to include exists
+include(existing_file.pri)
+
+# Test to see if by specifying full set of parameters to include()
+#  succeeds when the specified filed to include exists 
+include(existing_file.pri, "", false)
diff --git a/tests/auto/qmake/testdata/include_function/include_missing_file.pro b/tests/auto/qmake/testdata/include_function/include_missing_file.pro
new file mode 100644
index 0000000..0b59981
--- /dev/null
+++ b/tests/auto/qmake/testdata/include_function/include_missing_file.pro
@@ -0,0 +1,3 @@
+# Test to see if include(), by default, fails when the specific file 
+#   to include does not exist
+include(missing_file.pri)
diff --git a/tests/auto/qmake/testdata/include_function/include_missing_file2.pro b/tests/auto/qmake/testdata/include_function/include_missing_file2.pro
new file mode 100644
index 0000000..542b9ff
--- /dev/null
+++ b/tests/auto/qmake/testdata/include_function/include_missing_file2.pro
@@ -0,0 +1,3 @@
+# Specifying full set of parameters to include() to test that a warning 
+#   is shown for this non-existing file.
+include(missing_file.pri, "", false)
diff --git a/tests/auto/qmake/testdata/include_function/main.cpp b/tests/auto/qmake/testdata/include_function/main.cpp
new file mode 100644
index 0000000..0a8e3d3
--- /dev/null
+++ b/tests/auto/qmake/testdata/include_function/main.cpp
@@ -0,0 +1,4 @@
+int main(int /*argc*/, char ** /*argv*/)
+{
+    return 0;
+}
diff --git a/tests/auto/qmake/tst_qmake.cpp b/tests/auto/qmake/tst_qmake.cpp
index 168fcfd..50ea5b9 100644
--- a/tests/auto/qmake/tst_qmake.cpp
+++ b/tests/auto/qmake/tst_qmake.cpp
@@ -88,6 +88,7 @@ private slots:
     // Test requires make
     void bundle_spaces();
 #endif
+    void includefunction();
 
 private:
     TestCompiler test_compiler;
@@ -125,10 +126,12 @@ void tst_qmake::cleanupTestCase()
 
 void tst_qmake::init()
 {
+    test_compiler.clearCommandOutput();
 }
 
 void tst_qmake::cleanup()
 {
+    test_compiler.clearCommandOutput();
 }
 
 void tst_qmake::simple_app()
@@ -438,6 +441,26 @@ void tst_qmake::bundle_spaces()
 }
 #endif // Q_OS_WIN
 
+void tst_qmake::includefunction()
+{
+    QString workDir = base_path + "/testdata/include_function";
+    QString warningMsg("Unable to find file for inclusion");
+    QVERIFY(test_compiler.qmake( workDir, "include_existing_file"));
+    QVERIFY(!test_compiler.commandOutput().contains(warningMsg));
+
+    // test include()  usage on a missing file
+    test_compiler.clearCommandOutput();
+    workDir = base_path + "/testdata/include_function";
+    QVERIFY(test_compiler.qmake( workDir, "include_missing_file" ));
+    QVERIFY(test_compiler.commandOutput().contains(warningMsg));
+
+    // test include() usage on a missing file when all function parameters are used
+    test_compiler.clearCommandOutput();
+    workDir = base_path + "/testdata/include_function";
+    QVERIFY(test_compiler.qmake( workDir, "include_missing_file2" ));
+    QVERIFY(test_compiler.commandOutput().contains(warningMsg));
+}
+
 QTEST_MAIN(tst_qmake)
 #include "tst_qmake.moc"
 
diff --git a/tests/auto/qobject/tst_qobject.cpp b/tests/auto/qobject/tst_qobject.cpp
index a08f620..b20c0e0 100644
--- a/tests/auto/qobject/tst_qobject.cpp
+++ b/tests/auto/qobject/tst_qobject.cpp
@@ -120,6 +120,7 @@ private slots:
     void uniqConnection();
     void interfaceIid();
     void deleteQObjectWhenDeletingEvent();
+    void overloads();
 protected:
 };
 
@@ -2903,11 +2904,11 @@ void tst_QObject::uniqConnection()
 
 void tst_QObject::interfaceIid()
 {
-    QCOMPARE(QByteArray(qobject_interface_iid<Foo::Bleh *>()), 
+    QCOMPARE(QByteArray(qobject_interface_iid<Foo::Bleh *>()),
              QByteArray(Bleh_iid));
-    QCOMPARE(QByteArray(qobject_interface_iid<Foo::Bar *>()), 
+    QCOMPARE(QByteArray(qobject_interface_iid<Foo::Bar *>()),
              QByteArray("com.qtest.foobar"));
-    QCOMPARE(QByteArray(qobject_interface_iid<FooObject *>()), 
+    QCOMPARE(QByteArray(qobject_interface_iid<FooObject *>()),
              QByteArray());
 }
 
@@ -2927,6 +2928,93 @@ void tst_QObject::deleteQObjectWhenDeletingEvent()
     QCoreApplication::removePostedEvents(&o); // here you would get a deadlock
 }
 
+class OverloadObject : public QObject
+{
+    friend class tst_QObject;
+    Q_OBJECT
+    signals:
+        void sig(int i, char c, qreal m = 12);
+        void sig(int i, int j = 12);
+        void sig(QObject *o, QObject *p, QObject *q = 0, QObject *r = 0) const;
+        void other(int a = 0);
+        void sig(QObject *o, OverloadObject *p = 0, QObject *q = 0, QObject *r = 0);
+        void sig(double r = 0.5);
+    public slots:
+        void slo(int i, int j = 43)
+        {
+            s_num += 1;
+            i1_num = i;
+            i2_num = j;
+        }
+        void slo(QObject *o, QObject *p = qApp, QObject *q = qApp, QObject *r = qApp)
+        {
+            s_num += 10;
+            o1_obj = o;
+            o2_obj = p;
+            o3_obj = q;
+            o4_obj = r;
+        }
+        void slo()
+        {
+            s_num += 100;
+        }
+
+    public:
+        int s_num;
+        int i1_num;
+        int i2_num;
+        QObject *o1_obj;
+        QObject *o2_obj;
+        QObject *o3_obj;
+        QObject *o4_obj;
+};
+
+void tst_QObject::overloads()
+{
+    OverloadObject obj1;
+    OverloadObject obj2;
+    QObject obj3;
+    obj1.s_num = 0;
+    obj2.s_num = 0;
+
+    connect (&obj1, SIGNAL(sig(int)) , &obj1, SLOT(slo(int)));
+    connect (&obj1, SIGNAL(sig(QObject *, QObject *, QObject *)) , &obj1, SLOT(slo(QObject * , QObject *, QObject *)));
+
+    connect (&obj1, SIGNAL(sig(QObject *, QObject *, QObject *, QObject *)) , &obj2, SLOT(slo(QObject * , QObject *, QObject *)));
+    connect (&obj1, SIGNAL(sig(QObject *)) , &obj2, SLOT(slo()));
+    connect (&obj1, SIGNAL(sig(int, int)) , &obj2, SLOT(slo(int, int)));
+
+    emit obj1.sig(0.5); //connected to nothing
+    emit obj1.sig(1, 'a'); //connected to nothing
+    QCOMPARE(obj1.s_num, 0);
+    QCOMPARE(obj2.s_num, 0);
+
+    emit obj1.sig(1); //this signal is connected
+    QCOMPARE(obj1.s_num, 1);
+    QCOMPARE(obj1.i1_num, 1);
+    QCOMPARE(obj1.i2_num, 43); //default argument of the slot
+
+    QCOMPARE(obj2.s_num, 1);
+    QCOMPARE(obj2.i1_num, 1);
+    QCOMPARE(obj2.i2_num, 12); //default argument of the signal
+
+
+    emit obj1.sig(&obj2); //this signal is conencted to obj2
+    QCOMPARE(obj1.s_num, 1);
+    QCOMPARE(obj2.s_num, 101);
+    emit obj1.sig(&obj2, &obj3); //this signal is connected
+    QCOMPARE(obj1.s_num, 11);
+    QCOMPARE(obj1.o1_obj, &obj2);
+    QCOMPARE(obj1.o2_obj, &obj3);
+    QCOMPARE(obj1.o3_obj, (QObject *)0); //default arg of the signal
+    QCOMPARE(obj1.o4_obj, qApp); //default arg of the slot
+
+    QCOMPARE(obj2.s_num, 111);
+    QCOMPARE(obj2.o1_obj, &obj2);
+    QCOMPARE(obj2.o2_obj, &obj3);
+    QCOMPARE(obj2.o3_obj, (QObject *)0); //default arg of the signal
+    QCOMPARE(obj2.o4_obj, qApp); //default arg of the slot
+}
 
 QTEST_MAIN(tst_QObject)
 #include "tst_qobject.moc"
diff --git a/tests/auto/qpixmapfilter/tst_qpixmapfilter.cpp b/tests/auto/qpixmapfilter/tst_qpixmapfilter.cpp
index 410d868..66c6693 100644
--- a/tests/auto/qpixmapfilter/tst_qpixmapfilter.cpp
+++ b/tests/auto/qpixmapfilter/tst_qpixmapfilter.cpp
@@ -342,39 +342,44 @@ void tst_QPixmapFilter::dropShadowBoundingRectFor()
     QPixmapDropShadowFilter filter;
     filter.setBlurRadius(0);
 
-    QCOMPARE(filter.blurRadius(), 0.0);
+    QCOMPARE(filter.blurRadius(), 0);
+
+    const QRectF rect1(0, 0, 50, 50);
+    const QRectF rect2(30, 20, 10, 40);
+    const QRectF rect3(2.2, 6.3, 11.4, 47.5);
 
     filter.setOffset(QPointF(0,0));
-    QCOMPARE(filter.boundingRectFor(QRectF(0, 0, 50, 50)), QRectF(0, 0, 50, 50));
-    QCOMPARE(filter.boundingRectFor(QRectF(30, 20, 10, 40)), QRectF(30, 20, 10, 40));
-    QCOMPARE(filter.boundingRectFor(QRectF(2.2, 6.3, 11.4, 47.5)), QRectF(2.2, 6.3, 11.4, 47.5));
+    QCOMPARE(filter.boundingRectFor(rect1), rect1);
+    QCOMPARE(filter.boundingRectFor(rect2), rect2);
+    QCOMPARE(filter.boundingRectFor(rect3), rect3);
 
     filter.setOffset(QPointF(1,1));
     QCOMPARE(filter.offset(), QPointF(1, 1));
-    QCOMPARE(filter.boundingRectFor(QRectF(0, 0, 50, 50)), QRectF(0, 0, 51, 51));
-    QCOMPARE(filter.boundingRectFor(QRectF(30, 20, 10, 40)), QRectF(30, 20, 11, 41));
-    QCOMPARE(filter.boundingRectFor(QRectF(2.2, 6.3, 11.4, 47.5)), QRectF(2.2, 6.3, 12.4, 48.5));
+    QCOMPARE(filter.boundingRectFor(rect1), rect1.adjusted(0, 0, 1, 1));
+    QCOMPARE(filter.boundingRectFor(rect2), rect2.adjusted(0, 0, 1, 1));
+    QCOMPARE(filter.boundingRectFor(rect3), rect3.adjusted(0, 0, 1, 1));
 
     filter.setOffset(QPointF(-1,-1));
-    QCOMPARE(filter.boundingRectFor(QRectF(0, 0, 50, 50)), QRectF(-1, -1, 51, 51));
-    QCOMPARE(filter.boundingRectFor(QRectF(30, 20, 10, 40)), QRectF(29, 19, 11, 41));
-    QCOMPARE(filter.boundingRectFor(QRectF(2.2, 6.3, 11.4, 47.5)), QRectF(1.2, 5.3, 12.4, 48.5));
+    QCOMPARE(filter.boundingRectFor(rect1), rect1.adjusted(-1, -1, 0, 0));
+    QCOMPARE(filter.boundingRectFor(rect2), rect2.adjusted(-1, -1, 0, 0));
+    QCOMPARE(filter.boundingRectFor(rect3), rect3.adjusted(-1, -1, 0, 0));
 
     filter.setBlurRadius(2);
     filter.setOffset(QPointF(0,0));
-    QCOMPARE(filter.boundingRectFor(QRectF(0, 0, 50, 50)), QRectF(-2, -2, 54, 54));
-    QCOMPARE(filter.boundingRectFor(QRectF(30, 20, 10, 40)), QRectF(28, 18, 14, 44));
-    QCOMPARE(filter.boundingRectFor(QRectF(2.2, 6.3, 11.4, 47.5)), QRectF(0.2, 4.3, 15.4, 51.5));
+    int delta = 2 * 2;
+    QCOMPARE(filter.boundingRectFor(rect1), rect1.adjusted(-delta, -delta, delta, delta));
+    QCOMPARE(filter.boundingRectFor(rect2), rect2.adjusted(-delta, -delta, delta, delta));
+    QCOMPARE(filter.boundingRectFor(rect3), rect3.adjusted(-delta, -delta, delta, delta));
 
     filter.setOffset(QPointF(1,1));
-    QCOMPARE(filter.boundingRectFor(QRectF(0, 0, 50, 50)), QRectF(-1, -1, 54, 54));
-    QCOMPARE(filter.boundingRectFor(QRectF(30, 20, 10, 40)), QRectF(29, 19, 14, 44));
-    QCOMPARE(filter.boundingRectFor(QRectF(2.2, 6.3, 11.4, 47.5)), QRectF(1.2, 5.3, 15.4, 51.5));
+    QCOMPARE(filter.boundingRectFor(rect1), rect1.adjusted(-delta + 1, -delta + 1, delta + 1, delta + 1));
+    QCOMPARE(filter.boundingRectFor(rect2), rect2.adjusted(-delta + 1, -delta + 1, delta + 1, delta + 1));
+    QCOMPARE(filter.boundingRectFor(rect3), rect3.adjusted(-delta + 1, -delta + 1, delta + 1, delta + 1));
 
     filter.setOffset(QPointF(-10,-10));
-    QCOMPARE(filter.boundingRectFor(QRectF(0, 0, 50, 50)), QRectF(-12, -12, 62, 62));
-    QCOMPARE(filter.boundingRectFor(QRectF(30, 20, 10, 40)), QRectF(18, 8, 22, 52));
-    QCOMPARE(filter.boundingRectFor(QRectF(2.2, 6.3, 11.4, 47.5)), QRectF(-9.8, -5.7, 23.4, 59.5));
+    QCOMPARE(filter.boundingRectFor(rect1), rect1.adjusted(-delta - 10, -delta - 10, 0, 0));
+    QCOMPARE(filter.boundingRectFor(rect2), rect2.adjusted(-delta - 10, -delta - 10, 0, 0));
+    QCOMPARE(filter.boundingRectFor(rect3), rect3.adjusted(-delta - 10, -delta - 10, 0, 0));
 }
 
 
diff --git a/tests/auto/qpropertyanimation/tst_qpropertyanimation.cpp b/tests/auto/qpropertyanimation/tst_qpropertyanimation.cpp
index 04cfe1a..57fca9d 100644
--- a/tests/auto/qpropertyanimation/tst_qpropertyanimation.cpp
+++ b/tests/auto/qpropertyanimation/tst_qpropertyanimation.cpp
@@ -66,7 +66,7 @@ protected:
 class MyObject : public QObject
 {
     Q_OBJECT
-    Q_PROPERTY(qreal x READ x WRITE setX) 
+    Q_PROPERTY(qreal x READ x WRITE setX)
 public:
     MyObject() : m_x(0) { }
     qreal x() const { return m_x; }
@@ -115,6 +115,7 @@ private slots:
     void restart();
     void valueChanged();
     void twoAnimations();
+    void deletedInUpdateCurrentTime();
 };
 
 tst_QPropertyAnimation::tst_QPropertyAnimation()
@@ -142,7 +143,7 @@ class AnimationObject : public QObject
     Q_PROPERTY(qreal realValue READ realValue WRITE setRealValue)
 public:
     AnimationObject(int startValue = 0)
-        : v(startValue)
+        : v(startValue), rv(startValue)
     { }
 
     int value() const { return v; }
@@ -402,7 +403,7 @@ void tst_QPropertyAnimation::duration0()
     animation.setStartValue(42);
     QVERIFY(animation.currentValue().isValid());
     QCOMPARE(animation.currentValue().toInt(), 42);
-    
+
     QCOMPARE(o.property("ole").toInt(), 42);
     animation.setDuration(0);
     QCOMPARE(animation.currentValue().toInt(), 43); //it is at the end
@@ -1125,11 +1126,55 @@ void tst_QPropertyAnimation::twoAnimations()
 
     QCOMPARE(o1.ole(), 1000);
     QCOMPARE(o2.ole(), 1000);
-
 }
 
+class MyComposedAnimation : public QPropertyAnimation
+{
+    Q_OBJECT
+public:
+    MyComposedAnimation(QObject *target, const QByteArray &propertyName, const QByteArray &innerPropertyName)
+        : QPropertyAnimation(target, propertyName)
+    {
+        innerAnim = new QPropertyAnimation(target, innerPropertyName);
+        this->setEndValue(1000);
+        innerAnim->setEndValue(1000);
+        innerAnim->setDuration(duration() + 100);
+    }
 
+    void start()
+    {
+        QPropertyAnimation::start();
+        innerAnim->start();
+    }
 
+    void updateState(QAbstractAnimation::State oldState, QAbstractAnimation::State newState)
+    {
+        QPropertyAnimation::updateState(oldState, newState);
+        if (newState == QAbstractAnimation::Stopped)
+            delete innerAnim;
+    }
+
+public:
+    QPropertyAnimation *innerAnim;
+};
+
+void tst_QPropertyAnimation::deletedInUpdateCurrentTime()
+{
+    // this test case reproduces an animation being deleted in the updateCurrentTime of
+    // another animation(was causing segfault).
+    // the deleted animation must have been started after the animation that is deleting.
+    AnimationObject o;
+    o.setValue(0);
+    o.setRealValue(0.0);
+
+    MyComposedAnimation composedAnimation(&o, "value", "realValue");
+    composedAnimation.start();
+    QCOMPARE(composedAnimation.state(), QAbstractAnimation::Running);
+    QTest::qWait(composedAnimation.duration() + 50);
+
+    QCOMPARE(composedAnimation.state(), QAbstractAnimation::Stopped);
+    QCOMPARE(o.value(), 1000);
+}
 
 QTEST_MAIN(tst_QPropertyAnimation)
 #include "tst_qpropertyanimation.moc"
diff --git a/tests/auto/qscriptclass/tst_qscriptclass.cpp b/tests/auto/qscriptclass/tst_qscriptclass.cpp
index 11c7f56..33c2c35 100644
--- a/tests/auto/qscriptclass/tst_qscriptclass.cpp
+++ b/tests/auto/qscriptclass/tst_qscriptclass.cpp
@@ -606,6 +606,7 @@ void tst_QScriptClass::newInstance()
     QScriptValue arr = eng.newArray();
     QVERIFY(arr.isArray());
     QCOMPARE(arr.scriptClass(), (QScriptClass*)0);
+    QTest::ignoreMessage(QtWarningMsg, "QScriptValue::setScriptClass() failed: cannot change class of non-QScriptObject");
     arr.setScriptClass(&cls);
     QEXPECT_FAIL("", "Changing class of arbitrary script object is not allowed (it's OK)", Continue);
     QCOMPARE(arr.scriptClass(), (QScriptClass*)&cls);
diff --git a/tests/auto/qscriptcontext/tst_qscriptcontext.cpp b/tests/auto/qscriptcontext/tst_qscriptcontext.cpp
index ef609e0..a09d314 100644
--- a/tests/auto/qscriptcontext/tst_qscriptcontext.cpp
+++ b/tests/auto/qscriptcontext/tst_qscriptcontext.cpp
@@ -50,6 +50,10 @@
 
 Q_DECLARE_METATYPE(QScriptValueList)
 
+QT_BEGIN_NAMESPACE
+extern bool qt_script_isJITEnabled();
+QT_END_NAMESPACE
+
 class tst_QScriptContext : public QObject
 {
     Q_OBJECT
@@ -598,8 +602,10 @@ void tst_QScriptContext::backtrace_data()
 
            expected << "<native>('hey') at -1"
                     << "<eval>() at 3"
-                    //### line number should be 2 but the line number information is not kept for eval call
-                    << "foo(arg1 = 'hello', arg2 = 456) at testfile:-1"
+                    << QString::fromLatin1("foo(arg1 = 'hello', arg2 = 456) at testfile:%0")
+               // interpreter unfortunately doesn't provide line number for eval()
+               .arg(qt_script_isJITEnabled() ? 2 : -1);
+           expected
                     << "<global>() at testfile:4";
 
             QTest::newRow("eval") << source << expected;
@@ -658,8 +664,10 @@ void tst_QScriptContext::backtrace_data()
 
            expected << "<native>('hey') at -1"
                     << "<eval>() at 3"
-                    //### line number should be 3 but the line number information is not kept for eval call
-                    << "plop('hello', 456) at testfile:-1"
+                    << QString::fromLatin1("plop('hello', 456) at testfile:%0")
+               // interpreter unfortunately doesn't provide line number for eval()
+               .arg(qt_script_isJITEnabled() ? 3 : -1);
+           expected
                     << "<global>() at testfile:5";
 
             QTest::newRow("eval in member") << source << expected;
@@ -1003,6 +1011,8 @@ void tst_QScriptContext::calledAsConstructor()
         eng.evaluate("test();");
         QVERIFY(!fun3.property("calledAsConstructor").toBool());
         eng.evaluate("new test();");
+        if (qt_script_isJITEnabled())
+            QEXPECT_FAIL("", "calledAsConstructor is not correctly set for JS functions when JIT is enabled", Continue);
         QVERIFY(fun3.property("calledAsConstructor").toBool());
     }
 
diff --git a/tests/auto/qscriptengine/tst_qscriptengine.cpp b/tests/auto/qscriptengine/tst_qscriptengine.cpp
index df74144..b0ba922 100644
--- a/tests/auto/qscriptengine/tst_qscriptengine.cpp
+++ b/tests/auto/qscriptengine/tst_qscriptengine.cpp
@@ -1107,6 +1107,31 @@ void tst_QScriptEngine::globalObjectProperties()
         }
     }
     QVERIFY(remainingNames.isEmpty());
+
+    // create property with no attributes
+    {
+        QString name = QString::fromLatin1("foo");
+        QVERIFY(!global.property(name).isValid());
+        QScriptValue val(123);
+        global.setProperty(name, val);
+        QVERIFY(global.property(name).equals(val));
+        QVERIFY(global.propertyFlags(name) == 0);
+        global.setProperty(name, QScriptValue());
+        QVERIFY(!global.property(name).isValid());
+    }
+    // create property with attributes
+    {
+        QString name = QString::fromLatin1("bar");
+        QVERIFY(!global.property(name).isValid());
+        QScriptValue val(QString::fromLatin1("ciao"));
+        QScriptValue::PropertyFlags flags = QScriptValue::ReadOnly | QScriptValue::SkipInEnumeration;
+        global.setProperty(name, val, flags);
+        QVERIFY(global.property(name).equals(val));
+        QEXPECT_FAIL("", "custom Global Object properties don't retain attributes", Continue);
+        QCOMPARE(global.propertyFlags(name), flags);
+        global.setProperty(name, QScriptValue());
+        QVERIFY(!global.property(name).isValid());
+    }
 }
 
 void tst_QScriptEngine::globalObjectGetterSetterProperty()
diff --git a/tests/auto/qscriptengineagent/tst_qscriptengineagent.cpp b/tests/auto/qscriptengineagent/tst_qscriptengineagent.cpp
index 886c70b..f515304 100644
--- a/tests/auto/qscriptengineagent/tst_qscriptengineagent.cpp
+++ b/tests/auto/qscriptengineagent/tst_qscriptengineagent.cpp
@@ -49,6 +49,10 @@
 //TESTED_CLASS=
 //TESTED_FILES=
 
+QT_BEGIN_NAMESPACE
+extern bool qt_script_isJITEnabled();
+QT_END_NAMESPACE
+
 class tst_QScriptEngineAgent : public QObject
 {
     Q_OBJECT
@@ -557,6 +561,8 @@ void tst_QScriptEngineAgent::functionEntryAndExit_functionCall()
         spy->clear();
         QVERIFY(eng.evaluate("(function() { return 123; } )()").toNumber()==123);
 
+        if (qt_script_isJITEnabled())
+            QEXPECT_FAIL("", "functionExit() is not called for JS functions when JIT is enabled", Abort);
         QCOMPARE(spy->count(), 4);
 
         // evaluate() entry
@@ -592,6 +598,8 @@ void tst_QScriptEngineAgent::functionEntryAndExit_functionCallWithoutReturn()
         spy->clear();
         eng.evaluate("(function() { var a = 123; } )()");
 
+        if (qt_script_isJITEnabled())
+            QEXPECT_FAIL("", "functionExit() is not called for JS functions when JIT is enabled", Abort);
         QCOMPARE(spy->count(), 4);
 
         // evaluate() entry
@@ -634,6 +642,8 @@ void tst_QScriptEngineAgent::functionEntryAndExit_functionDefinition()
         QVERIFY(spy->at(1).value.isUndefined());
 
         eng.evaluate("foo()");
+        if (qt_script_isJITEnabled())
+            QEXPECT_FAIL("", "functionExit() is not called for JS functions when JIT is enabled", Abort);
         QCOMPARE(spy->count(), 6);
 
         // evaluate() entry
@@ -709,6 +719,8 @@ void tst_QScriptEngineAgent::functionEntryAndExit_native2()
 
         spy->clear();
         eng.evaluate("nativeFunctionCallingArg(function() { return 123; })");
+        if (qt_script_isJITEnabled())
+            QEXPECT_FAIL("", "functionExit() is not called for JS functions when JIT is enabled", Abort);
         QCOMPARE(spy->count(), 6);
 
         // evaluate() entry
@@ -797,6 +809,8 @@ void tst_QScriptEngineAgent::functionEntryAndExit_builtin()
         spy->clear();
         eng.evaluate("'ciao'.toString()");
 
+        if (qt_script_isJITEnabled())
+            QEXPECT_FAIL("", "Some events are missing when JIT is enabled", Abort);
         QCOMPARE(spy->count(), 4);
 
         // evaluate() entry
@@ -1021,6 +1035,8 @@ void tst_QScriptEngineAgent::functionEntryAndExit_call()
 
         spy->clear();
         fun.call();
+        if (qt_script_isJITEnabled())
+            QEXPECT_FAIL("", "functionExit() is not called for JS functions when JIT is enabled", Abort);
         QCOMPARE(spy->count(), 2);
 
         // entry
@@ -1575,6 +1591,8 @@ void tst_QScriptEngineAgent::exceptionThrowAndCatch()
     {
         spy->clear();
         eng.evaluate("try { throw new Error('ciao'); } catch (e) { }");
+        if (qt_script_isJITEnabled())
+            QEXPECT_FAIL("", "Some events are missing when JIT is enabled", Abort);
         QCOMPARE(spy->count(), 2);
 
         QCOMPARE(spy->at(0).type, ScriptEngineEvent::ExceptionThrow);
@@ -1632,6 +1650,8 @@ void tst_QScriptEngineAgent::eventOrder_functionDefinition()
         QCOMPARE(spy->at(2).type, ScriptEngineEvent::FunctionExit);
 
         eng.evaluate("foo(123)");
+        if (qt_script_isJITEnabled())
+            QEXPECT_FAIL("", "Some events are missing when JIT is enabled", Abort);
         QCOMPARE(spy->count(), 13);
         // load
         QCOMPARE(spy->at(3).type, ScriptEngineEvent::ScriptLoad);
@@ -1708,6 +1728,8 @@ void tst_QScriptEngineAgent::eventOrder_throwAndCatch()
     {
         spy->clear();
         eng.evaluate("try { throw new Error('ciao') } catch (e) { void(e); }");
+        if (qt_script_isJITEnabled())
+            QEXPECT_FAIL("", "One event is missing when JIT is enabled", Abort);
         QCOMPARE(spy->count(), 12);
         // load
         QCOMPARE(spy->at(0).type, ScriptEngineEvent::ScriptLoad);
@@ -1752,6 +1774,8 @@ void tst_QScriptEngineAgent::eventOrder_functions()
         QCOMPARE(spy->count(), 6);
 
         eng.evaluate("foo(123)");
+        if (qt_script_isJITEnabled())
+            QEXPECT_FAIL("", "Some events are missing when JIT is enabled", Abort);
         QCOMPARE(spy->count(), 21);
 
         // load
@@ -1876,6 +1900,8 @@ void tst_QScriptEngineAgent::eventOrder_throwCatchFinally()
     {
         spy->clear();
         eng.evaluate("try { throw 1; } catch(e) { i = e; } finally { i = 2; }");
+        if (qt_script_isJITEnabled())
+            QEXPECT_FAIL("", "One event is missing when JIT is enabled", Abort);
         QCOMPARE(spy->count(), 9);
 
         // load
diff --git a/tests/auto/qscriptjstestsuite/tst_qscriptjstestsuite.cpp b/tests/auto/qscriptjstestsuite/tst_qscriptjstestsuite.cpp
index f77738f..56b7df8 100644
--- a/tests/auto/qscriptjstestsuite/tst_qscriptjstestsuite.cpp
+++ b/tests/auto/qscriptjstestsuite/tst_qscriptjstestsuite.cpp
@@ -400,7 +400,6 @@ tst_Suite::tst_Suite()
     }
 
     QString willFixInNextReleaseMessage = QString::fromLatin1("Will fix in next release");
-    QString brokenOnSomePlatformsMessage = QString::fromLatin1("Doesn't behave the same on all platforms");
     QString fromCharCodeMessage = QString::fromLatin1("Test is wrong?");
     for (int i = 4256; i < 4294; ++i) {
         addExpectedFailure("ecma/String/15.5.4.11-2.js", QString::fromLatin1("var s = new String( String.fromCharCode(%0) ); s.toLowerCase().charCodeAt(0)").arg(i), fromCharCodeMessage);
@@ -418,61 +417,15 @@ tst_Suite::tst_Suite()
     addExpectedFailure("ecma/extensions/15.1.2.1-1.js", "var PROPS = ''; for ( p in eval ) { PROPS += p }; PROPS", willFixInNextReleaseMessage);
     addExpectedFailure("ecma/GlobalObject/15.1.2.2-1.js", "var PROPS=''; for ( var p in parseInt ) { PROPS += p; }; PROPS", willFixInNextReleaseMessage);
 
-    addSkip("ecma/GlobalObject/15.1.2.2-2.js", "parseInt(s,36)", brokenOnSomePlatformsMessage);
-
     addExpectedFailure("ecma/GlobalObject/15.1.2.3-1.js", "var MYPROPS=''; for ( var p in parseFloat ) { MYPROPS += p }; MYPROPS", willFixInNextReleaseMessage);
     addExpectedFailure("ecma/GlobalObject/15.1.2.4.js", "var MYPROPS=''; for ( var p in escape ) { MYPROPS+= p}; MYPROPS", willFixInNextReleaseMessage);
     addExpectedFailure("ecma/GlobalObject/15.1.2.5-1.js", "var MYPROPS=''; for ( var p in unescape ) { MYPROPS+= p }; MYPROPS", willFixInNextReleaseMessage);
     addExpectedFailure("ecma/GlobalObject/15.1.2.6.js", "var MYPROPS=''; for ( var p in isNaN ) { MYPROPS+= p }; MYPROPS", willFixInNextReleaseMessage);
     addExpectedFailure("ecma/GlobalObject/15.1.2.7.js", "var MYPROPS=''; for ( p in isFinite ) { MYPROPS+= p }; MYPROPS", willFixInNextReleaseMessage);
 
-    // qstrtod() has problems parsing reaaaaally big numbers -- they come out as NaN rather than Infinity or Number.MAX_VALUE
-    addSkip("ecma/TypeConversion/9.3.1-3.js", "parseInt(s1,10) == 1.7976931348623157e+308 || parseInt(s1,10) == Infinity", brokenOnSomePlatformsMessage);
-    addSkip("ecma/TypeConversion/9.3.1-3.js", "parseInt(s2,10) == Infinity || parseInt(s2,10) == 1.7976931348623157e+308", brokenOnSomePlatformsMessage);
-    addSkip("ecma/TypeConversion/9.3.1-3.js", "parseInt(s1) == 1.7976931348623157e+308 || parseInt(s1) == Infinity", brokenOnSomePlatformsMessage);
-    addSkip("ecma/TypeConversion/9.3.1-3.js", "parseInt(s2) == Infinity || parseInt(s2) == 1.7976931348623157e+308", brokenOnSomePlatformsMessage);
-    addSkip("ecma/TypeConversion/9.3.1-3.js", "parseInt(s,36)", brokenOnSomePlatformsMessage);
-
-#if defined(Q_OS_SOLARIS)
-    addExpectedFailure("ecma/Math/15.8.2.2.js", "Math.acos(11.00000001)", "Fails on Solaris");
-    addExpectedFailure("ecma/Math/15.8.2.3.js", "Math.asin(-1.000001)", "Fails on Solaris");
-#endif
-
     addExpectedFailure(QRegExp(), "NO TESTS EXIST", willFixInNextReleaseMessage);
 
-    addExpectedFailure("ecma_2/RegExp/multiline-001.js", "/.*[y]$/m.exec(ivory-billed\ndowny\nhairy\nacorn\nyellow-bellied sapsucker\nnorthern flicker\npileated\n)", willFixInNextReleaseMessage);
-    addExpectedFailure("ecma_2/RegExp/multiline-001.js", "/.*[d]$/m.exec(ivory-billed\ndowny\nhairy\nacorn\nyellow-bellied sapsucker\nnorthern flicker\npileated\n)", willFixInNextReleaseMessage);
-    addExpectedFailure("ecma_2/String/match-002.js", "//.toString()", willFixInNextReleaseMessage);
-
-#if defined(Q_WS_WIN)
-    addExpectedFailure(QRegExp(), "VAR1 = 0; VAR2= Infinity; VAR1 %= VAR2;VAR1", willFixInNextReleaseMessage);
-    addExpectedFailure(QRegExp(), "VAR1 = -0; VAR2= Infinity; VAR1 %= VAR2;VAR1", willFixInNextReleaseMessage);
-    addExpectedFailure(QRegExp(), "VAR1 = 0; VAR2= -Infinity; VAR1 %= VAR2;VAR1", willFixInNextReleaseMessage);
-    addExpectedFailure(QRegExp(), "VAR1 = -0; VAR2= -Infinity; VAR1 %= VAR2;VAR1", willFixInNextReleaseMessage);
-    addExpectedFailure(QRegExp(), "VAR1 = 1; VAR2= Infinity; VAR1 %= VAR2;VAR1", willFixInNextReleaseMessage);
-    addExpectedFailure(QRegExp(), "VAR1 = -1; VAR2= Infinity; VAR1 %= VAR2;VAR1", willFixInNextReleaseMessage);
-    addExpectedFailure(QRegExp(), "VAR1 = -1; VAR2= -Infinity; VAR1 %= VAR2;VAR1", willFixInNextReleaseMessage);
-    addExpectedFailure(QRegExp(), "VAR1 = 1; VAR2= -Infinity; VAR1 %= VAR2;VAR1", willFixInNextReleaseMessage);
-    addExpectedFailure(QRegExp(), "1 % Number.NEGATIVE_INFINITY", willFixInNextReleaseMessage);
-    addExpectedFailure(QRegExp(), "1 % Number.POSITIVE_INFINITY", willFixInNextReleaseMessage);
-    addExpectedFailure(QRegExp(), "-1 % Number.POSITIVE_INFINITY", willFixInNextReleaseMessage);
-    addExpectedFailure(QRegExp(), "-1 % Number.NEGATIVE_INFINITY", willFixInNextReleaseMessage);
-    addExpectedFailure(QRegExp(), "Number.MAX_VALUE % Number.NEGATIVE_INFINITY", willFixInNextReleaseMessage);
-    addExpectedFailure(QRegExp(), "Number.MAX_VALUE % Number.POSITIVE_INFINITY", willFixInNextReleaseMessage);
-    addExpectedFailure(QRegExp(), "-Number.MAX_VALUE % Number.POSITIVE_INFINITY", willFixInNextReleaseMessage);
-    addExpectedFailure(QRegExp(), "-Number.MAX_VALUE % Number.NEGATIVE_INFINITY", willFixInNextReleaseMessage);
-    addExpectedFailure(QRegExp(), "0 % Number.POSITIVE_INFINITY", willFixInNextReleaseMessage);
-    addExpectedFailure(QRegExp(), "0 % Number.NEGATIVE_INFINITY", willFixInNextReleaseMessage);
-    addExpectedFailure(QRegExp(), "-0 % Number.POSITIVE_INFINITY", willFixInNextReleaseMessage);
-    addExpectedFailure(QRegExp(), "-0 % Number.NEGATIVE_INFINITY", willFixInNextReleaseMessage);
-    addExpectedFailure(QRegExp(), "Math.atan2(Infinity, Infinity)", willFixInNextReleaseMessage);
-    addExpectedFailure(QRegExp(), "Math.atan2(Infinity, -Infinity)", willFixInNextReleaseMessage);
-    addExpectedFailure(QRegExp(), "Math.atan2(-Infinity, Infinity)", willFixInNextReleaseMessage);
-    addExpectedFailure(QRegExp(), "Math.atan2(-Infinity, -Infinity)", willFixInNextReleaseMessage);
-#endif
-
     addExpectedFailure("ecma_3/Array/15.4.5.1-01.js", "15.4.5.1 - array.length coverage", willFixInNextReleaseMessage);
-    addExpectedFailure("ecma_3/ExecutionContexts/10.1.4-1.js", "Expected to be able to delete x", willFixInNextReleaseMessage);
 
     addExpectedFailure("ecma_3/extensions/regress-228087-002.js",
                        "Section 1 of test - \nregexp = /{1.*}/g\n"
diff --git a/tests/auto/qscriptvalue/tst_qscriptvalue.cpp b/tests/auto/qscriptvalue/tst_qscriptvalue.cpp
index 3f231f2..1c09693 100644
--- a/tests/auto/qscriptvalue/tst_qscriptvalue.cpp
+++ b/tests/auto/qscriptvalue/tst_qscriptvalue.cpp
@@ -447,6 +447,8 @@ void tst_QScriptValue::toString()
     variant = eng.newVariant(QVariant(QPoint(10, 20)));
     QVERIFY(variant.isVariant());
     QCOMPARE(variant.toString(), QString::fromLatin1("QVariant(QPoint)"));
+    variant = eng.newVariant(QUrl());
+    QVERIFY(variant.toString().isEmpty());
 }
 
 void tst_QScriptValue::toNumber()
@@ -2106,6 +2108,7 @@ void tst_QScriptValue::getSetProperty()
     object.setProperty(foo, num);
     QVERIFY(object.property(foo).strictlyEquals(num));
     QVERIFY(object.property("foo").strictlyEquals(num));
+    QVERIFY(object.propertyFlags(foo) == 0);
 }
 
 void tst_QScriptValue::getSetPrototype()
@@ -2219,13 +2222,30 @@ void tst_QScriptValue::getSetScriptClass()
     QCOMPARE(inv.scriptClass(), (QScriptClass*)0);
     QScriptValue num(123);
     QCOMPARE(num.scriptClass(), (QScriptClass*)0);
-    QScriptValue obj = eng.newObject();
-    QCOMPARE(obj.scriptClass(), (QScriptClass*)0);
+
     TestScriptClass testClass(&eng);
-    obj.setScriptClass(&testClass);
-    QCOMPARE(obj.scriptClass(), (QScriptClass*)&testClass);
-    obj.setScriptClass(0);
-    QCOMPARE(obj.scriptClass(), (QScriptClass*)0);
+    // object created in C++ (newObject())
+    {
+        QScriptValue obj = eng.newObject();
+        QCOMPARE(obj.scriptClass(), (QScriptClass*)0);
+        obj.setScriptClass(&testClass);
+        QCOMPARE(obj.scriptClass(), (QScriptClass*)&testClass);
+        obj.setScriptClass(0);
+        QCOMPARE(obj.scriptClass(), (QScriptClass*)0);
+    }
+    // object created in JS
+    {
+        QScriptValue obj = eng.evaluate("new Object");
+        QVERIFY(!eng.hasUncaughtException());
+        QVERIFY(obj.isObject());
+        QCOMPARE(obj.scriptClass(), (QScriptClass*)0);
+        QTest::ignoreMessage(QtWarningMsg, "QScriptValue::setScriptClass() failed: cannot change class of non-QScriptObject");
+        obj.setScriptClass(&testClass);
+        QEXPECT_FAIL("", "With JSC back-end, the class of a plain object created in JS can't be changed", Continue);
+        QCOMPARE(obj.scriptClass(), (QScriptClass*)&testClass);
+        obj.setScriptClass(0);
+        QCOMPARE(obj.scriptClass(), (QScriptClass*)0);
+    }
 }
 
 static QScriptValue getArg(QScriptContext *ctx, QScriptEngine *)
@@ -3277,6 +3297,8 @@ void tst_QScriptValue::engineDeleted()
     QVERIFY(v4.engine() == 0);
     QVERIFY(v5.isValid());
     QVERIFY(v5.engine() == 0);
+
+    QVERIFY(!v3.property("foo").isValid());
 }
 
 void tst_QScriptValue::valueOfWithClosure()
diff --git a/tests/auto/qsharedpointer/tst_qsharedpointer.cpp b/tests/auto/qsharedpointer/tst_qsharedpointer.cpp
index 93f5b6e..d3df376 100644
--- a/tests/auto/qsharedpointer/tst_qsharedpointer.cpp
+++ b/tests/auto/qsharedpointer/tst_qsharedpointer.cpp
@@ -548,6 +548,13 @@ class OtherObject: public QObject
 void tst_QSharedPointer::qobjectWeakManagement()
 {
     {
+        QWeakPointer<QObject> weak;
+        weak = QWeakPointer<QObject>();
+        QVERIFY(weak.isNull());
+        QVERIFY(!weak.data());
+    }
+
+    {
         QObject *obj = new QObject;
         QWeakPointer<QObject> weak(obj);
         QVERIFY(!weak.isNull());
@@ -1661,6 +1668,11 @@ void tst_QSharedPointer::invalidConstructs_data()
         << "QObject *ptr = new QObject;\n"
            "QWeakPointer<QObject> weak = ptr;\n"    // this makes the object unmanaged
            "QSharedPointer<QObject> shared(ptr);\n";
+
+    QTest::newRow("shared-pointer-implicit-from-uninitialized")
+        << &QTest::QExternalTest::tryCompileFail
+        << "Data *ptr = 0;\n"
+           "QSharedPointer<Data> weakptr = Qt::Uninitialized;\n";
 }
 
 void tst_QSharedPointer::invalidConstructs()
diff --git a/tests/auto/qsqldriver/tst_qsqldriver.cpp b/tests/auto/qsqldriver/tst_qsqldriver.cpp
index 5af56c7..4857295 100644
--- a/tests/auto/qsqldriver/tst_qsqldriver.cpp
+++ b/tests/auto/qsqldriver/tst_qsqldriver.cpp
@@ -144,9 +144,11 @@ void tst_QSqlDriver::record()
     else if (db.driverName().startsWith("QPSQL"))
         tablename = tablename.toLower();
 
-    //check we can get records using a properly quoted table name
-    rec = db.driver()->record(db.driver()->escapeIdentifier(tablename,QSqlDriver::TableName));
-    QCOMPARE(rec.count(), 4);
+    if(!db.driverName().startsWith("QODBC") && !db.databaseName().contains("PostgreSql")) {
+        //check we can get records using a properly quoted table name
+        rec = db.driver()->record(db.driver()->escapeIdentifier(tablename,QSqlDriver::TableName));
+        QCOMPARE(rec.count(), 4);
+    }
 
     for (int i = 0; i < fields.count(); ++i)
         QCOMPARE(rec.fieldName(i), fields[i]);
@@ -188,8 +190,10 @@ void tst_QSqlDriver::primaryIndex()
     else if (db.driverName().startsWith("QPSQL"))
         tablename = tablename.toLower();
 
-    index = db.driver()->primaryIndex(db.driver()->escapeIdentifier(tablename, QSqlDriver::TableName));
-    QCOMPARE(index.count(), 1);
+    if(!db.driverName().startsWith("QODBC") && !db.databaseName().contains("PostgreSql")) {
+        index = db.driver()->primaryIndex(db.driver()->escapeIdentifier(tablename, QSqlDriver::TableName));
+        QCOMPARE(index.count(), 1);
+    }
     if( db.driverName().startsWith("QIBASE") || db.driverName().startsWith("QOCI") || db.driverName().startsWith("QDB2"))
         QCOMPARE(index.fieldName(0), QString::fromLatin1("ID"));
     else
diff --git a/tests/auto/qsslcertificate/more-certificates/badguy-nul-san.crt b/tests/auto/qsslcertificate/more-certificates/badguy-nul-san.crt
new file mode 100644
index 0000000..d897c39
--- /dev/null
+++ b/tests/auto/qsslcertificate/more-certificates/badguy-nul-san.crt
@@ -0,0 +1,83 @@
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number: 0 (0x0)
+        Signature Algorithm: sha1WithRSAEncryption
+        Issuer: C=GB, ST=Berkshire, L=Newbury, O=My Company Ltd, OU=CA, CN=NULL-friendly CA
+        Validity
+            Not Before: Aug  4 06:53:05 2009 GMT
+            Not After : Aug  2 06:53:05 2019 GMT
+        Subject: CN=www.badguy.com
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+            RSA Public Key: (2048 bit)
+                Modulus (2048 bit):
+                    00:cd:26:70:96:a9:a6:5d:3e:9c:ed:0f:08:15:5a:
+                    7c:17:25:68:68:af:13:b9:ad:41:fa:12:54:e2:84:
+                    72:7d:58:d1:e2:40:42:c1:59:ed:05:3d:aa:10:53:
+                    70:00:88:3a:77:a0:c0:56:9e:ac:7d:21:2a:71:44:
+                    51:08:bc:17:07:da:a8:a3:76:dc:51:bc:1b:8a:f6:
+                    02:1a:55:bf:46:b4:44:6b:27:5e:be:e5:17:8b:56:
+                    b2:c6:82:36:11:83:a8:bf:f7:2f:0d:17:f6:cd:47:
+                    b5:6f:2b:a6:41:b6:8d:33:5f:ea:ea:8b:b1:1a:e2:
+                    99:38:ff:59:5b:0a:a1:71:13:ca:37:3f:b9:b0:1e:
+                    91:9a:c8:93:35:0c:4a:e0:9d:f4:d2:61:c7:4e:5b:
+                    41:0a:7c:31:54:99:db:f5:65:ce:80:d3:c2:02:37:
+                    64:fd:54:12:7b:ea:ac:85:59:5c:17:e1:2e:f6:d0:
+                    a8:f2:d0:2e:94:59:2f:c2:a6:5f:da:07:de:7b:2e:
+                    14:07:ed:e4:27:24:37:9d:09:2e:b1:f9:5a:48:b9:
+                    80:24:43:e6:cb:c7:6e:35:df:d5:69:34:ff:e6:d6:
+                    9e:e8:76:66:6e:5f:59:01:3c:96:3b:ec:72:0b:3c:
+                    1e:95:0f:ce:68:13:9c:22:dd:1b:b5:44:28:50:4a:
+                    05:7f
+                Exponent: 65537 (0x10001)
+        X509v3 extensions:
+            X509v3 Basic Constraints: 
+                CA:FALSE
+            Netscape Comment: 
+                OpenSSL Generated Certificate
+            X509v3 Subject Key Identifier: 
+                33:15:24:BE:DA:66:3A:06:8B:D9:27:34:3A:AF:62:40:E4:95:66:5D
+            X509v3 Authority Key Identifier: 
+                keyid:0A:69:39:5F:9D:30:04:18:08:2E:02:0E:E6:EA:9D:B2:26:F6:E2:6A
+
+            X509v3 Subject Alternative Name: 
+                DNS:www.bank.com
+    Signature Algorithm: sha1WithRSAEncryption
+        27:6e:7d:b3:a9:86:52:57:6a:a0:c6:30:6c:1e:94:09:a7:6f:
+        ad:fe:11:9f:be:32:8d:01:7b:8b:94:66:d7:7c:b6:b1:90:fc:
+        e4:f5:b6:32:bc:6c:71:23:b1:18:88:d6:47:bc:da:07:c7:5e:
+        46:71:3a:e6:40:6e:c1:7f:1d:56:96:70:65:d8:51:a9:dc:9e:
+        a5:06:00:98:e7:1e:10:bc:82:ba:00:e5:4e:a2:0f:3e:ec:8a:
+        dd:6f:c6:c9:c1:ec:ed:6d:7c:31:3e:66:87:47:a1:8b:15:3c:
+        21:7e:ec:21:78:3d:21:70:72:ba:70:c3:64:f8:1d:4f:d9:d0:
+        27:3c:3e:7e:a2:59:ae:be:9a:d3:00:44:a7:72:3a:e3:3f:c8:
+        9b:c5:8f:b1:94:fe:00:0f:6e:b8:14:88:f1:03:50:91:51:af:
+        f0:1e:f7:b8:5a:a4:57:35:2d:f1:ad:c8:ae:dd:29:61:14:7d:
+        ea:d1:34:80:5c:1b:fd:eb:43:dc:21:6d:c6:44:f9:3b:54:76:
+        c4:91:5b:ac:a4:8e:72:e7:d8:24:ff:a7:5a:c0:ef:27:c3:d7:
+        e4:f9:7f:55:8d:0d:30:ec:a2:d9:6d:c8:76:f4:be:94:3d:12:
+        32:4a:91:4f:db:c3:e7:76:07:5a:12:97:18:b7:15:00:98:59:
+        21:89:3e:35
+-----BEGIN CERTIFICATE-----
+MIIDrTCCApWgAwIBAgIBADANBgkqhkiG9w0BAQUFADB0MQswCQYDVQQGEwJHQjES
+MBAGA1UECBMJQmVya3NoaXJlMRAwDgYDVQQHEwdOZXdidXJ5MRcwFQYDVQQKEw5N
+eSBDb21wYW55IEx0ZDELMAkGA1UECxMCQ0ExGTAXBgNVBAMTEE5VTEwtZnJpZW5k
+bHkgQ0EwHhcNMDkwODA0MDY1MzA1WhcNMTkwODAyMDY1MzA1WjAZMRcwFQYDVQQD
+Ew53d3cuYmFkZ3V5LmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+AM0mcJappl0+nO0PCBVafBclaGivE7mtQfoSVOKEcn1Y0eJAQsFZ7QU9qhBTcACI
+OnegwFaerH0hKnFEUQi8FwfaqKN23FG8G4r2AhpVv0a0RGsnXr7lF4tWssaCNhGD
+qL/3Lw0X9s1HtW8rpkG2jTNf6uqLsRrimTj/WVsKoXETyjc/ubAekZrIkzUMSuCd
+9NJhx05bQQp8MVSZ2/VlzoDTwgI3ZP1UEnvqrIVZXBfhLvbQqPLQLpRZL8KmX9oH
+3nsuFAft5CckN50JLrH5Wki5gCRD5svHbjXf1Wk0/+bWnuh2Zm5fWQE8ljvscgs8
+HpUPzmgTnCLdG7VEKFBKBX8CAwEAAaOBpDCBoTAJBgNVHRMEAjAAMCwGCWCGSAGG
++EIBDQQfFh1PcGVuU1NMIEdlbmVyYXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4EFgQU
+MxUkvtpmOgaL2Sc0Oq9iQOSVZl0wHwYDVR0jBBgwFoAUCmk5X50wBBgILgIO5uqd
+sib24mowJgYDVR0RBB8wHYIbd3d3LmJhbmsuY29tAHd3dy5iYWRndXkuY29tMA0G
+CSqGSIb3DQEBBQUAA4IBAQAnbn2zqYZSV2qgxjBsHpQJp2+t/hGfvjKNAXuLlGbX
+fLaxkPzk9bYyvGxxI7EYiNZHvNoHx15GcTrmQG7Bfx1WlnBl2FGp3J6lBgCY5x4Q
+vIK6AOVOog8+7Irdb8bJweztbXwxPmaHR6GLFTwhfuwheD0hcHK6cMNk+B1P2dAn
+PD5+olmuvprTAESncjrjP8ibxY+xlP4AD264FIjxA1CRUa/wHve4WqRXNS3xrciu
+3SlhFH3q0TSAXBv960PcIW3GRPk7VHbEkVuspI5y59gk/6dawO8nw9fk+X9VjQ0w
+7KLZbch29L6UPRIySpFP28PndgdaEpcYtxUAmFkhiT41
+-----END CERTIFICATE-----
diff --git a/tests/auto/qsslcertificate/tst_qsslcertificate.cpp b/tests/auto/qsslcertificate/tst_qsslcertificate.cpp
index c046e38..9cd5c72 100644
--- a/tests/auto/qsslcertificate/tst_qsslcertificate.cpp
+++ b/tests/auto/qsslcertificate/tst_qsslcertificate.cpp
@@ -107,6 +107,7 @@ private slots:
     void certInfo();
     void task256066toPem();
     void nulInCN();
+    void nulInSan();
 // ### add tests for certificate bundles (multiple certificates concatenated into a single
 //     structure); both PEM and DER formatted
 #endif
@@ -750,6 +751,26 @@ void tst_QSslCertificate::nulInCN()
     QCOMPARE(cn, QString::fromLatin1(realCN, sizeof realCN - 1));
 }
 
+void tst_QSslCertificate::nulInSan()
+{
+    QList<QSslCertificate> certList =
+        QSslCertificate::fromPath(SRCDIR "more-certificates/badguy-nul-san.crt");
+    QCOMPARE(certList.size(), 1);
+
+    const QSslCertificate &cert = certList.at(0);
+    QVERIFY(!cert.isNull());
+
+    QMultiMap<QSsl::AlternateNameEntryType, QString> san = cert.alternateSubjectNames();
+    QVERIFY(!san.isEmpty());
+
+    QString dnssan = san.value(QSsl::DnsEntry);
+    QVERIFY(!dnssan.isEmpty());
+    QVERIFY(dnssan != "www.bank.com");
+
+    static const char realSAN[] = "www.bank.com\0.badguy.com";
+    QCOMPARE(dnssan, QString::fromLatin1(realSAN, sizeof realSAN - 1));
+}
+
 #endif // QT_NO_OPENSSL
 
 QTEST_MAIN(tst_QSslCertificate)
diff --git a/tests/auto/qstatemachine/tst_qstatemachine.cpp b/tests/auto/qstatemachine/tst_qstatemachine.cpp
index 20e69ce..643daa2 100644
--- a/tests/auto/qstatemachine/tst_qstatemachine.cpp
+++ b/tests/auto/qstatemachine/tst_qstatemachine.cpp
@@ -93,10 +93,13 @@ Q_OBJECT
         { emit signalWithIntArg(arg); }
     void emitSignalWithStringArg(const QString &arg)
         { emit signalWithStringArg(arg); }
+    void emitSignalWithDefaultArg()
+        { emit signalWithDefaultArg(); }
 Q_SIGNALS:
     void signalWithNoArg();
     void signalWithIntArg(int);
     void signalWithStringArg(const QString &);
+    void signalWithDefaultArg(int i = 42);
 };
 
 class tst_QStateMachine : public QObject
@@ -193,6 +196,8 @@ private slots:
 
     void nestedStateMachines();
     void goToState();
+
+    void task260403_clonedSignals();
 };
 
 tst_QStateMachine::tst_QStateMachine()
@@ -3937,5 +3942,42 @@ void tst_QStateMachine::goToState()
     QVERIFY(machine.configuration().contains(s2_1));
 }
 
+class CloneSignalTransition : public QSignalTransition
+{
+public:
+    CloneSignalTransition(QObject *sender, const char *signal, QAbstractState *target)
+        : QSignalTransition(sender, signal)
+    {
+        setTargetState(target);
+    }
+
+    void onTransition(QEvent *e)
+    {
+        QSignalTransition::onTransition(e);
+        QSignalEvent *se = static_cast<QSignalEvent*>(e);
+        eventSignalIndex = se->signalIndex();
+    }
+
+    int eventSignalIndex;
+};
+
+void tst_QStateMachine::task260403_clonedSignals()
+{
+    SignalEmitter emitter;
+    QStateMachine machine;
+    QState *s1 = new QState(&machine);
+    QState *s2 = new QState(&machine);
+    CloneSignalTransition *t1 = new CloneSignalTransition(&emitter, SIGNAL(signalWithDefaultArg()), s2);
+    s1->addTransition(t1);
+
+    machine.setInitialState(s1);
+    machine.start();
+    QTest::qWait(1);
+
+    emitter.emitSignalWithDefaultArg();
+    QTest::qWait(1);
+    QCOMPARE(t1->eventSignalIndex, emitter.metaObject()->indexOfSignal("signalWithDefaultArg()"));
+}
+
 QTEST_MAIN(tst_QStateMachine)
 #include "tst_qstatemachine.moc"
diff --git a/tests/auto/qtabbar/tst_qtabbar.cpp b/tests/auto/qtabbar/tst_qtabbar.cpp
index 041836c..3f77b7a 100644
--- a/tests/auto/qtabbar/tst_qtabbar.cpp
+++ b/tests/auto/qtabbar/tst_qtabbar.cpp
@@ -94,6 +94,7 @@ private slots:
     void moveTab();
 
     void task251184_removeTab();
+    void changeTitleWhileDoubleClickingTab();
 };
 
 // Testing get/set functions
@@ -535,5 +536,38 @@ void tst_QTabBar::task251184_removeTab()
 }
 
 
+class TitleChangeTabBar : public QTabBar
+{
+    Q_OBJECT
+
+    QTimer timer;
+    int count;
+
+public:
+    TitleChangeTabBar(QWidget * parent = 0) : QTabBar(parent), count(0)
+    {
+        setMovable(true);
+        addTab("0");
+        connect(&timer, SIGNAL(timeout()), this, SLOT(updateTabText()));
+        timer.start(1);
+    }
+
+public slots:
+    void updateTabText()
+    {
+        count++;
+        setTabText(0, QString("%1").arg(count));
+    }
+};
+
+void tst_QTabBar::changeTitleWhileDoubleClickingTab()
+{
+    TitleChangeTabBar bar;
+    QPoint tabPos = bar.tabRect(0).center();
+
+    for(int i=0; i < 10; i++)
+        QTest::mouseDClick(&bar, Qt::LeftButton, 0, tabPos);
+}
+
 QTEST_MAIN(tst_QTabBar)
 #include "tst_qtabbar.moc"
diff --git a/tests/auto/qtreeview/tst_qtreeview.cpp b/tests/auto/qtreeview/tst_qtreeview.cpp
index d28c3c3..44185e7 100644
--- a/tests/auto/qtreeview/tst_qtreeview.cpp
+++ b/tests/auto/qtreeview/tst_qtreeview.cpp
@@ -232,6 +232,7 @@ private slots:
     void task250683_wrongSectionSize();
     void task239271_addRowsWithFirstColumnHidden();
     void task254234_proxySort();
+    void task248022_changeSelection();
 };
 
 class QtTestModel: public QAbstractItemModel
@@ -3435,5 +3436,33 @@ void tst_QTreeView::task254234_proxySort()
     QCOMPARE(view.model()->data(view.model()->index(1,1)).toString(), QString::fromLatin1("g"));
 }
 
+class TreeView : public QTreeView
+{
+    Q_OBJECT
+public slots:
+    void handleSelectionChanged()
+    {
+        //let's select the last item
+        QModelIndex idx = model()->index(0, 0);
+        selectionModel()->select(QItemSelection(idx, idx), QItemSelectionModel::Select);
+        disconnect(selectionModel(), SIGNAL(selectionChanged(QItemSelection, QItemSelection)), this, SLOT(handleSelectionChanged()));
+    }
+};
+
+void tst_QTreeView::task248022_changeSelection()
+{
+    //we check that changing the selection between the mouse press and the mouse release
+    //works correctly
+    TreeView view;
+    QStringList list = QStringList() << "1" << "2";
+    QStringListModel model(list);
+    view.setSelectionMode(QAbstractItemView::ExtendedSelection);
+    view.setModel(&model);
+    view.connect(view.selectionModel(), SIGNAL(selectionChanged(QItemSelection, QItemSelection)), SLOT(handleSelectionChanged()));
+    QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, view.visualRect(model.index(1)).center());
+    QCOMPARE(view.selectionModel()->selectedIndexes().count(), list.count());
+}
+
+
 QTEST_MAIN(tst_QTreeView)
 #include "tst_qtreeview.moc"
diff --git a/tests/auto/symbian/qsymbiantests.pro b/tests/auto/symbian/qsymbiantests.pro
index 648335e..a752c86 100644
--- a/tests/auto/symbian/qsymbiantests.pro
+++ b/tests/auto/symbian/qsymbiantests.pro
@@ -1,2 +1,4 @@
 TEMPLATE = subdirs
-SUBDIRS = qmainexceptions orientationchange
\ No newline at end of file
+SUBDIRS = qmainexceptions orientationchange
+
+requires(symbian)
diff --git a/tests/auto/uiloader/baseline/css_tab_closebutton.ui b/tests/auto/uiloader/baseline/css_tab_closebutton.ui
new file mode 100644
index 0000000..82bd2b5
--- /dev/null
+++ b/tests/auto/uiloader/baseline/css_tab_closebutton.ui
@@ -0,0 +1,128 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>Form</class>
+ <widget class="QWidget" name="Form">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>400</width>
+    <height>300</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Form</string>
+  </property>
+  <property name="styleSheet">
+   <string notr="true">*{}
+
+#tabWidget QTabBar::close-button
+{
+   background: blue;
+   border: 2px dotted red;
+   subcontrol-position: top;
+}
+
+
+#tabWidget_2 QTabBar::close-button
+{
+   image: url(images/checkbox_checked.png);
+   subcontrol-position: left;
+}
+
+#tabWidget_2 QTabBar::close-button:hover
+{
+   image: url(images/checkbox_unchecked_hover.png);
+}
+
+
+#tabWidget_3 QTabBar::close-button
+{
+   border-image: url(images/pushbutton.png) 3px;
+  border-width:3px;
+}
+
+
+</string>
+  </property>
+  <layout class="QGridLayout" name="gridLayout">
+   <item row="0" column="0">
+    <widget class="QTabWidget" name="tabWidget">
+     <property name="tabsClosable">
+      <bool>true</bool>
+     </property>
+     <widget class="QWidget" name="tab">
+      <attribute name="title">
+       <string>Tab 1</string>
+      </attribute>
+      <layout class="QGridLayout" name="gridLayout_2">
+       <item row="0" column="0">
+        <widget class="QLabel" name="label">
+         <property name="text">
+          <string>Test the close button in the tabbar</string>
+         </property>
+         <property name="wordWrap">
+          <bool>true</bool>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </widget>
+     <widget class="QWidget" name="tab_2">
+      <attribute name="title">
+       <string>Tab 2</string>
+      </attribute>
+     </widget>
+    </widget>
+   </item>
+   <item row="0" column="1" rowspan="2">
+    <widget class="QTabWidget" name="tabWidget_3">
+     <property name="tabPosition">
+      <enum>QTabWidget::East</enum>
+     </property>
+     <property name="currentIndex">
+      <number>0</number>
+     </property>
+     <property name="tabsClosable">
+      <bool>true</bool>
+     </property>
+     <widget class="QWidget" name="tab_5">
+      <attribute name="title">
+       <string>Tab 1</string>
+      </attribute>
+     </widget>
+     <widget class="QWidget" name="tab_6">
+      <attribute name="title">
+       <string>Tab 2</string>
+      </attribute>
+     </widget>
+    </widget>
+   </item>
+   <item row="1" column="0">
+    <widget class="QTabWidget" name="tabWidget_2">
+     <property name="tabPosition">
+      <enum>QTabWidget::South</enum>
+     </property>
+     <property name="currentIndex">
+      <number>0</number>
+     </property>
+     <property name="tabsClosable">
+      <bool>true</bool>
+     </property>
+     <widget class="QWidget" name="tab_3">
+      <attribute name="title">
+       <string>Tab 1</string>
+      </attribute>
+     </widget>
+     <widget class="QWidget" name="tab_4">
+      <attribute name="title">
+       <string>Tab 2</string>
+      </attribute>
+     </widget>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/tests/auto/windowsmobile/test/ddhelper.cpp b/tests/auto/windowsmobile/test/ddhelper.cpp
index 482f8dd..627b802 100644
--- a/tests/auto/windowsmobile/test/ddhelper.cpp
+++ b/tests/auto/windowsmobile/test/ddhelper.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/tests/auto/windowsmobile/test/ddhelper.h b/tests/auto/windowsmobile/test/ddhelper.h
index 3dfa9e6..36963d4 100644
--- a/tests/auto/windowsmobile/test/ddhelper.h
+++ b/tests/auto/windowsmobile/test/ddhelper.h
@@ -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 test suite 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$
+**
+****************************************************************************/
+
 #ifndef __DDHELPER__
 #define __DDHELPER__
 
diff --git a/tests/auto/windowsmobile/testQMenuBar/main.cpp b/tests/auto/windowsmobile/testQMenuBar/main.cpp
index f615c48..e9cb0bb 100644
--- a/tests/auto/windowsmobile/testQMenuBar/main.cpp
+++ b/tests/auto/windowsmobile/testQMenuBar/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/tests/auto/xmlpatternsview/view/FunctionSignaturesView.h b/tests/auto/xmlpatternsview/view/FunctionSignaturesView.h
index ff02f21..8ccd346 100644
--- a/tests/auto/xmlpatternsview/view/FunctionSignaturesView.h
+++ b/tests/auto/xmlpatternsview/view/FunctionSignaturesView.h
@@ -38,47 +38,6 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Patternist project on Qt Labs.
-**
-** $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$
-**
-***************************************************************************
-*/
 
 #ifndef PatternistSDK_FunctionSignaturesView_H
 #define PatternistSDK_FunctionSignaturesView_H
diff --git a/tests/auto/xmlpatternsview/view/MainWindow.h b/tests/auto/xmlpatternsview/view/MainWindow.h
index 71bfec2..9aa1d1a 100644
--- a/tests/auto/xmlpatternsview/view/MainWindow.h
+++ b/tests/auto/xmlpatternsview/view/MainWindow.h
@@ -38,47 +38,6 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Patternist project on Qt Labs.
-**
-** $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$
-**
-***************************************************************************
-*/
 
 #ifndef PatternistSDK_MainWindow_H
 #define PatternistSDK_MainWindow_H
diff --git a/tests/auto/xmlpatternsview/view/TestCaseView.h b/tests/auto/xmlpatternsview/view/TestCaseView.h
index 601422d..9329242 100644
--- a/tests/auto/xmlpatternsview/view/TestCaseView.h
+++ b/tests/auto/xmlpatternsview/view/TestCaseView.h
@@ -38,47 +38,6 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Patternist project on Qt Labs.
-**
-** $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$
-**
-***************************************************************************
-*/
 
 #ifndef PatternistSDK_TestCaseView_H
 #define PatternistSDK_TestCaseView_H
diff --git a/tests/auto/xmlpatternsview/view/TestResultView.h b/tests/auto/xmlpatternsview/view/TestResultView.h
index 6f5583f..006c690 100644
--- a/tests/auto/xmlpatternsview/view/TestResultView.h
+++ b/tests/auto/xmlpatternsview/view/TestResultView.h
@@ -38,47 +38,6 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Patternist project on Qt Labs.
-**
-** $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$
-**
-***************************************************************************
-*/
 
 #ifndef PatternistSDK_TestResultView_H
 #define PatternistSDK_TestResultView_H
diff --git a/tests/auto/xmlpatternsview/view/TreeSortFilter.h b/tests/auto/xmlpatternsview/view/TreeSortFilter.h
index c6d9432..a083b0a 100644
--- a/tests/auto/xmlpatternsview/view/TreeSortFilter.h
+++ b/tests/auto/xmlpatternsview/view/TreeSortFilter.h
@@ -38,47 +38,6 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Patternist project on Qt Labs.
-**
-** $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$
-**
-***************************************************************************
-*/
 
 #ifndef PatternistSDK_TreeSortFilter_H
 #define PatternistSDK_TreeSortFilter_H
diff --git a/tests/auto/xmlpatternsview/view/UserTestCase.h b/tests/auto/xmlpatternsview/view/UserTestCase.h
index 8da081a..39ef38e 100644
--- a/tests/auto/xmlpatternsview/view/UserTestCase.h
+++ b/tests/auto/xmlpatternsview/view/UserTestCase.h
@@ -38,47 +38,6 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Patternist project on Qt Labs.
-**
-** $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$
-**
-***************************************************************************
-*/
 
 #ifndef PatternistSDK_UserTestCase_H
 #define PatternistSDK_UserTestCase_H
diff --git a/tests/auto/xmlpatternsview/view/XDTItemItem.h b/tests/auto/xmlpatternsview/view/XDTItemItem.h
index 0e0f06e..240d1bb 100644
--- a/tests/auto/xmlpatternsview/view/XDTItemItem.h
+++ b/tests/auto/xmlpatternsview/view/XDTItemItem.h
@@ -38,47 +38,6 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Patternist project on Qt Labs.
-**
-** $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$
-**
-***************************************************************************
-*/
 
 #ifndef PatternistSDK_XDTItemItem_H
 #define PatternistSDK_XDTItemItem_H
diff --git a/tests/auto/xmlpatternsxqts/lib/ASTItem.cpp b/tests/auto/xmlpatternsxqts/lib/ASTItem.cpp
index e663409..64967e1 100644
--- a/tests/auto/xmlpatternsxqts/lib/ASTItem.cpp
+++ b/tests/auto/xmlpatternsxqts/lib/ASTItem.cpp
@@ -38,47 +38,6 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Patternist project on Qt Labs.
-**
-** $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$
-**
-***************************************************************************
-*/
 
 #include <QList>
 #include <QPointer>
diff --git a/tests/auto/xmlpatternsxqts/lib/DebugExpressionFactory.cpp b/tests/auto/xmlpatternsxqts/lib/DebugExpressionFactory.cpp
index 03e70bd..38cc6cd 100644
--- a/tests/auto/xmlpatternsxqts/lib/DebugExpressionFactory.cpp
+++ b/tests/auto/xmlpatternsxqts/lib/DebugExpressionFactory.cpp
@@ -38,47 +38,6 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Patternist project on Qt Labs.
-**
-** $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$
-**
-***************************************************************************
-*/
 
 #include <QStringList>
 #include <QVariant>
diff --git a/tests/auto/xmlpatternsxqts/lib/ErrorHandler.cpp b/tests/auto/xmlpatternsxqts/lib/ErrorHandler.cpp
index f78827a..4eef53a 100644
--- a/tests/auto/xmlpatternsxqts/lib/ErrorHandler.cpp
+++ b/tests/auto/xmlpatternsxqts/lib/ErrorHandler.cpp
@@ -38,47 +38,6 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Patternist project on Qt Labs.
-**
-** $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$
-**
-***************************************************************************
-*/
 
 #include <cstdio>
 
diff --git a/tests/auto/xmlpatternsxqts/lib/ErrorHandler.h b/tests/auto/xmlpatternsxqts/lib/ErrorHandler.h
index c056ac4..81f4c73 100644
--- a/tests/auto/xmlpatternsxqts/lib/ErrorHandler.h
+++ b/tests/auto/xmlpatternsxqts/lib/ErrorHandler.h
@@ -38,47 +38,6 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Patternist project on Qt Labs.
-**
-** $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$
-**
-***************************************************************************
-*/
 
 #ifndef PatternistSDK_ErrorHandler_H
 #define PatternistSDK_ErrorHandler_H
diff --git a/tests/auto/xmlpatternsxqts/lib/ErrorItem.cpp b/tests/auto/xmlpatternsxqts/lib/ErrorItem.cpp
index c2b2d1c..3b434fb 100644
--- a/tests/auto/xmlpatternsxqts/lib/ErrorItem.cpp
+++ b/tests/auto/xmlpatternsxqts/lib/ErrorItem.cpp
@@ -38,47 +38,6 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Patternist project on Qt Labs.
-**
-** $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$
-**
-***************************************************************************
-*/
 
 #include <QList>
 #include <QPointer>
diff --git a/tests/auto/xmlpatternsxqts/lib/ErrorItem.h b/tests/auto/xmlpatternsxqts/lib/ErrorItem.h
index f8cfa63..be28892 100644
--- a/tests/auto/xmlpatternsxqts/lib/ErrorItem.h
+++ b/tests/auto/xmlpatternsxqts/lib/ErrorItem.h
@@ -38,47 +38,6 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Patternist project on Qt Labs.
-**
-** $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$
-**
-***************************************************************************
-*/
 
 #ifndef PatternistSDK_ErrorItem_H
 #define PatternistSDK_ErrorItem_H
diff --git a/tests/auto/xmlpatternsxqts/lib/ExitCode.h b/tests/auto/xmlpatternsxqts/lib/ExitCode.h
index daed618..c23bd4b 100644
--- a/tests/auto/xmlpatternsxqts/lib/ExitCode.h
+++ b/tests/auto/xmlpatternsxqts/lib/ExitCode.h
@@ -38,47 +38,6 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Patternist project on Qt Labs.
-**
-** $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$
-**
-***************************************************************************
-*/
 
 #ifndef PatternistSDK_ExitCode_H
 #define PatternistSDK_ExitCode_H
diff --git a/tests/auto/xmlpatternsxqts/lib/ExpressionInfo.cpp b/tests/auto/xmlpatternsxqts/lib/ExpressionInfo.cpp
index ea58087..6ca6ef9 100644
--- a/tests/auto/xmlpatternsxqts/lib/ExpressionInfo.cpp
+++ b/tests/auto/xmlpatternsxqts/lib/ExpressionInfo.cpp
@@ -38,47 +38,6 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Patternist project on Qt Labs.
-**
-** $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$
-**
-***************************************************************************
-*/
 
 #include <QtDebug>
 
diff --git a/tests/auto/xmlpatternsxqts/lib/ExpressionInfo.h b/tests/auto/xmlpatternsxqts/lib/ExpressionInfo.h
index 3877674..973f347 100644
--- a/tests/auto/xmlpatternsxqts/lib/ExpressionInfo.h
+++ b/tests/auto/xmlpatternsxqts/lib/ExpressionInfo.h
@@ -38,47 +38,6 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Patternist project on Qt Labs.
-**
-** $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$
-**
-***************************************************************************
-*/
 
 #ifndef PatternistSDK_ExpressionInfo_H
 #define PatternistSDK_ExpressionInfo_H
diff --git a/tests/auto/xmlpatternsxqts/lib/ExpressionNamer.cpp b/tests/auto/xmlpatternsxqts/lib/ExpressionNamer.cpp
index 5fbbe07..e5e7991 100644
--- a/tests/auto/xmlpatternsxqts/lib/ExpressionNamer.cpp
+++ b/tests/auto/xmlpatternsxqts/lib/ExpressionNamer.cpp
@@ -38,47 +38,6 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Patternist project on Qt Labs.
-**
-** $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$
-**
-***************************************************************************
-*/
 
 #include <QtDebug>
 
diff --git a/tests/auto/xmlpatternsxqts/lib/ExternalSourceLoader.cpp b/tests/auto/xmlpatternsxqts/lib/ExternalSourceLoader.cpp
index 25ecd87..594123a 100644
--- a/tests/auto/xmlpatternsxqts/lib/ExternalSourceLoader.cpp
+++ b/tests/auto/xmlpatternsxqts/lib/ExternalSourceLoader.cpp
@@ -38,47 +38,6 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Patternist project on Qt Labs.
-**
-** $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$
-**
-***************************************************************************
-*/
 
 #include <QCoreApplication>
 #include <QFile>
diff --git a/tests/auto/xmlpatternsxqts/lib/Global.cpp b/tests/auto/xmlpatternsxqts/lib/Global.cpp
index 4fa8e10..72dbd4b 100644
--- a/tests/auto/xmlpatternsxqts/lib/Global.cpp
+++ b/tests/auto/xmlpatternsxqts/lib/Global.cpp
@@ -38,47 +38,6 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Patternist project on Qt Labs.
-**
-** $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$
-**
-***************************************************************************
-*/
 
 #include <QXmlNamePool>
 
diff --git a/tests/auto/xmlpatternsxqts/lib/ResultThreader.cpp b/tests/auto/xmlpatternsxqts/lib/ResultThreader.cpp
index c128798..4edf068 100644
--- a/tests/auto/xmlpatternsxqts/lib/ResultThreader.cpp
+++ b/tests/auto/xmlpatternsxqts/lib/ResultThreader.cpp
@@ -38,47 +38,6 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Patternist project on Qt Labs.
-**
-** $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$
-**
-***************************************************************************
-*/
 
 #include <QEventLoop>
 
diff --git a/tests/auto/xmlpatternsxqts/lib/TestBaseLine.cpp b/tests/auto/xmlpatternsxqts/lib/TestBaseLine.cpp
index f677aec..49e326c 100644
--- a/tests/auto/xmlpatternsxqts/lib/TestBaseLine.cpp
+++ b/tests/auto/xmlpatternsxqts/lib/TestBaseLine.cpp
@@ -38,47 +38,6 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Patternist project on Qt Labs.
-**
-** $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$
-**
-***************************************************************************
-*/
 
 #include <QDomDocument>
 #include <QFile>
diff --git a/tests/auto/xmlpatternsxqts/lib/TestCase.cpp b/tests/auto/xmlpatternsxqts/lib/TestCase.cpp
index 018a566..d7da43f 100644
--- a/tests/auto/xmlpatternsxqts/lib/TestCase.cpp
+++ b/tests/auto/xmlpatternsxqts/lib/TestCase.cpp
@@ -38,47 +38,6 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Patternist project on Qt Labs.
-**
-** $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$
-**
-***************************************************************************
-*/
 
 #include <QBuffer>
 #include <QUrl>
diff --git a/tests/auto/xmlpatternsxqts/lib/TestContainer.cpp b/tests/auto/xmlpatternsxqts/lib/TestContainer.cpp
index e2e666f..7ad52b5 100644
--- a/tests/auto/xmlpatternsxqts/lib/TestContainer.cpp
+++ b/tests/auto/xmlpatternsxqts/lib/TestContainer.cpp
@@ -38,47 +38,6 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Patternist project on Qt Labs.
-**
-** $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$
-**
-***************************************************************************
-*/
 
 #include <QPair>
 #include <QtDebug>
diff --git a/tests/auto/xmlpatternsxqts/lib/TestContainer.h b/tests/auto/xmlpatternsxqts/lib/TestContainer.h
index 91a8641..9ed87bf 100644
--- a/tests/auto/xmlpatternsxqts/lib/TestContainer.h
+++ b/tests/auto/xmlpatternsxqts/lib/TestContainer.h
@@ -38,47 +38,6 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Patternist project on Qt Labs.
-**
-** $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$
-**
-***************************************************************************
-*/
 
 #ifndef PatternistSDK_TestContainer_H
 #define PatternistSDK_TestContainer_H
diff --git a/tests/auto/xmlpatternsxqts/lib/TestGroup.cpp b/tests/auto/xmlpatternsxqts/lib/TestGroup.cpp
index 9c34246..1014ea4 100644
--- a/tests/auto/xmlpatternsxqts/lib/TestGroup.cpp
+++ b/tests/auto/xmlpatternsxqts/lib/TestGroup.cpp
@@ -38,47 +38,6 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Patternist project on Qt Labs.
-**
-** $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$
-**
-***************************************************************************
-*/
 
 #include <QColor>
 #include <QPair>
diff --git a/tests/auto/xmlpatternsxqts/lib/TestGroup.h b/tests/auto/xmlpatternsxqts/lib/TestGroup.h
index 6946fac..8c5cbf6 100644
--- a/tests/auto/xmlpatternsxqts/lib/TestGroup.h
+++ b/tests/auto/xmlpatternsxqts/lib/TestGroup.h
@@ -38,47 +38,6 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Patternist project on Qt Labs.
-**
-** $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$
-**
-***************************************************************************
-*/
 
 #ifndef PatternistSDK_TestGroup_H
 #define PatternistSDK_TestGroup_H
diff --git a/tests/auto/xmlpatternsxqts/lib/TestItem.h b/tests/auto/xmlpatternsxqts/lib/TestItem.h
index 6d151b8..4266480 100644
--- a/tests/auto/xmlpatternsxqts/lib/TestItem.h
+++ b/tests/auto/xmlpatternsxqts/lib/TestItem.h
@@ -38,47 +38,6 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Patternist project on Qt Labs.
-**
-** $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$
-**
-***************************************************************************
-*/
 
 #ifndef PatternistSDK_TestItem_H
 #define PatternistSDK_TestItem_H
diff --git a/tests/auto/xmlpatternsxqts/lib/TestResult.cpp b/tests/auto/xmlpatternsxqts/lib/TestResult.cpp
index ece714a..7ab2b4e 100644
--- a/tests/auto/xmlpatternsxqts/lib/TestResult.cpp
+++ b/tests/auto/xmlpatternsxqts/lib/TestResult.cpp
@@ -38,47 +38,6 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Patternist project on Qt Labs.
-**
-** $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$
-**
-***************************************************************************
-*/
 
 #include <QXmlAttributes>
 #include <QtDebug>
diff --git a/tests/auto/xmlpatternsxqts/lib/TestResultHandler.cpp b/tests/auto/xmlpatternsxqts/lib/TestResultHandler.cpp
index 3000ccf..bdf6abb 100644
--- a/tests/auto/xmlpatternsxqts/lib/TestResultHandler.cpp
+++ b/tests/auto/xmlpatternsxqts/lib/TestResultHandler.cpp
@@ -38,47 +38,6 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Patternist project on Qt Labs.
-**
-** $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$
-**
-***************************************************************************
-*/
 
 #include <QtDebug>
 
diff --git a/tests/auto/xmlpatternsxqts/lib/TestSuite.cpp b/tests/auto/xmlpatternsxqts/lib/TestSuite.cpp
index 27df5e3..5f22457 100644
--- a/tests/auto/xmlpatternsxqts/lib/TestSuite.cpp
+++ b/tests/auto/xmlpatternsxqts/lib/TestSuite.cpp
@@ -38,47 +38,6 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Patternist project on Qt Labs.
-**
-** $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$
-**
-***************************************************************************
-*/
 
 #include <QFileInfo>
 #include <QVariant>
diff --git a/tests/auto/xmlpatternsxqts/lib/TestSuite.h b/tests/auto/xmlpatternsxqts/lib/TestSuite.h
index 638caad..70aefc0 100644
--- a/tests/auto/xmlpatternsxqts/lib/TestSuite.h
+++ b/tests/auto/xmlpatternsxqts/lib/TestSuite.h
@@ -38,47 +38,6 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Patternist project on Qt Labs.
-**
-** $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$
-**
-***************************************************************************
-*/
 
 #ifndef PatternistSDK_TestSuite_H
 #define PatternistSDK_TestSuite_H
diff --git a/tests/auto/xmlpatternsxqts/lib/TestSuiteHandler.cpp b/tests/auto/xmlpatternsxqts/lib/TestSuiteHandler.cpp
index 2706314..d522ba4 100644
--- a/tests/auto/xmlpatternsxqts/lib/TestSuiteHandler.cpp
+++ b/tests/auto/xmlpatternsxqts/lib/TestSuiteHandler.cpp
@@ -38,47 +38,6 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Patternist project on Qt Labs.
-**
-** $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$
-**
-***************************************************************************
-*/
 
 #include <QtDebug>
 
diff --git a/tests/auto/xmlpatternsxqts/lib/TestSuiteResult.cpp b/tests/auto/xmlpatternsxqts/lib/TestSuiteResult.cpp
index f6f61d7..6721970 100644
--- a/tests/auto/xmlpatternsxqts/lib/TestSuiteResult.cpp
+++ b/tests/auto/xmlpatternsxqts/lib/TestSuiteResult.cpp
@@ -38,47 +38,6 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Patternist project on Qt Labs.
-**
-** $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$
-**
-***************************************************************************
-*/
 
 #include <QXmlContentHandler>
 
diff --git a/tests/auto/xmlpatternsxqts/lib/TestSuiteResult.h b/tests/auto/xmlpatternsxqts/lib/TestSuiteResult.h
index 492f4ae..62d204e 100644
--- a/tests/auto/xmlpatternsxqts/lib/TestSuiteResult.h
+++ b/tests/auto/xmlpatternsxqts/lib/TestSuiteResult.h
@@ -38,47 +38,6 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Patternist project on Qt Labs.
-**
-** $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$
-**
-***************************************************************************
-*/
 
 #ifndef PatternistSDK_TestSuiteResult_H
 #define PatternistSDK_TestSuiteResult_H
diff --git a/tests/auto/xmlpatternsxqts/lib/TreeItem.cpp b/tests/auto/xmlpatternsxqts/lib/TreeItem.cpp
index 1e6e528..3e41177 100644
--- a/tests/auto/xmlpatternsxqts/lib/TreeItem.cpp
+++ b/tests/auto/xmlpatternsxqts/lib/TreeItem.cpp
@@ -38,47 +38,6 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Patternist project on Qt Labs.
-**
-** $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$
-**
-***************************************************************************
-*/
 
 #include "TestContainer.h"
 
diff --git a/tests/auto/xmlpatternsxqts/lib/TreeItem.h b/tests/auto/xmlpatternsxqts/lib/TreeItem.h
index bebc7d3..9275828 100644
--- a/tests/auto/xmlpatternsxqts/lib/TreeItem.h
+++ b/tests/auto/xmlpatternsxqts/lib/TreeItem.h
@@ -38,47 +38,6 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Patternist project on Qt Labs.
-**
-** $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$
-**
-***************************************************************************
-*/
 
 #ifndef PatternistSDK_TreeItem_H
 #define PatternistSDK_TreeItem_H
diff --git a/tests/auto/xmlpatternsxqts/lib/TreeModel.cpp b/tests/auto/xmlpatternsxqts/lib/TreeModel.cpp
index bb25127..9255a73 100644
--- a/tests/auto/xmlpatternsxqts/lib/TreeModel.cpp
+++ b/tests/auto/xmlpatternsxqts/lib/TreeModel.cpp
@@ -38,47 +38,6 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Patternist project on Qt Labs.
-**
-** $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$
-**
-***************************************************************************
-*/
 
 #include <QtDebug>
 
diff --git a/tests/auto/xmlpatternsxqts/lib/TreeModel.h b/tests/auto/xmlpatternsxqts/lib/TreeModel.h
index 39a3173..181f25e 100644
--- a/tests/auto/xmlpatternsxqts/lib/TreeModel.h
+++ b/tests/auto/xmlpatternsxqts/lib/TreeModel.h
@@ -38,47 +38,6 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Patternist project on Qt Labs.
-**
-** $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$
-**
-***************************************************************************
-*/
 
 #ifndef PatternistSDK_TreeModel_H
 #define PatternistSDK_TreeModel_H
diff --git a/tests/auto/xmlpatternsxqts/lib/Worker.cpp b/tests/auto/xmlpatternsxqts/lib/Worker.cpp
index f72c163..5d6d402 100644
--- a/tests/auto/xmlpatternsxqts/lib/Worker.cpp
+++ b/tests/auto/xmlpatternsxqts/lib/Worker.cpp
@@ -38,47 +38,6 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Patternist project on Qt Labs.
-**
-** $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$
-**
-***************************************************************************
-*/
 
 #include <QDir>
 #include <QEventLoop>
diff --git a/tests/auto/xmlpatternsxqts/lib/XMLWriter.cpp b/tests/auto/xmlpatternsxqts/lib/XMLWriter.cpp
index 8f495a4..f2c6ba7 100644
--- a/tests/auto/xmlpatternsxqts/lib/XMLWriter.cpp
+++ b/tests/auto/xmlpatternsxqts/lib/XMLWriter.cpp
@@ -38,47 +38,6 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Patternist project on Qt Labs.
-**
-** $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$
-**
-***************************************************************************
-*/
 
 #include <QCoreApplication>
 #include <QDateTime>
diff --git a/tests/auto/xmlpatternsxqts/lib/XQTSTestCase.cpp b/tests/auto/xmlpatternsxqts/lib/XQTSTestCase.cpp
index 0cd84f6..6966d40 100644
--- a/tests/auto/xmlpatternsxqts/lib/XQTSTestCase.cpp
+++ b/tests/auto/xmlpatternsxqts/lib/XQTSTestCase.cpp
@@ -38,47 +38,6 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Patternist project on Qt Labs.
-**
-** $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$
-**
-***************************************************************************
-*/
 
 #include <QColor>
 #include <QFile>
diff --git a/tests/auto/xmlpatternsxqts/lib/XSLTTestSuiteHandler.cpp b/tests/auto/xmlpatternsxqts/lib/XSLTTestSuiteHandler.cpp
index 2957da4..eeff16f 100644
--- a/tests/auto/xmlpatternsxqts/lib/XSLTTestSuiteHandler.cpp
+++ b/tests/auto/xmlpatternsxqts/lib/XSLTTestSuiteHandler.cpp
@@ -38,47 +38,6 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Patternist project on Qt Labs.
-**
-** $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$
-**
-***************************************************************************
-*/
 
 #include <QtDebug>
 
diff --git a/tests/auto/xmlpatternsxqts/lib/XSLTTestSuiteHandler.h b/tests/auto/xmlpatternsxqts/lib/XSLTTestSuiteHandler.h
index eb9d604..8447cff 100644
--- a/tests/auto/xmlpatternsxqts/lib/XSLTTestSuiteHandler.h
+++ b/tests/auto/xmlpatternsxqts/lib/XSLTTestSuiteHandler.h
@@ -38,47 +38,6 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Patternist project on Qt Labs.
-**
-** $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$
-**
-***************************************************************************
-*/
 
 #ifndef PatternistSDK_XSLTTestSuiteHandler_H
 #define PatternistSDK_XSLTTestSuiteHandler_H
diff --git a/tests/auto/xmlpatternsxqts/lib/tests/XMLWriterTest.h b/tests/auto/xmlpatternsxqts/lib/tests/XMLWriterTest.h
index 5314a10..b8ff3ad 100644
--- a/tests/auto/xmlpatternsxqts/lib/tests/XMLWriterTest.h
+++ b/tests/auto/xmlpatternsxqts/lib/tests/XMLWriterTest.h
@@ -38,47 +38,6 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Patternist project on Qt Labs.
-**
-** $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$
-**
-***************************************************************************
- */
 
 #ifndef PatternistSDK_XMLWriterTest_H
 #define PatternistSDK_XMLWriterTest_H
diff --git a/tests/benchmarks/qanimation/dummyanimation.h b/tests/benchmarks/qanimation/dummyanimation.h
index fe6592b..6318a32 100644
--- a/tests/benchmarks/qanimation/dummyanimation.h
+++ b/tests/benchmarks/qanimation/dummyanimation.h
@@ -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 test suite 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$
+**
+****************************************************************************/
+
 #include <QtGui>
 
 #ifndef _DUMMYANIMATION_H__
@@ -16,4 +57,4 @@ private:
     DummyObject *m_dummy;
 };
 
-#endif
\ No newline at end of file
+#endif
diff --git a/tests/benchmarks/qanimation/dummyobject.h b/tests/benchmarks/qanimation/dummyobject.h
index c989662..bf5b60c6 100644
--- a/tests/benchmarks/qanimation/dummyobject.h
+++ b/tests/benchmarks/qanimation/dummyobject.h
@@ -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 test suite 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$
+**
+****************************************************************************/
+
 #include <QtGui>
 
 #ifndef _DUMMYOBJECT_H__
@@ -20,4 +61,4 @@ private:
 };
 
 
-#endif
\ No newline at end of file
+#endif
diff --git a/tests/benchmarks/qanimation/rectanimation.h b/tests/benchmarks/qanimation/rectanimation.h
index 99b82b4..5e088ea 100644
--- a/tests/benchmarks/qanimation/rectanimation.h
+++ b/tests/benchmarks/qanimation/rectanimation.h
@@ -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 test suite 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$
+**
+****************************************************************************/
+
 #include <QtGui>
 
 #ifndef _RECTANIMATION_H__
diff --git a/tests/benchmarks/qgraphicswidget/tst_qgraphicswidget.cpp b/tests/benchmarks/qgraphicswidget/tst_qgraphicswidget.cpp
index 07d8312..5c6e523 100644
--- a/tests/benchmarks/qgraphicswidget/tst_qgraphicswidget.cpp
+++ b/tests/benchmarks/qgraphicswidget/tst_qgraphicswidget.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/tests/benchmarks/qscriptvalue/tst_qscriptvalue.cpp b/tests/benchmarks/qscriptvalue/tst_qscriptvalue.cpp
index 904674e..b637591 100644
--- a/tests/benchmarks/qscriptvalue/tst_qscriptvalue.cpp
+++ b/tests/benchmarks/qscriptvalue/tst_qscriptvalue.cpp
@@ -68,6 +68,7 @@ private slots:
     void toQObject();
     void property();
     void setProperty();
+    void propertyFlags();
 };
 
 tst_QScriptValue::tst_QScriptValue()
@@ -189,5 +190,16 @@ void tst_QScriptValue::setProperty()
     }
 }
 
+void tst_QScriptValue::propertyFlags()
+{
+    QScriptEngine engine;
+    QScriptValue obj = engine.newObject();
+    QString propertyName = QString::fromLatin1("foo");
+    obj.setProperty(propertyName, 123, QScriptValue::SkipInEnumeration | QScriptValue::ReadOnly);
+    QBENCHMARK {
+        (void)obj.propertyFlags(propertyName);
+    }
+}
+
 QTEST_MAIN(tst_QScriptValue)
 #include "tst_qscriptvalue.moc"
diff --git a/tests/manual/qimagereader/Qt_logostrap_CMYK.jpg b/tests/manual/qimagereader/Qt_logostrap_CMYK.jpg
new file mode 100644
index 0000000..6a7bb1f
--- /dev/null
+++ b/tests/manual/qimagereader/Qt_logostrap_CMYK.jpg
diff --git a/tests/manual/qimagereader/main.cpp b/tests/manual/qimagereader/main.cpp
new file mode 100644
index 0000000..a17c203
--- /dev/null
+++ b/tests/manual/qimagereader/main.cpp
@@ -0,0 +1,99 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the examples 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$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+class MyWidget : public QWidget
+{
+public:
+    MyWidget(QWidget * parent, const QString &imagefname, bool scaleImage)
+            : QWidget(parent), fileName(imagefname), scale(scaleImage)
+    {
+
+    }
+
+    virtual void paintEvent(QPaintEvent * /*event*/)
+    {
+        QPainter painter(this);
+        QImageReader reader(fileName);
+        if (!reader.canRead()) {
+            qWarning("Unable to read image file %s", fileName.toLocal8Bit().constData());
+            return;
+        }
+        if (!scale){
+            QImage image = reader.read();
+            painter.drawImage(rect(), image);
+        }else{
+            reader.setScaledSize( QSize(rect().width(), rect().height()) );
+            QImage image = reader.read();
+            painter.drawImage(rect(), image);
+        }
+    }
+
+private:
+    QString fileName;
+    bool scale;
+
+};
+
+
+
+// both the scaled and unscaled version of the CMYK encoded JPEG
+//      should have the same colors and not look corrupted.
+
+int main(int argc, char** argv)
+{
+    QApplication app(argc, argv);
+
+    QWidget mainWidget;
+    mainWidget.setWindowTitle("Colors in images are identical?");
+    mainWidget.setMinimumSize(400,400);
+    QHBoxLayout *l = new QHBoxLayout;
+    MyWidget *w1 = new MyWidget(&mainWidget,"Qt_logostrap_CMYK.jpg", false);
+    MyWidget *w2 = new MyWidget(&mainWidget,"Qt_logostrap_CMYK.jpg", true);
+    l->addWidget(w1);
+    l->addWidget(w2);
+    mainWidget.setLayout(l);
+    mainWidget.show();
+
+    return app.exec();
+}
+
diff --git a/tests/manual/qimagereader/qimagereader.pro b/tests/manual/qimagereader/qimagereader.pro
new file mode 100644
index 0000000..b8293b9
--- /dev/null
+++ b/tests/manual/qimagereader/qimagereader.pro
@@ -0,0 +1,8 @@
+
+TEMPLATE = app
+TARGET = 
+DEPENDPATH += .
+INCLUDEPATH += .
+
+# Input
+SOURCES += main.cpp
diff --git a/tests/manual/qtabletevent/tabletwidget.h b/tests/manual/qtabletevent/tabletwidget.h
index b0efef2..b16e9ed 100644
--- a/tests/manual/qtabletevent/tabletwidget.h
+++ b/tests/manual/qtabletevent/tabletwidget.h
@@ -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 test suite 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$
+**
+****************************************************************************/
+
 #ifndef TABLETWIDGET_H
 #define TABLETWIDGET_H
 
diff --git a/tests/manual/qtouchevent/touchwidget.h b/tests/manual/qtouchevent/touchwidget.h
index 2726deb..7f7e0ff 100644
--- a/tests/manual/qtouchevent/touchwidget.h
+++ b/tests/manual/qtouchevent/touchwidget.h
@@ -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 test suite 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$
+**
+****************************************************************************/
+
 #ifndef TOUCHWIDGET_H
 #define TOUCHWIDGET_H