Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6

author: Andreas Kling <andreas.kling@nokia.com> 2010-01-20 08:34:08 (GMT)
committer: Andreas Kling <andreas.kling@nokia.com> 2010-01-20 08:34:08 (GMT)
commit: 01f733a64e45363e74bea62e4cae8a658bc09383 (patch)
tree: ea39b38552a063e7e10bd432b1155a7abae61620 /tests/auto
parent: fdf463ba74b2e00ba5f9db10f43585e8b15054f7 (diff)
parent: b906feddf1593a837785bc41d65e837e64d31284 (diff)
download: Qt-01f733a64e45363e74bea62e4cae8a658bc09383.zip
Qt-01f733a64e45363e74bea62e4cae8a658bc09383.tar.gz
Qt-01f733a64e45363e74bea62e4cae8a658bc09383.tar.bz2
89 files changed, 868 insertions, 1580 deletions
diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro
index 4215e97..3198a65 100644
--- a/tests/auto/auto.pro
+++ b/tests/auto/auto.pro
@@ -8,10 +8,14 @@ TEMPLATE = subdirs
            compiler \
            compilerwarnings \
            linguist \
+           maketestselftest \
            moc \
            uic \
            uic3 \
-           guiapplauncher	   
+           guiapplauncher \
+           #atwrapper \     # These tests need significant updating,
+           #uiloader \      # they have hardcoded machine names etc.
+
 Q3SUBDIRS += \
            q3accel \
            q3action \
@@ -130,6 +134,7 @@ SUBDIRS += \
            qdoublevalidator \
            qdrag \
            qerrormessage \
+           qevent \
            qeventloop \
            qexplicitlyshareddatapointer \
            qfile \
@@ -478,7 +483,8 @@ embedded:!wince* {
 }
 
 symbian {
-    SUBDIRS += qsoftkeymanager
+    SUBDIRS += qsoftkeymanager \
+               qs60mainapplication
 }
 
 # Enable the tests specific to QtXmlPatterns. If you add a test, remember to
@@ -563,3 +569,21 @@ contains(QT_CONFIG, webkit): SUBDIRS += \
            qwebhistory
 
 contains(QT_CONFIG, declarative): SUBDIRS += declarative
+
+# Following tests depends on private API
+!contains(QT_CONFIG, private_tests): SUBDIRS -= \
+           qcssparser \
+           qgraphicssceneindex \
+           qhttpnetworkconnection \
+           qhttpnetworkreply \
+           qnativesocketengine \
+           qnetworkreply \
+           qpathclipper \
+           qsocketnotifier \
+           qsocks5socketengine \
+           qstylesheetstyle \
+           qtextpiecetable \
+           xmlpatternsdiagnosticsts \
+           xmlpatternsview \
+           xmlpatternsxqts \
+           xmlpatternsxslts
diff --git a/tests/auto/linguist/lupdate/.gitignore b/tests/auto/linguist/lupdate/.gitignore
index 4ba5b79..389f2dc 100644
--- a/tests/auto/linguist/lupdate/.gitignore
+++ b/tests/auto/linguist/lupdate/.gitignore
@@ -1,4 +1,4 @@
 tst_lupdate
 testdata/good/*/project.ts
-testdata/output_ts/toplevel/library/tools/translations/project.ts
+testdata/good/*/*/project.ts
 testdata/recursivescan/*.ts
diff --git a/tests/auto/linguist/lupdate/lupdate.pro b/tests/auto/linguist/lupdate/lupdate.pro
index 19259dc..bcaaf66 100644
--- a/tests/auto/linguist/lupdate/lupdate.pro
+++ b/tests/auto/linguist/lupdate/lupdate.pro
@@ -2,6 +2,5 @@ CONFIG += qttest_p4
 
 TARGET = tst_lupdate
 
-HEADERS += testlupdate.h
-SOURCES += tst_lupdate.cpp testlupdate.cpp
+SOURCES += tst_lupdate.cpp
 
diff --git a/tests/auto/linguist/lupdate/testdata/good/backslashes/lupdatecmd b/tests/auto/linguist/lupdate/testdata/good/backslashes/lupdatecmd
index 9b83a04..f0e1ab2 100644
--- a/tests/auto/linguist/lupdate/testdata/good/backslashes/lupdatecmd
+++ b/tests/auto/linguist/lupdate/testdata/good/backslashes/lupdatecmd
@@ -1,3 +1 @@
-# Add the command that lupdate should run here. If it can't find anything it will default to
 TRANSLATION: ts\project.ts
-lupdate -silent project.pro
diff --git a/tests/auto/linguist/lupdate/testdata/good/backslashes/project.pro b/tests/auto/linguist/lupdate/testdata/good/backslashes/project.pro
index 3584c89..4698b2b 100644
--- a/tests/auto/linguist/lupdate/testdata/good/backslashes/project.pro
+++ b/tests/auto/linguist/lupdate/testdata/good/backslashes/project.pro
@@ -1,19 +1,3 @@
-######################################################################
-# Automatically generated by qmake (2.01a) ma 22. jan 10:10:16 2007
-######################################################################
-
-TEMPLATE = app
-TARGET =
-DEPENDPATH += .
-INCLUDEPATH += .
-
-# Input
 SOURCES += src\main.cpp
 
 TRANSLATIONS = ts\project.ts
-
-
-!exists(ts) {
-    win32: system(md ts)
-    else: system(mkdir ts)
-}
diff --git a/tests/auto/linguist/lupdate/testdata/good/backslashes/project.ts.result b/tests/auto/linguist/lupdate/testdata/good/backslashes/ts/project.ts.result
index d3a5fdf..d3a5fdf 100644
--- a/tests/auto/linguist/lupdate/testdata/good/backslashes/project.ts.result
+++ b/tests/auto/linguist/lupdate/testdata/good/backslashes/ts/project.ts.result
diff --git a/tests/auto/linguist/lupdate/testdata/good/codecforsrc/project.pro b/tests/auto/linguist/lupdate/testdata/good/codecforsrc/project.pro
index 848ebda..7225608 100644
--- a/tests/auto/linguist/lupdate/testdata/good/codecforsrc/project.pro
+++ b/tests/auto/linguist/lupdate/testdata/good/codecforsrc/project.pro
@@ -1,20 +1,7 @@
-TEMPLATE = app
-TARGET +=
-DEPENDPATH += .
-INCLUDEPATH += .
-
-# Input
 SOURCES += main.cpp
+CONFIG+= console
 
 TRANSLATIONS = project.ts
-CONFIG+= console
 
 CODECFORTR = utf-8
 CODECFORSRC = utf-8
-
-exists( $$TRANSLATIONS ) {
-    win32: system(del $$TRANSLATIONS)
-    unix:  system(rm $$TRANSLATIONS)
-}
-
-
diff --git a/tests/auto/linguist/lupdate/testdata/good/codecfortr/project.pro b/tests/auto/linguist/lupdate/testdata/good/codecfortr/project.pro
index 81273ee..64f3c85 100644
--- a/tests/auto/linguist/lupdate/testdata/good/codecfortr/project.pro
+++ b/tests/auto/linguist/lupdate/testdata/good/codecfortr/project.pro
@@ -1,19 +1,6 @@
-TEMPLATE = app
-TARGET +=
-DEPENDPATH += .
-INCLUDEPATH += .
-
-# Input
 SOURCES += main.cpp
+CONFIG+= console
 
 TRANSLATIONS = project.ts
-CONFIG+= console
 
 CODECFORTR = CP1251
-
-exists( $$TRANSLATIONS ) {
-    win32: system(del $$TRANSLATIONS)
-    unix:  system(rm $$TRANSLATIONS)
-}
-
-
diff --git a/tests/auto/linguist/lupdate/testdata/good/codecfortr1/project.pro b/tests/auto/linguist/lupdate/testdata/good/codecfortr1/project.pro
index 1d5b071..d5697eb 100644
--- a/tests/auto/linguist/lupdate/testdata/good/codecfortr1/project.pro
+++ b/tests/auto/linguist/lupdate/testdata/good/codecfortr1/project.pro
@@ -1,15 +1,6 @@
-TEMPLATE = app
-
 SOURCES += main.cpp
+CONFIG += console
 
 TRANSLATIONS = project.ts
-CONFIG += console
 
 CODECFORTR = CP1252
-
-exists( $$TRANSLATIONS ) {
-    win32: system(del $$TRANSLATIONS)
-    unix:  system(rm $$TRANSLATIONS)
-}
-
-
diff --git a/tests/auto/linguist/lupdate/testdata/good/codecfortr2/project.pro b/tests/auto/linguist/lupdate/testdata/good/codecfortr2/project.pro
index f4975f2..c95939c 100644
--- a/tests/auto/linguist/lupdate/testdata/good/codecfortr2/project.pro
+++ b/tests/auto/linguist/lupdate/testdata/good/codecfortr2/project.pro
@@ -1,16 +1,7 @@
-TEMPLATE = app
-
 SOURCES += main.cpp
+CONFIG += console
 
 TRANSLATIONS = project.ts
-CONFIG += console
 
 CODECFORSRC = CP1252
 CODECFORTR = UTF-8
-
-exists( $$TRANSLATIONS ) {
-    win32: system(del $$TRANSLATIONS)
-    unix:  system(rm $$TRANSLATIONS)
-}
-
-
diff --git a/tests/auto/linguist/lupdate/testdata/good/heuristics/expectedoutput.txt b/tests/auto/linguist/lupdate/testdata/good/heuristics/expectedoutput.txt
new file mode 100644
index 0000000..093610d
--- /dev/null
+++ b/tests/auto/linguist/lupdate/testdata/good/heuristics/expectedoutput.txt
@@ -0,0 +1,6 @@
+*.*Function 'eval' is not implemented
+Updating 'project\.ts'\.\.\.
+    Found 3 source text\(s\) \(3 new and 0 already existing\)
+    Removed 5 obsolete entries
+    Number heuristic provided 1 translation\(s\)
+    Same-text heuristic provided 1 translation\(s\)
diff --git a/tests/auto/linguist/lupdate/testdata/good/heuristics/lupdatecmd b/tests/auto/linguist/lupdate/testdata/good/heuristics/lupdatecmd
new file mode 100644
index 0000000..6bda261
--- /dev/null
+++ b/tests/auto/linguist/lupdate/testdata/good/heuristics/lupdatecmd
@@ -0,0 +1,2 @@
+TRANSLATION: project.ts
+lupdate -verbose -disable-heuristic similartext -no-obsolete project.pro
diff --git a/tests/auto/linguist/lupdate/testlupdate.h b/tests/auto/linguist/lupdate/testdata/good/heuristics/main.cpp
index 0b67057..542c228 100644
--- a/tests/auto/linguist/lupdate/testlupdate.h
+++ b/tests/auto/linguist/lupdate/testdata/good/heuristics/main.cpp
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the Qt Linguist of the Qt Toolkit.
+** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
@@ -39,49 +39,24 @@
 **
 ****************************************************************************/
 
-#ifndef TESTLUPDATE_H
-#define TESTLUPDATE_H
+// 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 <QObject>
-#include <QProcess>
-#include <QStringList>
+#define QTCORE <QtCore>
+#include QTCORE // Hidden from lupdate, but compiles
 
-class TestLUpdate : public QObject
-{
+class A: public QObject {
     Q_OBJECT
+    void foo()
+    {
+        // number Heuristics
+        tr("version 2.0 now");
 
-public:
-    TestLUpdate();
-    virtual ~TestLUpdate();
+        // same text match
+        tr("this is the matched same text");
 
-    void setWorkingDirectory( const QString &workDir);
-    bool run( const QString &commandline);
-    bool updateProFile( const QString &arguments);
-    bool qmake();
-    QStringList getErrorMessages() {
-        return make_result;
+        // failed same text
+        tr("this is the non-matched same text");
     }
-    void clearResult() {
-        make_result.clear();
-    }
-private:
-    QString     m_cmdLupdate;
-    QString     m_cmdQMake;
-    QString     m_workDir;
-    QProcess	*childProc;
-    QStringList env_list;
-    QStringList make_result;
-
-    bool	child_show;
-    bool    qws_mode;
-    bool	exit_ok;
-
-    bool runChild( bool showOutput, const QString &program, const QStringList &argList = QStringList());
-    void addMakeResult( const QString &result );
-    void childHasData();
-
-private slots:
-    void childReady(int exitCode);
 };
 
-#endif // TESTLUPDATE_H
diff --git a/tests/auto/linguist/lupdate/testdata/good/heuristics/project.pro b/tests/auto/linguist/lupdate/testdata/good/heuristics/project.pro
new file mode 100644
index 0000000..759bea0
--- /dev/null
+++ b/tests/auto/linguist/lupdate/testdata/good/heuristics/project.pro
@@ -0,0 +1,3 @@
+SOURCES = main.cpp
+
+TRANSLATIONS = project.ts
diff --git a/tests/auto/linguist/lupdate/testdata/good/heuristics/project.ts.before b/tests/auto/linguist/lupdate/testdata/good/heuristics/project.ts.before
new file mode 100644
index 0000000..ce82810
--- /dev/null
+++ b/tests/auto/linguist/lupdate/testdata/good/heuristics/project.ts.before
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.0">
+<context>
+    <name>A</name>
+    <message>
+        <location filename="main.cpp" line="53"/>
+        <source>version 1.0 now</source>
+        <translation>teraz wersja 1.0</translation>
+    </message>
+</context>
+<context>
+    <name>B</name>
+    <message>
+        <location filename="main.cpp" line="56"/>
+        <source>this is the matched same text</source>
+        <translation>der same-text-treffer</translation>
+    </message>
+    <message>
+        <location filename="main.cpp" line="59"/>
+        <source>this is the non-matched same text</source>
+        <translation>same-text-reinfall variante eins</translation>
+    </message>
+</context>
+<context>
+    <name>C</name>
+    <message>
+        <location filename="main.cpp" line="56"/>
+        <source>this is the matched same text</source>
+        <translation>der same-text-treffer</translation>
+    </message>
+    <message>
+        <location filename="main.cpp" line="59"/>
+        <source>this is the non-matched same text</source>
+        <translation>völlig andere variante des reinfalls mit same-text</translation>
+    </message>
+</context>
+</TS>
diff --git a/tests/auto/linguist/lupdate/testdata/good/heuristics/project.ts.result b/tests/auto/linguist/lupdate/testdata/good/heuristics/project.ts.result
new file mode 100644
index 0000000..402ad9a
--- /dev/null
+++ b/tests/auto/linguist/lupdate/testdata/good/heuristics/project.ts.result
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.0">
+<context>
+    <name>A</name>
+    <message>
+        <location filename="main.cpp" line="53"/>
+        <source>version 2.0 now</source>
+        <translation type="unfinished">teraz wersja 1.0 {2.0 ?}</translation>
+    </message>
+    <message>
+        <location filename="main.cpp" line="56"/>
+        <source>this is the matched same text</source>
+        <translation type="unfinished">der same-text-treffer</translation>
+    </message>
+    <message>
+        <location filename="main.cpp" line="59"/>
+        <source>this is the non-matched same text</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/tests/auto/linguist/lupdate/testdata/good/lacksqobject/project.pro b/tests/auto/linguist/lupdate/testdata/good/lacksqobject/project.pro
index 7547a8d..759bea0 100644
--- a/tests/auto/linguist/lupdate/testdata/good/lacksqobject/project.pro
+++ b/tests/auto/linguist/lupdate/testdata/good/lacksqobject/project.pro
@@ -1,12 +1,3 @@
-TEMPLATE = app
-LANGUAGE = C++
-
 SOURCES = main.cpp
 
-TRANSLATIONS        += project.ts
-
-exists( $$TRANSLATIONS ) {
-    win32: system(del $$TRANSLATIONS)
-    unix:  system(rm $$TRANSLATIONS)
-}
-
+TRANSLATIONS = project.ts
diff --git a/tests/auto/linguist/lupdate/testdata/good/merge_ordering/lupdatecmd b/tests/auto/linguist/lupdate/testdata/good/merge_ordering/lupdatecmd
index 91a4800..82b4b0d 100644
--- a/tests/auto/linguist/lupdate/testdata/good/merge_ordering/lupdatecmd
+++ b/tests/auto/linguist/lupdate/testdata/good/merge_ordering/lupdatecmd
@@ -1,5 +1 @@
-# Add the command that lupdate should run here. If it can't find anything it will default to
-# 'lupdate project.pro -ts project.ts'
-
-# lupdate project.pro
-lupdate -silent -locations relative project.pro
+lupdate -locations relative project.pro
diff --git a/tests/auto/linguist/lupdate/testdata/good/merge_ordering/project.pro b/tests/auto/linguist/lupdate/testdata/good/merge_ordering/project.pro
index e79456f..6149858 100644
--- a/tests/auto/linguist/lupdate/testdata/good/merge_ordering/project.pro
+++ b/tests/auto/linguist/lupdate/testdata/good/merge_ordering/project.pro
@@ -1,14 +1,3 @@
-TEMPLATE = app
-LANGUAGE = C++
-
 SOURCES += foo.cpp
 
-TRANSLATIONS        = project.ts
-
-# Copy the ts to a temp file because:
-# 1. The depot file is usually read-only
-# 2. We don't want to modify the original file, since then it won't be possible to run the test twice
-#    without reverting the original file again.
-
-win32: system(copy /Y project.ts.before $$TRANSLATIONS)
-unix:  system(cp -f project.ts.before $$TRANSLATIONS && chmod a+w $$TRANSLATIONS)
+TRANSLATIONS = project.ts
diff --git a/tests/auto/linguist/lupdate/testdata/good/merge_versions/project.pro b/tests/auto/linguist/lupdate/testdata/good/merge_versions/project.pro
index 6c704c2..fa56972 100644
--- a/tests/auto/linguist/lupdate/testdata/good/merge_versions/project.pro
+++ b/tests/auto/linguist/lupdate/testdata/good/merge_versions/project.pro
@@ -1,14 +1,3 @@
-TEMPLATE = app
-LANGUAGE = C++
-
 FORMS += project.ui
 
-TRANSLATIONS        = project.ts
-
-# Copy the ts to a temp file because:
-# 1. The depot file is usually read-only
-# 2. We don't want to modify the original file, since then it won't be possible to run the test twice
-#    without reverting the original file again.
-
-win32: system(copy /Y project.ts.before $$TRANSLATIONS)
-unix: system(cp -f project.ts.before $$TRANSLATIONS && chmod a+w $$TRANSLATIONS)
+TRANSLATIONS = project.ts
diff --git a/tests/auto/linguist/lupdate/testdata/good/merge_whitespace/project.pro b/tests/auto/linguist/lupdate/testdata/good/merge_whitespace/project.pro
index f4faf2f..759bea0 100644
--- a/tests/auto/linguist/lupdate/testdata/good/merge_whitespace/project.pro
+++ b/tests/auto/linguist/lupdate/testdata/good/merge_whitespace/project.pro
@@ -1,14 +1,3 @@
-TEMPLATE = app
-LANGUAGE = C++
-
 SOURCES = main.cpp
 
-TRANSLATIONS        = project.ts
-
-# Copy the ts to a temp file because:
-# 1. The depot file is usually read-only
-# 2. We don't want to modify the original file, since then it won't be possible to run the test twice
-#    without reverting the original file again.
-
-win32: system(copy /Y project.ts.before $$TRANSLATIONS)
-unix:  system(cp -f project.ts.before $$TRANSLATIONS && chmod a+w $$TRANSLATIONS)
+TRANSLATIONS = project.ts
diff --git a/tests/auto/linguist/lupdate/testdata/good/mergecpp/project.pro b/tests/auto/linguist/lupdate/testdata/good/mergecpp/project.pro
index e988c0a..63f5d66 100644
--- a/tests/auto/linguist/lupdate/testdata/good/mergecpp/project.pro
+++ b/tests/auto/linguist/lupdate/testdata/good/mergecpp/project.pro
@@ -1,14 +1,3 @@
-TEMPLATE = app
-LANGUAGE = C++
-
 SOURCES += finddialog.cpp
 
-TRANSLATIONS        = project.ts
-
-# Copy the ts to a temp file because:
-# 1. The depot file is usually read-only
-# 2. We don't want to modify the original file, since then it won't be possible to run the test twice
-#    without reverting the original file again.
-
-win32: system(copy /Y project.ts.before $$TRANSLATIONS)
-unix:  system(cp -f project.ts.before $$TRANSLATIONS && chmod a+w $$TRANSLATIONS)
+TRANSLATIONS = project.ts
diff --git a/tests/auto/linguist/lupdate/testdata/good/mergecpp_noobsolete/lupdatecmd b/tests/auto/linguist/lupdate/testdata/good/mergecpp_noobsolete/lupdatecmd
index d200143..500a822 100644
--- a/tests/auto/linguist/lupdate/testdata/good/mergecpp_noobsolete/lupdatecmd
+++ b/tests/auto/linguist/lupdate/testdata/good/mergecpp_noobsolete/lupdatecmd
@@ -1,5 +1 @@
-# Add the command that lupdate should run here. If it can't find anything it will default to
-# 'lupdate project.pro -ts project.ts'
-
-# lupdate project.pro
-lupdate -silent -noobsolete project.pro
+lupdate -noobsolete project.pro
diff --git a/tests/auto/linguist/lupdate/testdata/good/mergecpp_noobsolete/project.pro b/tests/auto/linguist/lupdate/testdata/good/mergecpp_noobsolete/project.pro
index e988c0a..63f5d66 100644
--- a/tests/auto/linguist/lupdate/testdata/good/mergecpp_noobsolete/project.pro
+++ b/tests/auto/linguist/lupdate/testdata/good/mergecpp_noobsolete/project.pro
@@ -1,14 +1,3 @@
-TEMPLATE = app
-LANGUAGE = C++
-
 SOURCES += finddialog.cpp
 
-TRANSLATIONS        = project.ts
-
-# Copy the ts to a temp file because:
-# 1. The depot file is usually read-only
-# 2. We don't want to modify the original file, since then it won't be possible to run the test twice
-#    without reverting the original file again.
-
-win32: system(copy /Y project.ts.before $$TRANSLATIONS)
-unix:  system(cp -f project.ts.before $$TRANSLATIONS && chmod a+w $$TRANSLATIONS)
+TRANSLATIONS = project.ts
diff --git a/tests/auto/linguist/lupdate/testdata/good/mergecpp_obsolete/project.pro b/tests/auto/linguist/lupdate/testdata/good/mergecpp_obsolete/project.pro
index e988c0a..63f5d66 100644
--- a/tests/auto/linguist/lupdate/testdata/good/mergecpp_obsolete/project.pro
+++ b/tests/auto/linguist/lupdate/testdata/good/mergecpp_obsolete/project.pro
@@ -1,14 +1,3 @@
-TEMPLATE = app
-LANGUAGE = C++
-
 SOURCES += finddialog.cpp
 
-TRANSLATIONS        = project.ts
-
-# Copy the ts to a temp file because:
-# 1. The depot file is usually read-only
-# 2. We don't want to modify the original file, since then it won't be possible to run the test twice
-#    without reverting the original file again.
-
-win32: system(copy /Y project.ts.before $$TRANSLATIONS)
-unix:  system(cp -f project.ts.before $$TRANSLATIONS && chmod a+w $$TRANSLATIONS)
+TRANSLATIONS = project.ts
diff --git a/tests/auto/linguist/lupdate/testdata/good/mergeui/project.pro b/tests/auto/linguist/lupdate/testdata/good/mergeui/project.pro
index 28ba291..fa56972 100644
--- a/tests/auto/linguist/lupdate/testdata/good/mergeui/project.pro
+++ b/tests/auto/linguist/lupdate/testdata/good/mergeui/project.pro
@@ -1,14 +1,3 @@
-TEMPLATE = app
-LANGUAGE = C++
-
 FORMS += project.ui
 
-TRANSLATIONS        = project.ts
-
-# Copy the ts to a temp file because:
-# 1. The depot file is usually read-only
-# 2. We don't want to modify the original file, since then it won't be possible to run the test twice
-#    without reverting the original file again.
-
-win32: system(copy /Y project.ts.before $$TRANSLATIONS)
-unix:  system(cp -f project.ts.before $$TRANSLATIONS && chmod a+w $$TRANSLATIONS)
+TRANSLATIONS = project.ts
diff --git a/tests/auto/linguist/lupdate/testdata/good/mergeui_obsolete/project.pro b/tests/auto/linguist/lupdate/testdata/good/mergeui_obsolete/project.pro
index 28ba291..fa56972 100644
--- a/tests/auto/linguist/lupdate/testdata/good/mergeui_obsolete/project.pro
+++ b/tests/auto/linguist/lupdate/testdata/good/mergeui_obsolete/project.pro
@@ -1,14 +1,3 @@
-TEMPLATE = app
-LANGUAGE = C++
-
 FORMS += project.ui
 
-TRANSLATIONS        = project.ts
-
-# Copy the ts to a temp file because:
-# 1. The depot file is usually read-only
-# 2. We don't want to modify the original file, since then it won't be possible to run the test twice
-#    without reverting the original file again.
-
-win32: system(copy /Y project.ts.before $$TRANSLATIONS)
-unix:  system(cp -f project.ts.before $$TRANSLATIONS && chmod a+w $$TRANSLATIONS)
+TRANSLATIONS = project.ts
diff --git a/tests/auto/linguist/lupdate/testdata/good/multiple_locations/project.pro b/tests/auto/linguist/lupdate/testdata/good/multiple_locations/project.pro
index 4582705..bbabdfb 100644
--- a/tests/auto/linguist/lupdate/testdata/good/multiple_locations/project.pro
+++ b/tests/auto/linguist/lupdate/testdata/good/multiple_locations/project.pro
@@ -1,13 +1,4 @@
-TEMPLATE = app
-LANGUAGE = C++
-
 SOURCES += main.cpp
 SOURCES += finddialog.cpp
 
-TRANSLATIONS        += project.ts
-
-exists( $$TRANSLATIONS ) {
-    win32: system(del $$TRANSLATIONS)
-    unix:  system(rm $$TRANSLATIONS)
-}
-
+TRANSLATIONS = project.ts
diff --git a/tests/auto/linguist/lupdate/testdata/good/namespaces/project.pro b/tests/auto/linguist/lupdate/testdata/good/namespaces/project.pro
index 56d472c..c96859b 100644
--- a/tests/auto/linguist/lupdate/testdata/good/namespaces/project.pro
+++ b/tests/auto/linguist/lupdate/testdata/good/namespaces/project.pro
@@ -1,12 +1,3 @@
-TEMPLATE = app
-LANGUAGE = C++
-
 SOURCES += main.cpp
 
-TRANSLATIONS += project.ts
-
-exists( $$TRANSLATIONS ) {
-    win32: system(del $$TRANSLATIONS)
-    unix:  system(rm $$TRANSLATIONS)
-}
-
+TRANSLATIONS = project.ts
diff --git a/tests/auto/linguist/lupdate/testdata/good/parse_special_chars/project.pro b/tests/auto/linguist/lupdate/testdata/good/parse_special_chars/project.pro
index cb18ea4..c96859b 100644
--- a/tests/auto/linguist/lupdate/testdata/good/parse_special_chars/project.pro
+++ b/tests/auto/linguist/lupdate/testdata/good/parse_special_chars/project.pro
@@ -1,12 +1,3 @@
-TEMPLATE = app
-LANGUAGE = C++
-
 SOURCES += main.cpp
 
-TRANSLATIONS        += project.ts
-
-exists( $$TRANSLATIONS ) {
-    win32: system(del $$TRANSLATIONS)
-    unix:  system(rm $$TRANSLATIONS)
-}
-
+TRANSLATIONS = project.ts
diff --git a/tests/auto/linguist/lupdate/testdata/good/parsecontexts/project.pro b/tests/auto/linguist/lupdate/testdata/good/parsecontexts/project.pro
index 7547a8d..759bea0 100644
--- a/tests/auto/linguist/lupdate/testdata/good/parsecontexts/project.pro
+++ b/tests/auto/linguist/lupdate/testdata/good/parsecontexts/project.pro
@@ -1,12 +1,3 @@
-TEMPLATE = app
-LANGUAGE = C++
-
 SOURCES = main.cpp
 
-TRANSLATIONS        += project.ts
-
-exists( $$TRANSLATIONS ) {
-    win32: system(del $$TRANSLATIONS)
-    unix:  system(rm $$TRANSLATIONS)
-}
-
+TRANSLATIONS = project.ts
diff --git a/tests/auto/linguist/lupdate/testdata/good/parsecpp/project.pro b/tests/auto/linguist/lupdate/testdata/good/parsecpp/project.pro
index 4582705..bbabdfb 100644
--- a/tests/auto/linguist/lupdate/testdata/good/parsecpp/project.pro
+++ b/tests/auto/linguist/lupdate/testdata/good/parsecpp/project.pro
@@ -1,13 +1,4 @@
-TEMPLATE = app
-LANGUAGE = C++
-
 SOURCES += main.cpp
 SOURCES += finddialog.cpp
 
-TRANSLATIONS        += project.ts
-
-exists( $$TRANSLATIONS ) {
-    win32: system(del $$TRANSLATIONS)
-    unix:  system(rm $$TRANSLATIONS)
-}
-
+TRANSLATIONS = project.ts
diff --git a/tests/auto/linguist/lupdate/testdata/good/parsecpp2/expectedoutput.txt b/tests/auto/linguist/lupdate/testdata/good/parsecpp2/expectedoutput.txt
index 8d057d8..e3543c9 100644
--- a/tests/auto/linguist/lupdate/testdata/good/parsecpp2/expectedoutput.txt
+++ b/tests/auto/linguist/lupdate/testdata/good/parsecpp2/expectedoutput.txt
@@ -5,3 +5,4 @@
 .*/lupdate/testdata/good/parsecpp2/main.cpp:61: Excess closing brace .*
 
 .*/lupdate/testdata/good/parsecpp2/main.cpp:65: Excess closing brace .*
+
diff --git a/tests/auto/linguist/lupdate/testdata/good/parsecpp2/project.pro b/tests/auto/linguist/lupdate/testdata/good/parsecpp2/project.pro
index 7547a8d..759bea0 100644
--- a/tests/auto/linguist/lupdate/testdata/good/parsecpp2/project.pro
+++ b/tests/auto/linguist/lupdate/testdata/good/parsecpp2/project.pro
@@ -1,12 +1,3 @@
-TEMPLATE = app
-LANGUAGE = C++
-
 SOURCES = main.cpp
 
-TRANSLATIONS        += project.ts
-
-exists( $$TRANSLATIONS ) {
-    win32: system(del $$TRANSLATIONS)
-    unix:  system(rm $$TRANSLATIONS)
-}
-
+TRANSLATIONS = project.ts
diff --git a/tests/auto/linguist/lupdate/testdata/good/parsejava/project.pro b/tests/auto/linguist/lupdate/testdata/good/parsejava/project.pro
index 7e64c80..657b535 100644
--- a/tests/auto/linguist/lupdate/testdata/good/parsejava/project.pro
+++ b/tests/auto/linguist/lupdate/testdata/good/parsejava/project.pro
@@ -1,12 +1,3 @@
-TEMPLATE = app
-LANGUAGE = Java
-
 SOURCES += main.java
 
-TRANSLATIONS        += project.ts
-
-exists( $$TRANSLATIONS ) {
-    win32: system(del $$TRANSLATIONS)
-    unix:  system(rm $$TRANSLATIONS)
-}
-
+TRANSLATIONS = project.ts
diff --git a/tests/auto/linguist/lupdate/testdata/good/parseui/project.pro b/tests/auto/linguist/lupdate/testdata/good/parseui/project.pro
index bdc06e7..fa56972 100644
--- a/tests/auto/linguist/lupdate/testdata/good/parseui/project.pro
+++ b/tests/auto/linguist/lupdate/testdata/good/parseui/project.pro
@@ -1,13 +1,3 @@
-TEMPLATE = app
-LANGUAGE = C++
-
 FORMS += project.ui
 
-TRANSLATIONS        = project.ts
-
-exists( $$TRANSLATIONS ) {
-    win32 : system(del $$TRANSLATIONS)
-    unix :  system(rm $$TRANSLATIONS)
-}
-
-
+TRANSLATIONS = project.ts
diff --git a/tests/auto/linguist/lupdate/testdata/good/prefix/project.pro b/tests/auto/linguist/lupdate/testdata/good/prefix/project.pro
index 7547a8d..759bea0 100644
--- a/tests/auto/linguist/lupdate/testdata/good/prefix/project.pro
+++ b/tests/auto/linguist/lupdate/testdata/good/prefix/project.pro
@@ -1,12 +1,3 @@
-TEMPLATE = app
-LANGUAGE = C++
-
 SOURCES = main.cpp
 
-TRANSLATIONS        += project.ts
-
-exists( $$TRANSLATIONS ) {
-    win32: system(del $$TRANSLATIONS)
-    unix:  system(rm $$TRANSLATIONS)
-}
-
+TRANSLATIONS = project.ts
diff --git a/tests/auto/linguist/lupdate/testdata/good/preprocess/project.pro b/tests/auto/linguist/lupdate/testdata/good/preprocess/project.pro
index 012c7e0..c96859b 100644
--- a/tests/auto/linguist/lupdate/testdata/good/preprocess/project.pro
+++ b/tests/auto/linguist/lupdate/testdata/good/preprocess/project.pro
@@ -1,12 +1,3 @@
-TEMPLATE = app
-LANGUAGE = C++
-
 SOURCES += main.cpp
 
-TRANSLATIONS        += project.ts
-
-exists( $$TRANSLATIONS ) {
-    win32: system(del $$TRANSLATIONS)
-    unix:  system(rm -f $$TRANSLATIONS)
-}
-
+TRANSLATIONS = project.ts
diff --git a/tests/auto/linguist/lupdate/testdata/good/proparsing/project.pro b/tests/auto/linguist/lupdate/testdata/good/proparsing/project.pro
index 3078817..0e920f9 100644
--- a/tests/auto/linguist/lupdate/testdata/good/proparsing/project.pro
+++ b/tests/auto/linguist/lupdate/testdata/good/proparsing/project.pro
@@ -1,6 +1,3 @@
-TEMPLATE = app
-LANGUAGE = C++
-
 # Try to reference a variable that does not exist:
 MYVAR=$$THIS_VARIABLE_IS_NOT_DEFINED
 
@@ -31,10 +28,4 @@ if (exists($$member($$(PATH), 0))) {
     SOURCES += main_dependpath.cpp
 }
 
-TRANSLATIONS        += project.ts
-
-exists( $$TRANSLATIONS ) {
-    win32: system(del $$TRANSLATIONS)
-    unix:  system(rm -f $$TRANSLATIONS)
-}
-
+TRANSLATIONS = project.ts
diff --git a/tests/auto/linguist/lupdate/testdata/good/proparsing2/project.pro b/tests/auto/linguist/lupdate/testdata/good/proparsing2/project.pro
index 1d6895a..3dc4208 100644
--- a/tests/auto/linguist/lupdate/testdata/good/proparsing2/project.pro
+++ b/tests/auto/linguist/lupdate/testdata/good/proparsing2/project.pro
@@ -3,9 +3,6 @@
 # It also tries to verify the behaviour of combining quoted and non-quoted elements with literals.
 #
 
-TEMPLATE = app
-LANGUAGE = C++
-
 QUOTED = $$quote(variable with spaces)
 VERSIONAB = "a.b"
 VAB = $$split(VERSIONAB, ".")
@@ -33,10 +30,4 @@ SOURCES += $$Q3
 win32: SOURCES += $$system(type files-cc.txt)
 unix: SOURCES += $$system(cat files-cc.txt)
 
-TRANSLATIONS        += project.ts
-
-exists( $$TRANSLATIONS ) {
-    win32: system(del $$TRANSLATIONS)
-    unix:  system(rm $$TRANSLATIONS)
-}
-
+TRANSLATIONS = project.ts
diff --git a/tests/auto/linguist/lupdate/testdata/good/proparsingpaths/project.pro b/tests/auto/linguist/lupdate/testdata/good/proparsingpaths/project.pro
index 820b4fa..6bfe751 100644
--- a/tests/auto/linguist/lupdate/testdata/good/proparsingpaths/project.pro
+++ b/tests/auto/linguist/lupdate/testdata/good/proparsingpaths/project.pro
@@ -3,8 +3,3 @@ SOURCES += file*.cpp filter.cpp non-existing.cpp
 include(sub/sub.pri)
 
 TRANSLATIONS = project.ts
-
-exists( $$TRANSLATIONS ) {
-    win32: system(del $$TRANSLATIONS)
-    unix:  system(rm -f $$TRANSLATIONS)
-}
diff --git a/tests/auto/linguist/lupdate/testdata/good/proparsingpri/project.pro b/tests/auto/linguist/lupdate/testdata/good/proparsingpri/project.pro
index 3810a02..5e23538 100644
--- a/tests/auto/linguist/lupdate/testdata/good/proparsingpri/project.pro
+++ b/tests/auto/linguist/lupdate/testdata/good/proparsingpri/project.pro
@@ -1,6 +1,3 @@
-TEMPLATE = app
-LANGUAGE = C++
-
 include(win/win.pri)
 include(mac/mac.pri)
 include(unix/unix.pri)
@@ -8,9 +5,5 @@ include (common/common.pri)             # Important: keep the space before the '
 include(relativity/relativity.pri)
 
 message($$SOURCES)
-TRANSLATIONS = project.ts
 
-exists( $$TRANSLATIONS ) {
-    win32: system(del $$TRANSLATIONS)
-    unix:  system(rm $$TRANSLATIONS)
-}
+TRANSLATIONS = project.ts
diff --git a/tests/auto/linguist/lupdate/testdata/good/proparsingsubdirs/project.pro b/tests/auto/linguist/lupdate/testdata/good/proparsingsubdirs/project.pro
index 4de6622..88f2435 100644
--- a/tests/auto/linguist/lupdate/testdata/good/proparsingsubdirs/project.pro
+++ b/tests/auto/linguist/lupdate/testdata/good/proparsingsubdirs/project.pro
@@ -1,3 +1,2 @@
-TEMPLATE       =subdirs
-
-SUBDIRS			=  sub1
+TEMPLATE = subdirs
+SUBDIRS = sub1
diff --git a/tests/auto/linguist/lupdate/testdata/good/proparsingsubdirs/sub1/sub1.pro b/tests/auto/linguist/lupdate/testdata/good/proparsingsubdirs/sub1/sub1.pro
index 1d50c2b..df18c5a 100644
--- a/tests/auto/linguist/lupdate/testdata/good/proparsingsubdirs/sub1/sub1.pro
+++ b/tests/auto/linguist/lupdate/testdata/good/proparsingsubdirs/sub1/sub1.pro
@@ -1,12 +1,3 @@
-TEMPLATE = app
-LANGUAGE = C++
-
 SOURCES += main.cpp
 
-TRANSLATIONS        += ../project.ts
-
-exists( $$TRANSLATIONS ) {
-    win32: system(del $$TRANSLATIONS)
-    unix:  system(rm -f $$TRANSLATIONS)
-}
-
+TRANSLATIONS = ../project.ts
diff --git a/tests/auto/linguist/lupdate/testdata/good/proparsingsubs/common/common.pro b/tests/auto/linguist/lupdate/testdata/good/proparsingsubs/common/common.pro
index a8b3106..3f6c643 100644
--- a/tests/auto/linguist/lupdate/testdata/good/proparsingsubs/common/common.pro
+++ b/tests/auto/linguist/lupdate/testdata/good/proparsingsubs/common/common.pro
@@ -1,5 +1,2 @@
-TEMPLATE = app
-LANGUAGE = C++
-
-SOURCES +=  main.cpp
+SOURCES += main.cpp
 
diff --git a/tests/auto/linguist/lupdate/testdata/good/proparsingsubs/lupdatecmd b/tests/auto/linguist/lupdate/testdata/good/proparsingsubs/lupdatecmd
new file mode 100644
index 0000000..b7e12cc
--- /dev/null
+++ b/tests/auto/linguist/lupdate/testdata/good/proparsingsubs/lupdatecmd
@@ -0,0 +1 @@
+lupdate project.pro -ts project.ts
diff --git a/tests/auto/linguist/lupdate/testdata/good/proparsingsubs/mac/mac.pro b/tests/auto/linguist/lupdate/testdata/good/proparsingsubs/mac/mac.pro
index 87478bf..a1863b6 100644
--- a/tests/auto/linguist/lupdate/testdata/good/proparsingsubs/mac/mac.pro
+++ b/tests/auto/linguist/lupdate/testdata/good/proparsingsubs/mac/mac.pro
@@ -1,5 +1 @@
-TEMPLATE = app
-LANGUAGE = C++
-
-SOURCES +=  main_mac.cpp
-
+SOURCES += main_mac.cpp
diff --git a/tests/auto/linguist/lupdate/testdata/good/proparsingsubs/project.pro b/tests/auto/linguist/lupdate/testdata/good/proparsingsubs/project.pro
index 668ecf4..f75a462 100644
--- a/tests/auto/linguist/lupdate/testdata/good/proparsingsubs/project.pro
+++ b/tests/auto/linguist/lupdate/testdata/good/proparsingsubs/project.pro
@@ -1,7 +1,2 @@
 TEMPLATE = subdirs
 SUBDIRS = win mac unix common
-
-exists( project.ts ) {
-    win32: system(del project.ts)
-    unix:  system(rm project.ts)
-}
diff --git a/tests/auto/linguist/lupdate/testdata/good/proparsingsubs/unix/unix.pro b/tests/auto/linguist/lupdate/testdata/good/proparsingsubs/unix/unix.pro
index d0ebec7..71b1a22 100644
--- a/tests/auto/linguist/lupdate/testdata/good/proparsingsubs/unix/unix.pro
+++ b/tests/auto/linguist/lupdate/testdata/good/proparsingsubs/unix/unix.pro
@@ -1,5 +1 @@
-TEMPLATE = app
-LANGUAGE = C++
-
-SOURCES +=  main_unix.cpp
-
+SOURCES += main_unix.cpp
diff --git a/tests/auto/linguist/lupdate/testdata/good/proparsingsubs/win/win.pro b/tests/auto/linguist/lupdate/testdata/good/proparsingsubs/win/win.pro
index a9a9751..afd7197 100644
--- a/tests/auto/linguist/lupdate/testdata/good/proparsingsubs/win/win.pro
+++ b/tests/auto/linguist/lupdate/testdata/good/proparsingsubs/win/win.pro
@@ -1,5 +1 @@
-TEMPLATE = app
-LANGUAGE = C++
-
-SOURCES +=  main_win.cpp
-
+SOURCES += main_win.cpp
diff --git a/tests/auto/linguist/lupdate/testdata/good/reloutput/lupdatecmd b/tests/auto/linguist/lupdate/testdata/good/reloutput/lupdatecmd
new file mode 100644
index 0000000..da6103f
--- /dev/null
+++ b/tests/auto/linguist/lupdate/testdata/good/reloutput/lupdatecmd
@@ -0,0 +1,2 @@
+TRANSLATION: translations/project.ts
+lupdate project.pro -ts translations/project.ts
diff --git a/tests/auto/linguist/lupdate/testdata/output_ts/toplevel/library/tools/main.cpp b/tests/auto/linguist/lupdate/testdata/good/reloutput/main.cpp
index 257b240..257b240 100644
--- a/tests/auto/linguist/lupdate/testdata/output_ts/toplevel/library/tools/main.cpp
+++ b/tests/auto/linguist/lupdate/testdata/good/reloutput/main.cpp
diff --git a/tests/auto/linguist/lupdate/testdata/good/reloutput/project.pro b/tests/auto/linguist/lupdate/testdata/good/reloutput/project.pro
new file mode 100644
index 0000000..4e2e6ad
--- /dev/null
+++ b/tests/auto/linguist/lupdate/testdata/good/reloutput/project.pro
@@ -0,0 +1,3 @@
+SOURCES += main.cpp
+
+TRANSLATIONS = translations/project.ts
diff --git a/tests/auto/linguist/lupdate/testdata/output_ts/project.ts.result b/tests/auto/linguist/lupdate/testdata/good/reloutput/translations/project.ts.result
index e398701..e398701 100644
--- a/tests/auto/linguist/lupdate/testdata/output_ts/project.ts.result
+++ b/tests/auto/linguist/lupdate/testdata/good/reloutput/translations/project.ts.result
diff --git a/tests/auto/linguist/lupdate/testdata/good/textsimilarity/project.pro b/tests/auto/linguist/lupdate/testdata/good/textsimilarity/project.pro
index 28ba291..fa56972 100644
--- a/tests/auto/linguist/lupdate/testdata/good/textsimilarity/project.pro
+++ b/tests/auto/linguist/lupdate/testdata/good/textsimilarity/project.pro
@@ -1,14 +1,3 @@
-TEMPLATE = app
-LANGUAGE = C++
-
 FORMS += project.ui
 
-TRANSLATIONS        = project.ts
-
-# Copy the ts to a temp file because:
-# 1. The depot file is usually read-only
-# 2. We don't want to modify the original file, since then it won't be possible to run the test twice
-#    without reverting the original file again.
-
-win32: system(copy /Y project.ts.before $$TRANSLATIONS)
-unix:  system(cp -f project.ts.before $$TRANSLATIONS && chmod a+w $$TRANSLATIONS)
+TRANSLATIONS = project.ts
diff --git a/tests/auto/linguist/lupdate/testdata/output_ts/lupdatecmd b/tests/auto/linguist/lupdate/testdata/output_ts/lupdatecmd
deleted file mode 100644
index 80319de..0000000
--- a/tests/auto/linguist/lupdate/testdata/output_ts/lupdatecmd
+++ /dev/null
@@ -1,5 +0,0 @@
-# Add the command that lupdate should run here. If it can't find anything it will default to
-# 'lupdate project.pro -ts project.ts'
-
-# lupdate project.pro
-lupdate toplevel/library/tools/tools.pro
diff --git a/tests/auto/linguist/lupdate/testdata/output_ts/toplevel/library/tools/tools.pro b/tests/auto/linguist/lupdate/testdata/output_ts/toplevel/library/tools/tools.pro
deleted file mode 100644
index ec6c01d..0000000
--- a/tests/auto/linguist/lupdate/testdata/output_ts/toplevel/library/tools/tools.pro
+++ /dev/null
@@ -1,12 +0,0 @@
-TEMPLATE = app
-LANGUAGE = C++
-
-SOURCES += main.cpp
-
-TRANSLATIONS        += translations/project.ts
-
-exists( $$TRANSLATIONS ) {
-    win32: system(del $$TRANSLATIONS)
-    unix:  system(rm -f $$TRANSLATIONS)
-}
-
diff --git a/tests/auto/linguist/lupdate/testdata/output_ts/toplevel/library/tools/translations/readme.txt b/tests/auto/linguist/lupdate/testdata/output_ts/toplevel/library/tools/translations/readme.txt
deleted file mode 100644
index 83adcd2..0000000
--- a/tests/auto/linguist/lupdate/testdata/output_ts/toplevel/library/tools/translations/readme.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-This is just a dummy file so that GIT creates this folder
-
diff --git a/tests/auto/linguist/lupdate/testlupdate.cpp b/tests/auto/linguist/lupdate/testlupdate.cpp
deleted file mode 100644
index 9e23a54..0000000
--- a/tests/auto/linguist/lupdate/testlupdate.cpp
+++ /dev/null
@@ -1,158 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Qt Linguist 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 Technology Preview License Agreement accompanying
-** this package.
-**
-** 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.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "testlupdate.h"
-#include <stdlib.h>
-#include <QtGui/QApplication>
-#include <QtCore/QProcess>
-#include <QtCore/QTimer>
-#include <QtCore/QDir>
-
-#ifdef Q_OS_WIN32
-#   include <windows.h>
-#endif
-
-#include <QtTest/QtTest>
-
-
-TestLUpdate::TestLUpdate()
-{
-    childProc = 0;
-    QString binPath = QLibraryInfo::location(QLibraryInfo::BinariesPath);
-    m_cmdLupdate = binPath + QLatin1String("/lupdate");
-    m_cmdQMake = binPath + QLatin1String("/qmake");
-}
-
-TestLUpdate::~TestLUpdate()
-{
-    if (childProc)
-        delete childProc;
-}
-
-void TestLUpdate::setWorkingDirectory(const QString &workDir)
-{
-    m_workDir = workDir;
-    QDir::setCurrent(m_workDir);
-}
-
-void TestLUpdate::addMakeResult( const QString &result )
-{
-    make_result.append( result );
-}
-
-bool TestLUpdate::runChild( bool showOutput, const QString &program, const QStringList &argList)
-{
-    make_result.clear();
-    exit_ok = FALSE;
-    if (childProc)
-        delete childProc;
-
-    child_show = showOutput;
-    if ( showOutput ) {
-        QString S = argList.join(" ");
-        addMakeResult( program + QLatin1String(" ") + S );
-    }
-
-    childProc = new QProcess();
-    Q_ASSERT(childProc);
-
-    childProc->setWorkingDirectory(m_workDir);
-    connect(childProc, SIGNAL(finished(int)), this, SLOT(childReady(int)));
-    childProc->setProcessChannelMode(QProcess::MergedChannels);
-    if (argList.isEmpty()) {
-        childProc->start( program, QIODevice::ReadWrite | QIODevice::Text );
-    } else {
-        childProc->start( program, argList, QIODevice::ReadWrite | QIODevice::Text );
-    }
-    bool ok;
-
-    ok = childProc->waitForStarted();
-
-    if (ok)
-        ok = childProc->waitForFinished();
-
-    if (!ok)
-        addMakeResult( "Error executing '" + program + "'." );
-
-    childReady(ok ? 0 : -1);
-
-    return ok;
-}
-
-void TestLUpdate::childReady(int /*exitCode*/)
-{
-    if (childProc != 0) {
-        childHasData();
-        exit_ok = childProc->state() == QProcess::NotRunning
-                  && childProc->exitStatus() == 0;
-        childProc->deleteLater();
-    }
-    childProc = 0;
-}
-
-void TestLUpdate::childHasData()
-{
-    //QByteArray ba = childProc->readAllStandardError();
-    //qDebug() << "ERROR:" << ba;
-    QString stdoutput = childProc->readAllStandardOutput();
-    stdoutput = stdoutput.replace("\t", "    ");
-    if (child_show)
-        addMakeResult(stdoutput);
-}
-
-bool TestLUpdate::run(const QString &commandline)
-{
-    return runChild(true, m_cmdLupdate + QLatin1String(" ") + commandline);
-}
-
-
-bool TestLUpdate::updateProFile(const QString &arguments)
-{
-    QStringList args = arguments.split(QChar(' '));
-    return runChild( true, m_cmdLupdate, args );
-}
-
-bool TestLUpdate::qmake()
-{
-    QStringList args;
-    args << "-r";
-    return runChild(true, m_cmdQMake, args);
-}
diff --git a/tests/auto/linguist/lupdate/tst_lupdate.cpp b/tests/auto/linguist/lupdate/tst_lupdate.cpp
index 0776914..568be37 100644
--- a/tests/auto/linguist/lupdate/tst_lupdate.cpp
+++ b/tests/auto/linguist/lupdate/tst_lupdate.cpp
@@ -39,7 +39,6 @@
 **
 ****************************************************************************/
 
-#include "testlupdate.h"
 #if CHECK_SIMTEXTH
 #include "../shared/simtexth.h"
 #endif
@@ -55,12 +54,11 @@ class tst_lupdate : public QObject
 {
     Q_OBJECT
 public:
-    tst_lupdate() { m_basePath = QDir::currentPath() + QLatin1String("/testdata/"); }
+    tst_lupdate();
 
 private slots:
     void good_data();
     void good();
-    void output_ts();
     void commandline_data();
     void commandline();
 #if CHECK_SIMTEXTH
@@ -69,7 +67,7 @@ private slots:
 #endif
 
 private:
-    TestLUpdate m_lupdate;
+    QString m_cmdLupdate;
     QString m_basePath;
 
     void doCompare(const QStringList &actual, const QString &expectedFn, bool err);
@@ -77,72 +75,149 @@ private:
 };
 
 
+tst_lupdate::tst_lupdate()
+{
+    QString binPath = QLibraryInfo::location(QLibraryInfo::BinariesPath);
+    m_cmdLupdate = binPath + QLatin1String("/lupdate");
+    m_basePath = QDir::currentPath() + QLatin1String("/testdata/");
+}
+
+static bool prepareMatch(const QString &expect, QString *tmpl, int *require, int *accept)
+{
+    if (expect.startsWith(QLatin1Char('\\'))) {
+        *tmpl = expect.mid(1);
+        *require = *accept = 1;
+    } else if (expect.startsWith(QLatin1Char('?'))) {
+        *tmpl = expect.mid(1);
+        *require = 0;
+        *accept = 1;
+    } else if (expect.startsWith(QLatin1Char('*'))) {
+        *tmpl = expect.mid(1);
+        *require = 0;
+        *accept = INT_MAX;
+    } else if (expect.startsWith(QLatin1Char('+'))) {
+        *tmpl = expect.mid(1);
+        *require = 1;
+        *accept = INT_MAX;
+    } else if (expect.startsWith(QLatin1Char('{'))) {
+        int brc = expect.indexOf(QLatin1Char('}'), 1);
+        if (brc < 0)
+            return false;
+        *tmpl = expect.mid(brc + 1);
+        QString sub = expect.mid(1, brc - 1);
+        int com = sub.indexOf(QLatin1Char(','));
+        bool ok;
+        if (com < 0) {
+            *require = *accept = sub.toInt(&ok);
+            return ok;
+        } else {
+            *require = sub.left(com).toInt();
+            *accept = sub.mid(com + 1).toInt(&ok);
+            if (!ok)
+                *accept = INT_MAX;
+            return *accept >= *require;
+        }
+    } else {
+        *tmpl = expect;
+        *require = *accept = 1;
+    }
+    return true;
+}
+
 void tst_lupdate::doCompare(const QStringList &actual, const QString &expectedFn, bool err)
 {
     QFile file(expectedFn);
-    QVERIFY(file.open(QIODevice::ReadOnly | QIODevice::Text));
-    QStringList expected = QString(file.readAll()).trimmed().split('\n');
-
-    int i = 0, ei = expected.size(), gi = actual.size();
-    for (; ; i++) {
-        if (i == gi) {
-            if (i == ei)
-                return;
-            gi = 0;
-            break;
-        } else if (i == ei) {
-            ei = 0;
+    QVERIFY2(file.open(QIODevice::ReadOnly | QIODevice::Text), qPrintable(expectedFn));
+    QStringList expected = QString(file.readAll()).split('\n');
+
+    int ei = 0, ai = 0, em = expected.size(), am = actual.size();
+    int oei = 0, oai = 0, oem = em, oam = am;
+    int require = 0, accept = 0;
+    QString tmpl;
+    forever {
+        if (!accept) {
+            oei = ei, oai = ai;
+            if (ei == em) {
+                if (ai == am)
+                    return;
+                break;
+            }
+            if (!prepareMatch(expected.at(ei++), &tmpl, &require, &accept))
+                QFAIL(qPrintable(QString("Malformed expected %1 at %3:%2")
+                                 .arg(err ? "output" : "result").arg(ei).arg(expectedFn)));
+        }
+        if (ai == am) {
+            if (require <= 0) {
+                accept = 0;
+                continue;
+            }
             break;
-        } else {
-            QString act = actual.at(i);
-            act.remove('\r');
-            if (err ? !QRegExp(expected.at(i)).exactMatch(act) :
-                         (act != expected.at(i))) {
-                bool cond = true;
-                while (cond) {
-                    act = actual.at(gi - 1);
-                    act.remove('\r');
-                    cond = (ei - 1) >= i && (gi - 1) >= i &&
-                         (err ? QRegExp(expected.at(ei - 1)).exactMatch(act) :
-                                (act == expected.at(ei - 1)));
-                    if (cond) {
-                        ei--, gi--;
+        }
+        if (err ? !QRegExp(tmpl).exactMatch(actual.at(ai)) : (actual.at(ai) != tmpl)) {
+            if (require <= 0) {
+                accept = 0;
+                continue;
+            }
+            ei--;
+            require = accept = 0;
+            forever {
+                if (!accept) {
+                    oem = em, oam = am;
+                    if (ei == em)
+                        break;
+                    if (!prepareMatch(expected.at(--em), &tmpl, &require, &accept))
+                        QFAIL(qPrintable(QString("Malformed expected %1 at %3:%2")
+                                         .arg(err ? "output" : "result")
+                                         .arg(em + 1).arg(expectedFn)));
+                }
+                if (ai == am || (err ? !QRegExp(tmpl).exactMatch(actual.at(am - 1)) :
+                                       (actual.at(am - 1) != tmpl))) {
+                    if (require <= 0) {
+                        accept = 0;
+                        continue;
                     }
+                    break;
                 }
-                break;
+                accept--;
+                require--;
+                am--;
             }
+            break;
         }
+        accept--;
+        require--;
+        ai++;
     }
     QByteArray diff;
-    for (int j = qMax(0, i - 3); j < i; j++)
-        diff += expected.at(j) + '\n';
+    for (int j = qMax(0, oai - 3); j < oai; j++)
+        diff += actual.at(j) + '\n';
     diff += "<<<<<<< got\n";
-    for (int j = i; j < gi; j++) {
+    for (int j = oai; j < oam; j++) {
         diff += actual.at(j) + '\n';
-        if (j >= i + 5) {
+        if (j >= oai + 5) {
             diff += "...\n";
             break;
         }
     }
     diff += "=========\n";
-    for (int j = i; j < ei; j++) {
+    for (int j = oei; j < oem; j++) {
         diff += expected.at(j) + '\n';
-        if (j >= i + 5) {
+        if (j >= oei + 5) {
             diff += "...\n";
             break;
         }
     }
     diff += ">>>>>>> expected\n";
-    for (int j = ei; j < qMin(ei + 3, expected.size()); j++)
-        diff += expected.at(j) + '\n';
+    for (int j = oam; j < qMin(oam + 3, actual.size()); j++)
+        diff += actual.at(j) + '\n';
     QFAIL(qPrintable((err ? "Output for " : "Result for ") + expectedFn + " does not meet expectations:\n" + diff));
 }
 
 void tst_lupdate::doCompare(const QString &actualFn, const QString &expectedFn, bool err)
 {
     QFile afile(actualFn);
-    QVERIFY(afile.open(QIODevice::ReadOnly | QIODevice::Text));
-    QStringList actual = QString(afile.readAll()).trimmed().split('\n');
+    QVERIFY2(afile.open(QIODevice::ReadOnly | QIODevice::Text), qPrintable(actualFn));
+    QStringList actual = QString(afile.readAll()).split('\n');
 
     doCompare(actual, expectedFn, err);
 }
@@ -167,20 +242,16 @@ void tst_lupdate::good()
     QFETCH(QString, directory);
 
     QString dir = m_basePath + "good/" + directory;
-    QString expectedFile = dir + QLatin1String("/project.ts.result");
 
     qDebug() << "Checking...";
 
-    // qmake will delete the previous one, to ensure that we don't do any merging....
-    QString generatedtsfile(QLatin1String("project.ts"));
+    QString generatedtsfile(dir + QLatin1String("/project.ts"));
 
-    m_lupdate.setWorkingDirectory(dir);
-    m_lupdate.qmake();
     // look for a command
     QString lupdatecmd;
     QFile file(dir + "/lupdatecmd");
     if (file.exists()) {
-        QVERIFY(file.open(QIODevice::ReadOnly | QIODevice::Text));
+        QVERIFY2(file.open(QIODevice::ReadOnly | QIODevice::Text), qPrintable(file.fileName()));
         while (!file.atEnd()) {
             QByteArray cmdstring = file.readLine().simplified();
             if (cmdstring.startsWith('#'))
@@ -197,72 +268,39 @@ void tst_lupdate::good()
         file.close();
     }
 
-    if (lupdatecmd.isEmpty()) {
-        lupdatecmd = QLatin1String("project.pro -ts project.ts");
-    }
-    lupdatecmd.prepend("-silent ");
-    m_lupdate.updateProFile(lupdatecmd);
-
-    // If the file expectedoutput.txt exists, compare the
-    // console output with the content of that file
-    QFile outfile(dir + "/expectedoutput.txt");
-    if (outfile.exists()) {
-        QString errs = m_lupdate.getErrorMessages().at(1).trimmed();
-        QStringList errslist = errs.split(QLatin1Char('\n'));
-        doCompare(errslist, outfile.fileName(), true);
-        if (QTest::currentTestFailed())
-            return;
-    }
-
-    doCompare(generatedtsfile, expectedFile, false);
-}
-
-void tst_lupdate::output_ts()
-{
-    QString dir = m_basePath + "output_ts";
-    m_lupdate.setWorkingDirectory(dir);
-
-    // look for a command
-    QString lupdatecmd;
-    QFile file(dir + "/lupdatecmd");
-    if (file.exists()) {
-        QVERIFY(file.open(QIODevice::ReadOnly | QIODevice::Text));
-        while (!file.atEnd()) {
-        QByteArray cmdstring = file.readLine().simplified();
-            if (cmdstring.startsWith('#'))
-                continue;
-            if (cmdstring.startsWith("lupdate")) {
-                cmdstring.remove(0, 8);
-                lupdatecmd.append(cmdstring);
-                break;
-            }
-        }
-        file.close();
-    }
-
-    QDir parsingDir(m_basePath + "output_ts");
-
-    QString generatedtsfile =
-        dir + QLatin1String("/toplevel/library/tools/translations/project.ts");
-
     QFile::remove(generatedtsfile);
+    QString beforetsfile = generatedtsfile + QLatin1String(".before");
+    if (QFile::exists(beforetsfile))
+        QVERIFY2(QFile::copy(beforetsfile, generatedtsfile), qPrintable(beforetsfile));
 
+    if (lupdatecmd.isEmpty())
+        lupdatecmd = QLatin1String("project.pro");
     lupdatecmd.prepend("-silent ");
-    m_lupdate.qmake();
-    m_lupdate.updateProFile(lupdatecmd);
+
+    QProcess proc;
+    proc.setWorkingDirectory(dir);
+    proc.setProcessChannelMode(QProcess::MergedChannels);
+    proc.start(m_cmdLupdate + ' ' + lupdatecmd, QIODevice::ReadWrite | QIODevice::Text);
+    QVERIFY2(proc.waitForFinished(5000), qPrintable(lupdatecmd));
+    QByteArray output = proc.readAll();
+    QVERIFY2(proc.exitStatus() == QProcess::NormalExit,
+             "\"lupdate " + lupdatecmd.toLatin1() + "\" crashed\n" + output);
+    QVERIFY2(!proc.exitCode(),
+             "\"lupdate " + lupdatecmd.toLatin1() + "\" exited with code " +
+             QByteArray::number(proc.exitCode()) + "\n" + proc.readAll());
 
     // If the file expectedoutput.txt exists, compare the
     // console output with the content of that file
     QFile outfile(dir + "/expectedoutput.txt");
     if (outfile.exists()) {
-        QString errs = m_lupdate.getErrorMessages().at(1).trimmed();
-        QStringList errslist = errs.split(QLatin1Char('\n'));
+        QStringList errslist = QString::fromLatin1(output).split(QLatin1Char('\n'));
         doCompare(errslist, outfile.fileName(), true);
         if (QTest::currentTestFailed())
             return;
     }
 
-    doCompare(generatedtsfile, dir + QLatin1String("/project.ts.result"), false);
+    QString expectedFile = generatedtsfile + QLatin1String(".result");
+    doCompare(generatedtsfile, expectedFile, false);
 }
 
 void tst_lupdate::commandline_data()
@@ -285,14 +323,21 @@ void tst_lupdate::commandline()
     QFETCH(QString, generatedtsfile);
     QFETCH(QString, expectedtsfile);
 
-    m_lupdate.setWorkingDirectory(m_basePath + currentPath);
     QString generated =
         m_basePath + currentPath + QLatin1Char('/') + generatedtsfile;
     QFile gen(generated);
     if (gen.exists())
         QVERIFY(gen.remove());
-    if (!m_lupdate.run("-silent " + commandline))
-        qDebug() << m_lupdate.getErrorMessages().last();
+    QProcess proc;
+    proc.setWorkingDirectory(m_basePath + currentPath);
+    proc.setProcessChannelMode(QProcess::MergedChannels);
+    proc.start(m_cmdLupdate + " -silent " + commandline, QIODevice::ReadWrite | QIODevice::Text);
+    QVERIFY2(proc.waitForFinished(5000), qPrintable(commandline));
+    QVERIFY2(proc.exitStatus() == QProcess::NormalExit,
+             "\"lupdate -silent " + commandline.toLatin1() + "\" crashed\n" + proc.readAll());
+    QVERIFY2(!proc.exitCode(),
+             "\"lupdate -silent " + commandline.toLatin1() + "\" exited with code " +
+             QByteArray::number(proc.exitCode()) + "\n" + proc.readAll());
 
     doCompare(generated, m_basePath + currentPath + QLatin1Char('/') + expectedtsfile, false);
 }
diff --git a/tests/auto/maketestselftest/maketestselftest.pro b/tests/auto/maketestselftest/maketestselftest.pro
new file mode 100644
index 0000000..6cc1744
--- /dev/null
+++ b/tests/auto/maketestselftest/maketestselftest.pro
@@ -0,0 +1,9 @@
+load(qttest_p4)
+
+SOURCES += tst_maketestselftest.cpp
+QT = core
+
+DEFINES += SRCDIR=\\\"$$PWD/\\\"
+
+requires(!cross_compile)
+
diff --git a/tests/auto/maketestselftest/tst_maketestselftest.cpp b/tests/auto/maketestselftest/tst_maketestselftest.cpp
new file mode 100644
index 0000000..c674202
--- /dev/null
+++ b/tests/auto/maketestselftest/tst_maketestselftest.cpp
@@ -0,0 +1,100 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** 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 Technology Preview License Agreement accompanying
+** this package.
+**
+** 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.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QDir>
+#include <QFile>
+#include <QRegExp>
+#include <QStringList>
+#include <QTest>
+
+class tst_MakeTestSelfTest: public QObject
+{
+    Q_OBJECT
+
+private slots:
+    void auto_dot_pro();
+    void auto_dot_pro_data();
+};
+
+/* Verify that all tests are listed somewhere in auto.pro */
+void tst_MakeTestSelfTest::auto_dot_pro()
+{
+    static QStringList lines;
+
+    if (lines.isEmpty()) {
+        QString filename = QString::fromLatin1(SRCDIR "/../auto.pro");
+        QFile file(filename);
+        if (!file.open(QIODevice::ReadOnly)) {
+            QFAIL(qPrintable(QString("open %1: %2").arg(filename).arg(file.errorString())));
+        }
+        while (!file.atEnd()) {
+            lines << file.readLine().trimmed();
+        }
+    }
+
+    QFETCH(QString, subdir);
+    QRegExp re(QString("( |=|^|#)%1( |\\\\|$)").arg(QRegExp::escape(subdir)));
+    foreach (const QString& line, lines) {
+        if (re.indexIn(line) != -1) {
+            return;
+        }
+    }
+
+    QFAIL(qPrintable(QString(
+        "Subdir `%1' is missing from tests/auto/auto.pro\n"
+        "This means the test won't be compiled or run on any platform.\n"
+        "If this is intentional, please put the test name in a comment in auto.pro.").arg(subdir))
+    );
+}
+
+void tst_MakeTestSelfTest::auto_dot_pro_data()
+{
+    QTest::addColumn<QString>("subdir");
+    QDir dir(SRCDIR "/..");
+    QStringList subdirs = dir.entryList(QDir::AllDirs|QDir::NoDotAndDotDot);
+
+    foreach (const QString& subdir, subdirs) {
+        QTest::newRow(qPrintable(subdir)) << subdir;
+    }
+}
+
+QTEST_MAIN(tst_MakeTestSelfTest)
+#include "tst_maketestselftest.moc"
diff --git a/tests/auto/mediaobject/dummy/dummy.pro b/tests/auto/mediaobject/dummy/dummy.pro
index 5417b50..2f27c4a 100644
--- a/tests/auto/mediaobject/dummy/dummy.pro
+++ b/tests/auto/mediaobject/dummy/dummy.pro
@@ -1,7 +1,7 @@
 TEMPLATE = lib
 
 isEmpty(QT_MAJOR_VERSION) {
-   VERSION=4.6.1
+   VERSION=4.6.2
 } else {
    VERSION=$${QT_MAJOR_VERSION}.$${QT_MINOR_VERSION}.$${QT_PATCH_VERSION}
 }
diff --git a/tests/auto/qaudiodeviceinfo/tst_qaudiodeviceinfo.cpp b/tests/auto/qaudiodeviceinfo/tst_qaudiodeviceinfo.cpp
index e332e11..d3d81e6 100644
--- a/tests/auto/qaudiodeviceinfo/tst_qaudiodeviceinfo.cpp
+++ b/tests/auto/qaudiodeviceinfo/tst_qaudiodeviceinfo.cpp
@@ -128,7 +128,7 @@ void tst_QAudioDeviceInfo::codecs()
 void tst_QAudioDeviceInfo::channels()
 {
     if(available) {
-        QList<int> avail = device->supportedChannelCounts();
+        QList<int> avail = device->supportedChannels();
         QVERIFY(avail.size() > 0);
     }
 }
@@ -160,7 +160,7 @@ void tst_QAudioDeviceInfo::sampleTypes()
 void tst_QAudioDeviceInfo::frequencies()
 {
     if(available) {
-        QList<int> avail = device->supportedSampleRates();
+        QList<int> avail = device->supportedFrequencies();
         QVERIFY(avail.size() > 0);
     }
 }
@@ -169,8 +169,8 @@ void tst_QAudioDeviceInfo::isformat()
 {
     if(available) {
         QAudioFormat     format;
-        format.setSampleRate(44100);
-        format.setChannelCount(2);
+        format.setFrequency(44100);
+        format.setChannels(2);
         format.setSampleType(QAudioFormat::SignedInt);
         format.setByteOrder(QAudioFormat::LittleEndian);
         format.setSampleSize(16);
@@ -185,8 +185,8 @@ void tst_QAudioDeviceInfo::preferred()
 {
     if(available) {
         QAudioFormat format = device->preferredFormat();
-        QVERIFY(format.sampleRate() == 44100);
-        QVERIFY(format.channelCount() == 2);
+        QVERIFY(format.frequency() == 44100);
+        QVERIFY(format.channels() == 2);
     }
 }
 
@@ -194,9 +194,9 @@ void tst_QAudioDeviceInfo::nearest()
 {
     if(available) {
         QAudioFormat format1, format2;
-        format1.setSampleRate(8000);
+        format1.setFrequency(8000);
         format2 = device->nearestFormat(format1);
-        QVERIFY(format2.sampleRate() == 44100);
+        QVERIFY(format2.frequency() == 44100);
     }
 }
 
diff --git a/tests/auto/qaudioformat/tst_qaudioformat.cpp b/tests/auto/qaudioformat/tst_qaudioformat.cpp
index a7200c4..0206798 100644
--- a/tests/auto/qaudioformat/tst_qaudioformat.cpp
+++ b/tests/auto/qaudioformat/tst_qaudioformat.cpp
@@ -77,8 +77,8 @@ void tst_QAudioFormat::checkNull()
     QAudioFormat    audioFormat1(audioFormat0);
     QVERIFY(!audioFormat1.isValid());
 
-    audioFormat0.setSampleRate(44100);
-    audioFormat0.setChannelCount(2);
+    audioFormat0.setFrequency(44100);
+    audioFormat0.setChannels(2);
     audioFormat0.setSampleSize(16);
     audioFormat0.setCodec("audio/pcm");
     audioFormat0.setSampleType(QAudioFormat::SignedInt);
@@ -88,15 +88,15 @@ void tst_QAudioFormat::checkNull()
 void tst_QAudioFormat::checkFrequency()
 {
     QAudioFormat    audioFormat;
-    audioFormat.setSampleRate(44100);
-    QVERIFY(audioFormat.sampleRate() == 44100);
+    audioFormat.setFrequency(44100);
+    QVERIFY(audioFormat.frequency() == 44100);
 }
 
 void tst_QAudioFormat::checkChannels()
 {
     QAudioFormat    audioFormat;
-    audioFormat.setChannelCount(2);
-    QVERIFY(audioFormat.channelCount() == 2);
+    audioFormat.setChannels(2);
+    QVERIFY(audioFormat.channels() == 2);
 }
 
 void tst_QAudioFormat::checkSampleSize()
@@ -137,15 +137,15 @@ void tst_QAudioFormat::checkEquality()
     QVERIFY(!(audioFormat0 != audioFormat1));
 
     // on filled formats
-    audioFormat0.setSampleRate(8000);
-    audioFormat0.setChannelCount(1);
+    audioFormat0.setFrequency(8000);
+    audioFormat0.setChannels(1);
     audioFormat0.setSampleSize(8);
     audioFormat0.setCodec("audio/pcm");
     audioFormat0.setByteOrder(QAudioFormat::LittleEndian);
     audioFormat0.setSampleType(QAudioFormat::UnSignedInt);
 
-    audioFormat1.setSampleRate(8000);
-    audioFormat1.setChannelCount(1);
+    audioFormat1.setFrequency(8000);
+    audioFormat1.setChannels(1);
     audioFormat1.setSampleSize(8);
     audioFormat1.setCodec("audio/pcm");
     audioFormat1.setByteOrder(QAudioFormat::LittleEndian);
@@ -154,7 +154,7 @@ void tst_QAudioFormat::checkEquality()
     QVERIFY(audioFormat0 == audioFormat1);
     QVERIFY(!(audioFormat0 != audioFormat1));
 
-    audioFormat0.setSampleRate(44100);
+    audioFormat0.setFrequency(44100);
     QVERIFY(audioFormat0 != audioFormat1);
     QVERIFY(!(audioFormat0 == audioFormat1));
 }
@@ -164,8 +164,8 @@ void tst_QAudioFormat::checkAssignment()
     QAudioFormat    audioFormat0;
     QAudioFormat    audioFormat1;
 
-    audioFormat0.setSampleRate(8000);
-    audioFormat0.setChannelCount(1);
+    audioFormat0.setFrequency(8000);
+    audioFormat0.setChannels(1);
     audioFormat0.setSampleSize(8);
     audioFormat0.setCodec("audio/pcm");
     audioFormat0.setByteOrder(QAudioFormat::LittleEndian);
diff --git a/tests/auto/qaudioinput/tst_qaudioinput.cpp b/tests/auto/qaudioinput/tst_qaudioinput.cpp
index 9468413..40b7fbb 100644
--- a/tests/auto/qaudioinput/tst_qaudioinput.cpp
+++ b/tests/auto/qaudioinput/tst_qaudioinput.cpp
@@ -68,8 +68,8 @@ private:
 
 void tst_QAudioInput::initTestCase()
 {
-    format.setSampleRate(8000);
-    format.setChannelCount(1);
+    format.setFrequency(8000);
+    format.setChannels(1);
     format.setSampleSize(8);
     format.setCodec("audio/pcm");
     format.setByteOrder(QAudioFormat::LittleEndian);
@@ -94,8 +94,8 @@ void tst_QAudioInput::settings()
         // Confirm the setting we added in the init function.
         QAudioFormat f = audio->format();
 
-        QVERIFY(format.channelCount() == f.channelCount());
-        QVERIFY(format.sampleRate() == f.sampleRate());
+        QVERIFY(format.channels() == f.channels());
+        QVERIFY(format.frequency() == f.frequency());
         QVERIFY(format.sampleSize() == f.sampleSize());
         QVERIFY(format.codec() == f.codec());
         QVERIFY(format.byteOrder() == f.byteOrder());
diff --git a/tests/auto/qaudiooutput/tst_qaudiooutput.cpp b/tests/auto/qaudiooutput/tst_qaudiooutput.cpp
index 5005838..aeb2286 100644
--- a/tests/auto/qaudiooutput/tst_qaudiooutput.cpp
+++ b/tests/auto/qaudiooutput/tst_qaudiooutput.cpp
@@ -71,8 +71,8 @@ private:
 
 void tst_QAudioOutput::initTestCase()
 {
-    format.setSampleRate(8000);
-    format.setChannelCount(1);
+    format.setFrequency(8000);
+    format.setChannels(1);
     format.setSampleSize(8);
     format.setCodec("audio/pcm");
     format.setByteOrder(QAudioFormat::LittleEndian);
@@ -95,8 +95,8 @@ void tst_QAudioOutput::settings()
         // Confirm the setting we added in the init function.
         QAudioFormat f = audio->format();
 
-        QVERIFY(format.channelCount() == f.channelCount());
-        QVERIFY(format.sampleRate() == f.sampleRate());
+        QVERIFY(format.channels() == f.channels());
+        QVERIFY(format.frequency() == f.frequency());
         QVERIFY(format.sampleSize() == f.sampleSize());
         QVERIFY(format.codec() == f.codec());
         QVERIFY(format.byteOrder() == f.byteOrder());
diff --git a/tests/auto/qdesktopwidget/tst_qdesktopwidget.cpp b/tests/auto/qdesktopwidget/tst_qdesktopwidget.cpp
index b9d9d7e..d846615 100644
--- a/tests/auto/qdesktopwidget/tst_qdesktopwidget.cpp
+++ b/tests/auto/qdesktopwidget/tst_qdesktopwidget.cpp
@@ -64,6 +64,7 @@ private slots:
     void screenNumberForQWidget();
     void screenNumberForQPoint();
     void availableGeometry();
+    void screenGeometry();
 };
 
 tst_QDesktopWidget::tst_QDesktopWidget()
@@ -98,6 +99,9 @@ void tst_QDesktopWidget::primaryScreen()
 void tst_QDesktopWidget::availableGeometry()
 {
     QDesktopWidget desktop;
+    QTest::ignoreMessage(QtWarningMsg, "QDesktopWidget::availableGeometry(): Attempt "
+                                       "to get the available geometry of a null widget");
+    desktop.availableGeometry((QWidget *)0);
 
     QRect total;
     QRect available;
@@ -158,6 +162,27 @@ void tst_QDesktopWidget::screenNumberForQPoint()
     QVERIFY(screen >= 0 && screen < desktopWidget->numScreens());
 }
 
+void tst_QDesktopWidget::screenGeometry()
+{
+    QDesktopWidget *desktopWidget = QApplication::desktop();
+    QTest::ignoreMessage(QtWarningMsg, "QDesktopWidget::screenGeometry(): Attempt "
+                                       "to get the screen geometry of a null widget");
+    QRect r = desktopWidget->screenGeometry((QWidget *)0);
+    QVERIFY(r.isNull());
+    QWidget widget;
+    widget.show();
+    QTest::qWaitForWindowShown(&widget);
+    r = desktopWidget->screenGeometry(&widget);
+
+    QRect total;
+    QRect available;
+    for (int i = 0; i < desktopWidget->screenCount(); ++i) {
+        total = desktopWidget->screenGeometry(i);
+        available = desktopWidget->availableGeometry(i);
+    }
+    QVERIFY(total.contains(r));
+}
+
 QTEST_MAIN(tst_QDesktopWidget)
 #include "tst_qdesktopwidget.moc"
 
diff --git a/tests/auto/qdoublespinbox/tst_qdoublespinbox.cpp b/tests/auto/qdoublespinbox/tst_qdoublespinbox.cpp
index e2cad08..258d8dc 100644
--- a/tests/auto/qdoublespinbox/tst_qdoublespinbox.cpp
+++ b/tests/auto/qdoublespinbox/tst_qdoublespinbox.cpp
@@ -149,6 +149,7 @@ private slots:
 
     void taskQTBUG_5008_textFromValueAndValidate();
     void taskQTBUG_6670_selectAllWithPrefix();
+    void taskQTBUG_6496_fiddlingWithPrecision();
 
 public slots:
     void valueChangedHelper(const QString &);
@@ -1096,5 +1097,17 @@ void tst_QDoubleSpinBox::taskQTBUG_6670_selectAllWithPrefix()
     QCOMPARE(spin.value(), 12.);
 }
 
+void tst_QDoubleSpinBox::taskQTBUG_6496_fiddlingWithPrecision()
+{
+    QDoubleSpinBox dsb;
+    dsb.setRange(0, 0.991);
+    dsb.setDecimals(1);
+    QCOMPARE(dsb.maximum(), 1.0);
+    dsb.setDecimals(2);
+    QCOMPARE(dsb.maximum(), 0.99);
+    dsb.setDecimals(3);
+    QCOMPARE(dsb.maximum(), 0.991);
+}
+
 QTEST_MAIN(tst_QDoubleSpinBox)
 #include "tst_qdoublespinbox.moc"
diff --git a/tests/auto/qfiledialog2/tst_qfiledialog2.cpp b/tests/auto/qfiledialog2/tst_qfiledialog2.cpp
index 4c52f57..f2e1dbd 100644
--- a/tests/auto/qfiledialog2/tst_qfiledialog2.cpp
+++ b/tests/auto/qfiledialog2/tst_qfiledialog2.cpp
@@ -116,6 +116,7 @@ private slots:
 #if defined(Q_OS_WIN) && !defined(Q_OS_WINCE)
     void task226366_lowerCaseHardDriveWindows();
 #endif
+    void completionOnLevelAfterRoot();
     void task233037_selectingDirectory();
     void task235069_hideOnEscape();
     void task236402_dontWatchDeletedDir();
@@ -202,7 +203,7 @@ void tst_QFiledialog::heapCorruption()
     qDeleteAll(dialogs);
 }
 
-struct FriendlyQFileDialog : public QFileDialog
+struct FriendlyQFileDialog : public QNonNativeFileDialog
 {
     friend class tst_QFileDialog;
     Q_DECLARE_PRIVATE(QFileDialog)
@@ -552,6 +553,45 @@ void tst_QFiledialog::task226366_lowerCaseHardDriveWindows()
 }
 #endif
 
+void tst_QFiledialog::completionOnLevelAfterRoot()
+{
+    QNonNativeFileDialog fd;
+#if defined(Q_OS_WIN) && !defined(Q_OS_WINCE)
+    fd.setDirectory("C:");
+    QDir current = fd.directory();
+    current.mkdir("completionOnLevelAfterRootTest");
+#else
+    fd.setFilter(QDir::Hidden | QDir::AllDirs | QDir::Files | QDir::System);
+    fd.setDirectory("/");
+    QDir etc("/etc");
+    if (!etc.exists())
+        QSKIP("This test requires to have an etc directory under /", SkipAll);
+#endif
+    fd.show();
+    QLineEdit *edit = qFindChild<QLineEdit*>(&fd, "fileNameEdit");
+    QTest::qWait(2000);
+#if defined(Q_OS_WIN) && !defined(Q_OS_WINCE)
+    //I love testlib :D
+    QTest::keyClick(edit, Qt::Key_C);
+    QTest::keyClick(edit, Qt::Key_O);
+    QTest::keyClick(edit, Qt::Key_M);
+    QTest::keyClick(edit, Qt::Key_P);
+    QTest::keyClick(edit, Qt::Key_L);
+#else
+    QTest::keyClick(edit, Qt::Key_E);
+    QTest::keyClick(edit, Qt::Key_T);
+#endif
+    QTest::qWait(200);
+    QTest::keyClick(edit->completer()->popup(), Qt::Key_Down);
+    QTest::qWait(200);
+#if defined(Q_OS_WIN) && !defined(Q_OS_WINCE)
+    QCOMPARE(edit->text(), QString("completionOnLevelAfterRootTest"));
+    current.rmdir("completionOnLevelAfterRootTest");
+#else
+    QCOMPARE(edit->text(), QString("etc"));
+#endif
+}
+
 void tst_QFiledialog::task233037_selectingDirectory()
 {
     QDir current = QDir::currentPath();
diff --git a/tests/auto/qgraphicsanchorlayout/tst_qgraphicsanchorlayout.cpp b/tests/auto/qgraphicsanchorlayout/tst_qgraphicsanchorlayout.cpp
index 8c8ab81..16a621a 100644
--- a/tests/auto/qgraphicsanchorlayout/tst_qgraphicsanchorlayout.cpp
+++ b/tests/auto/qgraphicsanchorlayout/tst_qgraphicsanchorlayout.cpp
@@ -1669,6 +1669,9 @@ void tst_QGraphicsAnchorLayout::floatConflict()
 
 void tst_QGraphicsAnchorLayout::infiniteMaxSizes()
 {
+    if (sizeof(qreal) <= 4) {
+        QSKIP("qreal has too little precision, result will be wrong", SkipAll);
+    }
     QGraphicsAnchorLayout *l = new QGraphicsAnchorLayout;
     l->setContentsMargins(0, 0, 0, 0);
     l->setSpacing(0);
diff --git a/tests/auto/qgraphicsanchorlayout1/tst_qgraphicsanchorlayout1.cpp b/tests/auto/qgraphicsanchorlayout1/tst_qgraphicsanchorlayout1.cpp
index e3d1bbe..7880d2d 100644
--- a/tests/auto/qgraphicsanchorlayout1/tst_qgraphicsanchorlayout1.cpp
+++ b/tests/auto/qgraphicsanchorlayout1/tst_qgraphicsanchorlayout1.cpp
@@ -1525,7 +1525,11 @@ void tst_QGraphicsAnchorLayout1::testMulti_data()
         }
 
 
-        QTest::newRow("Linear multi") << QSizeF(width, height) << theData << theResult;
+        if (sizeof(qreal) == 4) {
+            qDebug("Linear multi: Skipping! (qreal has too little precision, result will be wrong)");
+        } else {
+            QTest::newRow("Linear multi") << QSizeF(width, height) << theData << theResult;
+        }
     }
 
     // Multiple widgets, V shape
@@ -1595,7 +1599,11 @@ void tst_QGraphicsAnchorLayout1::testMulti_data()
             }
 
         }
-        QTest::newRow("V multi") << QSizeF(width, height) << theData << theResult;
+        if (sizeof(qreal) == 4) {
+            qDebug("V multi: Skipping! (qreal has too little precision, result will be wrong)");
+        } else {
+            QTest::newRow("V multi") << QSizeF(width, height) << theData << theResult;
+        }
     }
 
     // Multiple widgets, grid
@@ -1653,7 +1661,11 @@ void tst_QGraphicsAnchorLayout1::testMulti_data()
                 << BasicResult(i, QRectF(((i%d)+1)*horizontalStep, ((i/d)+1)*verticalStep, horizontalStep, verticalStep) );
         }
 
-        QTest::newRow("Grid multi") << QSizeF(200, 100) << theData << theResult;
+        if (sizeof(qreal) == 4) {
+            qDebug("Grid multi: Skipping! (qreal has too little precision, result will be wrong)");
+        } else {
+            QTest::newRow("Grid multi") << QSizeF(200, 100) << theData << theResult;
+        }
     }
 }
 
@@ -1669,16 +1681,16 @@ inline QGraphicsLayoutItem *getItem(
     return widgets[index];
 }
 
-static QRectF truncate(QRectF original)
+static bool fuzzierCompare(qreal a, qreal b)
 {
-    QRectF result;
+    return qAbs(a - b) <= qreal(0.0001);
+}
 
-    result.setX(qRound(original.x() * 1000000) / 1000000.0);
-    result.setY(qRound(original.y() * 1000000) / 1000000.0);
-    result.setWidth(qRound(original.width() * 1000000) / 1000000.0);
-    result.setHeight(qRound(original.height() * 1000000) / 1000000.0);
+static bool fuzzierCompare(const QRectF &r1, const QRectF &r2)
+{
 
-    return result;
+    return fuzzierCompare(r1.x(), r2.x()) && fuzzierCompare(r1.y(), r2.y())
+        && fuzzierCompare(r1.width(), r2.width()) && fuzzierCompare(r1.height(), r2.height());
 }
 
 void tst_QGraphicsAnchorLayout1::testBasicLayout()
@@ -1727,10 +1739,10 @@ void tst_QGraphicsAnchorLayout1::testBasicLayout()
     // Validate
     for (int i = 0; i < result.count(); ++i) {
         const BasicLayoutTestResult item = result[i];
-        QRectF expected = truncate(item.rect);
-        QRectF actual = truncate(widgets[item.index]->geometry());
+        QRectF expected = item.rect;
+        QRectF actual = widgets[item.index]->geometry();
 
-        QCOMPARE(actual, expected);
+        QVERIFY(fuzzierCompare(actual, expected));
     }
 
     // Test mirrored mode
@@ -1744,10 +1756,10 @@ void tst_QGraphicsAnchorLayout1::testBasicLayout()
         if (mirroredRect.isValid()){
             mirroredRect.moveLeft(size.width()-item.rect.width()-item.rect.left());
         }
-        QRectF expected = truncate(mirroredRect);
-        QRectF actual = truncate(widgets[item.index]->geometry());
+        QRectF expected = mirroredRect;
+        QRectF actual = widgets[item.index]->geometry();
 
-        QCOMPARE(actual, expected);
+        QVERIFY(fuzzierCompare(actual, expected));
     }
 
     qDeleteAll(widgets);
diff --git a/tests/auto/qgraphicseffect/tst_qgraphicseffect.cpp b/tests/auto/qgraphicseffect/tst_qgraphicseffect.cpp
index 95de70e..51e2a57 100644
--- a/tests/auto/qgraphicseffect/tst_qgraphicseffect.cpp
+++ b/tests/auto/qgraphicseffect/tst_qgraphicseffect.cpp
@@ -70,6 +70,7 @@ private slots:
     void grayscale();
     void colorize();
     void drawPixmapItem();
+    void deviceCoordinateTranslateCaching();
 };
 
 void tst_QGraphicsEffect::initTestCase()
@@ -514,6 +515,51 @@ void tst_QGraphicsEffect::drawPixmapItem()
     QTRY_VERIFY(effect->repaints >= 2);
 }
 
+class DeviceEffect : public QGraphicsEffect
+{
+public:
+    QRectF boundingRectFor(const QRectF &rect) const
+    { return rect; }
+
+    void draw(QPainter *painter)
+    {
+        QPoint offset;
+        QPixmap pixmap = sourcePixmap(Qt::DeviceCoordinates, &offset, QGraphicsEffect::NoPad);
+
+        if (pixmap.isNull())
+            return;
+
+        painter->save();
+        painter->setWorldTransform(QTransform());
+        painter->drawPixmap(offset, pixmap);
+        painter->restore();
+    }
+};
+
+void tst_QGraphicsEffect::deviceCoordinateTranslateCaching()
+{
+    QGraphicsScene scene;
+    CustomItem *item = new CustomItem(0, 0, 10, 10);
+    scene.addItem(item);
+    scene.setSceneRect(0, 0, 50, 0);
+
+    item->setGraphicsEffect(new DeviceEffect);
+    item->setPen(Qt::NoPen);
+    item->setBrush(Qt::red);
+
+    QGraphicsView view(&scene);
+    view.show();
+    QTest::qWaitForWindowShown(&view);
+
+    QTRY_VERIFY(item->numRepaints >= 1);
+    int numRepaints = item->numRepaints;
+
+    item->translate(10, 0);
+    QTest::qWait(50);
+
+    QVERIFY(item->numRepaints == numRepaints);
+}
+
 QTEST_MAIN(tst_QGraphicsEffect)
 #include "tst_qgraphicseffect.moc"
 
diff --git a/tests/auto/qnetworkreply/tst_qnetworkreply.cpp b/tests/auto/qnetworkreply/tst_qnetworkreply.cpp
index 33753f1..eec4797 100644
--- a/tests/auto/qnetworkreply/tst_qnetworkreply.cpp
+++ b/tests/auto/qnetworkreply/tst_qnetworkreply.cpp
@@ -838,13 +838,20 @@ void tst_QNetworkReply::stateChecking()
     QVERIFY(reply->isOpen());
     QVERIFY(reply->isReadable());
     QVERIFY(!reply->isWritable());
-    QCOMPARE(reply->errorString(), QString("Unknown error"));
+
+    // both behaviours are OK since we might change underlying behaviour again
+    if (!reply->isFinished())
+        QCOMPARE(reply->errorString(), QString("Unknown error"));
+    else
+        QVERIFY(!reply->errorString().isEmpty());
+
 
     QCOMPARE(reply->manager(), &manager);
     QCOMPARE(reply->request(), req);
     QCOMPARE(int(reply->operation()), int(QNetworkAccessManager::GetOperation));
-    QCOMPARE(reply->error(), QNetworkReply::NoError);
-    QCOMPARE(reply->isFinished(), false);
+    // error and not error are OK since we might change underlying behaviour again
+    if (!reply->isFinished())
+        QCOMPARE(reply->error(), QNetworkReply::NoError);
     QCOMPARE(reply->url(), url);
 
     reply->abort();
@@ -1151,7 +1158,8 @@ void tst_QNetworkReply::getErrors()
     QNetworkReplyPtr reply = manager.get(request);
     reply->setParent(this);     // we have expect-fails
 
-    QCOMPARE(reply->error(), QNetworkReply::NoError);
+    if (!reply->isFinished())
+        QCOMPARE(reply->error(), QNetworkReply::NoError);
 
     // now run the request:
     connect(reply, SIGNAL(finished()),
@@ -1512,6 +1520,7 @@ void tst_QNetworkReply::ioGetFromFile()
 
     QNetworkRequest request(QUrl::fromLocalFile(file.fileName()));
     QNetworkReplyPtr reply = manager.get(request);
+    QVERIFY(reply->isFinished()); // a file should immediatly be done
     DataReader reader(reply);
 
     connect(reply, SIGNAL(finished()), &QTestEventLoop::instance(), SLOT(exitLoop()));
@@ -3170,12 +3179,13 @@ void tst_QNetworkReply::ioPostToHttpEmptyUploadProgress()
 
 void tst_QNetworkReply::lastModifiedHeaderForFile()
 {
-    QFileInfo fileInfo(SRCDIR "./bigfile");
+    QFileInfo fileInfo(SRCDIR "/bigfile");
+    QVERIFY(fileInfo.exists());
+
     QUrl url = QUrl::fromLocalFile(fileInfo.filePath());
 
     QNetworkRequest request(url);
     QNetworkReplyPtr reply = manager.head(request);
-    QSignalSpy spy(reply, SIGNAL(uploadProgress(qint64,qint64)));
     connect(reply, SIGNAL(finished()), &QTestEventLoop::instance(), SLOT(exitLoop()));
     QTestEventLoop::instance().enterLoop(10);
     QVERIFY(!QTestEventLoop::instance().timeout());
@@ -3191,7 +3201,6 @@ void tst_QNetworkReply::lastModifiedHeaderForHttp()
 
     QNetworkRequest request(url);
     QNetworkReplyPtr reply = manager.head(request);
-    QSignalSpy spy(reply, SIGNAL(uploadProgress(qint64,qint64)));
     connect(reply, SIGNAL(finished()), &QTestEventLoop::instance(), SLOT(exitLoop()));
     QTestEventLoop::instance().enterLoop(10);
     QVERIFY(!QTestEventLoop::instance().timeout());
diff --git a/tests/auto/qobject/tst_qobject.cpp b/tests/auto/qobject/tst_qobject.cpp
index d342581..4fa6aaa 100644
--- a/tests/auto/qobject/tst_qobject.cpp
+++ b/tests/auto/qobject/tst_qobject.cpp
@@ -127,6 +127,7 @@ private slots:
     void overloads();
     void isSignalConnected();
     void qMetaObjectConnect();
+    void qMetaObjectDisconnectOne();
 protected:
 };
 
@@ -3269,5 +3270,77 @@ void tst_QObject::qMetaObjectConnect()
 
 }
 
+void tst_QObject::qMetaObjectDisconnectOne()
+{
+    SenderObject *s = new SenderObject;
+    ReceiverObject *r1 = new ReceiverObject;
+
+    int signal1Index = s->metaObject()->indexOfSignal("signal1()");
+    int signal3Index = s->metaObject()->indexOfSignal("signal3()");
+    int slot1Index = r1->metaObject()->indexOfSlot("slot1()");
+    int slot2Index = r1->metaObject()->indexOfSlot("slot2()");
+
+    QVERIFY(signal1Index > 0);
+    QVERIFY(signal3Index > 0);
+    QVERIFY(slot1Index > 0);
+    QVERIFY(slot2Index > 0);
+
+    QVERIFY( QMetaObject::connect(s, signal1Index, r1, slot1Index) );
+    QVERIFY( QMetaObject::connect(s, signal3Index, r1, slot2Index) );
+    QVERIFY( QMetaObject::connect(s, signal3Index, r1, slot2Index) );
+    QVERIFY( QMetaObject::connect(s, signal3Index, r1, slot2Index) );
+
+    r1->reset();
+    QCOMPARE( r1->count_slot1, 0 );
+    QCOMPARE( r1->count_slot2, 0 );
+
+    s->emitSignal1();
+    QCOMPARE( r1->count_slot1, 1 );
+    QCOMPARE( r1->count_slot2, 0 );
+
+    s->emitSignal3();
+    QCOMPARE( r1->count_slot1, 1 );
+    QCOMPARE( r1->count_slot2, 3 );
+
+    r1->reset();
+    QVERIFY( QMetaObject::disconnectOne(s, signal1Index, r1, slot1Index) );
+    QVERIFY( QMetaObject::disconnectOne(s, signal3Index, r1, slot2Index) );
+
+    s->emitSignal1();
+    QCOMPARE( r1->count_slot1, 0 );
+    QCOMPARE( r1->count_slot2, 0 );
+
+    s->emitSignal3();
+    QCOMPARE( r1->count_slot1, 0 );
+    QCOMPARE( r1->count_slot2, 2 );
+
+    r1->reset();
+    QVERIFY( false == QMetaObject::disconnectOne(s, signal1Index, r1, slot1Index) );
+    QVERIFY( QMetaObject::disconnectOne(s, signal3Index, r1, slot2Index) );
+
+    s->emitSignal1();
+    QCOMPARE( r1->count_slot1, 0 );
+    QCOMPARE( r1->count_slot2, 0 );
+
+    s->emitSignal3();
+    QCOMPARE( r1->count_slot1, 0 );
+    QCOMPARE( r1->count_slot2, 1 );
+
+    r1->reset();
+    QVERIFY( false == QMetaObject::disconnectOne(s, signal1Index, r1, slot1Index) );
+    QVERIFY( QMetaObject::disconnectOne(s, signal3Index, r1, slot2Index) );
+
+    s->emitSignal1();
+    QCOMPARE( r1->count_slot1, 0 );
+    QCOMPARE( r1->count_slot2, 0 );
+
+    s->emitSignal3();
+    QCOMPARE( r1->count_slot1, 0 );
+    QCOMPARE( r1->count_slot2, 0 );
+
+    delete s;
+    delete r1;
+}
+
 QTEST_MAIN(tst_QObject)
 #include "tst_qobject.moc"
diff --git a/tests/auto/qscriptextqobject/tst_qscriptextqobject.cpp b/tests/auto/qscriptextqobject/tst_qscriptextqobject.cpp
index 73e4fb6..b4ce561 100644
--- a/tests/auto/qscriptextqobject/tst_qscriptextqobject.cpp
+++ b/tests/auto/qscriptextqobject/tst_qscriptextqobject.cpp
@@ -112,6 +112,7 @@ class MyQObject : public QObject
     Q_PROPERTY(QKeySequence shortcut READ shortcut WRITE setShortcut)
     Q_PROPERTY(CustomType propWithCustomType READ propWithCustomType WRITE setPropWithCustomType)
     Q_PROPERTY(Policy enumProperty READ enumProperty WRITE setEnumProperty)
+    Q_PROPERTY(Ability flagsProperty READ flagsProperty WRITE setFlagsProperty)
     Q_ENUMS(Policy Strategy)
     Q_FLAGS(Ability)
 
@@ -150,6 +151,7 @@ public:
           m_writeOnlyValue(789),
           m_readOnlyValue(987),
           m_enumValue(BarPolicy),
+          m_flagsValue(FooAbility),
           m_qtFunctionInvoked(-1)
         { }
 
@@ -216,6 +218,11 @@ public:
     void setEnumProperty(Policy policy)
         { m_enumValue = policy; }
 
+    Ability flagsProperty() const
+        { return m_flagsValue; }
+    void setFlagsProperty(Ability ability)
+        { m_flagsValue = ability; }
+
     int qtFunctionInvoked() const
         { return m_qtFunctionInvoked; }
 
@@ -316,6 +323,10 @@ public:
         { m_qtFunctionInvoked = 56; return arg; }
     Q_INVOKABLE QObject* myInvokableReturningMyQObjectAsQObject()
         { m_qtFunctionInvoked = 57; return this; }
+    Q_INVOKABLE Ability myInvokableWithFlagsArg(Ability arg)
+        { m_qtFunctionInvoked = 58; m_actuals << int(arg); return arg; }
+    Q_INVOKABLE MyQObject::Ability myInvokableWithQualifiedFlagsArg(MyQObject::Ability arg)
+        { m_qtFunctionInvoked = 59; m_actuals << int(arg); return arg; }
 
     Q_INVOKABLE QObjectList findObjects() const
     {  return findChildren<QObject *>();  }
@@ -433,6 +444,7 @@ protected:
     QKeySequence m_shortcut;
     CustomType m_customType;
     Policy m_enumValue;
+    Ability m_flagsValue;
     int m_qtFunctionInvoked;
     QVariantList m_actuals;
     QByteArray m_connectedSignal;
@@ -520,6 +532,7 @@ private slots:
     void prototypes();
     void objectDeleted();
     void connectToDestroyedSignal();
+    void emitAfterReceiverDeleted();
 
 private:
     QScriptEngine *m_engine;
@@ -826,7 +839,7 @@ void tst_QScriptExtQObject::getSetStaticProperty()
     {
         QScriptValue val = m_engine->evaluate("myObject.enumProperty");
         QVERIFY(val.isNumber());
-        QCOMPARE(val.toInt32(), (int)MyQObject::BarPolicy);
+        QCOMPARE(val.toInt32(), int(MyQObject::BarPolicy));
     }
     m_engine->evaluate("myObject.enumProperty = 2");
     QCOMPARE(m_myObject->enumProperty(), MyQObject::BazPolicy);
@@ -846,6 +859,25 @@ void tst_QScriptExtQObject::getSetStaticProperty()
     m_engine->evaluate("myObject.enumProperty = 'nada'");
     QCOMPARE(m_myObject->enumProperty(), (MyQObject::Policy)-1);
 
+    // flags property
+    QCOMPARE(m_myObject->flagsProperty(), MyQObject::FooAbility);
+    {
+        QScriptValue val = m_engine->evaluate("myObject.flagsProperty");
+        QVERIFY(val.isNumber());
+        QCOMPARE(val.toInt32(), int(MyQObject::FooAbility));
+    }
+    m_engine->evaluate("myObject.flagsProperty = 0x80");
+    QCOMPARE(m_myObject->flagsProperty(), MyQObject::BarAbility);
+    m_engine->evaluate("myObject.flagsProperty = 0x81");
+    QCOMPARE(m_myObject->flagsProperty(), MyQObject::Ability(MyQObject::FooAbility | MyQObject::BarAbility));
+    m_engine->evaluate("myObject.flagsProperty = 123"); // bogus values are accepted
+    QCOMPARE(int(m_myObject->flagsProperty()), 123);
+    m_engine->evaluate("myObject.flagsProperty = 'BazAbility'");
+    QCOMPARE(m_myObject->flagsProperty(),  MyQObject::BazAbility);
+    m_engine->evaluate("myObject.flagsProperty = 'ScoobyDoo'");
+    // ### ouch! Shouldn't QMetaProperty::write() rather not change the value...?
+    QCOMPARE(m_myObject->flagsProperty(), (MyQObject::Ability)-1);
+
     // auto-dereferencing of pointers
     {
         QBrush b = QColor(0xCA, 0xFE, 0xBA, 0xBE);
@@ -2017,6 +2049,7 @@ void tst_QScriptExtQObject::classEnums()
     QScriptValue myClass = m_engine->newQMetaObject(m_myObject->metaObject(), m_engine->undefinedValue());
     m_engine->globalObject().setProperty("MyQObject", myClass);
 
+    QVERIFY(m_engine->evaluate("MyQObject.FooPolicy").isNumber()); // no strong typing
     QCOMPARE(static_cast<MyQObject::Policy>(m_engine->evaluate("MyQObject.FooPolicy").toInt32()),
              MyQObject::FooPolicy);
     QCOMPARE(static_cast<MyQObject::Policy>(m_engine->evaluate("MyQObject.BarPolicy").toInt32()),
@@ -2031,6 +2064,7 @@ void tst_QScriptExtQObject::classEnums()
     QCOMPARE(static_cast<MyQObject::Strategy>(m_engine->evaluate("MyQObject.BazStrategy").toInt32()),
              MyQObject::BazStrategy);
 
+    QVERIFY(m_engine->evaluate("MyQObject.NoAbility").isNumber()); // no strong typing
     QCOMPARE(MyQObject::Ability(m_engine->evaluate("MyQObject.NoAbility").toInt32()),
              MyQObject::NoAbility);
     QCOMPARE(MyQObject::Ability(m_engine->evaluate("MyQObject.FooAbility").toInt32()),
@@ -2042,6 +2076,9 @@ void tst_QScriptExtQObject::classEnums()
     QCOMPARE(MyQObject::Ability(m_engine->evaluate("MyQObject.AllAbility").toInt32()),
              MyQObject::AllAbility);
 
+    // Constructors for flags are not provided
+    QVERIFY(m_engine->evaluate("MyQObject.Ability").isUndefined());
+
     QScriptValue::PropertyFlags expectedEnumFlags = QScriptValue::ReadOnly | QScriptValue::Undeletable;
     QCOMPARE(myClass.propertyFlags("FooPolicy"), expectedEnumFlags);
     QCOMPARE(myClass.propertyFlags("BarPolicy"), expectedEnumFlags);
@@ -2094,6 +2131,25 @@ void tst_QScriptExtQObject::classEnums()
         QCOMPARE(ret.isNumber(), true);
     }
 
+    m_myObject->resetQtFunctionInvoked();
+    {
+        QScriptValue ret = m_engine->evaluate("myObject.myInvokableWithFlagsArg(MyQObject.FooAbility)");
+        QCOMPARE(m_myObject->qtFunctionInvoked(), 58);
+        QCOMPARE(m_myObject->qtFunctionActuals().size(), 1);
+        QCOMPARE(m_myObject->qtFunctionActuals().at(0).toInt(), int(MyQObject::FooAbility));
+        QCOMPARE(ret.isNumber(), true);
+        QCOMPARE(ret.toInt32(), int(MyQObject::FooAbility));
+    }
+    m_myObject->resetQtFunctionInvoked();
+    {
+        QScriptValue ret = m_engine->evaluate("myObject.myInvokableWithQualifiedFlagsArg(MyQObject.BarAbility)");
+        QCOMPARE(m_myObject->qtFunctionInvoked(), 59);
+        QCOMPARE(m_myObject->qtFunctionActuals().size(), 1);
+        QCOMPARE(m_myObject->qtFunctionActuals().at(0).toInt(), int(MyQObject::BarAbility));
+        QCOMPARE(ret.isNumber(), true);
+        QCOMPARE(ret.toInt32(), int(MyQObject::BarAbility));
+    }
+
     // enum properties are not deletable or writable
     QVERIFY(!m_engine->evaluate("delete MyQObject.BazPolicy").toBool());
     myClass.setProperty("BazPolicy", QScriptValue());
@@ -2858,7 +2914,8 @@ void tst_QScriptExtQObject::objectDeleted()
     v.setProperty("intProperty", QScriptValue(&eng, 123));
     QCOMPARE(qobj->intProperty(), 123);
     qobj->resetQtFunctionInvoked();
-    v.property("myInvokable").call(v);
+    QScriptValue invokable = v.property("myInvokable");
+    invokable.call(v);
     QCOMPARE(qobj->qtFunctionInvoked(), 0);
 
     // now delete the object
@@ -2896,6 +2953,14 @@ void tst_QScriptExtQObject::objectDeleted()
         QCOMPARE(ret.toString(), QLatin1String("Error: cannot access member `myInvokableWithIntArg' of deleted QObject"));
     }
 
+    // Meta-method wrappers are still valid, but throw error when called
+    QVERIFY(invokable.isFunction());
+    {
+        QScriptValue ret = invokable.call(v);
+        QVERIFY(ret.isError());
+        QCOMPARE(ret.toString(), QString::fromLatin1("Error: cannot call function of deleted QObject"));
+    }
+
     // access from script
     eng.globalObject().setProperty("o", v);
     {
@@ -2956,5 +3021,27 @@ void tst_QScriptExtQObject::connectToDestroyedSignal()
 #endif
 }
 
+void tst_QScriptExtQObject::emitAfterReceiverDeleted()
+{
+    for (int x = 0; x < 2; ++x) {
+        MyQObject *obj = new MyQObject;
+        QScriptValue scriptObj = m_engine->newQObject(obj);
+        if (x == 0) {
+            // Connecting from JS
+            m_engine->globalObject().setProperty("obj", scriptObj);
+            QVERIFY(m_engine->evaluate("myObject.mySignal.connect(obj, 'mySlot()')").isUndefined());
+        } else {
+            // Connecting from C++
+            qScriptConnect(m_myObject, SIGNAL(mySignal()), scriptObj, scriptObj.property("mySlot"));
+        }
+        delete obj;
+        QSignalSpy signalHandlerExceptionSpy(m_engine, SIGNAL(signalHandlerException(QScriptValue)));
+        QVERIFY(!m_engine->hasUncaughtException());
+        m_myObject->emitMySignal();
+        QCOMPARE(signalHandlerExceptionSpy.count(), 0);
+        QVERIFY(!m_engine->hasUncaughtException());
+    }
+}
+
 QTEST_MAIN(tst_QScriptExtQObject)
 #include "tst_qscriptextqobject.moc"
diff --git a/tests/auto/qsqldatabase/tst_databases.h b/tests/auto/qsqldatabase/tst_databases.h
index 4176122..4e99f18 100644
--- a/tests/auto/qsqldatabase/tst_databases.h
+++ b/tests/auto/qsqldatabase/tst_databases.h
@@ -221,7 +221,8 @@ public:
 //         addDb( "QMYSQL3", "testdb", "troll", "trond", "horsehead.nokia.troll.no", 3309, "CLIENT_COMPRESS=1;CLIENT_SSL=1" ); // MySQL 5.0.18 Linux
 //         addDb( "QMYSQL3", "testdb", "troll", "trond", "silence.nokia.troll.no" ); // MySQL 5.1.36 Windows
 //         addDb( "QMYSQL3", "testdb", "testuser", "Ee4Gabf6_", "mysql4-nokia.trolltech.com.au" ); // MySQL 4.1.22-2.el4  linux
-//         addDb( "QMYSQL3", "testdb", "testuser", "Ee4Gabf6_", "mysql5-nokia.trolltech.com.au" ); // MySQL 5.0.45-7.el5 linux
+//         addDb( "QMYSQL3", "testdb", "testuser", "Ee4Gabf6_", "bq-mysql50.apac.nokia.com" ); // MySQL 5.0.45-7.el5 linux
+//         addDb( "QMYSQL3", "testdb", "testuser", "Ee4Gabf6_", "bq-mysql51.apac.nokia.com" ); // MySQL 5.1.36-6.7.2.i586 linux
 
 //         addDb( "QPSQL7", "testdb", "troll", "trond", "horsehead.nokia.troll.no" ); // V7.2 NOT SUPPORTED!
 //         addDb( "QPSQL7", "testdb", "troll", "trond", "horsehead.nokia.troll.no", 5434 ); // V7.2 NOT SUPPORTED! Multi-byte
@@ -230,7 +231,8 @@ public:
 //         addDb( "QPSQL7", "testdb", "troll", "trond", "horsehead.nokia.troll.no", 5437 ); // V8.0.3
 //         addDb( "QPSQL7", "testdb", "troll", "trond", "silence.nokia.troll.no" );         // V8.2.1, UTF-8
 //         addDb( "QPSQL7", "testdb", "testuser", "Ee4Gabf6_", "postgres74-nokia.trolltech.com.au" );         // Version 7.4.19-1.el4_6.1
-//         addDb( "QPSQL7", "testdb", "testuser", "Ee4Gabf6_", "postgres81-nokia.trolltech.com.au" );         // Version 8.1.11-1.el5_1.1
+//         addDb( "QPSQL7", "testdb", "testuser", "Ee4Gabf6_", "bq-pgsql81.apac.nokia.com" );         // Version 8.1.11-1.el5_1.1
+//         addDb( "QPSQL7", "testdb", "testuser", "Ee4Gabf6_", "bq-pgsql84.apac.nokia.com" );         // Version 8.4.1-2.1.i586
 
 //         addDb( "QDB2", "testdb", "troll", "trond", "silence.nokia.troll.no" ); // DB2 v9.1 on silence
 
@@ -248,7 +250,7 @@ public:
 //         addDb( "QODBC3", "DRIVER={SQL SERVER};SERVER=iceblink.nokia.troll.no\\ICEBLINK", "troll", "trond", "" );
 //         addDb( "QODBC3", "DRIVER={SQL Native Client};SERVER=silence.nokia.troll.no\\SQLEXPRESS", "troll", "trond", "" );
 
-//         addDb( "QODBC", "DRIVER={MySQL ODBC 3.51 Driver};SERVER=mysql5-nokia.trolltech.com.au;DATABASE=testdb", "testuser", "Ee4Gabf6_", "" );
+//         addDb( "QODBC", "DRIVER={MySQL ODBC 5.1 Driver};SERVER=mysql5-nokia.trolltech.com.au;DATABASE=testdb", "testuser", "Ee4Gabf6_", "" );
 //         addDb( "QODBC", "DRIVER={MySQL ODBC 5.1 Driver};SERVER=mysql4-nokia.trolltech.com.au;DATABASE=testdb", "testuser", "Ee4Gabf6_", "" );
 //         addDb( "QODBC", "DRIVER={FreeTDS};SERVER=horsehead.nokia.troll.no;DATABASE=testdb;PORT=4101;UID=troll;PWD=trondk", "troll", "trondk", "" );
 //         addDb( "QODBC", "DRIVER={FreeTDS};SERVER=silence.nokia.troll.no;DATABASE=testdb;PORT=2392;UID=troll;PWD=trond", "troll", "trond", "" );
@@ -259,6 +261,7 @@ public:
 //         addDb( "QODBC3", "DRIVER={SQL SERVER};SERVER=bq-winserv2003-x86-01.apac.nokia.com;DATABASE=testdb;PORT=1433", "testuser", "Ee4Gabf6_", "" );
 //         addDb( "QODBC3", "DRIVER={SQL SERVER};SERVER=bq-winserv2008-x86-01.apac.nokia.com;DATABASE=testdb;PORT=1433", "testuser", "Ee4Gabf6_", "" );
 //         addDb( "QODBC", "DRIVER={Microsoft Access Driver (*.mdb)};DBQ=c:\\dbs\\access\\testdb.mdb", "", "", "" );
+//         addDb( "QODBC", "DRIVER={Postgresql};SERVER=postgres81-nokia.trolltech.com.au;DATABASE=testdb", "testuser", "Ee4Gabf6_", "" );
     }
 
     void open()
@@ -335,7 +338,10 @@ public:
                 foreach(const QString &table2, dbtables.filter(table, Qt::CaseInsensitive)) {
                     if(table2.compare(table.section('.', -1, -1), Qt::CaseInsensitive) == 0) {
                         table=db.driver()->escapeIdentifier(table2, QSqlDriver::TableName);
-                        wasDropped = q.exec( "drop table " + table);
+                        if(db.driverName().startsWith( "QPSQL" ))
+                            wasDropped = q.exec( "drop table " + table + " cascade");
+                        else
+                            wasDropped = q.exec( "drop table " + table);
                         dbtables.removeAll(table2);
                     }
                 }
diff --git a/tests/auto/qsslcertificate/tst_qsslcertificate.cpp b/tests/auto/qsslcertificate/tst_qsslcertificate.cpp
index 892d745..44f8522 100644
--- a/tests/auto/qsslcertificate/tst_qsslcertificate.cpp
+++ b/tests/auto/qsslcertificate/tst_qsslcertificate.cpp
@@ -105,6 +105,7 @@ private slots:
     void fromPath_data();
     void fromPath();
     void certInfo();
+    void certInfoQByteArray();
     void task256066toPem();
     void nulInCN();
     void nulInSan();
@@ -697,6 +698,18 @@ void tst_QSslCertificate::certInfo()
     QCOMPARE(cert, QSslCertificate(QByteArray::fromHex(der), QSsl::Der));
 }
 
+void tst_QSslCertificate::certInfoQByteArray()
+{
+    QSslCertificate cert =  QSslCertificate::fromPath("certificates/cert.pem", QSsl::Pem,
+                                                      QRegExp::FixedString).first();
+    QVERIFY(!cert.isNull());
+
+    // in this test, check the bytearray variants before the enum variants to see if
+    // we fixed a bug we had with lazy initialization of the values.
+    QCOMPARE(cert.issuerInfo("CN"), QString("Test CA (1024 bit)"));
+    QCOMPARE(cert.subjectInfo("CN"), QString("name/with/slashes"));
+}
+
 void tst_QSslCertificate::task256066toPem()
 {
     // a certificate whose PEM encoding's length is a multiple of 64
diff --git a/tests/auto/qtemporaryfile/tst_qtemporaryfile.cpp b/tests/auto/qtemporaryfile/tst_qtemporaryfile.cpp
index c781108..1304f4e 100644
--- a/tests/auto/qtemporaryfile/tst_qtemporaryfile.cpp
+++ b/tests/auto/qtemporaryfile/tst_qtemporaryfile.cpp
@@ -95,6 +95,7 @@ private slots:
     void keepOpenMode();
     void resetTemplateAfterError();
     void setTemplateAfterOpen();
+    void autoRemoveAfterFailedRename();
 
 public:
 };
@@ -558,5 +559,40 @@ void tst_QTemporaryFile::setTemplateAfterOpen()
     QCOMPARE( temp.fileTemplate(), newTemplate );
 }
 
+void tst_QTemporaryFile::autoRemoveAfterFailedRename()
+{
+    struct CleanOnReturn
+    {
+        ~CleanOnReturn()
+        {
+            if (!tempName.isEmpty())
+                QFile::remove(tempName);
+        }
+
+        void reset()
+        {
+            tempName.clear();
+        }
+
+        QString tempName;
+    };
+
+    CleanOnReturn cleaner;
+
+    {
+        QTemporaryFile file;
+        QVERIFY( file.open() );
+        cleaner.tempName = file.fileName();
+
+        QVERIFY( QFile::exists(cleaner.tempName) );
+        QVERIFY( !QFileInfo("i-do-not-exist").isDir() );
+        QVERIFY( !file.rename("i-do-not-exist/file.txt") );
+        QVERIFY( QFile::exists(cleaner.tempName) );
+    }
+
+    QVERIFY( !QFile::exists(cleaner.tempName) );
+    cleaner.reset();
+}
+
 QTEST_MAIN(tst_QTemporaryFile)
 #include "tst_qtemporaryfile.moc"
diff --git a/tests/auto/qtreeview/tst_qtreeview.cpp b/tests/auto/qtreeview/tst_qtreeview.cpp
index d269cc3..fd4815e 100644
--- a/tests/auto/qtreeview/tst_qtreeview.cpp
+++ b/tests/auto/qtreeview/tst_qtreeview.cpp
@@ -236,6 +236,7 @@ private slots:
     void task248022_changeSelection();
     void task245654_changeModelAndExpandAll();
     void doubleClickedWithSpans();
+    void taskQTBUG_6450_selectAllWith1stColumnHidden();
 };
 
 class QtTestModel: public QAbstractItemModel
@@ -3678,5 +3679,26 @@ void tst_QTreeView::doubleClickedWithSpans()
     QTRY_COMPARE(spy.count(), 2);
 }
 
+void tst_QTreeView::taskQTBUG_6450_selectAllWith1stColumnHidden()
+{
+    QTreeWidget tree;
+    tree.setSelectionMode(QAbstractItemView::MultiSelection);
+    tree.setColumnCount(2);
+    QList<QTreeWidgetItem *> items;
+    const int nrRows = 10;
+    for (int i = 0; i < nrRows; ++i) {
+        items.append(new QTreeWidgetItem((QTreeWidget*)0, QStringList(QString("item: %1").arg(i))));
+        items.last()->setText(1, QString("is an item"));
+    }
+    tree.insertTopLevelItems(0, items);
+
+    tree.hideColumn(0);
+    tree.selectAll();
+
+    QVERIFY(tree.selectionModel()->hasSelection());
+    for (int i = 0; i < nrRows; ++i)
+        QVERIFY(tree.selectionModel()->isRowSelected(i, QModelIndex()));
+}
+
 QTEST_MAIN(tst_QTreeView)
 #include "tst_qtreeview.moc"
diff --git a/tests/auto/selftests/expected_cmptest.txt b/tests/auto/selftests/expected_cmptest.txt
index a941f21..1b65adf 100644
--- a/tests/auto/selftests/expected_cmptest.txt
+++ b/tests/auto/selftests/expected_cmptest.txt
@@ -1,5 +1,5 @@
 ********* Start testing of tst_Cmptest *********
-Config: Using QTest library 4.6.1, Qt 4.6.1
+Config: Using QTest library 4.6.2, Qt 4.6.2
 PASS   : tst_Cmptest::initTestCase()
 PASS   : tst_Cmptest::compare_boolfuncs()
 PASS   : tst_Cmptest::compare_pointerfuncs()
diff --git a/tests/auto/selftests/expected_crashes_3.txt b/tests/auto/selftests/expected_crashes_3.txt
index 692fddb..aabe83d 100644
--- a/tests/auto/selftests/expected_crashes_3.txt
+++ b/tests/auto/selftests/expected_crashes_3.txt
@@ -1,5 +1,5 @@
 ********* Start testing of tst_Crashes *********
-Config: Using QTest library 4.6.1, Qt 4.6.1
+Config: Using QTest library 4.6.2, Qt 4.6.2
 PASS   : tst_Crashes::initTestCase()
 QFATAL : tst_Crashes::crash() Received signal 11
 FAIL!  : tst_Crashes::crash() Received a fatal error.
diff --git a/tests/auto/selftests/expected_longstring.txt b/tests/auto/selftests/expected_longstring.txt
index 5755c97..3fe237a 100644
--- a/tests/auto/selftests/expected_longstring.txt
+++ b/tests/auto/selftests/expected_longstring.txt
@@ -1,5 +1,5 @@
 ********* Start testing of tst_LongString *********
-Config: Using QTest library 4.6.1, Qt 4.6.1
+Config: Using QTest library 4.6.2, Qt 4.6.2
 PASS   : tst_LongString::initTestCase()
 FAIL!  : tst_LongString::failWithLongString() Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean commodo ligula eget dolor. Aenean massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec quam felis, ultricies nec, pellentesque eu, pretium quis, sem. Nulla consequat massa quis enim. Donec pede justo, fringilla vel, aliquet nec, vulputate eget, arcu. In enim justo, rhoncus ut, imperdiet a, venenatis vitae, justo. Nullam dictum felis eu pede mollis pretium. Integer tincidunt. Cras dapibus. Vivamus elementum semper nisi. Aenean vulputate eleifend tellus. Aenean leo ligula, porttitor eu, consequat vitae, eleifend ac, enim. Aliquam lorem ante, dapibus in, viverra quis, feugiat a, tellus. Phasellus viverra nulla ut metus varius laoreet. Quisque rutrum. Aenean imperdiet. Etiam ultricies nisi vel augue. Curabitur ullamcorper ultricies nisi. Nam eget dui.
 
diff --git a/tests/auto/selftests/expected_maxwarnings.txt b/tests/auto/selftests/expected_maxwarnings.txt
index 032a3e8..8bafeff 100644
--- a/tests/auto/selftests/expected_maxwarnings.txt
+++ b/tests/auto/selftests/expected_maxwarnings.txt
@@ -1,5 +1,5 @@
 ********* Start testing of MaxWarnings *********
-Config: Using QTest library 4.6.1, Qt 4.6.1
+Config: Using QTest library 4.6.2, Qt 4.6.2
 PASS   : MaxWarnings::initTestCase()
 QWARN  : MaxWarnings::warn() 0
 QWARN  : MaxWarnings::warn() 1
diff --git a/tests/auto/selftests/expected_skip.txt b/tests/auto/selftests/expected_skip.txt
index e687759..c4ef92d 100644
--- a/tests/auto/selftests/expected_skip.txt
+++ b/tests/auto/selftests/expected_skip.txt
@@ -1,5 +1,5 @@
 ********* Start testing of tst_Skip *********
-Config: Using QTest library 4.6.1, Qt 4.6.1
+Config: Using QTest library 4.6.2, Qt 4.6.2
 PASS   : tst_Skip::initTestCase()
 SKIP   : tst_Skip::test() skipping all
    Loc: [/home/rmcgover/depot/qt-git/mainline/tests/auto/selftests/skip/tst_skip.cpp(68)]
diff --git a/tests/auto/selftests/expected_xunit.txt b/tests/auto/selftests/expected_xunit.txt
index d5cd531..5ec4668 100644
--- a/tests/auto/selftests/expected_xunit.txt
+++ b/tests/auto/selftests/expected_xunit.txt
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <testsuite errors="5" failures="3" tests="9" name="tst_Xunit">
   <properties>
-    <property value="4.6.1" name="QTestVersion"/>
-    <property value="4.6.1" name="QtVersion"/>
+    <property value="4.6.2" name="QTestVersion"/>
+    <property value="4.6.2" name="QtVersion"/>
   </properties>
   <testcase result="pass" name="initTestCase"/>
   <testcase result="pass" name="testFunc1">
diff --git a/tests/auto/tests.xml b/tests/auto/tests.xml
deleted file mode 100644
index f197de0..0000000
--- a/tests/auto/tests.xml
+++ /dev/null
@@ -1,821 +0,0 @@
-<Configuration>
-    <Tests>
-        <Test name="atwrapper" location="tests/auto/atwrapper/tst_atwrapper" />
-        <Test name="bic" location="tests/auto/bic/tst_bic" />
-        <Test name="checkxmlfiles" location="tests/auto/checkxmlfiles/tst_checkxmlfiles" />
-        <Test name="collections" location="tests/auto/collections/tst_collections" />
-        <Test name="compile" location="tests/auto/compile/tst_compile" />
-        <Test name="compilerwarnings" location="tests/auto/compilerwarnings/tst_compilerwarnings" />
-        <Test name="exceptionsafety" location="tests/auto/exceptionsafety/tst_exceptionsafety" />
-        <Test name="headers" location="tests/auto/headers/tst_headers" />
-        <Test name="languagechange" location="tests/auto/languagechange/tst_languagechange" />
-        <Test name="lrelease" location="tests/auto/linguist/lrelease/tst_lrelease" />
-        <Test name="lconvert" location="tests/auto/linguist/lconvert/tst_convert" />
-        <Test name="lupdate" location="tests/auto/linguist/lupdate/tst_lupdate" />
-        <Test name="macgui" location="tests/auto/macgui/tst_macgui" platforms="macx-g++" />
-        <Test name="mediaobject" location="tests/auto/mediaobject/tst_mediaobject" />
-        <Test name="moc" location="tests/auto/moc/tst_moc" />
-        <Test name="patternistexamplefiletree" location="tests/auto/patternistexamplefiletree/tst_patternistexamplefiletree" />
-        <Test name="patternistexamples" location="tests/auto/patternistexamples/tst_patternistexamples" />
-        <Test name="patternistheaders" location="tests/auto/patternistheaders/tst_patternistheaders" />
-        <Test name="qabstractbutton" location="tests/auto/qabstractbutton/tst_qabstractbutton" />
-        <Test name="qabstractitemmodel" location="tests/auto/qabstractitemmodel/tst_qabstractitemmodel" />
-        <Test name="qabstractitemview" location="tests/auto/qabstractitemmodel/tst_qabstractitemmodel" />
-        <Test name="qabstractmessagehandler" location="tests/auto/qabstractmessagehandler/tst_qabstractmessagehandler" />
-        <Test name="qabstractprintdialog" location="tests/auto/qabstractprintdialog/tst_qabstractprintdialog" />
-        <Test name="qabstractproxymodel" location="tests/auto/qabstractproxymodel/tst_qabstractproxymodel" />
-        <Test name="qabstractscrollarea" location="tests/auto/qabstractscrollarea/tst_qabstractscrollarea" />
-        <Test name="qabstractslider" location="tests/auto/qabstractslider/tst_qabstractslider" />
-        <Test name="qabstractsocket" location="tests/auto/qabstractsocket/tst_qabstractsocket" />
-        <Test name="qabstractspinbox" location="tests/auto/qabstractspinbox/tst_qabstractspinbox" />
-        <Test name="qabstracttextdocumentlayout" location="tests/auto/qabstracttextdocumentlayout/tst_qabstracttextdocumentlayout" />
-        <Test name="qabstracturiresolver" location="tests/auto/qabstracturiresolver/tst_qabstracturiresolver" />
-        <Test name="qabstractxmlforwarditerator" location="tests/auto/qabstractxmlforwarditerator/tst_qabstractxmlforwarditerator" />
-        <Test name="qabstractxmlnodemodel" location="tests/auto/qabstractxmlnodemodel/tst_qabstractxmlnodemodel" />
-        <Test name="qabstractxmlreceiver" location="tests/auto/qabstractxmlreceiver/tst_qabstractxmlreceiver" />
-        <Test name="qaccessibility" location="tests/auto/qaccessibility/tst_qaccessibility" />
-        <Test name="qaccessibility_mac" location="tests/auto/qaccessibility_mac/tst_qaccessibility_mac" />
-        <Test name="qaction" location="tests/auto/qaction/tst_qaction" />
-        <Test name="qactiongroup" location="tests/auto/qactiongroup/tst_qactiongroup" />
-        <Test name="qalgorithms" location="tests/auto/qalgorithms/tst_qalgorithms" />
-        <Test name="qapplication" location="tests/auto/qapplication/tst_qapplication" />
-        <Test name="qatomicint" location="tests/auto/qatomicint/tst_qatomicint" />
-        <Test name="qatomicpointer" location="tests/auto/qatomicpointer/tst_qatomicpointer" />
-        <Test name="qautoptr" location="tests/auto/qautoptr/tst_qautoptr" />
-        <Test name="qbitarray" location="tests/auto/qbitarray/tst_qbitarray" />
-        <Test name="qboxlayout" location="tests/auto/qboxlayout/tst_qboxlayout" />
-        <Test name="qbrush" location="tests/auto/qbrush/tst_qbrush" />
-        <Test name="qbuffer" location="tests/auto/qbuffer/tst_qbuffer" />
-        <Test name="qbuttongroup" location="tests/auto/qbuttongroup/tst_qbuttongroup" />
-        <Test name="qbytearray" location="tests/auto/qbytearray/tst_qbytearray" />
-        <Test name="qcache" location="tests/auto/qcache/tst_qcache" />
-        <Test name="qcalendarwidget" location="tests/auto/qcalendarwidget/tst_qcalendarwidget" />
-        <Test name="qchar" location="tests/auto/qchar/tst_qchar" />
-        <Test name="qcheckbox" location="tests/auto/qcheckbox/tst_qcheckbox" />
-        <Test name="qclipboard" location="tests/auto/qclipboard/tst_qclipboard" />
-        <Test name="qcolor" location="tests/auto/qcolor/tst_qcolor" />
-        <Test name="qcolordialog" location="tests/auto/qcolordialog/tst_qcolordialog" />
-        <Test name="qcolumnview" location="tests/auto/qcolumnview/tst_qcolumnview" />
-        <Test name="qcombobox" location="tests/auto/qcombobox/tst_qcombobox" />
-        <Test name="qcommandlinkbutton" location="tests/auto/qcommandlinkbutton/tst_qcommandlinkbutton" />
-        <Test name="qcompleter" location="tests/auto/qcompleter/tst_qcompleter" />
-        <Test name="qcomplextext" location="tests/auto/qcomplextext/tst_qcomplextext" />
-        <Test name="qcopchannel" location="tests/auto/qcopchannel/tst_qcopchannel" />
-        <Test name="qcoreapplication" location="tests/auto/qcoreapplication/tst_qcoreapplication" />
-        <Test name="qcryptographichash" location="tests/auto/qcryptographichash/tst_qcryptographichash" />
-        <Test name="qcssparser" location="tests/auto/qcssparser/tst_qcssparser" />
-        <Test name="qdatastream" location="tests/auto/qdatastream/tst_qdatastream" />
-        <Test name="qdatawidgetmapper" location="tests/auto/qdatawidgetmapper/tst_qdatawidgetmapper" />
-        <Test name="qdate" location="tests/auto/qdate/tst_qdate" />
-        <Test name="qdatetime" location="tests/auto/qdatetime/tst_qdatetime" />
-        <Test name="qdatetimeedit" location="tests/auto/qdatetimeedit/tst_qdatetimeedit" />
-        <Test name="qdbusabstractadaptor" location="tests/auto/qdbusabstractadaptor/tst_qdbusabstractadaptor" />
-        <Test name="qdbusconnection" location="tests/auto/qdbusconnection/tst_qdbusconnection" />
-        <Test name="qdbuscontext" location="tests/auto/qdbuscontext/tst_qdbuscontext" />
-        <Test name="qdbusinterface" location="tests/auto/qdbusinterface/tst_qdbusinterface" />
-        <Test name="qdbuslocalcalls" location="tests/auto/qdbuslocalcalls/tst_qdbuslocalcalls" />
-        <Test name="qdbusmarshall" location="tests/auto/qdbusmarshall/tst_qdbusmarshall" />
-        <Test name="qdbusmetaobject" location="tests/auto/qdbusmetaobject/tst_qdbusmetaobject" />
-        <Test name="qdbusmetatype" location="tests/auto/qdbusmetatype/tst_qdbusmetatype" />
-        <Test name="qdbusperformance" location="tests/auto/qdbusperformance/tst_qdbusperformance" />
-        <Test name="qdbusreply" location="tests/auto/qdbusreply/tst_qdbusreply" />
-        <Test name="qdbusserver" location="tests/auto/qdbusserver/tst_qdbusserver" />
-        <Test name="qdbusthreading" location="tests/auto/qdbusthreading/tst_qdbusthreading" />
-        <Test name="qdbusxmlparser" location="tests/auto/qdbusxmlparser/tst_qdbusxmlparser" />
-        <Test name="qdebug" location="tests/auto/qdebug/tst_qdebug" />
-        <Test name="qdesktopservices" location="tests/auto/qdesktopservices/tst_qdesktopservices" />
-        <Test name="qdesktopwidget" location="tests/auto/qdesktopwidget/tst_qdesktopwidget" />
-        <Test name="qdial" location="tests/auto/qdial/tst_qdial" />
-        <Test name="qdialog" location="tests/auto/qdialog/tst_qdialog" />
-        <Test name="qdialogbuttonbox" location="tests/auto/qdialogbuttonbox/tst_qdialogbuttonbox" />
-        <Test name="qdir" location="tests/auto/qdir/tst_qdir" />
-        <Test name="qdirectpainter" location="tests/auto/qdirectpainter/tst_qdirectpainter" />
-        <Test name="qdiriterator" location="tests/auto/qdiriterator/tst_qdiriterator" />
-        <Test name="qdirmodel" location="tests/auto/qdirmodel/tst_qdirmodel" />
-        <Test name="qdockwidget" location="tests/auto/qdockwidget/tst_qdockwidget" />
-        <Test name="qdom" location="tests/auto/qdom/tst_qdom" />
-        <Test name="qdoublespinbox" location="tests/auto/qdoublespinbox/tst_qdoublespinbox" />
-        <Test name="qdoublevalidator" location="tests/auto/qdoublevalidator/tst_qdoublevalidator" />
-        <Test name="qdrag" location="tests/auto/qdrag/tst_qdrag" />
-        <Test name="qerrormessage" location="tests/auto/qerrormessage/tst_qerrormessage" />
-        <Test name="qevent" location="tests/auto/qevent/tst_qevent" />
-        <Test name="qeventloop" location="tests/auto/qeventloop/tst_qeventloop" />
-        <Test name="qexplicitlyshareddatapointer" location="tests/auto/qexplicitlyshareddatapointer/tst_qexplicitlyshareddatapointer" />
-        <Test name="qfile" location="tests/auto/qfile/tst_qfile" />
-        <Test name="qfiledialog" location="tests/auto/qfiledialog/tst_qfiledialog" />
-        <Test name="qfileinfo" location="tests/auto/qfileinfo/tst_qfileinfo" />
-        <Test name="qfilesystemmodel" location="tests/auto/qfilesystemmodel/tst_qfilesystemmodel" />
-        <Test name="qfilesystemwatcher" location="tests/auto/qfilesystemwatcher/tst_qfilesystemwatcher" />
-        <Test name="qflags" location="tests/auto/qflags/tst_qflags" />
-        <Test name="qfocusevent" location="tests/auto/qfocusevent/tst_qfocusevent" />
-        <Test name="qfocusframe" location="tests/auto/qfocusframe/tst_qfocusframe" />
-        <Test name="qfont" location="tests/auto/qfont/tst_qfont" />
-        <Test name="qfontcombobox" location="tests/auto/qfontcombobox/tst_qfontcombobox" />
-        <Test name="qfontdatabase" location="tests/auto/qfontdatabase/tst_qfontdatabase" />
-        <Test name="qfontdialog" location="tests/auto/qfontdialog/tst_qfontdialog" />
-        <Test name="qfontmetrics" location="tests/auto/qfontmetrics/tst_qfontmetrics" />
-        <Test name="qformlayout" location="tests/auto/qformlayout/tst_qformlayout" />
-        <Test name="qftp" location="tests/auto/qftp/tst_qftp" />
-        <Test name="q_func_info" location="tests/auto/q_func_info/tst_q_func_info" />
-        <Test name="qfuture" location="tests/auto/qfuture/tst_qfuture" />
-        <Test name="qfuturewatcher" location="tests/auto/qfuturewatcher/tst_qfuturewatcher" />
-        <Test name="qgetputenv" location="tests/auto/qgetputenv/tst_qgetputenv" />
-        <Test name="qgl" location="tests/auto/qgl/tst_qgl" />
-        <Test name="qglobal" location="tests/auto/qglobal/tst_qglobal" />
-        <Test name="qgraphicsgridlayout" location="tests/auto/qgraphicsgridlayout/tst_qgraphicsgridlayout" />
-        <Test name="qgraphicsitem" location="tests/auto/qgraphicsitem/tst_qgraphicsitem" />
-        <Test name="qgraphicsitemanimation" location="tests/auto/qgraphicsitemanimation/tst_qgraphicsitemanimation" />
-        <Test name="qgraphicslayout" location="tests/auto/qgraphicslayout/tst_qgraphicslayout" />
-        <Test name="qgraphicslayoutitem" location="tests/auto/qgraphicslayoutitem/tst_qgraphicslayoutitem" />
-        <Test name="qgraphicslinearlayout" location="tests/auto/qgraphicslinearlayout/tst_qgraphicslinearlayout" />
-        <Test name="qgraphicsanchorlayout" location="tests/auto/qgraphicsanchorlayout/tst_qgraphicsanchorlayout" />
-        <Test name="qgraphicspixmapitem" location="tests/auto/qgraphicspixmapitem/tst_qgraphicspixmapitem" />
-        <Test name="qgraphicspolygonitem" location="tests/auto/qgraphicspolygonitem/tst_qgraphicspolygonitem" />
-        <Test name="qgraphicsproxywidget" location="tests/auto/qgraphicsproxywidget/tst_qgraphicsproxywidget" />
-        <Test name="qgraphicsscene" location="tests/auto/qgraphicsscene/tst_qgraphicsscene" />
-        <Test name="qgraphicsview" location="tests/auto/qgraphicsview/tst_qgraphicsview" />
-        <Test name="qgraphicswidget" location="tests/auto/qgraphicswidget/tst_qgraphicswidget" />
-        <Test name="qgridlayout" location="tests/auto/qgridlayout/tst_qgridlayout" />
-        <Test name="qgroupbox" location="tests/auto/qgroupbox/tst_qgroupbox" />
-        <Test name="qguivariant" location="tests/auto/qguivariant/tst_qguivariant" />
-        <Test name="qhash" location="tests/auto/qhash/tst_qhash" />
-        <Test name="qheaderview" location="tests/auto/qheaderview/tst_qheaderview" />
-        <Test name="qhelpcontentmodel" location="tests/auto/qhelpcontentmodel/tst_qhelpcontentmodel" />
-        <Test name="qhelpenginecore" location="tests/auto/qhelpenginecore/tst_qhelpenginecore" />
-        <Test name="qhelpgenerator" location="tests/auto/qhelpgenerator/tst_qhelpgenerator" />
-        <Test name="qhelpindexmodel" location="tests/auto/qhelpindexmodel/tst_qhelpindexmodel" />
-        <Test name="qhelpprojectdata" location="tests/auto/qhelpprojectdata/tst_qhelpprojectdata" />
-        <Test name="qhostaddress" location="tests/auto/qhostaddress/tst_qhostaddress" />
-        <Test name="qhostinfo" location="tests/auto/qhostinfo/tst_qhostinfo" />
-        <Test name="qhttp" location="tests/auto/qhttp/tst_qhttp" />
-        <Test name="qhttpnetworkconnection" location="tests/auto/qhttpnetworkconnection/tst_qhttpnetworkconnection" />
-        <Test name="qhttpnetworkreply" location="tests/auto/qhttpnetworkreply/tst_qhttpnetworkreply" />
-        <Test name="qhttpsocketengine" location="tests/auto/qhttpsocketengine/tst_qhttpsocketengine" />
-        <Test name="qicoimageformat" location="tests/auto/qicoimageformat/tst_qicoimageformat" />
-        <Test name="qicon" location="tests/auto/qicon/tst_qicon" />
-        <Test name="qimage" location="tests/auto/qimage/tst_qimage" />
-        <Test name="qimageiohandler" location="tests/auto/qimageiohandler/tst_qimageiohandler" />
-        <Test name="qimagereader" location="tests/auto/qimagereader/tst_qimagereader" />
-        <Test name="qimagewriter" location="tests/auto/qimagewriter/tst_qimagewriter" />
-        <Test name="qinputdialog" location="tests/auto/qinputdialog/tst_qinputdialog" />
-        <Test name="qintvalidator" location="tests/auto/qintvalidator/tst_qintvalidator" />
-        <Test name="qiodevice" location="tests/auto/qiodevice/tst_qiodevice" />
-        <Test name="qitemdelegate" location="tests/auto/qitemdelegate/tst_qitemdelegate" />
-        <Test name="qitemeditorfactory" location="tests/auto/qitemeditorfactory/tst_qitemeditorfactory" />
-        <Test name="qitemmodel" location="tests/auto/qitemmodel/tst_qitemmodel" />
-        <Test name="qitemselectionmodel" location="tests/auto/qitemselectionmodel/tst_qitemselectionmodel" />
-        <Test name="qitemview" location="tests/auto/qitemview/tst_qitemview" />
-        <Test name="qkeyevent" location="tests/auto/qkeyevent/tst_qkeyevent" />
-        <Test name="qkeysequence" location="tests/auto/qkeysequence/tst_qkeysequence" />
-        <Test name="qlabel" location="tests/auto/qlabel/tst_qlabel" />
-        <Test name="qlayout" location="tests/auto/qlayout/tst_qlayout" />
-        <Test name="qlcdnumber" location="tests/auto/qlcdnumber/tst_qlcdnumber" />
-        <Test name="qlibrary" location="tests/auto/qlibrary/tst_qlibrary" />
-        <Test name="qline" location="tests/auto/qline/tst_qline" />
-        <Test name="qlineedit" location="tests/auto/qlineedit/tst_qlineedit" />
-        <Test name="qlistbox" location="tests/auto/qlistbox/tst_qlistbox" />
-        <Test name="qlistview" location="tests/auto/qlistview/tst_qlistview" />
-        <Test name="qlistwidget" location="tests/auto/qlistwidget/tst_qlistwidget" />
-        <Test name="qlocale" location="tests/auto/qlocale/tst_qlocale" />
-        <Test name="qlocalsocket" location="tests/auto/qlocalsocket/tst_qlocalsocket" />
-        <Test name="qmacstyle" location="tests/auto/qmacstyle/tst_qmacstyle" />
-        <Test name="qmainwindow" location="tests/auto/qmainwindow/tst_qmainwindow" />
-        <Test name="qmake" location="tests/auto/qmake/tst_qmake" />
-        <Test name="qmap" location="tests/auto/qmap/tst_qmap" />
-        <Test name="qmdiarea" location="tests/auto/qmdiarea/tst_qmdiarea" />
-        <Test name="qmdisubwindow" location="tests/auto/qmdisubwindow/tst_qmdisubwindow" />
-        <Test name="qmenu" location="tests/auto/qmenu/tst_qmenu" />
-        <Test name="qmenubar" location="tests/auto/qmenubar/tst_qmenubar" />
-        <Test name="qmessagebox" location="tests/auto/qmessagebox/tst_qmessagebox" />
-        <Test name="qmetaobject" location="tests/auto/qmetaobject/tst_qmetaobject" />
-        <Test name="qmetatype" location="tests/auto/qmetatype/tst_qmetatype" />
-        <Test name="qmouseevent" location="tests/auto/qmouseevent/tst_qmouseevent" />
-        <Test name="qmouseevent_modal" location="tests/auto/qmouseevent_modal/tst_qmousevent_modal" />
-        <Test name="qmovie" location="tests/auto/qmovie/tst_qmovie" />
-        <Test name="qmultiscreen" location="tests/auto/qmultiscreen/tst_qmultiscreen" />
-        <Test name="qmutex" location="tests/auto/qmutex/tst_qmutex" />
-        <Test name="qmutexlocker" location="tests/auto/qmutexlocker/tst_qmutexlocker" />
-        <Test name="qnativesocketengine" location="tests/auto/qnativesocketengine/tst_qnativesocketengine" />
-        <Test name="qnetworkcookie" location="tests/auto/qnetworkcookie/tst_qnetworkcookie" />
-        <Test name="qnetworkcookiejar" location="tests/auto/qnetworkcookiejar/tst_qnetworkcookiejar" />
-        <Test name="qnetworkinterface" location="tests/auto/qnetworkinterface/tst_qnetworkinterface" />
-        <Test name="qnetworkproxy" location="tests/auto/qnetworkproxy/tst_qnetworkproxy" />
-        <Test name="qnetworkreply" location="tests/auto/qnetworkreply/tst_qnetworkreply" />
-        <Test name="qnetworkrequest" location="tests/auto/qnetworkrequest/tst_qnetworkrequest" />
-        <Test name="qnumeric" location="tests/auto/qnumeric/tst_qnumeric" />
-        <Test name="qobject" location="tests/auto/qobject/tst_qobject" />
-        <Test name="qobjectperformance" location="tests/auto/qobjectperformance/tst_qobjectperformance" />
-        <Test name="qobjectrace" location="tests/auto/qobjectrace/tst_qobjectrace" />
-        <Test name="qpaintengine" location="tests/auto/qpaintengine/tst_qpaintengine" />
-        <Test name="qpainter" location="tests/auto/qpainter/tst_qpainter" />
-        <Test name="qpainterpath" location="tests/auto/qpainterpath/tst_qpainterpath" />
-        <Test name="qpainterpathstroker" location="tests/auto/qpainterpathstroker/tst_qpainterpathstroker" />
-        <Test name="qpalette" location="tests/auto/qpalette/tst_qpalette" />
-        <Test name="qpathclipper" location="tests/auto/qpathclipper/tst_qpathclipper" />
-        <Test name="qpen" location="tests/auto/qpen/tst_qpen" />
-        <Test name="qpicture" location="tests/auto/qpicture/tst_qpicture" />
-        <Test name="qpixmap" location="tests/auto/qpixmap/tst_qpixmap" />
-        <Test name="qpixmapcache" location="tests/auto/qpixmapcache/tst_qpixmapcache" />
-        <Test name="qpixmapfilter" location="tests/auto/qpixmapfilter/tst_qpixmapfilter" />
-        <Test name="qplaintextedit" location="tests/auto/qplaintextedit/tst_qplaintextedit" />
-        <Test name="qplugin" location="tests/auto/qplugin/tst_qplugin" />
-        <Test name="qpluginloader" location="tests/auto/qpluginloader/tst_qpluginloader" />
-        <Test name="qpoint" location="tests/auto/qpoint/tst_qpoint" />
-        <Test name="qpointarray" location="tests/auto/qpointarray/tst_qpointarray" />
-        <Test name="qpointer" location="tests/auto/qpointer/tst_qpointer" />
-        <Test name="qpopmenu" location="tests/auto/qpopmenu/tst_qpopmenu" />
-        <Test name="qprinter" location="tests/auto/qprinter/tst_qprinter" />
-        <Test name="qprinterinfo" location="tests/auto/qprinterinfo/tst_qprinterinfo" />
-        <Test name="qprocess" location="tests/auto/qprocess/tst_qprocess" />
-        <Test name="qprogressbar" location="tests/auto/qprogressbar/tst_qprogressbar" />
-        <Test name="qprogressdialog" location="tests/auto/qprogressdialog/tst_qprogressdialog" />
-        <Test name="qpushbutton" location="tests/auto/qpushbutton/tst_qpushbutton" />
-        <Test name="qqueue" location="tests/auto/qqueue/tst_qqueue" />
-        <Test name="qradiobutton" location="tests/auto/qradiobutton/tst_qradiobutton" />
-        <Test name="qrand" location="tests/auto/qrand/tst_qrand" />
-        <Test name="qreadlocker" location="tests/auto/qreadlocker/tst_qreadlocker" />
-        <Test name="qreadwritelock" location="tests/auto/qreadwritelock/tst_qreadwritelock" />
-        <Test name="qrect" location="tests/auto/qrect/tst_qrect" />
-        <Test name="qregexp" location="tests/auto/qregexp/tst_qregexp" />
-        <Test name="qregexpvalidator" location="tests/auto/qregexpvalidator/tst_qregexpvalidator" />
-        <Test name="qregion" location="tests/auto/qregion/tst_qregion" />
-        <Test name="qresourceengine" location="tests/auto/qresourceengine/tst_qresourceengine" />
-        <Test name="qscriptable" location="tests/auto/qscriptable/tst_qscriptable" />
-        <Test name="qscriptclass" location="tests/auto/qscriptclass/tst_qscriptclass" />
-        <Test name="qscriptcontext" location="tests/auto/qscriptcontext/tst_qscriptcontext" />
-        <Test name="qscriptcontextinfo" location="tests/auto/qscriptcontextinfo/tst_qscriptcontextinfo" />
-        <Test name="qscriptengine" location="tests/auto/qscriptengine/tst_qscriptengine" />
-        <Test name="qscriptengineagent" location="tests/auto/qscriptengineagent/tst_qscriptengineagent" />
-        <Test name="qscriptjstestsuite" location="tests/auto/qscriptjstestsuite/tst_qscriptjstestsuite" />
-        <Test name="qscriptobject" location="tests/auto/qscriptobject/tst_qscriptobject" />
-        <Test name="qscriptstring" location="tests/auto/qscriptstring/tst_qscriptstring" />
-        <Test name="qscriptvalue" location="tests/auto/qscriptvalue/tst_qscriptvalue" />
-        <Test name="qscriptvalueiterator" location="tests/auto/qscriptvalueiterator/tst_qscriptvalueiterator" />
-        <Test name="qscrollarea" location="tests/auto/qscrollarea/tst_qscrollarea" />
-        <Test name="qscrollbar" location="tests/auto/qscrollbar/tst_qscrollbar" />
-        <Test name="qscrollview" location="tests/auto/qscrollview/tst_qscrollview" />
-        <Test name="qsemaphore" location="tests/auto/qsemaphore/tst_qsemaphore" />
-        <Test name="qset" location="tests/auto/qset/tst_qset" />
-        <Test name="qsettings" location="tests/auto/qsettings/tst_qsettings" />
-        <Test name="qsharedmemory" location="tests/auto/qsharedmemory/tst_qsharedmemory" />
-        <Test name="qshortcut" location="tests/auto/qshortcut/tst_qshortcut" />
-        <Test name="qsidebar" location="tests/auto/qsidebar/tst_qsidebar" />
-        <Test name="qsignalmapper" location="tests/auto/qsignalmapper/tst_qsignalmapper" />
-        <Test name="qsignalspy" location="tests/auto/qsignalspy/tst_qsignalspy" />
-        <Test name="qsimplexmlnodemodel" location="tests/auto/qsimplexmlnodemodel/tst_qsimplexmlnodemodel" />
-        <Test name="qsize" location="tests/auto/qsize/tst_qsize" />
-        <Test name="qsizef" location="tests/auto/qsizef/tst_qsizef" />
-        <Test name="qsizegrip" location="tests/auto/qsizegrip/tst_qsizegrip" />
-        <Test name="qslider" location="tests/auto/qslider/tst_qslider" />
-        <Test name="qsocket" location="tests/auto/qsocket/tst_qsocket" />
-        <Test name="qsocketnotifier" location="tests/auto/qsocketnotifier/tst_qsocketnotifier" />
-        <Test name="qsocks5socketengine" location="tests/auto/qsocks5socketengine/tst_qsocks5socketengine" />
-        <Test name="qsortfilterproxymodel" location="tests/auto/qsortfilterproxymodel/tst_qsortfilterproxymodel" />
-        <Test name="qsound" location="tests/auto/qsound/tst_qsound" />
-        <Test name="qaudiodeviceid" location="tests/auto/qaudiodeviceid/tst_qaudiodeviceid" />
-        <Test name="qaudioformat" location="tests/auto/qaudioformat/tst_qaudioformat" />
-        <Test name="qaudiooutput" location="tests/auto/qaudiooutput/tst_qaudiooutput" />
-        <Test name="qaudioinput" location="tests/auto/qaudioinput/tst_qaudioinput" />
-        <Test name="qsourcelocation" location="tests/auto/qsourcelocation/tst_qsourcelocation" />
-        <Test name="qspinbox" location="tests/auto/qspinbox/tst_qspinbox" />
-        <Test name="qsplitter" location="tests/auto/qsplitter/tst_qsplitter" />
-        <Test name="qsql" location="tests/auto/qsql/tst_qsql" />
-        <Test name="qsqlbatch" location="tests/auto/qsqlbatch/tst_qsqlbatch" />
-        <Test name="qsqlcursor" location="tests/auto/qsqlcursor/tst_qsqlcursor" />
-        <Test name="qsqldatabase" location="tests/auto/qsqldatabase/tst_qsqldatabase" />
-        <Test name="qsqlerror" location="tests/auto/qsqlerror/tst_qsqlerror" />
-        <Test name="qsqlfield" location="tests/auto/qsqlfield/tst_qsqlfield" />
-        <Test name="qsqlquery" location="tests/auto/qsqlquery/tst_qsqlquery" />
-        <Test name="qsqlquerymodel" location="tests/auto/qsqlquerymodel/tst_qsqlquerymodel" />
-        <Test name="qsqlrecord" location="tests/auto/qsqlrecord/tst_qsqlrecord" />
-        <Test name="qsqlrelationaltablemodel" location="tests/auto/qsqlrelationaltablemodel/tst_qsqlrelationaltablemodel" />
-        <Test name="qsqlselectcursor" location="tests/auto/qsqlselectcursor/tst_qsqlselectcursor" />
-        <Test name="qsqltablemodel" location="tests/auto/qsqltablemodel/tst_qsqltablemodel" />
-        <Test name="qsqlthread" location="tests/auto/qsqlthread/tst_qsqlthread" />
-        <Test name="qsslcertificate" location="tests/auto/qsslcertificate/tst_qsslcertificate" />
-        <Test name="qsslcipher" location="tests/auto/qsslcipher/tst_qsslcipher" />
-        <Test name="qsslerror" location="tests/auto/qsslerror/tst_qsslerror" />
-        <Test name="qsslkey" location="tests/auto/qsslkey/tst_qsslkey" />
-        <Test name="qsslsocket" location="tests/auto/qsslsocket/tst_qsslsocket" />
-        <Test name="qstackedlayout" location="tests/auto/qstackedlayout/tst_qstackedlayout" />
-        <Test name="qstackedwidget" location="tests/auto/qstackedwidget/tst_qstackedwidget" />
-        <Test name="qstandarditem" location="tests/auto/qstandarditem/tst_qstandarditem" />
-        <Test name="qstandarditemmodel" location="tests/auto/qstandarditemmodel/tst_qstandarditemmodel" />
-        <Test name="qstatusbar" location="tests/auto/qstatusbar/tst_qstatusbar" />
-        <Test name="qstl" location="tests/auto/qstl/tst_qstl" />
-        <Test name="qstring" location="tests/auto/qstring/tst_qstring" />
-        <Test name="qstringlist" location="tests/auto/qstringlist/tst_qstringlist" />
-        <Test name="qstringlistmodel" location="tests/auto/qstringlistmodel/tst_qstringlistmodel" />
-        <Test name="qstyle" location="tests/auto/qstyle/tst_qstyle" />
-        <Test name="qstyleoption" location="tests/auto/qstyleoption/tst_qstyleoption" />
-        <Test name="qstylesheetstyle" location="tests/auto/qstylesheetstyle/tst_qstylesheetstyle" />
-        <Test name="qsvgdevice" location="tests/auto/qsvgdevice/tst_qsvgdevice" />
-        <Test name="qsvggenerator" location="tests/auto/qsvggenerator/tst_qsvggenerator" />
-        <Test name="qsvgrenderer" location="tests/auto/qsvgrenderer/tst_qsvgrenderer" />
-        <Test name="qsyntaxhighlighter" location="tests/auto/qsyntaxhighlighter/tst_qsyntaxhighlighter" />
-        <Test name="qsysinfo" location="tests/auto/qsysinfo/tst_qsysinfo" />
-        <Test name="qsystemsemaphore" location="tests/auto/qsystemsemaphore/tst_qsystemsemaphore" />
-        <Test name="qsystemtrayicon" location="tests/auto/qsystemtrayicon/tst_qsystemtrayicon" />
-        <Test name="qtabbar" location="tests/auto/qtabbar/tst_qtabbar" />
-        <Test name="qtableview" location="tests/auto/qtableview/tst_qtableview" />
-        <Test name="qtablewidget" location="tests/auto/qtablewidget/tst_qtablewidget" />
-        <Test name="qtabwidget" location="tests/auto/qtabwidget/tst_qtabwidget" />
-        <Test name="qtconcurrentfilter" location="tests/auto/qtconcurrentfilter/tst_qtconcurrentfilter" />
-        <Test name="qtconcurrentiteratekernel" location="tests/auto/qtconcurrentiteratekernel/tst_qtconcurrentiteratekernel" />
-        <Test name="qtconcurrentmap" location="tests/auto/qtconcurrentmap/tst_qtconcurrentmap" />
-        <Test name="qtconcurrentrun" location="tests/auto/qtconcurrentrun/tst_qtconcurrentrun" />
-        <Test name="qtconcurrentthreadengine" location="tests/auto/qtconcurrentthreadengine/tst_qtconcurrentthreadengine" />
-        <Test name="qtcpserver" location="tests/auto/qtcpserver/tst_qtcpserver" />
-        <Test name="qtcpsocket" location="tests/auto/qtcpsocket/tst_qtcpsocket" />
-        <Test name="qtemporaryfile" location="tests/auto/qtemporaryfile/tst_qtemporaryfile" />
-        <Test name="qtessellator" location="tests/auto/qtessellator/tst_qtessellator" />
-        <Test name="qtextblock" location="tests/auto/qtextblock/tst_qtextblock" />
-        <Test name="qtextboundaryfinder" location="tests/auto/qtextboundaryfinder/tst_qtextboundaryfinder" />
-        <Test name="qtextbrowser" location="tests/auto/qtextbrowser/tst_qtextbrowser" />
-        <Test name="qtextcodec" location="tests/auto/qtextcodec/tst_qtextcodec" />
-        <Test name="qtextcursor" location="tests/auto/qtextcursor/tst_qtextcursor" />
-        <Test name="qtextdocument" location="tests/auto/qtextdocument/tst_qtextdocument" />
-        <Test name="qtextdocumentfragment" location="tests/auto/qtextdocumentfragment/tst_qtextdocumentfragment" />
-        <Test name="qtextdocumentlayout" location="tests/auto/qtextdocumentlayout/tst_qtextdocumentlayout" />
-        <Test name="qtextedit" location="tests/auto/qtextedit/tst_qtextedit" />
-        <Test name="qtextformat" location="tests/auto/qtextformat/tst_qtextformat" />
-        <Test name="qtextlayout" location="tests/auto/qtextlayout/tst_qtextlayout" />
-        <Test name="qtextlist" location="tests/auto/qtextlist/tst_qtextlist" />
-        <Test name="qtextobject" location="tests/auto/qtextobject/tst_qtextobject" />
-        <Test name="qtextpiecetable" location="tests/auto/qtextpiecetable/tst_qtextpiecetable" />
-        <Test name="qtextscriptengine" location="tests/auto/qtextscriptengine/tst_qtextscriptengine" />
-        <Test name="qtextstream" location="tests/auto/qtextstream/tst_qtextstream" />
-        <Test name="qtexttable" location="tests/auto/qtexttable/tst_qtexttable" />
-        <Test name="qthread" location="tests/auto/qthread/tst_qthread" />
-        <Test name="qthreadpool" location="tests/auto/qthreadpool/tst_qthreadpool" />
-        <Test name="qthreadstorage" location="tests/auto/qthreadstorage/tst_qthreadstorage" />
-        <Test name="qtime" location="tests/auto/qtime/tst_qtime" />
-        <Test name="qtimeline" location="tests/auto/qtimeline/tst_qtimeline" />
-        <Test name="qtimer" location="tests/auto/qtimer/tst_qtimer" />
-        <Test name="qtmd5" location="tests/auto/qtmd5/tst_qtmd5" />
-        <Test name="qtoolbar" location="tests/auto/qtoolbar/tst_qtoolbar" />
-        <Test name="qtoolbox" location="tests/auto/qtoolbox/tst_qtoolbox" />
-        <Test name="qtoolbutton" location="tests/auto/qtoolbutton/tst_qtoolbutton" />
-        <Test name="qtooltip" location="tests/auto/qtooltip/tst_qtooltip" />
-        <Test name="qtransform" location="tests/auto/qtransform/tst_qtransform" />
-        <Test name="qtransformedscreen" location="tests/auto/qtransformedscreen/tst_qtransformedscreen" />
-        <Test name="qtranslator" location="tests/auto/qtranslator/tst_qtranslator" />
-        <Test name="qtreeview" location="tests/auto/qtreeview/tst_qtreeview" />
-        <Test name="qtreewidget" location="tests/auto/qtreewidget/tst_qtreewidget" />
-        <Test name="qtreewidgetitemiterator" location="tests/auto/qtreewidgetitemiterator/tst_qtreewidgetitemiterator" />
-        <Test name="qtwidgets" location="tests/auto/qtwidgets/tst_qtwidgets" />
-        <Test name="qudpsocket" location="tests/auto/qudpsocket/tst_qudpsocket" />
-        <Test name="qundogroup" location="tests/auto/qundogroup/tst_qundogroup" />
-        <Test name="qundostack" location="tests/auto/qundostack/tst_qundostack" />
-        <Test name="quridrag" location="tests/auto/quridrag/tst_quridrag" />
-        <Test name="qurl" location="tests/auto/qurl/tst_qurl" />
-        <Test name="quuid" location="tests/auto/quuid/tst_quuid" />
-        <Test name="qvariant" location="tests/auto/qvariant/tst_qvariant" />
-        <Test name="qvarlengtharray" location="tests/auto/qvarlengtharray/tst_qvarlengtharray" />
-        <Test name="qvector" location="tests/auto/qvector/tst_qvector" />
-        <Test name="qwaitcondition" location="tests/auto/qwaitcondition/tst_qwaitcondition" />
-        <Test name="qwebframe" location="tests/auto/qwebframe/tst_qwebframe" />
-        <Test name="qwebpage" location="tests/auto/qwebpage/tst_qwebpage" />
-        <Test name="qwidget" location="tests/auto/qwidget/tst_qwidget" />
-        <Test name="qwidgetaction" location="tests/auto/qwidgetaction/tst_qwidgetaction" />
-        <Test name="qwidgetstack" location="tests/auto/qwidgetstack/tst_qwidgetstack" />
-        <Test name="qwidget_window" location="tests/auto/qwidget_window/tst_qwidget_window" />
-        <Test name="qwindowsurface" location="tests/auto/qwindowsurface/tst_qwindowsurface" />
-        <Test name="qwineventnotifier" location="tests/auto/qwineventnotifier/tst_qwineventnotifier" />
-        <Test name="qwizard" location="tests/auto/qwizard/tst_qwizard" />
-        <Test name="qwmatrix" location="tests/auto/qwmatrix/tst_qwmatrix" />
-        <Test name="qworkspace" location="tests/auto/qworkspace/tst_qworkspace" />
-        <Test name="qwritelocker" location="tests/auto/qwritelocker/tst_qwritelocker" />
-        <Test name="qwsembedwidget" location="tests/auto/qwsembedwidget/tst_qwsembedwidget" />
-        <Test name="qwsinputmethod" location="tests/auto/qwsinputmethod/tst_qwsinputmethod" />
-        <Test name="qwswindowsystem" location="tests/auto/qwswindowsystem/tst_qwswindowsystem" />
-        <Test name="qx11info" location="tests/auto/qx11info/tst_qx11info" />
-        <Test name="qxml" location="tests/auto/qxml/tst_qxml" />
-        <Test name="qxmlformatter" location="tests/auto/qxmlformatter/tst_qxmlformatter" />
-        <Test name="qxmlinputsource" location="tests/auto/qxmlinputsource/tst_qxmlinputsource" />
-        <Test name="qxmlitem" location="tests/auto/qxmlitem/tst_qxmlitem" />
-        <Test name="qxmlname" location="tests/auto/qxmlname/tst_qxmlname" />
-        <Test name="qxmlnamepool" location="tests/auto/qxmlnamepool/tst_qxmlnamepool" />
-        <Test name="qxmlnodemodelindex" location="tests/auto/qxmlnodemodelindex/tst_qxmlnodemodelindex" />
-        <Test name="qxmlquery" location="tests/auto/qxmlquery/tst_qxmlquery" />
-        <Test name="qxmlresultitems" location="tests/auto/qxmlresultitems/tst_qxmlresultitems" />
-        <Test name="qxmlserializer" location="tests/auto/qxmlserializer/tst_qxmlserializer" />
-        <Test name="qxmlsimplereader" location="tests/auto/qxmlsimplereader/tst_qxmlsimplereader" />
-        <Test name="qxmlstream" location="tests/auto/qxmlstream/tst_qxmlstream" />
-        <Test name="selftests" location="tests/auto/selftests/tst_selftests" />
-        <Test name="symbols" location="tests/auto/symbols/tst_symbols" />
-        <Test name="tests" location="tests/auto/tests/tst_tests" />
-        <Test name="uic" location="tests/auto/uic/tst_uic" />
-        <Test name="xmlpatterns" location="tests/auto/xmlpatterns/tst_xmlpatterns" />
-        <Test name="xmlpatternsxqts" location="tests/auto/xmlpatternsxqts/tst_xmlpatternsxqts" />
-    </Tests>
-    <TestSuites>
-        <TestSuite name="qt-4.4">
-            <Test id="atwrapper" />
-            <Test id="bic" />
-            <Test id="checkxmlfiles" />
-            <Test id="collections" />
-            <Test id="compile" />
-            <Test id="compilerwarnings" />
-            <Test id="exceptionsafety" />
-            <Test id="headers" />
-            <Test id="languagechange" />
-            <Test id="lrelease" />
-            <Test id="lconvert" />
-            <Test id="lupdate" />
-            <Test id="macgui" />
-            <Test id="mediaobject" />
-            <Test id="moc" />
-            <Test id="patternistexamplefiletree" />
-            <Test id="patternistexamples" />
-            <Test id="patternistheaders" />
-            <Test id="qabstractbutton" />
-            <Test id="qabstractitemmodel" />
-            <Test id="qabstractitemview" />
-            <Test id="qabstractmessagehandler" />
-            <Test id="qabstractprintdialog" />
-            <Test id="qabstractproxymodel" />
-            <Test id="qabstractscrollarea" />
-            <Test id="qabstractslider" />
-            <Test id="qabstractsocket" />
-            <Test id="qabstractspinbox" />
-            <Test id="qabstracttextdocumentlayout" />
-            <Test id="qabstracturiresolver" />
-            <Test id="qabstractxmlforwarditerator" />
-            <Test id="qabstractxmlnodemodel" />
-            <Test id="qabstractxmlreceiver" />
-            <Test id="qaccessibility" />
-            <Test id="qaccessibility_mac" />
-            <Test id="qaction" />
-            <Test id="qactiongroup" />
-            <Test id="qalgorithms" />
-            <Test id="qapplication" />
-            <Test id="qatomicint" />
-            <Test id="qatomicpointer" />
-            <Test id="qautoptr" />
-            <Test id="qbitarray" />
-            <Test id="qboxlayout" />
-            <Test id="qbrush" />
-            <Test id="qbuffer" />
-            <Test id="qbuttongroup" />
-            <Test id="qbytearray" />
-            <Test id="qcache" />
-            <Test id="qcalendarwidget" />
-            <Test id="qchar" />
-            <Test id="qcheckbox" />
-            <Test id="qclipboard" />
-            <Test id="qcolor" />
-            <Test id="qcolordialog" />
-            <Test id="qcolumnview" />
-            <Test id="qcombobox" />
-            <Test id="qcommandlinkbutton" />
-            <Test id="qcompleter" />
-            <Test id="qcomplextext" />
-            <Test id="qcopchannel" />
-            <Test id="qcoreapplication" />
-            <Test id="qcryptographichash" />
-            <Test id="qcssparser" />
-            <Test id="qdatastream" />
-            <Test id="qdatawidgetmapper" />
-            <Test id="qdate" />
-            <Test id="qdatetime" />
-            <Test id="qdatetimeedit" />
-            <Test id="qdbusabstractadaptor" />
-            <Test id="qdbusconnection" />
-            <Test id="qdbuscontext" />
-            <Test id="qdbusinterface" />
-            <Test id="qdbuslocalcalls" />
-            <Test id="qdbusmarshall" />
-            <Test id="qdbusmetaobject" />
-            <Test id="qdbusmetatype" />
-            <Test id="qdbusperformance" />
-            <Test id="qdbusreply" />
-            <Test id="qdbusserver" />
-            <Test id="qdbusthreading" />
-            <Test id="qdbusxmlparser" />
-            <Test id="qdebug" />
-            <Test id="qdesktopservices" />
-            <Test id="qdesktopwidget" />
-            <Test id="qdial" />
-            <Test id="qdialog" />
-            <Test id="qdialogbuttonbox" />
-            <Test id="qdir" />
-            <Test id="qdirectpainter" />
-            <Test id="qdiriterator" />
-            <Test id="qdirmodel" />
-            <Test id="qdockwidget" />
-            <Test id="qdom" />
-            <Test id="qdoublespinbox" />
-            <Test id="qdoublevalidator" />
-            <Test id="qdrag" />
-            <Test id="qerrormessage" />
-            <Test id="qevent" />
-            <Test id="qeventloop" />
-            <Test id="qexplicitlyshareddatapointer" />
-            <Test id="qfile" />
-            <Test id="qfiledialog" />
-            <Test id="qfileinfo" />
-            <Test id="qfilesystemmodel" />
-            <Test id="qfilesystemwatcher" />
-            <Test id="qflags" />
-            <Test id ="qfocusevent" />
-            <Test id="qfocusframe" />
-            <Test id="qfont" />
-            <Test id="qfontcombobox" />
-            <Test id="qfontdatabase" />
-            <Test id="qfontdialog" />
-            <Test id="qfontmetrics" />
-            <Test id="qformlayout" />
-            <Test id="qftp" />
-            <Test id="q_func_info" />
-            <Test id="qfuture" />
-            <Test id="qfuturewatcher" />
-            <Test id="qgetputenv" />
-            <Test id="qgl" />
-            <Test id="qglobal" />
-            <Test id="qgraphicsgridlayout" />
-            <Test id="qgraphicsitem" />
-            <Test id="qgraphicsitemanimation" />
-            <Test id="qgraphicslayout" />
-            <Test id="qgraphicslayoutitem" />
-            <Test id="qgraphicslinearlayout" />
-            <Test id="qgraphicsanchorlayout" />
-            <Test id="qgraphicspixmapitem" />
-            <Test id="qgraphicspolygonitem" />
-            <Test id="qgraphicsproxywidget" />
-            <Test id="qgraphicsscene" />
-            <Test id="qgraphicsview" />
-            <Test id="qgraphicswidget" />
-            <Test id="qgridlayout" />
-            <Test id="qgroupbox" />
-            <Test id="qguivariant" />
-            <Test id="qhash" />
-            <Test id="qheaderview" />
-            <Test id="qhelpcontentmodel" />
-            <Test id="qhelpenginecore" />
-            <Test id="qhelpgenerator" />
-            <Test id="qhelpindexmodel" />
-            <Test id="qhelpprojectdata" />
-            <Test id="qhostaddress" />
-            <Test id="qhostinfo" />
-            <Test id="qhttp" />
-            <Test id="qhttpnetworkconnection" />
-            <Test id="qhttpnetworkreply" />
-            <Test id="qhttpsocketengine" />
-            <Test id="qicoimageformat" />
-            <Test id="qicon" />
-            <Test id="qimage" />
-            <Test id="qimageiohandler" />
-            <Test id="qimagereader" />
-            <Test id="qimagewriter" />
-            <Test id="qinputdialog" />
-            <Test id="qintvalidator" />
-            <Test id="qiodevice" />
-            <Test id="qitemdelegate" />
-            <Test id="qitemeditorfactory" />
-            <Test id="qitemmodel" />
-            <Test id="qitemselectionmodel" />
-            <Test id="qitemview" />
-            <Test id="qkeyevent" />
-            <Test id="qkeysequence" />
-            <Test id="qlabel" />
-            <Test id="qlayout" />
-            <Test id="qlcdnumber" />
-            <Test id="qlibrary" />
-            <Test id="qline" />
-            <Test id="qlineedit" />
-            <Test id="qlistbox" />
-            <Test id="qlistview" />
-            <Test id="qlistwidget" />
-            <Test id="qlocale" />
-            <Test id="qlocalsocket" />
-            <Test id="qmacstyle" />
-            <Test id="qmainwindow" />
-            <Test id="qmake" />
-            <Test id="qmap" />
-            <Test id="qmdiarea" />
-            <Test id="qmdisubwindow" />
-            <Test id="qmenu" />
-            <Test id="qmenubar" />
-            <Test id="qmessagebox" />
-            <Test id="qmetaobject" />
-            <Test id="qmetatype" />
-            <Test id="qmouseevent" />
-            <Test id="qmouseevent_modal" />
-            <Test id="qmovie" />
-            <Test id="qmultiscreen" />
-            <Test id="qmutex" />
-            <Test id="qmutexlocker" />
-            <Test id="qnativesocketengine" />
-            <Test id="qnetworkcookie" />
-            <Test id="qnetworkcookiejar" />
-            <Test id="qnetworkinterface" />
-            <Test id="qnetworkproxy" />
-            <Test id="qnetworkreply" />
-            <Test id="qnetworkrequest" />
-            <Test id="qnumeric" />
-            <Test id="qobject" />
-            <Test id="qobjectperformance" />
-            <Test id="qobjectrace" />
-            <Test id="qpaintengine" />
-            <Test id="qpainter" />
-            <Test id="qpainterpath" />
-            <Test id="qpainterpathstroker" />
-            <Test id="qpalette" />
-            <Test id="qpathclipper" />
-            <Test id="qpen" />
-            <Test id="qpicture" />
-            <Test id="qpixmap" />
-            <Test id="qpixmapcache" />
-            <Test id="qplaintextedit" />
-            <Test id="qplugin" />
-            <Test id="qpluginloader" />
-            <Test id="qpoint" />
-            <Test id="qpointarray" />
-            <Test id="qpointer" />
-            <Test id="qpopmenu" />
-            <Test id="qprinter" />
-            <Test id="qprinterinfo" />
-            <Test id="qprocess" />
-            <Test id="qprogressbar" />
-            <Test id="qprogressdialog" />
-            <Test id="qpushbutton" />
-            <Test id="qqueue" />
-            <Test id="qradiobutton" />
-            <Test id="qrand" />
-            <Test id="qreadlocker" />
-            <Test id="qreadwritelock" />
-            <Test id="qrect" />
-            <Test id="qregexp" />
-            <Test id="qregexpvalidator" />
-            <Test id="qregion" />
-            <Test id="qresourceengine" />
-            <Test id="qscriptable" />
-            <Test id="qscriptclass" />
-            <Test id="qscriptcontext" />
-            <Test id="qscriptcontextinfo" />
-            <Test id="qscriptengine" />
-            <Test id="qscriptengineagent" />
-            <Test id="qscriptjstestsuite" />
-            <Test id="qscriptobject" />
-            <Test id="qscriptstring" />
-            <Test id="qscriptvalue" />
-            <Test id="qscriptvalueiterator" />
-            <Test id="qscrollarea" />
-            <Test id="qscrollbar" />
-            <Test id="qscrollview" />
-            <Test id="qsemaphore" />
-            <Test id="qset" />
-            <Test id="qsettings" />
-            <Test id="qsharedmemory" />
-            <Test id="qshortcut" />
-            <Test id="qsidebar" />
-            <Test id="qsignalmapper" />
-            <Test id="qsignalspy" />
-            <Test id="qsimplexmlnodemodel" />
-            <Test id="qsize" />
-            <Test id="qsizef" />
-            <Test id="qsizegrip" />
-            <Test id="qslider" />
-            <Test id="qsocket" />
-            <Test id="qsocketnotifier" />
-            <Test id="qsocks5socketengine" />
-            <Test id="qsortfilterproxymodel" />
-            <Test id="qsound" />
-            <Test id="qaudiodeviceid" />
-            <Test id="qaudioformat" />
-            <Test id="qaudiooutput" />
-            <Test id="qaudioinput" />
-            <Test id="qsourcelocation" />
-            <Test id="qspinbox" />
-            <Test id="qsplitter" />
-            <Test id="qsql" />
-            <Test id="qsqlbatch" />
-            <Test id="qsqlcursor" />
-            <Test id="qsqldatabase" />
-            <Test id="qsqlerror" />
-            <Test id="qsqlfield" />
-            <Test id="qsqlquery" />
-            <Test id="qsqlquerymodel" />
-            <Test id="qsqlrecord" />
-            <Test id="qsqlrelationaltablemodel" />
-            <Test id="qsqlselectcursor" />
-            <Test id="qsqltablemodel" />
-            <Test id="qsqlthread" />
-            <Test id="qsslcertificate" />
-            <Test id="qsslcipher" />
-            <Test id="qsslerror" />
-            <Test id="qsslkey" />
-            <Test id="qsslsocket" />
-            <Test id="qstackedlayout" />
-            <Test id="qstackedwidget" />
-            <Test id="qstandarditem" />
-            <Test id="qstandarditemmodel" />
-            <Test id="qstatusbar" />
-            <Test id="qstl" />
-            <Test id="qstring" />
-            <Test id="qstringlist" />
-            <Test id="qstringlistmodel" />
-            <Test id="qstyle" />
-            <Test id="qstyleoption" />
-            <Test id="qstylesheetstyle" />
-            <Test id="qsvgdevice" />
-            <Test id="qsvggenerator" />
-            <Test id="qsvgrenderer" />
-            <Test id="qsyntaxhighlighter" />
-            <Test id="qsysinfo" />
-            <Test id="qsystemsemaphore" />
-            <Test id="qsystemtrayicon" />
-            <Test id="qtabbar" />
-            <Test id="qtableview" />
-            <Test id="qtablewidget" />
-            <Test id="qtabwidget" />
-            <Test id="qtconcurrentfilter" />
-            <Test id="qtconcurrentiteratekernel" />
-            <Test id="qtconcurrentmap" />
-            <Test id="qtconcurrentrun" />
-            <Test id="qtconcurrentthreadengine" />
-            <Test id="qtcpserver" />
-            <Test id="qtcpsocket" />
-            <Test id="qtemporaryfile" />
-            <Test id="qtessellator" />
-            <Test id="qtextblock" />
-            <Test id="qtextboundaryfinder" />
-            <Test id="qtextbrowser" />
-            <Test id="qtextcodec" />
-            <Test id="qtextcursor" />
-            <Test id="qtextdocument" />
-            <Test id="qtextdocumentfragment" />
-            <Test id="qtextdocumentlayout" />
-            <Test id="qtextedit" />
-            <Test id="qtextformat" />
-            <Test id="qtextlayout" />
-            <Test id="qtextlist" />
-            <Test id="qtextobject" />
-            <Test id="qtextpiecetable" />
-            <Test id="qtextscriptengine" />
-            <Test id="qtextstream" />
-            <Test id="qtexttable" />
-            <Test id="qthread" />
-            <Test id="qthreadpool" />
-            <Test id="qthreadstorage" />
-            <Test id="qtime" />
-            <Test id="qtimeline" />
-            <Test id="qtimer" />
-            <Test id="qtmd5" />
-            <Test id="qtoolbar" />
-            <Test id="qtoolbox" />
-            <Test id="qtoolbutton" />
-            <Test id="qtooltip" />
-            <Test id="qtransform" />
-            <Test id="qtransformedscreen" />
-            <Test id="qtranslator" />
-            <Test id="qtreeview" />
-            <Test id="qtreewidget" />
-            <Test id="qtreewidgetitemiterator" />
-            <Test id="qtwidgets" />
-            <Test id="qudpsocket" />
-            <Test id="qundogroup" />
-            <Test id="qundostack" />
-            <Test id="quridrag" />
-            <Test id="qurl" />
-            <Test id="quuid" />
-            <Test id="qvariant" />
-            <Test id="qvarlengtharray" />
-            <Test id="qvector" />
-            <Test id="qwaitcondition" />
-            <Test id="qwebframe" />
-            <Test id="qwebpage" />
-            <Test id="qwidget" />
-            <Test id="qwidgetaction" />
-            <Test id="qwidgetstack" />
-            <Test id="qwidget_window" />
-            <Test id="qwindowsurface" />
-            <Test id="qwineventnotifier" />
-            <Test id="qwizard" />
-            <Test id="qwmatrix" />
-            <Test id="qworkspace" />
-            <Test id="qwritelocker" />
-            <Test id="qwsembedwidget" />
-            <Test id="qwsinputmethod" />
-            <Test id="qwswindowsystem" />
-            <Test id="qx11info" />
-            <Test id="qxml" />
-            <Test id="qxmlformatter" />
-            <Test id="qxmlinputsource" />
-            <Test id="qxmlitem" />
-            <Test id="qxmlname" />
-            <Test id="qxmlnamepool" />
-            <Test id="qxmlnodemodelindex" />
-            <Test id="qxmlquery" />
-            <Test id="qxmlresultitems" />
-            <Test id="qxmlserializer" />
-            <Test id="qxmlsimplereader" />
-            <Test id="qxmlstream" />
-        </TestSuite>
-    </TestSuites>
-    <Testruns>
-        <Testrun name="qt-4.4-macx-g++" suite="qt-4.4" results="/Users/pulse/results" qt="4.4" qtest="4.4" hostname="macbuilder" makespec="macx-g++" timeout="300000" os="osx" />
-        <Testrun name="qt-4.4-linux-g++" suite="qt-4.4" results="/home/pulse/results" qt="4.4" qtest="4.4" hostname="sv-linux-g++" makespec="linux-g++" timeout="300000" os="unix" />
-    </Testruns>
-</Configuration>
diff --git a/tests/auto/uic/baseline/config_fromuic3.ui b/tests/auto/uic/baseline/config_fromuic3.ui
index 0bd6256..2e7addb 100644
--- a/tests/auto/uic/baseline/config_fromuic3.ui
+++ b/tests/auto/uic/baseline/config_fromuic3.ui
@@ -3,7 +3,7 @@
   <author></author>
   <comment>*********************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff --git a/tests/auto/uic/baseline/config_fromuic3.ui.h b/tests/auto/uic/baseline/config_fromuic3.ui.h
index ec20d05..6e22dc7 100644
--- a/tests/auto/uic/baseline/config_fromuic3.ui.h
+++ b/tests/auto/uic/baseline/config_fromuic3.ui.h
@@ -1,7 +1,7 @@
 /*
 *********************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
@@ -45,7 +45,7 @@
 ** Form generated from reading UI file 'config_fromuic3.ui'
 **
 ** Created: Thu Dec 17 12:48:42 2009
-**      by: Qt User Interface Compiler version 4.6.1
+**      by: Qt User Interface Compiler version 4.6.2
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
 ********************************************************************************/
author	Andreas Kling <andreas.kling@nokia.com>	2010-01-20 08:34:08 (GMT)
committer	Andreas Kling <andreas.kling@nokia.com>	2010-01-20 08:34:08 (GMT)
commit	01f733a64e45363e74bea62e4cae8a658bc09383 (patch)
tree	ea39b38552a063e7e10bd432b1155a7abae61620 /tests/auto
parent	fdf463ba74b2e00ba5f9db10f43585e8b15054f7 (diff)
parent	b906feddf1593a837785bc41d65e837e64d31284 (diff)
download	Qt-01f733a64e45363e74bea62e4cae8a658bc09383.zip Qt-01f733a64e45363e74bea62e4cae8a658bc09383.tar.gz Qt-01f733a64e45363e74bea62e4cae8a658bc09383.tar.bz2