Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt

169 files changed, 1103 insertions, 724 deletions

diff --git a/FAQ.txt b/FAQ.txt
deleted file mode 100644
index 1d2266d..0000000
--- a/FAQ.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-This is a list of Frequently Asked Questions regarding this Qt release.
-
-Q: I'm using a Unix system and I downloaded the Zip package. However, when I try
-to run the configure script, I get the following error message:
-"bash: ./configure: /bin/sh^M: bad interpreter: No such file or directory"
-A: The problem here is converting files from Windows style line endings (CRLF)
-to Unix style line endings (LF). To avoid this problem, uncompress the file
-again and give the option "-a" to unzip, which will then add the correct line
-endings.
-
-Q: I'm running Windows XP and I downloaded the qt-win-eval-%VERSION%-vs2008.exe
-version of Qt. However, when I try to run the examples I get an error saying:
-"The application failed to start because the application configuration is
-incorrect. Reinstalling the application may fix this problem.". I reinstalled
-the package but the error persists. What am I doing wrong?
-A: The problem is an incorrect version of the CRT. Visual studio requires CRT90
-while Windows XP comes with CRT80. To solve this problem, please install the
-2008 CRT redistributable package from Microsoft.
diff --git a/demos/browser/xbel.cpp b/demos/browser/xbel.cpp
index ed62868..66b49a4 100644
--- a/demos/browser/xbel.cpp
+++ b/demos/browser/xbel.cpp
@@ -133,16 +133,13 @@ BookmarkNode *XbelReader::read(QIODevice *device)
 {
     BookmarkNode *root = new BookmarkNode(BookmarkNode::Root);
     setDevice(device);
-    while (!atEnd()) {
-        readNext();
-        if (isStartElement()) {
-            QString version = attributes().value(QLatin1String("version")).toString();
-            if (name() == QLatin1String("xbel")
-                && (version.isEmpty() || version == QLatin1String("1.0"))) {
-                readXBEL(root);
-            } else {
-                raiseError(QObject::tr("The file is not an XBEL version 1.0 file."));
-            }
+    if (readNextStartElement()) {
+        QString version = attributes().value(QLatin1String("version")).toString();
+        if (name() == QLatin1String("xbel")
+            && (version.isEmpty() || version == QLatin1String("1.0"))) {
+            readXBEL(root);
+        } else {
+            raiseError(QObject::tr("The file is not an XBEL version 1.0 file."));
         }
     }
     return root;
@@ -152,21 +149,15 @@ void XbelReader::readXBEL(BookmarkNode *parent)
 {
     Q_ASSERT(isStartElement() && name() == QLatin1String("xbel"));
 
-    while (!atEnd()) {
-        readNext();
-        if (isEndElement())
-            break;
-
-        if (isStartElement()) {
-            if (name() == QLatin1String("folder"))
-                readFolder(parent);
-            else if (name() == QLatin1String("bookmark"))
-                readBookmarkNode(parent);
-            else if (name() == QLatin1String("separator"))
-                readSeparator(parent);
-            else
-                skipUnknownElement();
-        }
+    while (readNextStartElement()) {
+        if (name() == QLatin1String("folder"))
+            readFolder(parent);
+        else if (name() == QLatin1String("bookmark"))
+            readBookmarkNode(parent);
+        else if (name() == QLatin1String("separator"))
+            readSeparator(parent);
+        else
+            skipCurrentElement();
     }
 }
 
@@ -177,26 +168,19 @@ void XbelReader::readFolder(BookmarkNode *parent)
     BookmarkNode *folder = new BookmarkNode(BookmarkNode::Folder, parent);
     folder->expanded = (attributes().value(QLatin1String("folded")) == QLatin1String("no"));
 
-    while (!atEnd()) {
-        readNext();
-
-        if (isEndElement())
-            break;
-
-        if (isStartElement()) {
-            if (name() == QLatin1String("title"))
-                readTitle(folder);
-            else if (name() == QLatin1String("desc"))
-                readDescription(folder);
-            else if (name() == QLatin1String("folder"))
-                readFolder(folder);
-            else if (name() == QLatin1String("bookmark"))
-                readBookmarkNode(folder);
-            else if (name() == QLatin1String("separator"))
-                readSeparator(folder);
-            else
-                skipUnknownElement();
-        }
+    while (readNextStartElement()) {
+        if (name() == QLatin1String("title"))
+            readTitle(folder);
+        else if (name() == QLatin1String("desc"))
+            readDescription(folder);
+        else if (name() == QLatin1String("folder"))
+            readFolder(folder);
+        else if (name() == QLatin1String("bookmark"))
+            readBookmarkNode(folder);
+        else if (name() == QLatin1String("separator"))
+            readSeparator(folder);
+        else
+            skipCurrentElement();
     }
 }
 
@@ -224,39 +208,18 @@ void XbelReader::readBookmarkNode(BookmarkNode *parent)
     Q_ASSERT(isStartElement() && name() == QLatin1String("bookmark"));
     BookmarkNode *bookmark = new BookmarkNode(BookmarkNode::Bookmark, parent);
     bookmark->url = attributes().value(QLatin1String("href")).toString();
-    while (!atEnd()) {
-        readNext();
-        if (isEndElement())
-            break;
-
-        if (isStartElement()) {
-            if (name() == QLatin1String("title"))
-                readTitle(bookmark);
-            else if (name() == QLatin1String("desc"))
-                readDescription(bookmark);
-            else
-                skipUnknownElement();
-        }
+    while (readNextStartElement()) {
+        if (name() == QLatin1String("title"))
+            readTitle(bookmark);
+        else if (name() == QLatin1String("desc"))
+            readDescription(bookmark);
+        else
+            skipCurrentElement();
     }
     if (bookmark->title.isEmpty())
         bookmark->title = QObject::tr("Unknown title");
 }
 
-void XbelReader::skipUnknownElement()
-{
-    Q_ASSERT(isStartElement());
-
-    while (!atEnd()) {
-        readNext();
-
-        if (isEndElement())
-            break;
-
-        if (isStartElement())
-            skipUnknownElement();
-    }
-}
-
 
 XbelWriter::XbelWriter()
 {
diff --git a/demos/browser/xbel.h b/demos/browser/xbel.h
index 2bdffe1..ec9008e 100644
--- a/demos/browser/xbel.h
+++ b/demos/browser/xbel.h
@@ -87,7 +87,6 @@ public:
     BookmarkNode *read(QIODevice *device);
 
 private:
-    void skipUnknownElement();
     void readXBEL(BookmarkNode *parent);
     void readTitle(BookmarkNode *parent);
     void readDescription(BookmarkNode *parent);
diff --git a/doc/src/diagrams/dbus-examples.png b/doc/src/diagrams/dbus-examples.png
new file mode 100644
index 0000000..816a9ab
--- /dev/null
+++ b/doc/src/diagrams/dbus-examples.png
diff --git a/doc/src/examples/qxmlstreambookmarks.qdoc b/doc/src/examples/qxmlstreambookmarks.qdoc
index def4c47..26964c4 100644
--- a/doc/src/examples/qxmlstreambookmarks.qdoc
+++ b/doc/src/examples/qxmlstreambookmarks.qdoc
@@ -106,19 +106,18 @@
     of reading only takes place if the file is a valid XBEL 1.0 file. 
     Note that the XML input needs to be well-formed to be accepted by 
     QXmlStreamReader. Otherwise, the \l{QXmlStreamReader::raiseError()}
-    {raiseError()} function is used to display an error message.
+    {raiseError()} function is used to display an error message. Since the
+    XBEL reader is only concerned with reading XML elements, it makes
+    extensive use of the \l{QXmlStreamReader::readNextStartElement()}
+    convenience function.
 
     \snippet examples/xml/streambookmarks/xbelreader.cpp 1
 
-    The \c readUnknownElement() function reads an unknown element. The
-    Q_ASSERT() macro is used to provide a pre-condition for the function.
-
-    \snippet examples/xml/streambookmarks/xbelreader.cpp 2
-
     The \c readXBEL() function reads the name of a startElement and calls
     the appropriate function to read it, depending on whether if its a
     "folder", "bookmark" or "separator". Otherwise, it calls
-    \c readUnknownElement().
+    \l{QXmlStreamReader::skipCurrentElement()}. The Q_ASSERT() macro is used
+    to provide a pre-condition for the function.
 
     \snippet examples/xml/streambookmarks/xbelreader.cpp 3
 
diff --git a/doc/src/frameworks-technologies/gestures.qdoc b/doc/src/frameworks-technologies/gestures.qdoc
index 49a9ae3..316d74d 100644
--- a/doc/src/frameworks-technologies/gestures.qdoc
+++ b/doc/src/frameworks-technologies/gestures.qdoc
@@ -34,7 +34,7 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
+** contact the sales department at http://www.example.com/contact.
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/doc/src/getting-started/known-issues.qdoc b/doc/src/getting-started/known-issues.qdoc
index 0a94d86..41bdcdf 100644
--- a/doc/src/getting-started/known-issues.qdoc
+++ b/doc/src/getting-started/known-issues.qdoc
@@ -133,6 +133,7 @@
 
     \endlist
 
+
     \section2 Mac OS X Software Support
 
     \list
@@ -140,4 +141,34 @@
         window will cause it to flash. This behavior has been reported to Apple
         (bug number 5827676).
     \endlist
+
+
+    \section2 Installing source packages on Unix systems
+
+    \list
+    \o  If you download a Zip source package, you will need to convert
+        Windows-style line endings (CR/LF) to Unix-style line-endings (LF) when
+        you uncompress the package.  To do this, give the "-a" option when you
+        run the "unzip' command.
+    
+        If you fail to supply the "-a" option when unzipping the package, you
+        will see the following error message when you attempt to execute the
+        configure command:
+        "bash: ./configure: /bin/sh^M: bad interpreter: No such file or directory"
+    \endlist
+
+
+    \section2 Running evaluation packages on Windows XP
+
+    \list
+    \o  If running the qt-win-eval-%VERSION%-vs2008.exe package on a Windows XP
+        system, you may encounter the following error message:
+        "The application failed to start because the application configuration
+        is incorrect. Reinstalling the application may fix this problem.".
+
+        This error occurs because the version of the CRT component on the
+        system is incorrect.  Visual Studio 2008 requires CRT90 while Windows
+        XP comes with CRT80. To solve this problem, please install the 2008 CRT
+        redistributable package from Microsoft.
+    \endlist
 */
diff --git a/doc/src/images/dbus-examples.png b/doc/src/images/dbus-examples.png
new file mode 100644
index 0000000..6768935
--- /dev/null
+++ b/doc/src/images/dbus-examples.png
diff --git a/doc/src/snippets/code/doc_src_qalgorithms.qdoc b/doc/src/snippets/code/doc_src_qalgorithms.qdoc
index 69d943c..e2126dd 100644
--- a/doc/src/snippets/code/doc_src_qalgorithms.qdoc
+++ b/doc/src/snippets/code/doc_src_qalgorithms.qdoc
@@ -302,7 +302,7 @@ list.clear();
 QList<int> list;
 list << 33 << 12 << 68 << 6 << 12;
 qSort(list.begin(), list.end(), qLess<int>());
-// list: [ 68, 33, 12, 12, 6 ]
+// list: [ 6, 12, 12, 33, 68 ]
 //! [24]
 
 
diff --git a/doc/src/xml-processing/xml-processing.qdoc b/doc/src/xml-processing/xml-processing.qdoc
index 44c5450..6e48515 100644
--- a/doc/src/xml-processing/xml-processing.qdoc
+++ b/doc/src/xml-processing/xml-processing.qdoc
@@ -121,18 +121,18 @@
     Before we can apply a namespace to element or attribute names we must
     declare it.
 
-    Namespaces are URIs like \e http://www.qtsoftware.com/fnord/book/. This
+    Namespaces are URIs like \e http://www.example.com/fnord/book/. This
     does not mean that data must be available at this address; the URI is
     simply used to provide a unique name.
 
     We declare namespaces in the same way as attributes; strictly speaking
     they \e are attributes. To make for example \e
-    http://www.qtsoftware.com/fnord/ the document's default XML namespace \e
+    http://www.example.com/fnord/ the document's default XML namespace \e
     xmlns we write
 
     \snippet doc/src/snippets/code/doc_src_qtxml.qdoc 8
 
-    To distinguish the \e http://www.qtsoftware.com/fnord/book/ namespace from
+    To distinguish the \e http://www.example.com/fnord/book/ namespace from
     the default, we must supply it with a prefix:
 
     \snippet doc/src/snippets/code/doc_src_qtxml.qdoc 9
@@ -159,12 +159,12 @@
     \snippet doc/src/snippets/code/doc_src_qtxml.qdoc 10
 
     Within the \e document element we have two namespaces declared. The
-    default namespace \e http://www.qtsoftware.com/fnord/ applies to the \e
+    default namespace \e http://www.example.com/fnord/ applies to the \e
     book element, the \e chapter element, the appropriate \e title element
     and of course to \e document itself.
 
     The \e book:author and \e book:title elements belong to the namespace
-    with the URI \e http://www.qtsoftware.com/fnord/book/.
+    with the URI \e http://www.example.com/fnord/book/.
 
     The two \e book:author attributes \e title and \e name have no XML
     namespace assigned. They are only members of the "traditional"
@@ -172,7 +172,7 @@
     \e title attributes in \e book:author are forbidden.
 
     In the above example we circumvent the last rule by adding a \e title
-    attribute from the \e http://www.qtsoftware.com/fnord/ namespace to \e
+    attribute from the \e http://www.example.com/fnord/ namespace to \e
     book:author: the \e fnord:title comes from the namespace with the
     prefix \e fnord that is declared in the \e book:author element.
 
@@ -212,7 +212,7 @@
         local part of \e book:title.)
     \o  The \e {namespace URI} ("Uniform Resource Identifier") is a unique
         identifier for a namespace. It looks like a URL
-        (e.g. \e http://www.qtsoftware.com/fnord/ ) but does not require
+        (e.g. \e http://www.example.com/fnord/ ) but does not require
         data to be accessible by the given protocol at the named address.
     \endlist
 
diff --git a/examples/network/googlesuggest/googlesuggest.cpp b/examples/network/googlesuggest/googlesuggest.cpp
index ada0edf..4142511 100644
--- a/examples/network/googlesuggest/googlesuggest.cpp
+++ b/examples/network/googlesuggest/googlesuggest.cpp
@@ -134,7 +134,6 @@ bool GSuggestCompletion::eventFilter(QObject *obj, QEvent *ev)
 
 void GSuggestCompletion::showCompletion(const QStringList &choices, const QStringList &hits)
 {
-
     if (choices.isEmpty() || choices.count() != hits.count())
         return;
 
@@ -204,16 +203,16 @@ void GSuggestCompletion::handleNetworkData(QNetworkReply *networkReply)
         QXmlStreamReader xml(response);
         while (!xml.atEnd()) {
             xml.readNext();
-            if (xml.tokenType() == QXmlStreamReader::StartElement)
+            if (xml.isStartElement()) {
                 if (xml.name() == "suggestion") {
                     QStringRef str = xml.attributes().value("data");
                     choices << str.toString();
                 }
-            if (xml.tokenType() == QXmlStreamReader::StartElement)
-                if (xml.name() == "num_queries") {
+                else if (xml.name() == "num_queries") {
                     QStringRef str = xml.attributes().value("int");
                     hits << str.toString();
                 }
+            }
         }
 
         showCompletion(choices, hits);
diff --git a/examples/xml/streambookmarks/xbelreader.cpp b/examples/xml/streambookmarks/xbelreader.cpp
index 47c8c3d..4472f8a 100644
--- a/examples/xml/streambookmarks/xbelreader.cpp
+++ b/examples/xml/streambookmarks/xbelreader.cpp
@@ -62,15 +62,11 @@ bool XbelReader::read(QIODevice *device)
 {
     setDevice(device);
 
-    while (!atEnd()) {
-        readNext();
-
-        if (isStartElement()) {
-            if (name() == "xbel" && attributes().value("version") == "1.0")
-                readXBEL();
-            else
-                raiseError(QObject::tr("The file is not an XBEL version 1.0 file."));
-        }
+    if (readNextStartElement()) {
+        if (name() == "xbel" && attributes().value("version") == "1.0")
+            readXBEL();
+        else
+            raiseError(QObject::tr("The file is not an XBEL version 1.0 file."));
     }
 
     return !error();
@@ -80,15 +76,7 @@ bool XbelReader::read(QIODevice *device)
 //! [2]
 void XbelReader::readUnknownElement()
 {
-    Q_ASSERT(isStartElement());
-
-    while (!atEnd()) {
-        readNext();
-
-        if (isEndElement())
-            break;
-
-        if (isStartElement())
+    while (readNextStartElement()) {
             readUnknownElement();
     }
 }
@@ -99,22 +87,15 @@ void XbelReader::readXBEL()
 {
     Q_ASSERT(isStartElement() && name() == "xbel");
 
-    while (!atEnd()) {
-        readNext();
-
-        if (isEndElement())
-            break;
-
-        if (isStartElement()) {
-            if (name() == "folder")
-                readFolder(0);
-            else if (name() == "bookmark")
-                readBookmark(0);
-            else if (name() == "separator")
-                readSeparator(0);
-            else
-                readUnknownElement();
-        }
+    while (readNextStartElement()) {
+        if (name() == "folder")
+            readFolder(0);
+        else if (name() == "bookmark")
+            readBookmark(0);
+        else if (name() == "separator")
+            readSeparator(0);
+        else
+            readUnknownElement();
     }
 }
 //! [3]
@@ -132,10 +113,12 @@ void XbelReader::readTitle(QTreeWidgetItem *item)
 //! [5]
 void XbelReader::readSeparator(QTreeWidgetItem *item)
 {
+    Q_ASSERT(isStartElement() && name() == "separator");
+
     QTreeWidgetItem *separator = createChildItem(item);
     separator->setFlags(item->flags() & ~Qt::ItemIsSelectable);
     separator->setText(0, QString(30, 0xB7));
-    readElementText();
+    skipCurrentElement();
 }
 //! [5]
 
@@ -147,24 +130,17 @@ void XbelReader::readFolder(QTreeWidgetItem *item)
     bool folded = (attributes().value("folded") != "no");
     treeWidget->setItemExpanded(folder, !folded);
 
-    while (!atEnd()) {
-        readNext();
-
-        if (isEndElement())
-            break;
-
-        if (isStartElement()) {
-            if (name() == "title")
-                readTitle(folder);
-            else if (name() == "folder")
-                readFolder(folder);
-            else if (name() == "bookmark")
-                readBookmark(folder);
-            else if (name() == "separator")
-                readSeparator(folder);
-            else
-                readUnknownElement();
-        }
+    while (readNextStartElement()) {
+        if (name() == "title")
+            readTitle(folder);
+        else if (name() == "folder")
+            readFolder(folder);
+        else if (name() == "bookmark")
+            readBookmark(folder);
+        else if (name() == "separator")
+            readSeparator(folder);
+        else
+            skipCurrentElement();
     }
 }
 
@@ -177,18 +153,12 @@ void XbelReader::readBookmark(QTreeWidgetItem *item)
     bookmark->setIcon(0, bookmarkIcon);
     bookmark->setText(0, QObject::tr("Unknown title"));
     bookmark->setText(1, attributes().value("href").toString());
-    while (!atEnd()) {
-        readNext();
-
-        if (isEndElement())
-            break;
-
-        if (isStartElement()) {
-            if (name() == "title")
-                readTitle(bookmark);
-            else
-                readUnknownElement();
-        }
+
+    while (readNextStartElement()) {
+        if (name() == "title")
+            readTitle(bookmark);
+        else
+            skipCurrentElement();
     }
 }
 
diff --git a/mkspecs/features/win32/rtti_off.prf b/mkspecs/features/win32/rtti_off.prf
index 8f175de..b520bfa 100644
--- a/mkspecs/features/win32/rtti_off.prf
+++ b/mkspecs/features/win32/rtti_off.prf
@@ -1,3 +1,4 @@
 CONFIG -= rtti
 QMAKE_CFLAGS += $$QMAKE_CFLAGS_RTTI_OFF
 QMAKE_CXXFLAGS += $$QMAKE_CXXFLAGS_RTTI_OFF
+DEFINES += QT_NO_DYNAMIC_CAST
\ No newline at end of file
diff --git a/qmake/generators/win32/msvc_vcproj.cpp b/qmake/generators/win32/msvc_vcproj.cpp
index 2b0ce28..7c4c70f 100644
--- a/qmake/generators/win32/msvc_vcproj.cpp
+++ b/qmake/generators/win32/msvc_vcproj.cpp
@@ -623,7 +623,7 @@ void VcprojGenerator::writeSubDirs(QTextStream &t)
                         }
 
                         // Add all unknown libs to the deps
-                        QStringList where("QMAKE_LIBS");
+                        QStringList where = QStringList() << "QMAKE_LIBS" << "QMAKE_LIBS_PRIVATE";
                         if(!tmp_proj.isEmpty("QMAKE_INTERNAL_PRL_LIBS"))
                             where = tmp_proj.variables()["QMAKE_INTERNAL_PRL_LIBS"];
                         for(QStringList::iterator wit = where.begin();
@@ -1556,6 +1556,7 @@ void VcprojGenerator::initOld()
     }
 
     project->values("QMAKE_LIBS") += escapeFilePaths(project->values("LIBS"));
+    project->values("QMAKE_LIBS_PRIVATE") += escapeFilePaths(project->values("LIBS_PRIVATE"));
 
      // Get filename w/o extension -----------------------------------
     QString msvcproj_project = "";
@@ -1599,6 +1600,7 @@ void VcprojGenerator::initOld()
 
     // $$QMAKE.. -> $$MSVCPROJ.. -------------------------------------
     project->values("MSVCPROJ_LIBS") += project->values("QMAKE_LIBS");
+    project->values("MSVCPROJ_LIBS") += project->values("QMAKE_LIBS_PRIVATE");
     project->values("MSVCPROJ_LFLAGS") += project->values("QMAKE_LFLAGS");
     if(!project->values("QMAKE_LIBDIR").isEmpty()) {
         QStringList strl = project->values("QMAKE_LIBDIR");
diff --git a/src/corelib/animation/qanimationgroup.cpp b/src/corelib/animation/qanimationgroup.cpp
index ab47b5a..78777f1 100644
--- a/src/corelib/animation/qanimationgroup.cpp
+++ b/src/corelib/animation/qanimationgroup.cpp
@@ -79,13 +79,6 @@
     QAnimationGroup takes ownership of the animations it manages, and
     ensures that they are deleted when the animation group is deleted.
 
-    You can also use a \l{The State Machine Framework}{state machine}
-    to create complex animations. The framework provides a special
-    state, QAnimationState, that plays an animation upon entry and
-    transitions to a new state when the animation has finished
-    playing. This technique can also be combined with using animation
-    groups.
-
     \sa QAbstractAnimation, QVariantAnimation, {The Animation Framework}
 */
 
diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h
index 92fe649..40b65fd 100644
--- a/src/corelib/global/qglobal.h
+++ b/src/corelib/global/qglobal.h
@@ -297,7 +297,7 @@ namespace QT_NAMESPACE {}
 #  ifdef MAC_OS_X_VERSION_MIN_REQUIRED
 #    undef MAC_OS_X_VERSION_MIN_REQUIRED
 #  endif
-#  define MAC_OS_X_VERSION_MIN_REQUIRED MAC_OS_X_VERSION_10_3
+#  define MAC_OS_X_VERSION_MIN_REQUIRED MAC_OS_X_VERSION_10_4
 #  include <AvailabilityMacros.h>
 #  if !defined(MAC_OS_X_VERSION_10_3)
 #     define MAC_OS_X_VERSION_10_3 MAC_OS_X_VERSION_10_2 + 1
diff --git a/src/corelib/io/qurl.cpp b/src/corelib/io/qurl.cpp
index acbac36..4aae53d 100644
--- a/src/corelib/io/qurl.cpp
+++ b/src/corelib/io/qurl.cpp
@@ -5699,6 +5699,10 @@ QString QUrl::fromAce(const QByteArray &domain)
     Applications (IDNA) specification, which allows for domain names
     (like \c "example.com") to be written using international
     characters.
+
+    This function return an empty QByteArra if \a domain is not a valid
+    hostname. Note, in particular, that IPv6 literals are not valid domain
+    names.
 */
 QByteArray QUrl::toAce(const QString &domain)
 {
diff --git a/src/corelib/xml/qxmlstream.cpp b/src/corelib/xml/qxmlstream.cpp
index a08b167..a311b99 100644
--- a/src/corelib/xml/qxmlstream.cpp
+++ b/src/corelib/xml/qxmlstream.cpp
@@ -129,6 +129,21 @@ QT_BEGIN_NAMESPACE
 */
 
 /*!
+    \enum QXmlStreamReader::ReadElementTextBehaviour
+
+    This enum specifies the different behaviours of readElementText().
+
+    \value ErrorOnUnexpectedElement Raise an UnexpectedElementError and return
+    what was read so far when a child element is encountered.
+
+    \value IncludeChildElements Recursively include the text from child elements.
+
+    \value SkipChildElements Skip child elements.
+
+    \since 4.6
+*/
+
+/*!
     \enum QXmlStreamReader::Error
 
     This enum specifies different error cases
@@ -622,6 +637,56 @@ QXmlStreamReader::TokenType QXmlStreamReader::tokenType() const
     return d->type;
 }
 
+/*!
+  Reads until the next start element within the current element. Returns true
+  when a start element was reached. When the end element was reached, or when
+  an error occurred, false is returned.
+
+  The current element is the element matching the most recently parsed start
+  element of which a matching end element has not yet been reached. When the
+  parser has reached the end element, the current element becomes the parent
+  element.
+
+  This is a convenience function for when you're only concerned with parsing
+  XML elements. The \l{QXmlStream Bookmarks Example} makes extensive use of
+  this function.
+
+  \since 4.6
+  \sa readNext()
+ */
+bool QXmlStreamReader::readNextStartElement()
+{
+    while (readNext() != Invalid) {
+        if (isEndElement())
+            return false;
+        else if (isStartElement())
+            return true;
+    }
+    return false;
+}
+
+/*!
+  Reads until the end of the current element, skipping any child nodes.
+  This function is useful for skipping unknown elements.
+
+  The current element is the element matching the most recently parsed start
+  element of which a matching end element has not yet been reached. When the
+  parser has reached the end element, the current element becomes the parent
+  element.
+
+  \since 4.6
+ */
+void QXmlStreamReader::skipCurrentElement()
+{
+    int depth = 1;
+    while (depth && readNext() != Invalid) {
+        if (isEndElement())
+            --depth;
+        else if (isStartElement())
+            ++depth;
+    }
+}
+
 /*
  * Use the following Perl script to generate the error string index list:
 ===== PERL SCRIPT ====
@@ -2021,12 +2086,17 @@ void QXmlStreamReader::addExtraNamespaceDeclarations(const QXmlStreamNamespaceDe
 
   The function concatenates text() when it reads either \l Characters
   or EntityReference tokens, but skips ProcessingInstruction and \l
-  Comment. In case anything else is read before reaching EndElement,
-  the function returns what it read so far and raises an
-  UnexpectedElementError. If the current token is not StartElement, an
-  empty string is returned.
+  Comment. If the current token is not StartElement, an empty string is
+  returned.
+
+  The \a behaviour defines what happens in case anything else is
+  read before reaching EndElement. The function can include the text from
+  child elements (useful for example for HTML), ignore child elements, or
+  raise an UnexpectedElementError and return what was read so far.
+
+  \since 4.6
  */
-QString QXmlStreamReader::readElementText()
+QString QXmlStreamReader::readElementText(ReadElementTextBehaviour behaviour)
 {
     Q_D(QXmlStreamReader);
     if (isStartElement()) {
@@ -2042,16 +2112,37 @@ QString QXmlStreamReader::readElementText()
             case ProcessingInstruction:
             case Comment:
                 break;
+            case StartElement:
+                if (behaviour == SkipChildElements) {
+                    skipCurrentElement();
+                    break;
+                } else if (behaviour == IncludeChildElements) {
+                    result += readElementText(behaviour);
+                    break;
+                }
+                // Fall through (for ErrorOnUnexpectedElement)
             default:
-                if (!d->error)
-                    d->raiseError(UnexpectedElementError, QXmlStream::tr("Expected character data."));
-                return result;
+                if (d->error || behaviour == ErrorOnUnexpectedElement) {
+                    if (!d->error)
+                        d->raiseError(UnexpectedElementError, QXmlStream::tr("Expected character data."));
+                    return result;
+                }
             }
         }
     }
     return QString();
 }
 
+/*!
+  \overload readElementText()
+
+  Calling this function is equivalent to calling readElementText(ErrorOnUnexpectedElement).
+ */
+QString QXmlStreamReader::readElementText()
+{
+    return readElementText(ErrorOnUnexpectedElement);
+}
+
 /*!  Raises a custom error with an optional error \a message.
 
   \sa error(), errorString()
diff --git a/src/corelib/xml/qxmlstream.h b/src/corelib/xml/qxmlstream.h
index 420a66a..71deb66 100644
--- a/src/corelib/xml/qxmlstream.h
+++ b/src/corelib/xml/qxmlstream.h
@@ -321,6 +321,9 @@ public:
     bool atEnd() const;
     TokenType readNext();
 
+    bool readNextStartElement();
+    void skipCurrentElement();
+
     TokenType tokenType() const;
     QString tokenString() const;
 
@@ -348,6 +351,13 @@ public:
     qint64 characterOffset() const;
 
     QXmlStreamAttributes attributes() const;
+
+    enum ReadElementTextBehaviour {
+        ErrorOnUnexpectedElement,
+        IncludeChildElements,
+        SkipChildElements
+    };
+    QString readElementText(ReadElementTextBehaviour behaviour);
     QString readElementText();
 
     QStringRef name() const;
diff --git a/src/dbus/qdbus_symbols.cpp b/src/dbus/qdbus_symbols.cpp
index ca0147a..356b14c 100644
--- a/src/dbus/qdbus_symbols.cpp
+++ b/src/dbus/qdbus_symbols.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 
+#include "qdbus_symbols_p.h"
 #include <QtCore/qglobal.h>
 #include <QtCore/qlibrary.h>
 #include <QtCore/qmutex.h>
@@ -52,7 +53,7 @@ void *qdbus_resolve_me(const char *name);
 
 static QLibrary *qdbus_libdbus = 0;
 
-void qdbus_unloadLibDBus()
+static void qdbus_unloadLibDBus()
 {
     delete qdbus_libdbus;
     qdbus_libdbus = 0;
@@ -76,8 +77,11 @@ bool qdbus_loadLibDBus()
     lib->setFileName(QLatin1String("dbus-1"));
     for (uint i = 0; i < sizeof(majorversions) / sizeof(majorversions[0]); ++i) {
         lib->setFileNameAndVersion(lib->fileName(), majorversions[i]);
-        if (lib->load() && lib->resolve("dbus_connection_open_private"))
+        if (lib->load() && lib->resolve("dbus_connection_open_private")) {
+            struct Unloader { ~Unloader() { qdbus_unloadLibDBus(); } };
+            static Unloader unloader;
             return true;
+        }
 
         lib->unload();
     }
@@ -107,8 +111,6 @@ void *qdbus_resolve_me(const char *name)
     return ptr;
 }
 
-Q_DESTRUCTOR_FUNCTION(qdbus_unloadLibDBus)
-
 QT_END_NAMESPACE
 
 #endif
diff --git a/src/gui/graphicsview/qgraphicsitem.h b/src/gui/graphicsview/qgraphicsitem.h
index b5e6ed5..52b862e 100644
--- a/src/gui/graphicsview/qgraphicsitem.h
+++ b/src/gui/graphicsview/qgraphicsitem.h
@@ -516,6 +516,7 @@ class Q_GUI_EXPORT QGraphicsObject : public QObject, public QGraphicsItem
     Q_PROPERTY(qreal rotation READ rotation WRITE setRotation NOTIFY rotationChanged)
     Q_PROPERTY(qreal scale READ scale WRITE setScale NOTIFY scaleChanged)
     Q_PROPERTY(QPointF transformOriginPoint READ transformOriginPoint WRITE setTransformOriginPoint)
+    Q_INTERFACES(QGraphicsItem)
 public:
     QGraphicsObject(QGraphicsItem *parent = 0);
 
diff --git a/src/gui/itemviews/qheaderview.cpp b/src/gui/itemviews/qheaderview.cpp
index f7b5b6f..4ab81f5 100644
--- a/src/gui/itemviews/qheaderview.cpp
+++ b/src/gui/itemviews/qheaderview.cpp
@@ -1195,7 +1195,8 @@ QHeaderView::ResizeMode QHeaderView::resizeMode(int logicalIndex) const
 {
     Q_D(const QHeaderView);
     int visual = visualIndex(logicalIndex);
-    Q_ASSERT(visual != -1);
+    if (visual == -1)
+        return Fixed; //the default value
     return d->headerSectionResizeMode(visual);
 }
 
diff --git a/src/gui/itemviews/qitemselectionmodel.cpp b/src/gui/itemviews/qitemselectionmodel.cpp
index 98810a0..8414460 100644
--- a/src/gui/itemviews/qitemselectionmodel.cpp
+++ b/src/gui/itemviews/qitemselectionmodel.cpp
@@ -573,6 +573,7 @@ void QItemSelectionModelPrivate::_q_rowsAboutToBeRemoved(const QModelIndex &pare
                                                          int start, int end)
 {
     Q_Q(QItemSelectionModel);
+    finalize();
 
     // update current index
     if (currentIndex.isValid() && parent == currentIndex.parent()
@@ -591,8 +592,8 @@ void QItemSelectionModelPrivate::_q_rowsAboutToBeRemoved(const QModelIndex &pare
     }
 
     QItemSelection deselected;
-    QItemSelection::iterator it = currentSelection.begin();
-    while (it != currentSelection.end()) {
+    QItemSelection::iterator it = ranges.begin();
+    while (it != ranges.end()) {
         if (it->topLeft().parent() != parent) {  // Check parents until reaching root or contained in range
             QModelIndex itParent = it->topLeft().parent();
             while (itParent.isValid() && itParent.parent() != parent)
@@ -600,24 +601,22 @@ void QItemSelectionModelPrivate::_q_rowsAboutToBeRemoved(const QModelIndex &pare
 
             if (parent.isValid() && start <= itParent.row() && itParent.row() <= end) {
                 deselected.append(*it);
-                it = currentSelection.erase(it);
+                it = ranges.erase(it);
             } else {
                 ++it;
             }
         } else if (start <= it->bottom() && it->bottom() <= end    // Full inclusion
                    && start <= it->top() && it->top() <= end) {
             deselected.append(*it);
-            it = currentSelection.erase(it);
+            it = ranges.erase(it);
         } else if (start <= it->top() && it->top() <= end) {      // Top intersection
             deselected.append(QItemSelectionRange(it->topLeft(), model->index(end, it->left(), it->parent())));
-            it = currentSelection.insert(it, QItemSelectionRange(model->index(end + 1, it->left(), it->parent()),
-                                                                 it->bottomRight()));
-            it = currentSelection.erase(++it);
+            *it = QItemSelectionRange(model->index(end + 1, it->left(), it->parent()), it->bottomRight());
+            ++it;
         } else if (start <= it->bottom() && it->bottom() <= end) {    // Bottom intersection
             deselected.append(QItemSelectionRange(model->index(start, it->right(), it->parent()), it->bottomRight()));
-            it = currentSelection.insert(it, QItemSelectionRange(it->topLeft(),
-                                                                 model->index(start - 1, it->right(), it->parent())));
-            it = currentSelection.erase(++it);
+            *it = QItemSelectionRange(it->topLeft(), model->index(start - 1, it->right(), it->parent()));
+            ++it;
         } else {
             if (it->top() < start && end < it->bottom())  // Middle intersection (do nothing)
                 deselected.append(QItemSelectionRange(model->index(start, it->right(), it->parent()),
@@ -626,7 +625,8 @@ void QItemSelectionModelPrivate::_q_rowsAboutToBeRemoved(const QModelIndex &pare
        }
     }
 
-    emit q->selectionChanged(QItemSelection(), deselected);
+    if (!deselected.isEmpty())
+        emit q->selectionChanged(QItemSelection(), deselected);
 }
 
 /*!
diff --git a/src/gui/itemviews/qlistview.cpp b/src/gui/itemviews/qlistview.cpp
index ea38f5f..e9e365f 100644
--- a/src/gui/itemviews/qlistview.cpp
+++ b/src/gui/itemviews/qlistview.cpp
@@ -458,6 +458,8 @@ QSize QListView::gridSize() const
 void QListView::setViewMode(ViewMode mode)
 {
     Q_D(QListView);
+    if (d->viewMode == mode)
+        return;
     d->viewMode = mode;
 
     if (mode == ListMode) {
@@ -1963,7 +1965,7 @@ QListViewPrivate::QListViewPrivate()
       movement(QListView::Static),
       resizeMode(QListView::Fixed),
       layoutMode(QListView::SinglePass),
-      viewMode(QListView::ListMode),
+      viewMode(QListView::IconMode), //this will ensure the first initialization to ListView
       modeProperties(0),
       column(0),
       uniformItemSizes(false),
diff --git a/src/gui/kernel/qapplication_x11.cpp b/src/gui/kernel/qapplication_x11.cpp
index db349f0..d942519 100644
--- a/src/gui/kernel/qapplication_x11.cpp
+++ b/src/gui/kernel/qapplication_x11.cpp
@@ -1851,10 +1851,20 @@ void qt_init(QApplicationPrivate *priv, int,
             QX11InfoData *screen = X11->screens + s;
             screen->ref = 1; // ensures it doesn't get deleted
             screen->screen = s;
-            screen->dpiX = (DisplayWidth(X11->display, s) * 254 + DisplayWidthMM(X11->display, s)*5)
-                           / (DisplayWidthMM(X11->display, s)*10);
-            screen->dpiY = (DisplayHeight(X11->display, s) * 254 + DisplayHeightMM(X11->display, s)*5)
-                           / (DisplayHeightMM(X11->display, s)*10);
+
+            int widthMM = DisplayWidthMM(X11->display, s);
+            if (widthMM != 0) {
+                screen->dpiX = (DisplayWidth(X11->display, s) * 254 + widthMM * 5) / (widthMM * 10);
+            } else {
+                screen->dpiX = 72;
+            }
+
+            int heightMM = DisplayHeightMM(X11->display, s);
+            if (heightMM != 0) {
+                screen->dpiY = (DisplayHeight(X11->display, s) * 254 + heightMM * 5) / (heightMM * 10);
+            } else {
+                screen->dpiY = 72;
+            }
 
             X11->argbVisuals[s] = 0;
             X11->argbColormaps[s] = 0;
diff --git a/src/gui/kernel/qcocoaview_mac.mm b/src/gui/kernel/qcocoaview_mac.mm
index 45b0ada..7ac0d89 100644
--- a/src/gui/kernel/qcocoaview_mac.mm
+++ b/src/gui/kernel/qcocoaview_mac.mm
@@ -872,7 +872,7 @@ extern "C" {
     NSPoint p = [[event window] convertBaseToScreen:[event locationInWindow]];
     qNGEvent.position = flipPoint(p).toPoint();
     qNGEvent.percentage = [event magnification];
-    qApp->sendEvent(qwidget, &qNGEvent);
+    qt_sendSpontaneousEvent(qwidget, &qNGEvent);
 }
 
 - (void)rotateWithEvent:(NSEvent *)event;
@@ -885,7 +885,7 @@ extern "C" {
     NSPoint p = [[event window] convertBaseToScreen:[event locationInWindow]];
     qNGEvent.position = flipPoint(p).toPoint();
     qNGEvent.percentage = [event rotation];
-    qApp->sendEvent(qwidget, &qNGEvent);
+    qt_sendSpontaneousEvent(qwidget, &qNGEvent);
 }
 
 - (void)swipeWithEvent:(NSEvent *)event;
@@ -898,7 +898,7 @@ extern "C" {
     NSPoint p = [[event window] convertBaseToScreen:[event locationInWindow]];
     qNGEvent.position = flipPoint(p).toPoint();
     qNGEvent.direction = QSize(-[event deltaX], -[event deltaY]);
-    qApp->sendEvent(qwidget, &qNGEvent);
+    qt_sendSpontaneousEvent(qwidget, &qNGEvent);
 }
 
 - (void)beginGestureWithEvent:(NSEvent *)event;
@@ -910,7 +910,7 @@ extern "C" {
     qNGEvent.gestureType = QNativeGestureEvent::GestureBegin;
     NSPoint p = [[event window] convertBaseToScreen:[event locationInWindow]];
     qNGEvent.position = flipPoint(p).toPoint();
-    qApp->sendEvent(qwidget, &qNGEvent);
+    qt_sendSpontaneousEvent(qwidget, &qNGEvent);
 }
 
 - (void)endGestureWithEvent:(NSEvent *)event;
@@ -922,7 +922,7 @@ extern "C" {
     qNGEvent.gestureType = QNativeGestureEvent::GestureEnd;
     NSPoint p = [[event window] convertBaseToScreen:[event locationInWindow]];
     qNGEvent.position = flipPoint(p).toPoint();
-    qApp->sendEvent(qwidget, &qNGEvent);
+    qt_sendSpontaneousEvent(qwidget, &qNGEvent);
 }
 #endif // MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6
 
diff --git a/src/gui/kernel/qeventdispatcher_mac.mm b/src/gui/kernel/qeventdispatcher_mac.mm
index efe6375..113362a 100644
--- a/src/gui/kernel/qeventdispatcher_mac.mm
+++ b/src/gui/kernel/qeventdispatcher_mac.mm
@@ -500,7 +500,7 @@ static bool IsMouseOrKeyEvent( NSEvent* event )
 static inline void qt_mac_waitForMoreEvents()
 {
 #ifndef QT_MAC_USE_COCOA
-    while(CFRunLoopRunInMode(kCFRunLoopDefaultMode, 1.0e20, true) == kCFRunLoopRunTimedOut);
+    while (CFRunLoopRunInMode(kCFRunLoopDefaultMode, 1.0e20, true) == kCFRunLoopRunTimedOut) ;
 #else
     // If no event exist in the cocoa event que, wait
     // (and free up cpu time) until at least one event occur.
diff --git a/src/gui/kernel/qwidget_mac.mm b/src/gui/kernel/qwidget_mac.mm
index 5bf140c..999faeb 100644
--- a/src/gui/kernel/qwidget_mac.mm
+++ b/src/gui/kernel/qwidget_mac.mm
@@ -107,6 +107,7 @@
 #include <private/qcocoapanel_mac_p.h>
 
 #include "qwidget_p.h"
+#include "qevent_p.h"
 #include "qdnd_p.h"
 #include <QtGui/qgraphicsproxywidget.h>
 
@@ -729,6 +730,13 @@ static EventTypeSpec window_events[] = {
     { kEventClassWindow, kEventWindowGetRegion },
     { kEventClassWindow, kEventWindowGetClickModality },
     { kEventClassWindow, kEventWindowTransitionCompleted },
+#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6
+    { kEventClassGesture, kEventGestureStarted },
+    { kEventClassGesture, kEventGestureEnded },
+    { kEventClassGesture, kEventGestureMagnify },
+    { kEventClassGesture, kEventGestureSwipe },
+    { kEventClassGesture, kEventGestureRotate },
+#endif
     { kEventClassMouse, kEventMouseDown }
 };
 static EventHandlerUPP mac_win_eventUPP = 0;
@@ -1013,6 +1021,69 @@ OSStatus QWidgetPrivate::qt_window_event(EventHandlerCallRef er, EventRef event,
             return SendEventToApplication(event);
         handled_event = false;
         break; }
+
+#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6
+    case kEventClassGesture: {
+        // First, find the widget that was under
+        // the mouse when the gesture happened:
+        HIPoint screenLocation;
+        if (GetEventParameter(event, kEventParamMouseLocation, typeHIPoint, 0,
+                    sizeof(screenLocation), 0, &screenLocation) != noErr) {
+            handled_event = false;
+            break;
+        }
+        QWidget *widget = QApplication::widgetAt(screenLocation.x, screenLocation.y);
+        if (!widget) {
+            handled_event = false;
+            break;
+        }
+
+        QNativeGestureEvent qNGEvent;
+        qNGEvent.position = QPoint(screenLocation.x, screenLocation.y);
+
+        switch (ekind) {
+            case kEventGestureStarted:
+                qNGEvent.gestureType = QNativeGestureEvent::GestureBegin;
+                break;
+            case kEventGestureEnded:
+                qNGEvent.gestureType = QNativeGestureEvent::GestureEnd;
+                break;
+            case kEventGestureRotate: {
+                CGFloat amount;
+                if (GetEventParameter(event, kEventParamRotationAmount, typeCGFloat, 0,
+                            sizeof(amount), 0, &amount) != noErr) {
+                    handled_event = false;
+                    break;
+                }
+                qNGEvent.gestureType = QNativeGestureEvent::Zoom;
+                qNGEvent.percentage = float(amount);
+                break; }
+            case kEventGestureSwipe: {
+                HIPoint swipeDirection;
+                if (GetEventParameter(event, kEventParamSwipeDirection, typeHIPoint, 0,
+                            sizeof(swipeDirection), 0, &swipeDirection) != noErr) {
+                    handled_event = false;
+                    break;
+                }
+                qNGEvent.gestureType = QNativeGestureEvent::Swipe;
+                qNGEvent.direction = QSize(-swipeDirection.x, -swipeDirection.y);
+                break; }
+            case kEventGestureMagnify: {
+                CGFloat amount;
+                if (GetEventParameter(event, kEventParamMagnificationAmount, typeCGFloat, 0,
+                            sizeof(amount), 0, &amount) != noErr) {
+                    handled_event = false;
+                    break;
+                }
+                qNGEvent.gestureType = QNativeGestureEvent::Zoom;
+                qNGEvent.percentage = float(amount);
+                break; }
+        }
+
+        QApplication::sendSpontaneousEvent(widget, &qNGEvent);
+    break; }
+#endif // gestures
+
     default:
         handled_event = false;
     }
diff --git a/src/gui/math3d/qmatrix4x4.cpp b/src/gui/math3d/qmatrix4x4.cpp
index dc17eda..8fc439b 100644
--- a/src/gui/math3d/qmatrix4x4.cpp
+++ b/src/gui/math3d/qmatrix4x4.cpp
@@ -1010,11 +1010,24 @@ QMatrix4x4& QMatrix4x4::rotate(qreal angle, const QVector3D& vector)
 */
 QMatrix4x4& QMatrix4x4::rotate(qreal angle, qreal x, qreal y, qreal z)
 {
+    if (angle == 0.0f)
+        return *this;
     QMatrix4x4 m(1); // The "1" says to not load the identity.
-    qreal a = angle * M_PI / 180.0f;
-    qreal c = qCos(a);
-    qreal s = qSin(a);
-    qreal ic;
+    qreal c, s, ic;
+    if (angle == 90.0f || angle == -270.0f) {
+        s = 1.0f;
+        c = 0.0f;
+    } else if (angle == -90.0f || angle == 270.0f) {
+        s = -1.0f;
+        c = 0.0f;
+    } else if (angle == 180.0f || angle == -180.0f) {
+        s = 0.0f;
+        c = -1.0f;
+    } else {
+        qreal a = angle * M_PI / 180.0f;
+        c = qCos(a);
+        s = qSin(a);
+    }
     bool quick = false;
     if (x == 0.0f) {
         if (y == 0.0f) {
diff --git a/src/gui/painting/qpaintdevice.cpp b/src/gui/painting/qpaintdevice.cpp
index 6477952..6a2a4c4 100644
--- a/src/gui/painting/qpaintdevice.cpp
+++ b/src/gui/painting/qpaintdevice.cpp
@@ -64,3 +64,5 @@ int QPaintDevice::metric(PaintDeviceMetric) const
     qWarning("QPaintDevice::metrics: Device has no metric information");
     return 0;
 }
+
+QT_END_NAMESPACE
diff --git a/src/gui/painting/qpaintengine_raster.cpp b/src/gui/painting/qpaintengine_raster.cpp
index 8b83f02..63c4e32 100644
--- a/src/gui/painting/qpaintengine_raster.cpp
+++ b/src/gui/painting/qpaintengine_raster.cpp
@@ -2544,12 +2544,44 @@ void QRasterPaintEngine::drawImage(const QRectF &r, const QImage &img, const QRe
     Q_D(QRasterPaintEngine);
     QRasterPaintEngineState *s = state();
     const bool aa = s->flags.antialiased || s->flags.bilinear;
-    if (!aa && sr.size() == QSize(1, 1)) {
+    int sr_l = qFloor(sr.left());
+    int sr_r = qCeil(sr.right()) - 1;
+    int sr_t = qFloor(sr.top());
+    int sr_b = qCeil(sr.bottom()) - 1;
+
+    if (!aa && sr_l == sr_r && sr_t == sr_b) {
         // as fillRect will apply the aliased coordinate delta we need to
         // subtract it here as we don't use it for image drawing
         QTransform old = s->matrix;
         s->matrix = s->matrix * QTransform::fromTranslate(-aliasedCoordinateDelta, -aliasedCoordinateDelta);
-        fillRect(r, QColor::fromRgba(img.pixel(sr.x(), sr.y())));
+
+        // Do whatever fillRect() does, but without premultiplying the color if it's already premultiplied.
+        QRgb color = img.pixel(sr_l, sr_t);
+        switch (img.format()) {
+        case QImage::Format_ARGB32_Premultiplied:
+        case QImage::Format_ARGB8565_Premultiplied:
+        case QImage::Format_ARGB6666_Premultiplied:
+        case QImage::Format_ARGB8555_Premultiplied:
+        case QImage::Format_ARGB4444_Premultiplied:
+            // Combine premultiplied color with the opacity set on the painter.
+            d->solid_color_filler.solid.color =
+                ((((color & 0x00ff00ff) * s->intOpacity) >> 8) & 0x00ff00ff)
+                | ((((color & 0xff00ff00) >> 8) * s->intOpacity) & 0xff00ff00);
+            break;
+        default:
+            d->solid_color_filler.solid.color = PREMUL(ARGB_COMBINE_ALPHA(color, s->intOpacity));
+            break;
+        }
+
+        if ((d->solid_color_filler.solid.color & 0xff000000) == 0
+            && s->composition_mode == QPainter::CompositionMode_SourceOver) {
+            return;
+        }
+
+        d->solid_color_filler.clip = d->clip();
+        d->solid_color_filler.adjustSpanMethods();
+        fillRect(r, &d->solid_color_filler);
+
         s->matrix = old;
         return;
     }
@@ -5198,6 +5230,13 @@ static void drawLine_midpoint_i(int x1, int y1, int x2, int y2, ProcessSpans spa
             dy = -dy;
         }
 
+        int x_lower_limit = - 128;
+        if (x1 < x_lower_limit) {
+            int cy = dy * (x_lower_limit - x1) / dx + y1;
+            drawLine_midpoint_i(x_lower_limit, cy, x2, y2, span_func, data, style, devRect);
+            return;
+        }
+
         if (style == LineDrawNormal)
             --x2;
 
@@ -5335,6 +5374,13 @@ static void drawLine_midpoint_i(int x1, int y1, int x2, int y2, ProcessSpans spa
             dx = -dx;
         }
 
+        int y_lower_limit = - 128;
+        if (y1 < y_lower_limit) {
+            int cx = dx * (y_lower_limit - y1) / dy + x1;
+            drawLine_midpoint_i(cx, y_lower_limit, x2, y2, span_func, data, style, devRect);
+            return;
+        }
+
         if (style == LineDrawNormal)
             --y2;
 
diff --git a/src/gui/painting/qpaintengine_x11.cpp b/src/gui/painting/qpaintengine_x11.cpp
index 6816aac..a4d34b5 100644
--- a/src/gui/painting/qpaintengine_x11.cpp
+++ b/src/gui/painting/qpaintengine_x11.cpp
@@ -2459,15 +2459,23 @@ void QX11PaintEngine::drawFreetype(const QPointF &p, const QTextItemInt &ti)
     XRectangle rects[rectcount];
     int num_rects = 0;
 
+    QPoint delta(qRound(d->matrix.dx()), qRound(d->matrix.dy()));
+    QRect clip(d->polygonClipper.boundingRect());
     for (int i=0; i < path.elementCount(); i+=5) {
         int x = qRound(path.elementAt(i).x);
         int y = qRound(path.elementAt(i).y);
         int w = qRound(path.elementAt(i+1).x) - x;
         int h = qRound(path.elementAt(i+2).y) - y;
-        rects[num_rects].x = x + qRound(d->matrix.dx());
-        rects[num_rects].y = y + qRound(d->matrix.dy());
-        rects[num_rects].width = w;
-        rects[num_rects].height = h;
+
+        QRect rect = QRect(x + delta.x(), y + delta.y(), w, h);
+        rect = rect.intersected(clip);
+        if (rect.isEmpty())
+            continue;
+
+        rects[num_rects].x = short(rect.x());
+        rects[num_rects].y = short(rect.y());
+        rects[num_rects].width = ushort(rect.width());
+        rects[num_rects].height = ushort(rect.height());
         ++num_rects;
         if (num_rects == rectcount) {
             XFillRectangles(d->dpy, d->hd, d->gc, rects, num_rects);
diff --git a/src/gui/text/qtextcursor.cpp b/src/gui/text/qtextcursor.cpp
index 88ab9d0..5a938e3 100644
--- a/src/gui/text/qtextcursor.cpp
+++ b/src/gui/text/qtextcursor.cpp
@@ -84,7 +84,8 @@ QTextCursorPrivate::QTextCursorPrivate(const QTextCursorPrivate &rhs)
 
 QTextCursorPrivate::~QTextCursorPrivate()
 {
-    priv->removeCursor(this);
+    if (priv)
+        priv->removeCursor(this);
 }
 
 QTextCursorPrivate::AdjustResult QTextCursorPrivate::adjustPosition(int positionOfChange, int charsAddedOrRemoved, QTextUndoCommand::Operation op)
diff --git a/src/network/access/qnetworkcookie.cpp b/src/network/access/qnetworkcookie.cpp
index 0c13286..6884bee 100644
--- a/src/network/access/qnetworkcookie.cpp
+++ b/src/network/access/qnetworkcookie.cpp
@@ -504,7 +504,12 @@ QByteArray QNetworkCookie::toRawForm(RawForm form) const
         }
         if (!d->domain.isEmpty()) {
             result += "; domain=";
-            result += QUrl::toAce(d->domain);
+            QString domainNoDot = d->domain;
+            if (domainNoDot.startsWith(QLatin1Char('.'))) {
+                result += '.';
+                domainNoDot = domainNoDot.mid(1);
+            }
+            result += QUrl::toAce(domainNoDot);
         }
         if (!d->path.isEmpty()) {
             result += "; path=";
diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbpaintdevice.cpp b/src/plugins/gfxdrivers/directfb/qdirectfbpaintdevice.cpp
index d2fadcb..3979a8c 100644
--- a/src/plugins/gfxdrivers/directfb/qdirectfbpaintdevice.cpp
+++ b/src/plugins/gfxdrivers/directfb/qdirectfbpaintdevice.cpp
@@ -47,7 +47,7 @@
 
 QDirectFBPaintDevice::QDirectFBPaintDevice(QDirectFBScreen *scr)
     : QCustomRasterPaintDevice(0), dfbSurface(0), lockedImage(0), screen(scr),
-      lock(DFBSurfaceLockFlags(0)), mem(0), engine(0)
+      bpl(-1), lockFlgs(DFBSurfaceLockFlags(0)), mem(0), engine(0)
 {}
 
 QDirectFBPaintDevice::~QDirectFBPaintDevice()
@@ -65,15 +65,15 @@ IDirectFBSurface *QDirectFBPaintDevice::directFBSurface() const
 
 void QDirectFBPaintDevice::lockDirectFB(DFBSurfaceLockFlags flags)
 {
-    if (!(lock & flags)) {
-        if (lock)
+    if (!(lockFlgs & flags)) {
+        if (lockFlgs)
             unlockDirectFB();
         mem = QDirectFBScreen::lockSurface(dfbSurface, flags, &bpl);
         Q_ASSERT(mem);
         const QSize s = size();
         lockedImage = new QImage(mem, s.width(), s.height(), bpl,
                                  QDirectFBScreen::getImageFormat(dfbSurface));
-        lock = flags;
+        lockFlgs = flags;
     }
 }
 
@@ -87,7 +87,7 @@ void QDirectFBPaintDevice::unlockDirectFB()
     delete lockedImage;
     lockedImage = 0;
     mem = 0;
-    lock = DFBSurfaceLockFlags(0);
+    lockFlgs = DFBSurfaceLockFlags(0);
 }
 
 
diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbpaintdevice.h b/src/plugins/gfxdrivers/directfb/qdirectfbpaintdevice.h
index 3932403..688fd7b 100644
--- a/src/plugins/gfxdrivers/directfb/qdirectfbpaintdevice.h
+++ b/src/plugins/gfxdrivers/directfb/qdirectfbpaintdevice.h
@@ -68,7 +68,7 @@ public:
     int bytesPerLine() const;
     QSize size() const;
     int metric(QPaintDevice::PaintDeviceMetric metric) const;
-    DFBSurfaceLockFlags lockFlags() const { return lock; }
+    DFBSurfaceLockFlags lockFlags() const { return lockFlgs; }
     QPaintEngine *paintEngine() const;
 
 protected:
@@ -86,7 +86,7 @@ protected:
     QImage *lockedImage;
     QDirectFBScreen *screen;
     int bpl;
-    DFBSurfaceLockFlags lock;
+    DFBSurfaceLockFlags lockFlgs;
     uchar *mem;
     QDirectFBPaintEngine *engine;
 private:
diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp b/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp
index 131ff4b..ba715c3 100644
--- a/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp
+++ b/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp
@@ -119,13 +119,14 @@ private:
     IDirectFB *fb;
     quint8 opacity;
 
-    bool dirtyClip;
     ClipType clipType;
     QDirectFBPaintDevice *dfbDevice;
     uint compositionModeStatus;
 
-    QDirectFBPaintEngine *q;
+    bool inClip;
     QRect currentClip;
+
+    QDirectFBPaintEngine *q;
     friend class QDirectFBPaintEngine;
 };
 
@@ -236,7 +237,7 @@ static inline void drawRects(const T *rects, int n, const QTransform &transform,
                 d->surface->SetClip(d->surface, &clipRegion);           \
                 operation;                                              \
             }                                                           \
-            d->dirtyClip = true;                                        \
+            d->updateClip();                                            \
             break; }                                                    \
         case QDirectFBPaintEnginePrivate::ComplexClip:                  \
         case QDirectFBPaintEnginePrivate::ClipUnset:                    \
@@ -297,8 +298,8 @@ bool QDirectFBPaintEngine::end()
 void QDirectFBPaintEngine::clipEnabledChanged()
 {
     Q_D(QDirectFBPaintEngine);
-    d->dirtyClip = true;
     QRasterPaintEngine::clipEnabledChanged();
+    d->updateClip();
 }
 
 void QDirectFBPaintEngine::penChanged()
@@ -341,26 +342,49 @@ void QDirectFBPaintEngine::setState(QPainterState *state)
 {
     Q_D(QDirectFBPaintEngine);
     QRasterPaintEngine::setState(state);
-    d->dirtyClip = true;
     d->setPen(state->pen);
     d->opacity = quint8(state->opacity * 255);
     d->setCompositionMode(state->compositionMode());
     d->setTransform(state->transform());
     d->setRenderHints(state->renderHints);
+    if (d->surface)
+        d->updateClip();
 }
 
 void QDirectFBPaintEngine::clip(const QVectorPath &path, Qt::ClipOperation op)
 {
     Q_D(QDirectFBPaintEngine);
-    d->dirtyClip = true;
+    const bool wasInClip = d->inClip;
+    d->inClip = true;
     QRasterPaintEngine::clip(path, op);
+    if (!wasInClip) {
+        d->inClip = false;
+        d->updateClip();
+    }
+}
+
+void QDirectFBPaintEngine::clip(const QRegion &region, Qt::ClipOperation op)
+{
+    Q_D(QDirectFBPaintEngine);
+    const bool wasInClip = d->inClip;
+    d->inClip = true;
+    QRasterPaintEngine::clip(region, op);
+    if (!wasInClip) {
+        d->inClip = false;
+        d->updateClip();
+    }
 }
 
 void QDirectFBPaintEngine::clip(const QRect &rect, Qt::ClipOperation op)
 {
     Q_D(QDirectFBPaintEngine);
-    d->dirtyClip = true;
+    const bool wasInClip = d->inClip;
+    d->inClip = true;
     QRasterPaintEngine::clip(rect, op);
+    if (!wasInClip) {
+        d->inClip = false;
+        d->updateClip();
+    }
 }
 
 void QDirectFBPaintEngine::drawRects(const QRect *rects, int rectCount)
@@ -371,7 +395,6 @@ void QDirectFBPaintEngine::drawRects(const QRect *rects, int rectCount)
     if (brush == Qt::NoBrush && pen == Qt::NoPen)
         return;
 
-    d->updateClip();
     if (!(d->compositionModeStatus & QDirectFBPaintEnginePrivate::PorterDuff_SupportedPrimitives)
         || (d->transformationType & QDirectFBPaintEnginePrivate::Matrix_RectsUnsupported)
         || !d->simplePen
@@ -401,7 +424,6 @@ void QDirectFBPaintEngine::drawRects(const QRectF *rects, int rectCount)
     if (brush == Qt::NoBrush && pen == Qt::NoPen)
         return;
 
-    d->updateClip();
     if (!(d->compositionModeStatus & QDirectFBPaintEnginePrivate::PorterDuff_SupportedPrimitives)
         || (d->transformationType & QDirectFBPaintEnginePrivate::Matrix_RectsUnsupported)
         || !d->simplePen
@@ -426,7 +448,6 @@ void QDirectFBPaintEngine::drawRects(const QRectF *rects, int rectCount)
 void QDirectFBPaintEngine::drawLines(const QLine *lines, int lineCount)
 {
     Q_D(QDirectFBPaintEngine);
-    d->updateClip();
 
     if (!(d->compositionModeStatus & QDirectFBPaintEnginePrivate::PorterDuff_SupportedPrimitives)
         || !d->simplePen
@@ -448,7 +469,6 @@ void QDirectFBPaintEngine::drawLines(const QLine *lines, int lineCount)
 void QDirectFBPaintEngine::drawLines(const QLineF *lines, int lineCount)
 {
     Q_D(QDirectFBPaintEngine);
-    d->updateClip();
 
     if (!(d->compositionModeStatus & QDirectFBPaintEnginePrivate::PorterDuff_SupportedPrimitives)
         || !d->simplePen
@@ -491,7 +511,6 @@ void QDirectFBPaintEngine::drawImage(const QRectF &r, const QImage &image,
     than the max image cache size we fall back to raster engine.
     */
 
-    d->updateClip();
 #if !defined QT_NO_DIRECTFB_PREALLOCATED || defined QT_DIRECTFB_IMAGECACHE
     if (!(d->compositionModeStatus & QDirectFBPaintEnginePrivate::PorterDuff_SupportedBlits)
         || (d->transformationType & QDirectFBPaintEnginePrivate::Matrix_BlitsUnsupported)
@@ -534,7 +553,6 @@ void QDirectFBPaintEngine::drawPixmap(const QRectF &r, const QPixmap &pixmap,
 {
     Q_D(QDirectFBPaintEngine);
 
-    d->updateClip();
     if (pixmap.pixmapData()->classId() != QPixmapData::DirectFBClass) {
         RASTERFALLBACK(DRAW_PIXMAP, r, pixmap.size(), sr);
         d->lock();
@@ -569,7 +587,6 @@ void QDirectFBPaintEngine::drawTiledPixmap(const QRectF &r,
                                            const QPointF &offset)
 {
     Q_D(QDirectFBPaintEngine);
-    d->updateClip();
     if (pixmap.pixmapData()->classId() != QPixmapData::DirectFBClass) {
         RASTERFALLBACK(DRAW_TILED_PIXMAP, r, pixmap.size(), offset);
         d->lock();
@@ -586,7 +603,7 @@ void QDirectFBPaintEngine::drawTiledPixmap(const QRectF &r,
         QRasterPaintEngine::drawTiledPixmap(r, pix, offset);
     } else {
         d->unlock();
-        d->drawTiledPixmap(r, pixmap, offset);
+        CLIPPED_PAINT(d->drawTiledPixmap(r, pixmap, offset));
     }
 }
 
@@ -674,7 +691,6 @@ void QDirectFBPaintEngine::fillRect(const QRectF &rect, const QBrush &brush)
     Q_D(QDirectFBPaintEngine);
     if (brush.style() == Qt::NoBrush)
         return;
-    d->updateClip();
     if (d->clipType != QDirectFBPaintEnginePrivate::ComplexClip) {
         switch (brush.style()) {
         case Qt::SolidPattern: {
@@ -718,7 +734,6 @@ void QDirectFBPaintEngine::fillRect(const QRectF &rect, const QColor &color)
     if (!color.isValid())
         return;
     Q_D(QDirectFBPaintEngine);
-    d->updateClip();
     if (!(d->compositionModeStatus & QDirectFBPaintEnginePrivate::PorterDuff_SupportedPrimitives)
         || (d->transformationType & QDirectFBPaintEnginePrivate::Matrix_RectsUnsupported)
         || d->clipType == QDirectFBPaintEnginePrivate::ComplexClip) {
@@ -729,8 +744,7 @@ void QDirectFBPaintEngine::fillRect(const QRectF &rect, const QColor &color)
         d->unlock();
         d->setDFBColor(color);
         const QRect r = state()->matrix.mapRect(rect).toRect();
-        d->surface->FillRectangle(d->surface, r.x(), r.y(),
-                                  r.width(), r.height());
+        CLIPPED_PAINT(d->surface->FillRectangle(d->surface, r.x(), r.y(), r.width(), r.height()));
     }
 }
 
@@ -765,9 +779,9 @@ void QDirectFBPaintEngine::initImageCache(int size)
 
 QDirectFBPaintEnginePrivate::QDirectFBPaintEnginePrivate(QDirectFBPaintEngine *p)
     : surface(0), antialiased(false), simplePen(false),
-      transformationType(0), opacity(255), dirtyClip(true),
+      transformationType(0), opacity(255),
       clipType(ClipUnset), dfbDevice(0),
-      compositionModeStatus(0), q(p)
+      compositionModeStatus(0), inClip(false), q(p)
 {
     fb = QDirectFBScreen::instance()->dfb();
     surfaceCache = new SurfaceCache;
@@ -978,7 +992,6 @@ static inline qreal fixCoord(qreal rect_pos, qreal pixmapSize, qreal offset)
 
 void QDirectFBPaintEnginePrivate::drawTiledPixmap(const QRectF &dest, const QPixmap &pixmap, const QPointF &off)
 {
-    Q_ASSERT(!dirtyClip);
     Q_ASSERT(!(transformationType & Matrix_BlitsUnsupported));
     const QTransform &transform = q->state()->matrix;
     const QRect destinationRect = transform.mapRect(dest).toRect().normalized();
@@ -1071,9 +1084,7 @@ void QDirectFBPaintEnginePrivate::drawTiledPixmap(const QRectF &dest, const QPix
 
 void QDirectFBPaintEnginePrivate::updateClip()
 {
-    if (!dirtyClip)
-        return;
-
+    Q_ASSERT(surface);
     currentClip = QRect();
     const QClipData *clipData = clip();
     if (!clipData || !clipData->enabled) {
@@ -1095,14 +1106,12 @@ void QDirectFBPaintEnginePrivate::updateClip()
     } else {
         clipType = ComplexClip;
     }
-
-    dirtyClip = false;
 }
 
 void QDirectFBPaintEnginePrivate::systemStateChanged()
 {
-    dirtyClip = true;
     QRasterPaintEnginePrivate::systemStateChanged();
+    updateClip();
 }
 
 IDirectFBSurface *SurfaceCache::getSurface(const uint *buf, int size)
diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.h b/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.h
index b939b68..80108b2 100644
--- a/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.h
+++ b/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.h
@@ -101,6 +101,7 @@ public:
     virtual void setState(QPainterState *state);
 
     virtual void clip(const QVectorPath &path, Qt::ClipOperation op);
+    virtual void clip(const QRegion &region, Qt::ClipOperation op);
     virtual void clip(const QRect &rect, Qt::ClipOperation op);
 
     static void initImageCache(int size);
diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbscreen.cpp b/src/plugins/gfxdrivers/directfb/qdirectfbscreen.cpp
index 774162c..dc53847 100644
--- a/src/plugins/gfxdrivers/directfb/qdirectfbscreen.cpp
+++ b/src/plugins/gfxdrivers/directfb/qdirectfbscreen.cpp
@@ -56,13 +56,18 @@
 
 class QDirectFBScreenPrivate : public QObject, public QWSGraphicsSystem
 {
+    Q_OBJECT
 public:
     QDirectFBScreenPrivate(QDirectFBScreen *qptr);
     ~QDirectFBScreenPrivate();
 
     void setFlipFlags(const QStringList &args);
     QPixmapData *createPixmapData(QPixmapData::PixelType type) const;
-
+public slots:
+#ifdef QT_DIRECTFB_WM
+    void onWindowEvent(QWSWindow *window, QWSServer::WindowEvent event);
+#endif
+public:
     IDirectFB *dfb;
     DFBSurfaceFlipFlags flipFlags;
     QDirectFBScreen::DirectFBFlags directFBFlags;
@@ -86,6 +91,8 @@ public:
     QDirectFBScreen *q;
 };
 
+#include "qdirectfbscreen.moc"
+
 QDirectFBScreenPrivate::QDirectFBScreenPrivate(QDirectFBScreen *qptr)
     : QWSGraphicsSystem(qptr), dfb(0), flipFlags(DSFLIP_NONE),
       directFBFlags(QDirectFBScreen::NoFlags), alphaPixmapFormat(QImage::Format_Invalid),
@@ -107,6 +114,10 @@ QDirectFBScreenPrivate::QDirectFBScreenPrivate(QDirectFBScreen *qptr)
 #ifndef QT_NO_QWS_SIGNALHANDLER
     QWSSignalHandler::instance()->addObject(this);
 #endif
+#ifdef QT_DIRECTFB_WM
+    connect(QWSServer::instance(), SIGNAL(windowEvent(QWSWindow*, QWSServer::WindowEvent)),
+            this, SLOT(onWindowEvent(QWSWindow*, QWSServer::WindowEvent)));
+#endif
 }
 
 QDirectFBScreenPrivate::~QDirectFBScreenPrivate()
@@ -578,6 +589,7 @@ QDirectFBScreenCursor::QDirectFBScreenCursor()
 
 void QDirectFBScreenCursor::move(int x, int y)
 {
+    pos = QPoint(x, y);
     layer->WarpCursor(layer, x, y);
 }
 
@@ -746,6 +758,18 @@ void QDirectFBScreenPrivate::setFlipFlags(const QStringList &args)
     }
 }
 
+#ifdef QT_DIRECTFB_WM
+void QDirectFBScreenPrivate::onWindowEvent(QWSWindow *window, QWSServer::WindowEvent event)
+{
+    if (event == QWSServer::Raise) {
+        QWSWindowSurface *windowSurface = window->windowSurface();
+        if (windowSurface && windowSurface->key() == QLatin1String("directfb")) {
+            static_cast<QDirectFBWindowSurface*>(windowSurface)->raise();
+        }
+    }
+}
+#endif
+
 QPixmapData *QDirectFBScreenPrivate::createPixmapData(QPixmapData::PixelType type) const
 {
     if (type == QPixmapData::BitmapType)
diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbwindowsurface.cpp b/src/plugins/gfxdrivers/directfb/qdirectfbwindowsurface.cpp
index 584f334..441bac9 100644
--- a/src/plugins/gfxdrivers/directfb/qdirectfbwindowsurface.cpp
+++ b/src/plugins/gfxdrivers/directfb/qdirectfbwindowsurface.cpp
@@ -54,6 +54,7 @@ QDirectFBWindowSurface::QDirectFBWindowSurface(DFBSurfaceFlipFlags flip, QDirect
     : QDirectFBPaintDevice(scr)
 #ifndef QT_NO_DIRECTFB_WM
     , dfbWindow(0)
+    , sibling(0)
 #endif
     , flipFlags(flip)
     , boundingRectFlip(scr->directFBFlags() & QDirectFBScreen::BoundingRectFlip)
@@ -72,6 +73,7 @@ QDirectFBWindowSurface::QDirectFBWindowSurface(DFBSurfaceFlipFlags flip, QDirect
     : QWSWindowSurface(widget), QDirectFBPaintDevice(scr)
 #ifndef QT_NO_DIRECTFB_WM
     , dfbWindow(0)
+    , sibling(0)
 #endif
     , flipFlags(flip)
     , boundingRectFlip(scr->directFBFlags() & QDirectFBScreen::BoundingRectFlip)
@@ -98,6 +100,17 @@ QDirectFBWindowSurface::~QDirectFBWindowSurface()
 {
 }
 
+#ifdef QT_DIRECTFB_WM
+void QDirectFBWindowSurface::raise()
+{
+    if (dfbWindow) {
+        dfbWindow->RaiseToTop(dfbWindow);
+    } else if (sibling && (!sibling->sibling || sibling->dfbWindow)) {
+        sibling->raise();
+    }
+}
+#endif
+
 bool QDirectFBWindowSurface::isValid() const
 {
     return true;
@@ -126,6 +139,7 @@ void QDirectFBWindowSurface::createWindow()
         description.surface_caps = DSCAPS_PREMULTIPLIED;
 
     DFBResult result = layer->CreateWindow(layer, &description, &dfbWindow);
+
     if (result != DFB_OK)
         DirectFBErrorFatal("QDirectFBWindowSurface::createWindow", result);
 
@@ -231,34 +245,25 @@ void QDirectFBWindowSurface::setGeometry(const QRect &rect)
 
 QByteArray QDirectFBWindowSurface::permanentState() const
 {
-    QByteArray array;
-#ifdef QT_NO_DIRECTFB_WM
-    array.resize(sizeof(SurfaceFlags) + sizeof(IDirectFBSurface*));
-#else
-    array.resize(sizeof(SurfaceFlags));
-#endif
-    char *ptr = array.data();
-
-    *reinterpret_cast<SurfaceFlags*>(ptr) = surfaceFlags();
-    ptr += sizeof(SurfaceFlags);
-
-#ifdef QT_NO_DIRECTFB_WM
-    *reinterpret_cast<IDirectFBSurface**>(ptr) = dfbSurface;
+    QByteArray state;
+#ifdef QT_DIRECTFB_WM
+    QDataStream ds(&state, QIODevice::WriteOnly);
+    ds << reinterpret_cast<quintptr>(this);
 #endif
-    return array;
+    return state;
 }
 
 void QDirectFBWindowSurface::setPermanentState(const QByteArray &state)
 {
-    SurfaceFlags flags;
-    const char *ptr = state.constData();
-
-    flags = *reinterpret_cast<const SurfaceFlags*>(ptr);
-    setSurfaceFlags(flags);
-
-#ifdef QT_NO_DIRECTFB_WM
-    ptr += sizeof(SurfaceFlags);
-    dfbSurface = *reinterpret_cast<IDirectFBSurface* const*>(ptr);
+#ifdef QT_DIRECTFB_WM
+    if (state.size() == sizeof(quintptr)) {
+        QDataStream ds(state);
+        quintptr ptr;
+        ds >> ptr;
+        sibling = reinterpret_cast<QDirectFBWindowSurface*>(ptr);
+    }
+#else
+    Q_UNUSED(state);
 #endif
 }
 
diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbwindowsurface.h b/src/plugins/gfxdrivers/directfb/qdirectfbwindowsurface.h
index 64b1920..2c4bcdf 100644
--- a/src/plugins/gfxdrivers/directfb/qdirectfbwindowsurface.h
+++ b/src/plugins/gfxdrivers/directfb/qdirectfbwindowsurface.h
@@ -65,6 +65,9 @@ public:
     QDirectFBWindowSurface(DFBSurfaceFlipFlags flipFlags, QDirectFBScreen *scr, QWidget *widget);
     ~QDirectFBWindowSurface();
 
+#ifdef QT_DIRECTFB_WM
+    void raise();
+#endif
     bool isValid() const;
 
     void setGeometry(const QRect &rect);
@@ -87,9 +90,10 @@ public:
 
     QImage *buffer(const QWidget *widget);
 private:
-#ifndef QT_NO_DIRECTFB_WM
+#ifdef QT_DIRECTFB_WM
     void createWindow();
     IDirectFBWindow *dfbWindow;
+    QDirectFBWindowSurface *sibling;
 #endif
 
 #ifdef QT_NO_DIRECTFB_WM
diff --git a/src/testlib/qtestcase.cpp b/src/testlib/qtestcase.cpp
index a144923..15c49e1 100644
--- a/src/testlib/qtestcase.cpp
+++ b/src/testlib/qtestcase.cpp
@@ -808,12 +808,12 @@ namespace QTest
 {
     static QObject *currentTestObject = 0;
 
-    struct TestFunction {
+    static struct TestFunction {
         TestFunction():function(0), data(0) {}
         ~TestFunction() { delete [] data; }
         int function;
         char *data;
-    } testFuncs[512];
+    } *testFuncs;
 
     /**
      * Contains the count of test functions that was supplied
@@ -1120,6 +1120,11 @@ static void qParseArgs(int argc, char *argv[])
                 exit(1);
             }
             ++QTest::lastTestFuncIdx;
+            if (!QTest::testFuncs) {
+                struct Cleanup { ~Cleanup() { delete[] QTest::testFuncs; } };
+                static Cleanup cleanup;
+                QTest::testFuncs = new TestFunction[512];
+            }
             QTest::testFuncs[QTest::lastTestFuncIdx].function = idx;
             QTest::testFuncs[QTest::lastTestFuncIdx].data = data;
             QTEST_ASSERT(QTest::lastTestFuncIdx < 512);
diff --git a/src/testlib/qtestevent.h b/src/testlib/qtestevent.h
index a8376ee..dfbba33 100644
--- a/src/testlib/qtestevent.h
+++ b/src/testlib/qtestevent.h
@@ -71,6 +71,7 @@ public:
     virtual ~QTestEvent() {}
 };
 
+#ifdef QT_GUI_LIB
 class QTestKeyEvent: public QTestEvent
 {
 public:
@@ -135,6 +136,8 @@ private:
     QPoint _pos;
     int _delay;
 };
+#endif //QT_GUI_LIB
+
 
 class QTestDelayEvent: public QTestEvent
 {
@@ -159,6 +162,7 @@ public:
     inline void clear()
     { qDeleteAll(*this); QList<QTestEvent *>::clear(); }
 
+#ifdef QT_GUI_LIB
     inline void addKeyClick(Qt::Key qtKey, Qt::KeyboardModifiers modifiers = Qt::NoModifier, int msecs = -1)
     { addKeyEvent(QTest::Click, qtKey, modifiers, msecs); }
     inline void addKeyPress(Qt::Key qtKey, Qt::KeyboardModifiers modifiers = Qt::NoModifier, int msecs = -1)
@@ -194,6 +198,7 @@ public:
     { append(new QTestMouseEvent(QTest::MouseDClick, button, stateKey, pos, delay)); }
     inline void addMouseMove(QPoint pos = QPoint(), int delay=-1)
     { append(new QTestMouseEvent(QTest::MouseMove, Qt::NoButton, 0, pos, delay)); }
+#endif //QT_GUI_LIB
 
     inline void addDelay(int msecs)
     { append(new QTestDelayEvent(msecs)); }
diff --git a/src/testlib/qtestkeyboard.h b/src/testlib/qtestkeyboard.h
index 2e475b2..af81075 100644
--- a/src/testlib/qtestkeyboard.h
+++ b/src/testlib/qtestkeyboard.h
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#ifndef QTESTKEYBOARD_H
+#if !defined(QTESTKEYBOARD_H) && defined(QT_GUI_LIB)
 #define QTESTKEYBOARD_H
 
 #if 0
diff --git a/src/testlib/qtestmouse.h b/src/testlib/qtestmouse.h
index 2825c58..7ea927c 100644
--- a/src/testlib/qtestmouse.h
+++ b/src/testlib/qtestmouse.h
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#ifndef QTESTMOUSE_H
+#if !defined(QTESTMOUSE_H) && defined(QT_GUI_LIB)
 #define QTESTMOUSE_H
 
 #if 0
diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro
index 585f461..b3382bb 100644
--- a/tests/auto/auto.pro
+++ b/tests/auto/auto.pro
@@ -11,8 +11,6 @@ SUBDIRS += \
            compilerwarnings \
            exceptionsafety \
            linguist \
-           macgui \
-           macplist \
            mediaobject \
 #           mediaobject_wince_ds9 \   This is Windows CE only (we test the second phonon backend ds9 here)
            moc \
@@ -74,7 +72,6 @@ SUBDIRS += \
            qabstractspinbox \
            qabstracttextdocumentlayout \
            qaccessibility \
-           qaccessibility_mac \
            qaction \
            qactiongroup \
            qalgorithms \
@@ -97,7 +94,6 @@ SUBDIRS += \
            qcombobox \
            qcompleter \
            qcomplextext \
-           qcopchannel \
            qcoreapplication \
            qcryptographichash \
            qcssparser \
@@ -113,7 +109,6 @@ SUBDIRS += \
            qdialog \
            qdialogbuttonbox \
            qdir \
-           qdirectpainter \
            qdirmodel \
            qdockwidget \
            qdom \
@@ -199,6 +194,7 @@ SUBDIRS += \
            qmainwindow \
            qmake \
            qmap \
+           qmatrixnxn \
            qmdiarea \
            qmdisubwindow \
            qmenu \
@@ -209,7 +205,6 @@ SUBDIRS += \
            qmouseevent \
            qmouseevent_modal \
            qmovie \
-           qmultiscreen \
            qmutex \
            qmutexlocker \
            qnativesocketengine \
@@ -246,6 +241,7 @@ SUBDIRS += \
            qprogressdialog \
            qpropertyanimation \
            qpushbutton \
+           qquaternion \
            qqueue \
            qradiobutton \
            qreadlocker \
@@ -349,7 +345,6 @@ SUBDIRS += \
            qtextlayout \
            qtextlist \
            qtextobject \
-           qtextpiecetable \
            qtextscriptengine \
            qtextstream \
            qtexttable \
@@ -379,6 +374,7 @@ SUBDIRS += \
            qvariant \
            qvarlengtharray \
            qvector \
+           qvectornd \
            qwaitcondition \
            qwidget \
            qwidgetaction \
@@ -404,6 +400,19 @@ SUBDIRS += \
            utf8
 
 contains(QT_CONFIG, OdfWriter):SUBDIRS += qzip qtextodfwriter
+mac: {
+    SUBDIRS += macgui \
+               macplist \
+               qaccessibility_mac
+}
+embedded: {
+    SUBDIRS += qcopchannel \
+               qdirectpainter \
+               qmultiscreen
+}
+!win32: {
+    SUBDIRS += qtextpiecetable
+}
 
 # Enable the tests specific to QtXmlPatterns. If you add a test, remember to
 # update runQtXmlPatternsTests.sh too. Remember that this file, auto.pro, is
@@ -470,5 +479,3 @@ contains(QT_CONFIG, webkit): SUBDIRS += \
            qwebhistoryinterface \
            qwebelement \
            qwebhistory
-
-SUBDIRS += math3d
diff --git a/tests/auto/math3d/math3d.pro b/tests/auto/math3d/math3d.pro
deleted file mode 100644
index d6189ef..0000000
--- a/tests/auto/math3d/math3d.pro
+++ /dev/null
@@ -1,2 +0,0 @@
-TEMPLATE = subdirs
-SUBDIRS = qmatrixnxn qquaternion qvectornd
diff --git a/tests/auto/math3d/qmatrixnxn/qmatrixnxn.pro b/tests/auto/math3d/qmatrixnxn/qmatrixnxn.pro
deleted file mode 100644
index 40c6cc0..0000000
--- a/tests/auto/math3d/qmatrixnxn/qmatrixnxn.pro
+++ /dev/null
@@ -1,5 +0,0 @@
-load(qttest_p4)
-VPATH += ../shared
-INCLUDEPATH += ../shared
-HEADERS += math3dincludes.h
-SOURCES += tst_qmatrixnxn.cpp
diff --git a/tests/auto/math3d/qquaternion/qquaternion.pro b/tests/auto/math3d/qquaternion/qquaternion.pro
deleted file mode 100644
index eea84f0..0000000
--- a/tests/auto/math3d/qquaternion/qquaternion.pro
+++ /dev/null
@@ -1,5 +0,0 @@
-load(qttest_p4)
-VPATH += ../shared
-INCLUDEPATH += ../shared
-HEADERS += math3dincludes.h
-SOURCES += tst_qquaternion.cpp
diff --git a/tests/auto/math3d/qvectornd/qvectornd.pro b/tests/auto/math3d/qvectornd/qvectornd.pro
deleted file mode 100644
index 0981637..0000000
--- a/tests/auto/math3d/qvectornd/qvectornd.pro
+++ /dev/null
@@ -1,5 +0,0 @@
-load(qttest_p4)
-VPATH += ../shared
-INCLUDEPATH += ../shared
-HEADERS += math3dincludes.h
-SOURCES += tst_qvectornd.cpp
diff --git a/tests/auto/math3d/shared/math3dincludes.h b/tests/auto/math3d/shared/math3dincludes.h
deleted file mode 100644
index 243c5a5..0000000
--- a/tests/auto/math3d/shared/math3dincludes.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the either Technology Preview License Agreement or the
-** Beta Release License Agreement.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://qt.nokia.com/contact.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef MATH3DINCLUDES_H
-#define MATH3DINCLUDES_H
-
-#include <QtGui/qmatrix4x4.h>
-#include <QtGui/qgenericmatrix.h>
-#include <QtGui/qvector2d.h>
-#include <QtGui/qvector3d.h>
-#include <QtGui/qvector4d.h>
-#include <QtGui/qquaternion.h>
-
-#endif
diff --git a/tests/auto/qgraphicsview/tst_qgraphicsview.cpp b/tests/auto/qgraphicsview/tst_qgraphicsview.cpp
index c12fb11..2506e70 100644
--- a/tests/auto/qgraphicsview/tst_qgraphicsview.cpp
+++ b/tests/auto/qgraphicsview/tst_qgraphicsview.cpp
@@ -3637,18 +3637,18 @@ void tst_QGraphicsView::task255529_transformationAnchorMouseAndViewportMargins()
 
     VpGraphicsView view(&scene);
     view.show();
+#ifdef Q_WS_X11
+    qt_x11_wait_for_window_manager(&view);
+#endif
     QPoint mouseViewPos(20, 20);
     sendMouseMove(view.viewport(), mouseViewPos);
-    QTest::qWait(125);
 
     QPointF mouseScenePos = view.mapToScene(mouseViewPos);
-    view.setTransform(QTransform().scale(5, 5));
-    QTest::qWait(125);
-    view.setTransform(QTransform().rotate(5, Qt::ZAxis), true);
-    QTest::qWait(125);
+    view.setTransform(QTransform().scale(5, 5).rotate(5, Qt::ZAxis), true);
 
     QPointF newMouseScenePos = view.mapToScene(mouseViewPos);
-    qreal slack = 3;
+
+    qreal slack = 1;
     QVERIFY(qAbs(newMouseScenePos.x() - mouseScenePos.x()) < slack);
     QVERIFY(qAbs(newMouseScenePos.y() - mouseScenePos.y()) < slack);
 }
diff --git a/tests/auto/qmatrixnxn/qmatrixnxn.pro b/tests/auto/qmatrixnxn/qmatrixnxn.pro
new file mode 100644
index 0000000..cf6e4a1
--- /dev/null
+++ b/tests/auto/qmatrixnxn/qmatrixnxn.pro
@@ -0,0 +1,2 @@
+load(qttest_p4)
+SOURCES += tst_qmatrixnxn.cpp
diff --git a/tests/auto/math3d/qmatrixnxn/tst_qmatrixnxn.cpp b/tests/auto/qmatrixnxn/tst_qmatrixnxn.cpp
index 5541162..b8c04c0 100644
--- a/tests/auto/math3d/qmatrixnxn/tst_qmatrixnxn.cpp
+++ b/tests/auto/qmatrixnxn/tst_qmatrixnxn.cpp
@@ -41,7 +41,7 @@
 
 #include <QtTest/QtTest>
 #include <QtCore/qmath.h>
-#include "math3dincludes.h"
+#include <QtGui/qmatrix4x4.h>
 
 class tst_QMatrixNxN : public QObject
 {
diff --git a/tests/auto/qmenu/tst_qmenu.cpp b/tests/auto/qmenu/tst_qmenu.cpp
index b06b247..90b9a2a 100644
--- a/tests/auto/qmenu/tst_qmenu.cpp
+++ b/tests/auto/qmenu/tst_qmenu.cpp
@@ -710,7 +710,6 @@ void tst_QMenu::task250673_activeMultiColumnSubMenuPosition()
     uint i = 2;
     while (main.columnCount() < 2) {
         main.addAction(QString("Item %1").arg(i));
-        qDebug() << "adding action" << i;
         ++i;
         Q_ASSERT(i<1000);
     }
diff --git a/tests/auto/qnetworkcookie/tst_qnetworkcookie.cpp b/tests/auto/qnetworkcookie/tst_qnetworkcookie.cpp
index 5519dee..abd1660 100644
--- a/tests/auto/qnetworkcookie/tst_qnetworkcookie.cpp
+++ b/tests/auto/qnetworkcookie/tst_qnetworkcookie.cpp
@@ -234,17 +234,17 @@ void tst_QNetworkCookie::parseSingleCookie_data()
     QTest::newRow("path-with-utf8-2") << "a=b;path=/R%C3%A9sum%C3%A9" << cookie;
 
     cookie.setPath(QString());
-    cookie.setDomain(".trolltech.com");
-    QTest::newRow("plain-domain1") << "a=b;domain=trolltech.com" << cookie;
-    QTest::newRow("plain-domain2") << "a=b; domain=trolltech.com " << cookie;
-    QTest::newRow("plain-domain3") << "a=b;domain=TROLLTECH.COM" << cookie;
-    QTest::newRow("plain-domain4") << "a=b;DOMAIN = TROLLTECH.COM" << cookie;
-
-    cookie.setDomain(".trolltech.com");
-    QTest::newRow("dot-domain1") << "a=b;domain=.trolltech.com" << cookie;
-    QTest::newRow("dot-domain2") << "a=b; domain=.trolltech.com" << cookie;
-    QTest::newRow("dot-domain3") << "a=b; domain=.TROLLTECH.COM" << cookie;
-    QTest::newRow("dot-domain4") << "a=b; Domain = .TROLLTECH.COM" << cookie;
+    cookie.setDomain(".qt.nokia.com");
+    QTest::newRow("plain-domain1") << "a=b;domain=qt.nokia.com" << cookie;
+    QTest::newRow("plain-domain2") << "a=b; domain=qt.nokia.com " << cookie;
+    QTest::newRow("plain-domain3") << "a=b;domain=QT.NOKIA.COM" << cookie;
+    QTest::newRow("plain-domain4") << "a=b;DOMAIN = QT.NOKIA.COM" << cookie;
+
+    cookie.setDomain(".qt.nokia.com");
+    QTest::newRow("dot-domain1") << "a=b;domain=.qt.nokia.com" << cookie;
+    QTest::newRow("dot-domain2") << "a=b; domain=.qt.nokia.com" << cookie;
+    QTest::newRow("dot-domain3") << "a=b; domain=.QT.NOKIA.COM" << cookie;
+    QTest::newRow("dot-domain4") << "a=b; Domain = .QT.NOKIA.COM" << cookie;
 
     cookie.setDomain(QString::fromUtf8(".d\303\270gn\303\245pent.troll.no"));
     QTest::newRow("idn-domain1") << "a=b;domain=xn--dgnpent-gxa2o.troll.no" << cookie;
@@ -259,20 +259,20 @@ void tst_QNetworkCookie::parseSingleCookie_data()
     QTest::newRow("dot-idn-domain3") << "a=b;domain=.XN--DGNPENT-GXA2O.TROLL.NO" << cookie;
     QTest::newRow("dot-idn-domain4") << "a=b;domain=.D\303\230GN\303\205PENT.troll.NO" << cookie;
 
-    cookie.setDomain(".trolltech.com");
+    cookie.setDomain(".qt.nokia.com");
     cookie.setPath("/");
-    QTest::newRow("two-fields") << "a=b;domain=trolltech.com;path=/" << cookie;
-    QTest::newRow("two-fields2") << "a=b; domain=trolltech.com; path=/" << cookie;
-    QTest::newRow("two-fields3") << "a=b;   domain=trolltech.com ; path=/ " << cookie;
-    QTest::newRow("two-fields4") << "a=b;path=/; domain=trolltech.com" << cookie;
-    QTest::newRow("two-fields5") << "a=b; path=/  ;   domain=trolltech.com" << cookie;
-    QTest::newRow("two-fields6") << "a=b; path= /  ;   domain =trolltech.com" << cookie;
+    QTest::newRow("two-fields") << "a=b;domain=qt.nokia.com;path=/" << cookie;
+    QTest::newRow("two-fields2") << "a=b; domain=qt.nokia.com; path=/" << cookie;
+    QTest::newRow("two-fields3") << "a=b;   domain=qt.nokia.com ; path=/ " << cookie;
+    QTest::newRow("two-fields4") << "a=b;path=/; domain=qt.nokia.com" << cookie;
+    QTest::newRow("two-fields5") << "a=b; path=/  ;   domain=qt.nokia.com" << cookie;
+    QTest::newRow("two-fields6") << "a=b; path= /  ;   domain =qt.nokia.com" << cookie;
 
     cookie.setSecure(true);
-    QTest::newRow("three-fields") << "a=b;domain=trolltech.com;path=/;secure" << cookie;
-    QTest::newRow("three-fields2") << "a=b;secure;path=/;domain=trolltech.com" << cookie;
-    QTest::newRow("three-fields3") << "a=b;secure;domain=trolltech.com; path=/" << cookie;
-    QTest::newRow("three-fields4") << "a = b;secure;domain=trolltech.com; path=/" << cookie;
+    QTest::newRow("three-fields") << "a=b;domain=qt.nokia.com;path=/;secure" << cookie;
+    QTest::newRow("three-fields2") << "a=b;secure;path=/;domain=qt.nokia.com" << cookie;
+    QTest::newRow("three-fields3") << "a=b;secure;domain=qt.nokia.com; path=/" << cookie;
+    QTest::newRow("three-fields4") << "a = b;secure;domain=qt.nokia.com; path=/" << cookie;
 
     cookie = QNetworkCookie();
     cookie.setName("a");
@@ -560,9 +560,9 @@ void tst_QNetworkCookie::parseSingleCookie_data()
     QTest::newRow("expires+path") << "a=b; expires=Wed, 09-Nov-1999 23:12:40 GMT; path=/" << cookie;
     QTest::newRow("path+expires") << "a=b; path=/;expires=Wed, 09-Nov-1999 23:12:40 GMT " << cookie;
 
-    cookie.setDomain(".trolltech.com");
-    QTest::newRow("full") << "a=b; domain=.trolltech.com;expires=Wed, 09-Nov-1999 23:12:40 GMT;path=/" << cookie;
-    QTest::newRow("full2") << "a=b;path=/; expires=Wed, 09-Nov-1999 23:12:40 GMT ;domain=.trolltech.com" << cookie;
+    cookie.setDomain(".qt.nokia.com");
+    QTest::newRow("full") << "a=b; domain=.qt.nokia.com;expires=Wed, 09-Nov-1999 23:12:40 GMT;path=/" << cookie;
+    QTest::newRow("full2") << "a=b;path=/; expires=Wed, 09-Nov-1999 23:12:40 GMT ;domain=.qt.nokia.com" << cookie;
 
     // cookies obtained from the network:
     cookie = QNetworkCookie("__siteid", "1");
@@ -662,9 +662,9 @@ void tst_QNetworkCookie::parseMultipleCookies_data()
     QTest::newRow("complex-1") << "c=d, a=, foo=bar; path=/" << list;
 
     cookie.setName("baz");
-    cookie.setDomain(".trolltech.com");
+    cookie.setDomain(".qt.nokia.com");
     list.prepend(cookie);
-    QTest::newRow("complex-2") << "baz=bar; path=/; domain=trolltech.com, c=d,a=,foo=bar; path=/" << list;
+    QTest::newRow("complex-2") << "baz=bar; path=/; domain=qt.nokia.com, c=d,a=,foo=bar; path=/" << list;
 
     // cookies obtained from the network:
     cookie = QNetworkCookie("id", "51706646077999719");
diff --git a/tests/auto/qnetworkcookiejar/tst_qnetworkcookiejar.cpp b/tests/auto/qnetworkcookiejar/tst_qnetworkcookiejar.cpp
index 92b7ae5..67b6d08 100644
--- a/tests/auto/qnetworkcookiejar/tst_qnetworkcookiejar.cpp
+++ b/tests/auto/qnetworkcookiejar/tst_qnetworkcookiejar.cpp
@@ -220,21 +220,21 @@ void tst_QNetworkCookieJar::cookiesForUrl_data()
     QNetworkCookie cookie;
     cookie.setName("a");
     cookie.setPath("/web");
-    cookie.setDomain(".trolltech.com");
+    cookie.setDomain(".nokia.com");
     allCookies += cookie;
 
     QTest::newRow("no-match-1") << allCookies << "http://foo.bar/" << result;
     QTest::newRow("no-match-2") << allCookies << "http://foo.bar/web" << result;
     QTest::newRow("no-match-3") << allCookies << "http://foo.bar/web/wiki" << result;
-    QTest::newRow("no-match-4") << allCookies << "http://trolltech.com" << result;
+    QTest::newRow("no-match-4") << allCookies << "http://nokia.com" << result;
     QTest::newRow("no-match-5") << allCookies << "http://qt.nokia.com" << result;
-    QTest::newRow("no-match-6") << allCookies << "http://trolltech.com/webinar" << result;
+    QTest::newRow("no-match-6") << allCookies << "http://nokia.com/webinar" << result;
     QTest::newRow("no-match-7") << allCookies << "http://qt.nokia.com/webinar" << result;
 
     result = allCookies;
-    QTest::newRow("match-1") << allCookies << "http://trolltech.com/web" << result;
-    QTest::newRow("match-2") << allCookies << "http://trolltech.com/web/" << result;
-    QTest::newRow("match-3") << allCookies << "http://trolltech.com/web/content" << result;
+    QTest::newRow("match-1") << allCookies << "http://nokia.com/web" << result;
+    QTest::newRow("match-2") << allCookies << "http://nokia.com/web/" << result;
+    QTest::newRow("match-3") << allCookies << "http://nokia.com/web/content" << result;
     QTest::newRow("match-4") << allCookies << "http://qt.nokia.com/web" << result;
     QTest::newRow("match-4") << allCookies << "http://qt.nokia.com/web/" << result;
     QTest::newRow("match-6") << allCookies << "http://qt.nokia.com/web/content" << result;
@@ -243,21 +243,21 @@ void tst_QNetworkCookieJar::cookiesForUrl_data()
     allCookies += cookie;
 
     // exact same results as before:
-    QTest::newRow("one-match-1") << allCookies << "http://trolltech.com/web" << result;
-    QTest::newRow("one-match-2") << allCookies << "http://trolltech.com/web/" << result;
-    QTest::newRow("one-match-3") << allCookies << "http://trolltech.com/web/content" << result;
+    QTest::newRow("one-match-1") << allCookies << "http://nokia.com/web" << result;
+    QTest::newRow("one-match-2") << allCookies << "http://nokia.com/web/" << result;
+    QTest::newRow("one-match-3") << allCookies << "http://nokia.com/web/content" << result;
     QTest::newRow("one-match-4") << allCookies << "http://qt.nokia.com/web" << result;
     QTest::newRow("one-match-4") << allCookies << "http://qt.nokia.com/web/" << result;
     QTest::newRow("one-match-6") << allCookies << "http://qt.nokia.com/web/content" << result;
 
     result.prepend(cookie);     // longer path, it must match first
-    QTest::newRow("two-matches-1") << allCookies << "http://trolltech.com/web/wiki" << result;
+    QTest::newRow("two-matches-1") << allCookies << "http://nokia.com/web/wiki" << result;
     QTest::newRow("two-matches-2") << allCookies << "http://qt.nokia.com/web/wiki" << result;
 
     // invert the order;
     allCookies.clear();
     allCookies << result.at(1) << result.at(0);
-    QTest::newRow("two-matches-3") << allCookies << "http://trolltech.com/web/wiki" << result;
+    QTest::newRow("two-matches-3") << allCookies << "http://nokia.com/web/wiki" << result;
     QTest::newRow("two-matches-4") << allCookies << "http://qt.nokia.com/web/wiki" << result;
 
     // expired cookie
@@ -265,9 +265,9 @@ void tst_QNetworkCookieJar::cookiesForUrl_data()
     cookie.setExpirationDate(QDateTime::fromString("09-Nov-1999", "dd-MMM-yyyy"));
     allCookies += cookie;
     result.clear();
-    QTest::newRow("exp-match-1") << allCookies << "http://trolltech.com/web" << result;
-    QTest::newRow("exp-match-2") << allCookies << "http://trolltech.com/web/" << result;
-    QTest::newRow("exp-match-3") << allCookies << "http://trolltech.com/web/content" << result;
+    QTest::newRow("exp-match-1") << allCookies << "http://nokia.com/web" << result;
+    QTest::newRow("exp-match-2") << allCookies << "http://nokia.com/web/" << result;
+    QTest::newRow("exp-match-3") << allCookies << "http://nokia.com/web/content" << result;
     QTest::newRow("exp-match-4") << allCookies << "http://qt.nokia.com/web" << result;
     QTest::newRow("exp-match-4") << allCookies << "http://qt.nokia.com/web/" << result;
     QTest::newRow("exp-match-6") << allCookies << "http://qt.nokia.com/web/content" << result;
diff --git a/tests/auto/qquaternion/qquaternion.pro b/tests/auto/qquaternion/qquaternion.pro
new file mode 100644
index 0000000..6f740cf
--- /dev/null
+++ b/tests/auto/qquaternion/qquaternion.pro
@@ -0,0 +1,2 @@
+load(qttest_p4)
+SOURCES += tst_qquaternion.cpp
diff --git a/tests/auto/math3d/qquaternion/tst_qquaternion.cpp b/tests/auto/qquaternion/tst_qquaternion.cpp
index 899c5c2..ba546f1 100644
--- a/tests/auto/math3d/qquaternion/tst_qquaternion.cpp
+++ b/tests/auto/qquaternion/tst_qquaternion.cpp
@@ -41,7 +41,7 @@
 
 #include <QtTest/QtTest>
 #include <QtCore/qmath.h>
-#include "math3dincludes.h"
+#include <QtGui/qquaternion.h>
 
 class tst_QQuaternion : public QObject
 {
diff --git a/tests/auto/qsharedpointer/tst_qsharedpointer.cpp b/tests/auto/qsharedpointer/tst_qsharedpointer.cpp
index ab75c91..c9b2325 100644
--- a/tests/auto/qsharedpointer/tst_qsharedpointer.cpp
+++ b/tests/auto/qsharedpointer/tst_qsharedpointer.cpp
@@ -761,17 +761,46 @@ void tst_QSharedPointer::differentPointers()
     {
         DiffPtrDerivedData *aData = new DiffPtrDerivedData;
         Data *aBase = aData;
-        Q_ASSERT(aData == aBase);
-        Q_ASSERT(*reinterpret_cast<quintptr *>(&aData) != *reinterpret_cast<quintptr *>(&aBase));
+
+        // ensure that this compiler isn't broken
+        if (*reinterpret_cast<quintptr *>(&aData) == *reinterpret_cast<quintptr *>(&aBase))
+            qFatal("Something went very wrong -- we couldn't create two different pointers to the same object");
+        if (aData != aBase)
+            QSKIP("Broken compiler", SkipAll);
+        if (aBase != aData)
+            QSKIP("Broken compiler", SkipAll);
 
         QSharedPointer<DiffPtrDerivedData> ptr = QSharedPointer<DiffPtrDerivedData>(aData);
         QSharedPointer<Data> baseptr = qSharedPointerCast<Data>(ptr);
-        QVERIFY(ptr == baseptr);
+        qDebug("naked: orig: %p; base: %p (%s) -- QSharedPointer: orig: %p; base %p (%s) -- result: %s",
+               aData, aBase, aData == aBase ? "equal" : "not equal",
+               ptr.data(), baseptr.data(), ptr.data() == baseptr.data() ? "equal" : "not equal",
+               baseptr.data() == aData ? "equal" : "not equal");
+
         QVERIFY(ptr.data() == baseptr.data());
+        QVERIFY(baseptr.data() == ptr.data());
+        QVERIFY(ptr == baseptr);
+        QVERIFY(baseptr == ptr);
+
+        QVERIFY(ptr.data() == aBase);
+        QVERIFY(aBase == ptr.data());
+        QVERIFY(ptr.data() == aData);
+        QVERIFY(aData == ptr.data());
+
         QVERIFY(ptr == aBase);
+        QVERIFY(aBase == ptr);
         QVERIFY(ptr == aData);
-        QVERIFY(baseptr == aData);
+        QVERIFY(aData == ptr);
+
+        QVERIFY(baseptr.data() == aBase);
+        QVERIFY(aBase == baseptr.data());
         QVERIFY(baseptr == aBase);
+        QVERIFY(aBase == baseptr);
+
+        QVERIFY(baseptr.data() == aData);
+        QVERIFY(aData == baseptr.data());
+        QVERIFY(baseptr == aData);
+        QVERIFY(aData == baseptr);
     }
     check();
 
diff --git a/tests/auto/qtableview/tst_qtableview.cpp b/tests/auto/qtableview/tst_qtableview.cpp
index 2f41d77..e650dc8 100644
--- a/tests/auto/qtableview/tst_qtableview.cpp
+++ b/tests/auto/qtableview/tst_qtableview.cpp
@@ -3270,6 +3270,7 @@ void tst_QTableView::task259308_scrollVerticalHeaderSwappedSections()
     tv.setModel(&model);
     tv.show();
     tv.verticalHeader()->swapSections(0, model.rowCount() - 1);
+    tv.setCurrentIndex(model.index(model.rowCount() - 1, 0));
 
     QTest::qWait(60);
     QTest::keyClick(&tv, Qt::Key_PageUp);   // PageUp won't scroll when at top
diff --git a/tests/auto/qtoolbutton/tst_qtoolbutton.cpp b/tests/auto/qtoolbutton/tst_qtoolbutton.cpp
index 6376c5d..aca9a20 100644
--- a/tests/auto/qtoolbutton/tst_qtoolbutton.cpp
+++ b/tests/auto/qtoolbutton/tst_qtoolbutton.cpp
@@ -222,8 +222,10 @@ void tst_QToolButton::task176137_autoRepeatOfAction()
     tb.setAutoRepeat (true);
     QSignalSpy repeatSpy(&action,SIGNAL(triggered())); // new spy
     QTest::mousePress ( &tb, Qt::LeftButton);
-    QTest::mouseRelease ( &tb, Qt::LeftButton, 0, QPoint (), 2000);
-    QCOMPARE (repeatSpy.count(), (2000 - tb.autoRepeatDelay()) / tb.autoRepeatInterval() + 1);
+    QTest::mouseRelease ( &tb, Qt::LeftButton, 0, QPoint (), 3000);
+    qreal expected = (3000 - tb.autoRepeatDelay()) / tb.autoRepeatInterval() + 1;
+    //we check that the difference is less than 10% (on some systems timers are not super accurate)
+    QVERIFY ( qAbs( (expected - repeatSpy.count()) / expected) < 0.1);
 }
 
 
diff --git a/tests/auto/qurl/tst_qurl.cpp b/tests/auto/qurl/tst_qurl.cpp
index 5d909d8..fea48ea 100644
--- a/tests/auto/qurl/tst_qurl.cpp
+++ b/tests/auto/qurl/tst_qurl.cpp
@@ -2047,7 +2047,7 @@ void tst_QUrl::compat_decode_data()
     QTest::newRow("NormalStringEncoded") << QByteArray("file%20name") << QString("file name");
     QTest::newRow("JustEncoded") << QByteArray("%20") << QString(" ");
     QTest::newRow("HTTPUrl") << QByteArray("http://qt.nokia.com") << QString("http://qt.nokia.com");
-    QTest::newRow("HTTPUrlEncoded") << QByteArray("http://www%20trolltech%20com") << QString("http://qt.nokia.com");
+    QTest::newRow("HTTPUrlEncoded") << QByteArray("http://qt%20nokia%20com") << QString("http://qt nokia com");
     QTest::newRow("EmptyString") << QByteArray("") << QString("");
     QTest::newRow("Task27166") << QByteArray("Fran%C3%A7aise") << QString("Française");
 }
@@ -2069,7 +2069,7 @@ void tst_QUrl::compat_encode_data()
     QTest::newRow("NormalStringEncoded") << QString("file name") << QByteArray("file%20name");
     QTest::newRow("JustEncoded") << QString(" ") << QByteArray("%20");
     QTest::newRow("HTTPUrl") << QString("http://qt.nokia.com") << QByteArray("http%3A//qt.nokia.com");
-    QTest::newRow("HTTPUrlEncoded") << QString("http://qt.nokia.com") << QByteArray("http%3A//www%20trolltech%20com");
+    QTest::newRow("HTTPUrlEncoded") << QString("http://qt nokia com") << QByteArray("http%3A//qt%20nokia%20com");
     QTest::newRow("EmptyString") << QString("") << QByteArray("");
     QTest::newRow("Task27166") << QString::fromLatin1("Française") << QByteArray("Fran%C3%A7aise");
 }
diff --git a/tests/auto/qvectornd/qvectornd.pro b/tests/auto/qvectornd/qvectornd.pro
new file mode 100644
index 0000000..6346199
--- /dev/null
+++ b/tests/auto/qvectornd/qvectornd.pro
@@ -0,0 +1,2 @@
+load(qttest_p4)
+SOURCES += tst_qvectornd.cpp
diff --git a/tests/auto/math3d/qvectornd/tst_qvectornd.cpp b/tests/auto/qvectornd/tst_qvectornd.cpp
index cfcce8e..22f0ce1 100644
--- a/tests/auto/math3d/qvectornd/tst_qvectornd.cpp
+++ b/tests/auto/qvectornd/tst_qvectornd.cpp
@@ -41,7 +41,9 @@
 
 #include <QtTest/QtTest>
 #include <QtCore/qmath.h>
-#include "math3dincludes.h"
+#include <QtGui/qvector2d.h>
+#include <QtGui/qvector3d.h>
+#include <QtGui/qvector4d.h>
 
 class tst_QVector : public QObject
 {
diff --git a/tests/auto/qxmlstream/tst_qxmlstream.cpp b/tests/auto/qxmlstream/tst_qxmlstream.cpp
index 375528c..04f990f 100644
--- a/tests/auto/qxmlstream/tst_qxmlstream.cpp
+++ b/tests/auto/qxmlstream/tst_qxmlstream.cpp
@@ -55,6 +55,8 @@
 //TESTED_CLASS=QXmlStreamReader QXmlStreamWriter
 //TESTED_FILES=corelib/xml/stream/qxmlutils.cpp corelib/xml/stream/qxmlstream.cpp corelib/xml/stream/qxmlstream_p.h
 
+Q_DECLARE_METATYPE(QXmlStreamReader::ReadElementTextBehaviour)
+
 static const char *const catalogFile = "XML-Test-Suite/xmlconf/finalCatalog.xml";
 static const int expectedRunCount = 1646;
 static const int expectedSkipCount = 532;
@@ -550,6 +552,9 @@ private slots:
     void setEntityResolver();
     void readFromQBuffer() const;
     void readFromQBufferInvalid() const;
+    void readNextStartElement() const;
+    void readElementText() const;
+    void readElementText_data() const;
     void crashInUTF16Codec() const;
     void hasAttributeSignature() const;
     void hasAttribute() const;
@@ -1107,6 +1112,71 @@ void tst_QXmlStream::readFromQBufferInvalid() const
     QVERIFY(reader.hasError());
 }
 
+void tst_QXmlStream::readNextStartElement() const
+{
+    QLatin1String in("<?xml version=\"1.0\"?><A><!-- blah --><B><C/></B><B attr=\"value\"/>text</A>");
+    QXmlStreamReader reader(in);
+
+    QVERIFY(reader.readNextStartElement());
+    QVERIFY(reader.isStartElement() && reader.name() == "A");
+
+    int amountOfB = 0;
+    while (reader.readNextStartElement()) {
+        QVERIFY(reader.isStartElement() && reader.name() == "B");
+        ++amountOfB;
+        reader.skipCurrentElement();
+    }
+
+    QCOMPARE(amountOfB, 2);
+}
+
+void tst_QXmlStream::readElementText() const
+{
+    QFETCH(QXmlStreamReader::ReadElementTextBehaviour, behaviour);
+    QFETCH(QString, input);
+    QFETCH(QString, expected);
+
+    QXmlStreamReader reader(input);
+
+    QVERIFY(reader.readNextStartElement());
+    QCOMPARE(reader.readElementText(behaviour), expected);
+}
+
+void tst_QXmlStream::readElementText_data() const
+{
+    QTest::addColumn<QXmlStreamReader::ReadElementTextBehaviour>("behaviour");
+    QTest::addColumn<QString>("input");
+    QTest::addColumn<QString>("expected");
+
+    QString validInput("<p>He was <em>never</em> going to admit<!-- TODO: rephrase --> his mistake.</p>");
+    QString invalidInput("<p>invalid...<p>");
+    QString invalidOutput("invalid...");
+
+    QTest::newRow("ErrorOnUnexpectedElement")
+            << QXmlStreamReader::ErrorOnUnexpectedElement
+            << validInput << QString("He was ");
+
+    QTest::newRow("IncludeChildElements")
+            << QXmlStreamReader::IncludeChildElements
+            << validInput << QString("He was never going to admit his mistake.");
+
+    QTest::newRow("SkipChildElements")
+            << QXmlStreamReader::SkipChildElements
+            << validInput << QString("He was  going to admit his mistake.");
+
+    QTest::newRow("ErrorOnUnexpectedElement Invalid")
+            << QXmlStreamReader::ErrorOnUnexpectedElement
+            << invalidInput << invalidOutput;
+
+    QTest::newRow("IncludeChildElements Invalid")
+            << QXmlStreamReader::IncludeChildElements
+            << invalidInput << invalidOutput;
+
+    QTest::newRow("SkipChildElements Invalid")
+            << QXmlStreamReader::SkipChildElements
+            << invalidInput << invalidOutput;
+}
+
 void tst_QXmlStream::crashInUTF16Codec() const
 {
     QEventLoop eventLoop;
diff --git a/tests/auto/symbols/tst_symbols.cpp b/tests/auto/symbols/tst_symbols.cpp
index 784c979..fea3380 100644
--- a/tests/auto/symbols/tst_symbols.cpp
+++ b/tests/auto/symbols/tst_symbols.cpp
@@ -111,11 +111,19 @@ void tst_Symbols::globalObjects()
 
     bool isFailed = false;
 
-    QDir dir(qgetenv("QTDIR") + "/lib", "*.so");
+    QDir dir(QLibraryInfo::location(QLibraryInfo::LibrariesPath), "*.so");
     QStringList files = dir.entryList();
     QVERIFY(!files.isEmpty());
 
     foreach (QString lib, files) {
+        if (lib == "libQtCLucene.so") {
+            // skip this library, it's 3rd-party C++
+            continue;
+        }
+        if (lib == "libQt3Support.so") {
+            // we're not going to fix these issues anyway, so skip this library
+            continue;
+        }
 
         QProcess proc;
         proc.start("nm",
diff --git a/tests/auto/uic/baseline/Dialog_with_Buttons_Bottom.ui.h b/tests/auto/uic/baseline/Dialog_with_Buttons_Bottom.ui.h
index 166dc60..efbeb97 100644
--- a/tests/auto/uic/baseline/Dialog_with_Buttons_Bottom.ui.h
+++ b/tests/auto/uic/baseline/Dialog_with_Buttons_Bottom.ui.h
@@ -1,8 +1,8 @@
 /********************************************************************************
 ** Form generated from reading UI file 'Dialog_with_Buttons_Bottom.ui'
 **
-** Created: Thu Jul 10 09:47:34 2008
-**      by: Qt User Interface Compiler version 4.5.0
+** Created: Tue Aug 18 19:03:31 2009
+**      by: Qt User Interface Compiler version 4.6.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
 ********************************************************************************/
diff --git a/tests/auto/uic/baseline/Dialog_with_Buttons_Right.ui.h b/tests/auto/uic/baseline/Dialog_with_Buttons_Right.ui.h
index cbb3cc4..0f23ee3 100644
--- a/tests/auto/uic/baseline/Dialog_with_Buttons_Right.ui.h
+++ b/tests/auto/uic/baseline/Dialog_with_Buttons_Right.ui.h
@@ -1,8 +1,8 @@
 /********************************************************************************
 ** Form generated from reading UI file 'Dialog_with_Buttons_Right.ui'
 **
-** Created: Thu Jul 10 09:47:34 2008
-**      by: Qt User Interface Compiler version 4.5.0
+** Created: Tue Aug 18 19:03:31 2009
+**      by: Qt User Interface Compiler version 4.6.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
 ********************************************************************************/
diff --git a/tests/auto/uic/baseline/Dialog_without_Buttons.ui.h b/tests/auto/uic/baseline/Dialog_without_Buttons.ui.h
index bb06a54..ff88063 100644
--- a/tests/auto/uic/baseline/Dialog_without_Buttons.ui.h
+++ b/tests/auto/uic/baseline/Dialog_without_Buttons.ui.h
@@ -1,8 +1,8 @@
 /********************************************************************************
 ** Form generated from reading UI file 'Dialog_without_Buttons.ui'
 **
-** Created: Thu Jul 10 09:47:34 2008
-**      by: Qt User Interface Compiler version 4.5.0
+** Created: Tue Aug 18 19:03:31 2009
+**      by: Qt User Interface Compiler version 4.6.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
 ********************************************************************************/
diff --git a/tests/auto/uic/baseline/Main_Window.ui.h b/tests/auto/uic/baseline/Main_Window.ui.h
index 07a8389..4fbc750 100644
--- a/tests/auto/uic/baseline/Main_Window.ui.h
+++ b/tests/auto/uic/baseline/Main_Window.ui.h
@@ -1,8 +1,8 @@
 /********************************************************************************
 ** Form generated from reading UI file 'Main_Window.ui'
 **
-** Created: Thu Jul 10 09:47:34 2008
-**      by: Qt User Interface Compiler version 4.5.0
+** Created: Tue Aug 18 19:03:31 2009
+**      by: Qt User Interface Compiler version 4.6.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
 ********************************************************************************/
diff --git a/tests/auto/uic/baseline/Widget.ui.h b/tests/auto/uic/baseline/Widget.ui.h
index bba9fd9..e49646e 100644
--- a/tests/auto/uic/baseline/Widget.ui.h
+++ b/tests/auto/uic/baseline/Widget.ui.h
@@ -1,8 +1,8 @@
 /********************************************************************************
 ** Form generated from reading UI file 'Widget.ui'
 **
-** Created: Thu Jul 10 09:47:35 2008
-**      by: Qt User Interface Compiler version 4.5.0
+** Created: Tue Aug 18 19:03:32 2009
+**      by: Qt User Interface Compiler version 4.6.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
 ********************************************************************************/
diff --git a/tests/auto/uic/baseline/addlinkdialog.ui.h b/tests/auto/uic/baseline/addlinkdialog.ui.h
index 920a8f7..1b174ad 100644
--- a/tests/auto/uic/baseline/addlinkdialog.ui.h
+++ b/tests/auto/uic/baseline/addlinkdialog.ui.h
@@ -1,8 +1,8 @@
 /********************************************************************************
 ** Form generated from reading UI file 'addlinkdialog.ui'
 **
-** Created: Thu Jul 10 09:47:34 2008
-**      by: Qt User Interface Compiler version 4.5.0
+** Created: Tue Aug 18 19:03:31 2009
+**      by: Qt User Interface Compiler version 4.6.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
 ********************************************************************************/
diff --git a/tests/auto/uic/baseline/addtorrentform.ui.h b/tests/auto/uic/baseline/addtorrentform.ui.h
index 185ce2e..a454da9 100644
--- a/tests/auto/uic/baseline/addtorrentform.ui.h
+++ b/tests/auto/uic/baseline/addtorrentform.ui.h
@@ -1,8 +1,8 @@
 /********************************************************************************
 ** Form generated from reading UI file 'addtorrentform.ui'
 **
-** Created: Thu Jul 10 09:47:34 2008
-**      by: Qt User Interface Compiler version 4.5.0
+** Created: Tue Aug 18 19:03:31 2009
+**      by: Qt User Interface Compiler version 4.6.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
 ********************************************************************************/
diff --git a/tests/auto/uic/baseline/authenticationdialog.ui.h b/tests/auto/uic/baseline/authenticationdialog.ui.h
index b46c05d..dd27f5c 100644
--- a/tests/auto/uic/baseline/authenticationdialog.ui.h
+++ b/tests/auto/uic/baseline/authenticationdialog.ui.h
@@ -1,8 +1,8 @@
 /********************************************************************************
 ** Form generated from reading UI file 'authenticationdialog.ui'
 **
-** Created: Thu Jul 10 09:47:34 2008
-**      by: Qt User Interface Compiler version 4.5.0
+** Created: Tue Aug 18 19:03:31 2009
+**      by: Qt User Interface Compiler version 4.6.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
 ********************************************************************************/
diff --git a/tests/auto/uic/baseline/backside.ui.h b/tests/auto/uic/baseline/backside.ui.h
index 6fdab4b..1660846 100644
--- a/tests/auto/uic/baseline/backside.ui.h
+++ b/tests/auto/uic/baseline/backside.ui.h
@@ -1,8 +1,8 @@
 /********************************************************************************
 ** Form generated from reading UI file 'backside.ui'
 **
-** Created: Tue Jun 17 09:18:47 2008
-**      by: Qt User Interface Compiler version 4.5.0
+** Created: Tue Aug 18 19:03:31 2009
+**      by: Qt User Interface Compiler version 4.6.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
 ********************************************************************************/
diff --git a/tests/auto/uic/baseline/batchtranslation.ui.h b/tests/auto/uic/baseline/batchtranslation.ui.h
index d781c34..2285e1b 100644
--- a/tests/auto/uic/baseline/batchtranslation.ui.h
+++ b/tests/auto/uic/baseline/batchtranslation.ui.h
@@ -1,4 +1,5 @@
-/****************************************************************************
+/*
+*********************************************************************
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: Nokia Corporation (qt-info@nokia.com)
@@ -37,13 +38,14 @@
 ** contact the sales department at http://qt.nokia.com/contact.
 ** $QT_END_LICENSE$
 **
-****************************************************************************/
+*********************************************************************
+*/
 
 /********************************************************************************
 ** Form generated from reading UI file 'batchtranslation.ui'
 **
-** Created: Thu Jul 10 09:47:34 2008
-**      by: Qt User Interface Compiler version 4.5.0
+** Created: Tue Aug 18 19:03:31 2009
+**      by: Qt User Interface Compiler version 4.6.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
 ********************************************************************************/
diff --git a/tests/auto/uic/baseline/bookmarkdialog.ui.h b/tests/auto/uic/baseline/bookmarkdialog.ui.h
index 1db7dca..0c7764f 100644
--- a/tests/auto/uic/baseline/bookmarkdialog.ui.h
+++ b/tests/auto/uic/baseline/bookmarkdialog.ui.h
@@ -1,8 +1,8 @@
 /********************************************************************************
 ** Form generated from reading UI file 'bookmarkdialog.ui'
 **
-** Created: Mon Jun 16 18:01:55 2008
-**      by: Qt User Interface Compiler version 4.5.0
+** Created: Tue Aug 18 19:03:31 2009
+**      by: Qt User Interface Compiler version 4.6.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
 ********************************************************************************/
diff --git a/tests/auto/uic/baseline/bookwindow.ui.h b/tests/auto/uic/baseline/bookwindow.ui.h
index 776f9e9..92639ec 100644
--- a/tests/auto/uic/baseline/bookwindow.ui.h
+++ b/tests/auto/uic/baseline/bookwindow.ui.h
@@ -1,8 +1,8 @@
 /********************************************************************************
 ** Form generated from reading UI file 'bookwindow.ui'
 **
-** Created: Thu Jul 10 09:47:34 2008
-**      by: Qt User Interface Compiler version 4.5.0
+** Created: Tue Aug 18 19:03:31 2009
+**      by: Qt User Interface Compiler version 4.6.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
 ********************************************************************************/
diff --git a/tests/auto/uic/baseline/browserwidget.ui.h b/tests/auto/uic/baseline/browserwidget.ui.h
index c1ca60f..1a3a282 100644
--- a/tests/auto/uic/baseline/browserwidget.ui.h
+++ b/tests/auto/uic/baseline/browserwidget.ui.h
@@ -1,8 +1,8 @@
 /********************************************************************************
 ** Form generated from reading UI file 'browserwidget.ui'
 **
-** Created: Mon Jun 16 18:01:09 2008
-**      by: Qt User Interface Compiler version 4.5.0
+** Created: Tue Aug 18 19:03:31 2009
+**      by: Qt User Interface Compiler version 4.6.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
 ********************************************************************************/
diff --git a/tests/auto/uic/baseline/calculator.ui.h b/tests/auto/uic/baseline/calculator.ui.h
index f476d9b..ace5f44 100644
--- a/tests/auto/uic/baseline/calculator.ui.h
+++ b/tests/auto/uic/baseline/calculator.ui.h
@@ -1,8 +1,8 @@
 /********************************************************************************
 ** Form generated from reading UI file 'calculator.ui'
 **
-** Created: Thu Jul 10 09:47:34 2008
-**      by: Qt User Interface Compiler version 4.5.0
+** Created: Tue Aug 18 19:03:31 2009
+**      by: Qt User Interface Compiler version 4.6.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
 ********************************************************************************/
diff --git a/tests/auto/uic/baseline/calculatorform.ui.h b/tests/auto/uic/baseline/calculatorform.ui.h
index 1c575e8..2a369c7 100644
--- a/tests/auto/uic/baseline/calculatorform.ui.h
+++ b/tests/auto/uic/baseline/calculatorform.ui.h
@@ -1,8 +1,8 @@
 /********************************************************************************
 ** Form generated from reading UI file 'calculatorform.ui'
 **
-** Created: Thu Jul 10 09:47:34 2008
-**      by: Qt User Interface Compiler version 4.5.0
+** Created: Tue Aug 18 19:03:31 2009
+**      by: Qt User Interface Compiler version 4.6.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
 ********************************************************************************/
diff --git a/tests/auto/uic/baseline/certificateinfo.ui.h b/tests/auto/uic/baseline/certificateinfo.ui.h
index 548bec5..6d13787 100644
--- a/tests/auto/uic/baseline/certificateinfo.ui.h
+++ b/tests/auto/uic/baseline/certificateinfo.ui.h
@@ -1,8 +1,8 @@
 /********************************************************************************
 ** Form generated from reading UI file 'certificateinfo.ui'
 **
-** Created: Thu Jul 10 09:47:34 2008
-**      by: Qt User Interface Compiler version 4.5.0
+** Created: Tue Aug 18 19:03:31 2009
+**      by: Qt User Interface Compiler version 4.6.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
 ********************************************************************************/
diff --git a/tests/auto/uic/baseline/chatdialog.ui.h b/tests/auto/uic/baseline/chatdialog.ui.h
index c9f2693..ba1b99f 100644
--- a/tests/auto/uic/baseline/chatdialog.ui.h
+++ b/tests/auto/uic/baseline/chatdialog.ui.h
@@ -1,8 +1,8 @@
 /********************************************************************************
 ** Form generated from reading UI file 'chatdialog.ui'
 **
-** Created: Thu Jul 10 09:47:34 2008
-**      by: Qt User Interface Compiler version 4.5.0
+** Created: Tue Aug 18 19:03:31 2009
+**      by: Qt User Interface Compiler version 4.6.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
 ********************************************************************************/
diff --git a/tests/auto/uic/baseline/chatmainwindow.ui.h b/tests/auto/uic/baseline/chatmainwindow.ui.h
index 87ac882..d4d4996 100644
--- a/tests/auto/uic/baseline/chatmainwindow.ui.h
+++ b/tests/auto/uic/baseline/chatmainwindow.ui.h
@@ -1,8 +1,8 @@
 /********************************************************************************
 ** Form generated from reading UI file 'chatmainwindow.ui'
 **
-** Created: Mon Sep 1 09:31:02 2008
-**      by: Qt User Interface Compiler version 4.5.0
+** Created: Tue Aug 18 19:03:31 2009
+**      by: Qt User Interface Compiler version 4.6.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
 ********************************************************************************/
diff --git a/tests/auto/uic/baseline/chatsetnickname.ui.h b/tests/auto/uic/baseline/chatsetnickname.ui.h
index 54f48e7..4b081b6 100644
--- a/tests/auto/uic/baseline/chatsetnickname.ui.h
+++ b/tests/auto/uic/baseline/chatsetnickname.ui.h
@@ -1,8 +1,8 @@
 /********************************************************************************
 ** Form generated from reading UI file 'chatsetnickname.ui'
 **
-** Created: Thu Jul 10 09:47:34 2008
-**      by: Qt User Interface Compiler version 4.5.0
+** Created: Tue Aug 18 19:03:31 2009
+**      by: Qt User Interface Compiler version 4.6.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
 ********************************************************************************/
diff --git a/tests/auto/uic/baseline/config.ui.h b/tests/auto/uic/baseline/config.ui.h
index a14d7c8..f708f6b 100644
--- a/tests/auto/uic/baseline/config.ui.h
+++ b/tests/auto/uic/baseline/config.ui.h
@@ -1,4 +1,5 @@
-/****************************************************************************
+/*
+*********************************************************************
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: Nokia Corporation (qt-info@nokia.com)
@@ -37,13 +38,14 @@
 ** contact the sales department at http://qt.nokia.com/contact.
 ** $QT_END_LICENSE$
 **
-****************************************************************************/
+*********************************************************************
+*/
 
 /********************************************************************************
 ** Form generated from reading UI file 'config.ui'
 **
-** Created: Thu Jul 10 09:47:34 2008
-**      by: Qt User Interface Compiler version 4.5.0
+** Created: Tue Aug 18 19:03:31 2009
+**      by: Qt User Interface Compiler version 4.6.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
 ********************************************************************************/
diff --git a/tests/auto/uic/baseline/connectdialog.ui.h b/tests/auto/uic/baseline/connectdialog.ui.h
index d7e0eaf..880653e 100644
--- a/tests/auto/uic/baseline/connectdialog.ui.h
+++ b/tests/auto/uic/baseline/connectdialog.ui.h
@@ -1,8 +1,8 @@
 /********************************************************************************
 ** Form generated from reading UI file 'connectdialog.ui'
 **
-** Created: Thu Jul 10 09:47:34 2008
-**      by: Qt User Interface Compiler version 4.5.0
+** Created: Tue Aug 18 19:03:31 2009
+**      by: Qt User Interface Compiler version 4.6.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
 ********************************************************************************/
diff --git a/tests/auto/uic/baseline/controller.ui.h b/tests/auto/uic/baseline/controller.ui.h
index c5cd1fe..609c32c 100644
--- a/tests/auto/uic/baseline/controller.ui.h
+++ b/tests/auto/uic/baseline/controller.ui.h
@@ -1,8 +1,8 @@
 /********************************************************************************
 ** Form generated from reading UI file 'controller.ui'
 **
-** Created: Thu Jul 10 09:47:34 2008
-**      by: Qt User Interface Compiler version 4.5.0
+** Created: Tue Aug 18 19:03:31 2009
+**      by: Qt User Interface Compiler version 4.6.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
 ********************************************************************************/
diff --git a/tests/auto/uic/baseline/cookies.ui.h b/tests/auto/uic/baseline/cookies.ui.h
index 0b4d88a..5e0bf88 100644
--- a/tests/auto/uic/baseline/cookies.ui.h
+++ b/tests/auto/uic/baseline/cookies.ui.h
@@ -1,8 +1,8 @@
 /********************************************************************************
 ** Form generated from reading UI file 'cookies.ui'
 **
-** Created: Thu Jul 10 09:47:34 2008
-**      by: Qt User Interface Compiler version 4.5.0
+** Created: Tue Aug 18 19:03:31 2009
+**      by: Qt User Interface Compiler version 4.6.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
 ********************************************************************************/
diff --git a/tests/auto/uic/baseline/cookiesexceptions.ui.h b/tests/auto/uic/baseline/cookiesexceptions.ui.h
index 12e80d8..9eaf01c 100644
--- a/tests/auto/uic/baseline/cookiesexceptions.ui.h
+++ b/tests/auto/uic/baseline/cookiesexceptions.ui.h
@@ -1,8 +1,8 @@
 /********************************************************************************
 ** Form generated from reading UI file 'cookiesexceptions.ui'
 **
-** Created: Thu Jul 10 09:47:34 2008
-**      by: Qt User Interface Compiler version 4.5.0
+** Created: Tue Aug 18 19:03:31 2009
+**      by: Qt User Interface Compiler version 4.6.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
 ********************************************************************************/
diff --git a/tests/auto/uic/baseline/default.ui.h b/tests/auto/uic/baseline/default.ui.h
index f68a93e..093e7b4 100644
--- a/tests/auto/uic/baseline/default.ui.h
+++ b/tests/auto/uic/baseline/default.ui.h
@@ -1,8 +1,8 @@
 /********************************************************************************
 ** Form generated from reading UI file 'default.ui'
 **
-** Created: Mon Sep 1 09:31:03 2008
-**      by: Qt User Interface Compiler version 4.5.0
+** Created: Tue Aug 18 19:03:31 2009
+**      by: Qt User Interface Compiler version 4.6.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
 ********************************************************************************/
diff --git a/tests/auto/uic/baseline/dialog.ui.h b/tests/auto/uic/baseline/dialog.ui.h
index d65c10a..95fa40b 100644
--- a/tests/auto/uic/baseline/dialog.ui.h
+++ b/tests/auto/uic/baseline/dialog.ui.h
@@ -1,8 +1,8 @@
 /********************************************************************************
 ** Form generated from reading UI file 'dialog.ui'
 **
-** Created: Thu Jul 10 09:47:34 2008
-**      by: Qt User Interface Compiler version 4.5.0
+** Created: Tue Aug 18 19:03:31 2009
+**      by: Qt User Interface Compiler version 4.6.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
 ********************************************************************************/
diff --git a/tests/auto/uic/baseline/downloaditem.ui.h b/tests/auto/uic/baseline/downloaditem.ui.h
index 341fdd2..c211fa0 100644
--- a/tests/auto/uic/baseline/downloaditem.ui.h
+++ b/tests/auto/uic/baseline/downloaditem.ui.h
@@ -1,8 +1,8 @@
 /********************************************************************************
 ** Form generated from reading UI file 'downloaditem.ui'
 **
-** Created: Thu Jul 10 09:47:34 2008
-**      by: Qt User Interface Compiler version 4.5.0
+** Created: Tue Aug 18 19:03:31 2009
+**      by: Qt User Interface Compiler version 4.6.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
 ********************************************************************************/
diff --git a/tests/auto/uic/baseline/downloads.ui.h b/tests/auto/uic/baseline/downloads.ui.h
index 70a038a..f5028c8 100644
--- a/tests/auto/uic/baseline/downloads.ui.h
+++ b/tests/auto/uic/baseline/downloads.ui.h
@@ -1,8 +1,8 @@
 /********************************************************************************
 ** Form generated from reading UI file 'downloads.ui'
 **
-** Created: Thu Jul 10 09:47:34 2008
-**      by: Qt User Interface Compiler version 4.5.0
+** Created: Tue Aug 18 19:03:31 2009
+**      by: Qt User Interface Compiler version 4.6.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
 ********************************************************************************/
diff --git a/tests/auto/uic/baseline/embeddeddialog.ui.h b/tests/auto/uic/baseline/embeddeddialog.ui.h
index 3dd36a6..050f0ab 100644
--- a/tests/auto/uic/baseline/embeddeddialog.ui.h
+++ b/tests/auto/uic/baseline/embeddeddialog.ui.h
@@ -1,8 +1,8 @@
 /********************************************************************************
 ** Form generated from reading UI file 'embeddeddialog.ui'
 **
-** Created: Mon Sep 1 09:31:03 2008
-**      by: Qt User Interface Compiler version 4.5.0
+** Created: Tue Aug 18 19:03:31 2009
+**      by: Qt User Interface Compiler version 4.6.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
 ********************************************************************************/
diff --git a/tests/auto/uic/baseline/filespage.ui.h b/tests/auto/uic/baseline/filespage.ui.h
index 15a0f5b..3b4c156 100644
--- a/tests/auto/uic/baseline/filespage.ui.h
+++ b/tests/auto/uic/baseline/filespage.ui.h
@@ -1,8 +1,8 @@
 /********************************************************************************
 ** Form generated from reading UI file 'filespage.ui'
 **
-** Created: Thu Jul 10 09:47:34 2008
-**      by: Qt User Interface Compiler version 4.5.0
+** Created: Tue Aug 18 19:03:31 2009
+**      by: Qt User Interface Compiler version 4.6.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
 ********************************************************************************/
diff --git a/tests/auto/uic/baseline/filternamedialog.ui.h b/tests/auto/uic/baseline/filternamedialog.ui.h
index ad435c1..64713b4d 100644
--- a/tests/auto/uic/baseline/filternamedialog.ui.h
+++ b/tests/auto/uic/baseline/filternamedialog.ui.h
@@ -1,8 +1,8 @@
 /********************************************************************************
 ** Form generated from reading UI file 'filternamedialog.ui'
 **
-** Created: Thu Jul 10 09:47:34 2008
-**      by: Qt User Interface Compiler version 4.5.0
+** Created: Tue Aug 18 19:03:31 2009
+**      by: Qt User Interface Compiler version 4.6.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
 ********************************************************************************/
diff --git a/tests/auto/uic/baseline/filterpage.ui.h b/tests/auto/uic/baseline/filterpage.ui.h
index e7fb7fb..57beb6b 100644
--- a/tests/auto/uic/baseline/filterpage.ui.h
+++ b/tests/auto/uic/baseline/filterpage.ui.h
@@ -1,8 +1,8 @@
 /********************************************************************************
 ** Form generated from reading UI file 'filterpage.ui'
 **
-** Created: Mon Jun 16 17:58:59 2008
-**      by: Qt User Interface Compiler version 4.5.0
+** Created: Tue Aug 18 19:03:31 2009
+**      by: Qt User Interface Compiler version 4.6.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
 ********************************************************************************/
diff --git a/tests/auto/uic/baseline/finddialog.ui.h b/tests/auto/uic/baseline/finddialog.ui.h
index 7cd2b69..809657a 100644
--- a/tests/auto/uic/baseline/finddialog.ui.h
+++ b/tests/auto/uic/baseline/finddialog.ui.h
@@ -1,4 +1,5 @@
-/****************************************************************************
+/*
+*********************************************************************
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: Nokia Corporation (qt-info@nokia.com)
@@ -37,13 +38,14 @@
 ** contact the sales department at http://qt.nokia.com/contact.
 ** $QT_END_LICENSE$
 **
-****************************************************************************/
+*********************************************************************
+*/
 
 /********************************************************************************
 ** Form generated from reading UI file 'finddialog.ui'
 **
-** Created: Mon Sep 1 09:31:03 2008
-**      by: Qt User Interface Compiler version 4.5.0
+** Created: Tue Aug 18 19:03:31 2009
+**      by: Qt User Interface Compiler version 4.6.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
 ********************************************************************************/
diff --git a/tests/auto/uic/baseline/form.ui.h b/tests/auto/uic/baseline/form.ui.h
index 60f5a14..4edbc42 100644
--- a/tests/auto/uic/baseline/form.ui.h
+++ b/tests/auto/uic/baseline/form.ui.h
@@ -1,8 +1,8 @@
 /********************************************************************************
 ** Form generated from reading UI file 'form.ui'
 **
-** Created: Thu Jul 10 09:47:34 2008
-**      by: Qt User Interface Compiler version 4.5.0
+** Created: Tue Aug 18 19:03:31 2009
+**      by: Qt User Interface Compiler version 4.6.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
 ********************************************************************************/
diff --git a/tests/auto/uic/baseline/formwindowsettings.ui.h b/tests/auto/uic/baseline/formwindowsettings.ui.h
index 99bb61c..71e6c6d 100644
--- a/tests/auto/uic/baseline/formwindowsettings.ui.h
+++ b/tests/auto/uic/baseline/formwindowsettings.ui.h
@@ -1,4 +1,5 @@
-/****************************************************************************
+/*
+*********************************************************************
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: Nokia Corporation (qt-info@nokia.com)
@@ -37,13 +38,14 @@
 ** contact the sales department at http://qt.nokia.com/contact.
 ** $QT_END_LICENSE$
 **
-****************************************************************************/
+*********************************************************************
+*/
 
 /********************************************************************************
 ** Form generated from reading UI file 'formwindowsettings.ui'
 **
-** Created: Mon Sep 1 09:31:03 2008
-**      by: Qt User Interface Compiler version 4.5.0
+** Created: Tue Aug 18 19:03:31 2009
+**      by: Qt User Interface Compiler version 4.6.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
 ********************************************************************************/
diff --git a/tests/auto/uic/baseline/generalpage.ui.h b/tests/auto/uic/baseline/generalpage.ui.h
index 0dcc6ec..ed72265 100644
--- a/tests/auto/uic/baseline/generalpage.ui.h
+++ b/tests/auto/uic/baseline/generalpage.ui.h
@@ -1,8 +1,8 @@
 /********************************************************************************
 ** Form generated from reading UI file 'generalpage.ui'
 **
-** Created: Thu Jul 10 09:47:34 2008
-**      by: Qt User Interface Compiler version 4.5.0
+** Created: Tue Aug 18 19:03:31 2009
+**      by: Qt User Interface Compiler version 4.6.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
 ********************************************************************************/
diff --git a/tests/auto/uic/baseline/gridpanel.ui.h b/tests/auto/uic/baseline/gridpanel.ui.h
index 1bc2f04..b722753 100644
--- a/tests/auto/uic/baseline/gridpanel.ui.h
+++ b/tests/auto/uic/baseline/gridpanel.ui.h
@@ -1,8 +1,8 @@
 /********************************************************************************
 ** Form generated from reading UI file 'gridpanel.ui'
 **
-** Created: Mon Sep 1 09:31:03 2008
-**      by: Qt User Interface Compiler version 4.5.0
+** Created: Tue Aug 18 19:03:31 2009
+**      by: Qt User Interface Compiler version 4.6.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
 ********************************************************************************/
diff --git a/tests/auto/uic/baseline/helpdialog.ui.h b/tests/auto/uic/baseline/helpdialog.ui.h
index 269f5b8..b64e251 100644
--- a/tests/auto/uic/baseline/helpdialog.ui.h
+++ b/tests/auto/uic/baseline/helpdialog.ui.h
@@ -1,4 +1,5 @@
-/****************************************************************************
+/*
+*********************************************************************
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: Nokia Corporation (qt-info@nokia.com)
@@ -37,13 +38,14 @@
 ** contact the sales department at http://qt.nokia.com/contact.
 ** $QT_END_LICENSE$
 **
-****************************************************************************/
+*********************************************************************
+*/
 
 /********************************************************************************
 ** Form generated from reading UI file 'helpdialog.ui'
 **
-** Created: Mon Sep 1 09:31:03 2008
-**      by: Qt User Interface Compiler version 4.5.0
+** Created: Tue Aug 18 19:03:31 2009
+**      by: Qt User Interface Compiler version 4.6.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
 ********************************************************************************/
diff --git a/tests/auto/uic/baseline/history.ui.h b/tests/auto/uic/baseline/history.ui.h
index 16553df..f151e53 100644
--- a/tests/auto/uic/baseline/history.ui.h
+++ b/tests/auto/uic/baseline/history.ui.h
@@ -1,8 +1,8 @@
 /********************************************************************************
 ** Form generated from reading UI file 'history.ui'
 **
-** Created: Thu Jul 10 09:47:34 2008
-**      by: Qt User Interface Compiler version 4.5.0
+** Created: Tue Aug 18 19:03:31 2009
+**      by: Qt User Interface Compiler version 4.6.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
 ********************************************************************************/
diff --git a/tests/auto/uic/baseline/identifierpage.ui.h b/tests/auto/uic/baseline/identifierpage.ui.h
index 24aecf8..e60c277 100644
--- a/tests/auto/uic/baseline/identifierpage.ui.h
+++ b/tests/auto/uic/baseline/identifierpage.ui.h
@@ -1,8 +1,8 @@
 /********************************************************************************
 ** Form generated from reading UI file 'identifierpage.ui'
 **
-** Created: Thu Jul 10 09:47:34 2008
-**      by: Qt User Interface Compiler version 4.5.0
+** Created: Tue Aug 18 19:03:31 2009
+**      by: Qt User Interface Compiler version 4.6.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
 ********************************************************************************/
diff --git a/tests/auto/uic/baseline/imagedialog.ui.h b/tests/auto/uic/baseline/imagedialog.ui.h
index 2f51b65..a22a85e 100644
--- a/tests/auto/uic/baseline/imagedialog.ui.h
+++ b/tests/auto/uic/baseline/imagedialog.ui.h
@@ -1,8 +1,8 @@
 /********************************************************************************
 ** Form generated from reading UI file 'imagedialog.ui'
 **
-** Created: Thu Jul 10 09:47:34 2008
-**      by: Qt User Interface Compiler version 4.5.0
+** Created: Tue Aug 18 19:03:31 2009
+**      by: Qt User Interface Compiler version 4.6.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
 ********************************************************************************/
diff --git a/tests/auto/uic/baseline/inputpage.ui.h b/tests/auto/uic/baseline/inputpage.ui.h
index 23f2a0b..938eacb 100644
--- a/tests/auto/uic/baseline/inputpage.ui.h
+++ b/tests/auto/uic/baseline/inputpage.ui.h
@@ -1,8 +1,8 @@
 /********************************************************************************
 ** Form generated from reading UI file 'inputpage.ui'
 **
-** Created: Thu Jul 10 09:47:34 2008
-**      by: Qt User Interface Compiler version 4.5.0
+** Created: Tue Aug 18 19:03:31 2009
+**      by: Qt User Interface Compiler version 4.6.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
 ********************************************************************************/
diff --git a/tests/auto/uic/baseline/installdialog.ui.h b/tests/auto/uic/baseline/installdialog.ui.h
index e6180f7..1a7166d 100644
--- a/tests/auto/uic/baseline/installdialog.ui.h
+++ b/tests/auto/uic/baseline/installdialog.ui.h
@@ -1,8 +1,8 @@
 /********************************************************************************
 ** Form generated from reading UI file 'installdialog.ui'
 **
-** Created: Thu Jul 10 09:47:34 2008
-**      by: Qt User Interface Compiler version 4.5.0
+** Created: Tue Aug 18 19:03:31 2009
+**      by: Qt User Interface Compiler version 4.6.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
 ********************************************************************************/
diff --git a/tests/auto/uic/baseline/languagesdialog.ui.h b/tests/auto/uic/baseline/languagesdialog.ui.h
index ff837c1..ffdc9c0 100644
--- a/tests/auto/uic/baseline/languagesdialog.ui.h
+++ b/tests/auto/uic/baseline/languagesdialog.ui.h
@@ -1,8 +1,8 @@
 /********************************************************************************
 ** Form generated from reading UI file 'languagesdialog.ui'
 **
-** Created: Fri May 15 16:58:03 2009
-**      by: Qt User Interface Compiler version 4.5.2
+** Created: Tue Aug 18 19:03:31 2009
+**      by: Qt User Interface Compiler version 4.6.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
 ********************************************************************************/
diff --git a/tests/auto/uic/baseline/listwidgeteditor.ui.h b/tests/auto/uic/baseline/listwidgeteditor.ui.h
index ac9f801..e848252 100644
--- a/tests/auto/uic/baseline/listwidgeteditor.ui.h
+++ b/tests/auto/uic/baseline/listwidgeteditor.ui.h
@@ -1,4 +1,5 @@
-/****************************************************************************
+/*
+*********************************************************************
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: Nokia Corporation (qt-info@nokia.com)
@@ -37,13 +38,14 @@
 ** contact the sales department at http://qt.nokia.com/contact.
 ** $QT_END_LICENSE$
 **
-****************************************************************************/
+*********************************************************************
+*/
 
 /********************************************************************************
 ** Form generated from reading UI file 'listwidgeteditor.ui'
 **
-** Created: Mon Jun 16 17:54:30 2008
-**      by: Qt User Interface Compiler version 4.5.0
+** Created: Tue Aug 18 19:03:31 2009
+**      by: Qt User Interface Compiler version 4.6.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
 ********************************************************************************/
diff --git a/tests/auto/uic/baseline/mainwindow.ui.h b/tests/auto/uic/baseline/mainwindow.ui.h
index 11b0196..6a84b18 100644
--- a/tests/auto/uic/baseline/mainwindow.ui.h
+++ b/tests/auto/uic/baseline/mainwindow.ui.h
@@ -1,8 +1,8 @@
 /********************************************************************************
 ** Form generated from reading UI file 'mainwindow.ui'
 **
-** Created: Thu Jul 10 09:47:35 2008
-**      by: Qt User Interface Compiler version 4.5.0
+** Created: Tue Aug 18 19:03:31 2009
+**      by: Qt User Interface Compiler version 4.6.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
 ********************************************************************************/
diff --git a/tests/auto/uic/baseline/mainwindowbase.ui.h b/tests/auto/uic/baseline/mainwindowbase.ui.h
index 10b028f..ce03ae9 100644
--- a/tests/auto/uic/baseline/mainwindowbase.ui.h
+++ b/tests/auto/uic/baseline/mainwindowbase.ui.h
@@ -1,4 +1,5 @@
-/****************************************************************************
+/*
+*********************************************************************
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: Nokia Corporation (qt-info@nokia.com)
@@ -37,13 +38,14 @@
 ** contact the sales department at http://qt.nokia.com/contact.
 ** $QT_END_LICENSE$
 **
-****************************************************************************/
+*********************************************************************
+*/
 
 /********************************************************************************
 ** Form generated from reading UI file 'mainwindowbase.ui'
 **
-** Created: Mon Sep 1 09:31:03 2008
-**      by: Qt User Interface Compiler version 4.5.0
+** Created: Tue Aug 18 19:03:31 2009
+**      by: Qt User Interface Compiler version 4.6.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
 ********************************************************************************/
diff --git a/tests/auto/uic/baseline/mydialog.ui.h b/tests/auto/uic/baseline/mydialog.ui.h
index ac7b458..d3da712 100644
--- a/tests/auto/uic/baseline/mydialog.ui.h
+++ b/tests/auto/uic/baseline/mydialog.ui.h
@@ -1,8 +1,8 @@
 /********************************************************************************
 ** Form generated from reading UI file 'mydialog.ui'
 **
-** Created: Thu Jul 10 09:47:35 2008
-**      by: Qt User Interface Compiler version 4.5.0
+** Created: Tue Aug 18 19:03:31 2009
+**      by: Qt User Interface Compiler version 4.6.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
 ********************************************************************************/
diff --git a/tests/auto/uic/baseline/myform.ui.h b/tests/auto/uic/baseline/myform.ui.h
index 74c83f5..45ed883 100644
--- a/tests/auto/uic/baseline/myform.ui.h
+++ b/tests/auto/uic/baseline/myform.ui.h
@@ -1,8 +1,8 @@
 /********************************************************************************
 ** Form generated from reading UI file 'myform.ui'
 **
-** Created: Thu Jul 10 09:47:35 2008
-**      by: Qt User Interface Compiler version 4.5.0
+** Created: Tue Aug 18 19:03:31 2009
+**      by: Qt User Interface Compiler version 4.6.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
 ********************************************************************************/
diff --git a/tests/auto/uic/baseline/newactiondialog.ui.h b/tests/auto/uic/baseline/newactiondialog.ui.h
index 3fecddb..fc13fbc 100644
--- a/tests/auto/uic/baseline/newactiondialog.ui.h
+++ b/tests/auto/uic/baseline/newactiondialog.ui.h
@@ -1,4 +1,5 @@
-/****************************************************************************
+/*
+*********************************************************************
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: Nokia Corporation (qt-info@nokia.com)
@@ -37,13 +38,14 @@
 ** contact the sales department at http://qt.nokia.com/contact.
 ** $QT_END_LICENSE$
 **
-****************************************************************************/
+*********************************************************************
+*/
 
 /********************************************************************************
 ** Form generated from reading UI file 'newactiondialog.ui'
 **
-** Created: Mon Sep 1 09:31:03 2008
-**      by: Qt User Interface Compiler version 4.5.0
+** Created: Tue Aug 18 19:03:31 2009
+**      by: Qt User Interface Compiler version 4.6.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
 ********************************************************************************/
diff --git a/tests/auto/uic/baseline/newdynamicpropertydialog.ui.h b/tests/auto/uic/baseline/newdynamicpropertydialog.ui.h
index f8e5b51..4ee3d98 100644
--- a/tests/auto/uic/baseline/newdynamicpropertydialog.ui.h
+++ b/tests/auto/uic/baseline/newdynamicpropertydialog.ui.h
@@ -1,8 +1,8 @@
 /********************************************************************************
 ** Form generated from reading UI file 'newdynamicpropertydialog.ui'
 **
-** Created: Thu Jul 10 09:47:35 2008
-**      by: Qt User Interface Compiler version 4.5.0
+** Created: Tue Aug 18 19:03:31 2009
+**      by: Qt User Interface Compiler version 4.6.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
 ********************************************************************************/
diff --git a/tests/auto/uic/baseline/newform.ui.h b/tests/auto/uic/baseline/newform.ui.h
index 13b5572..2af4836 100644
--- a/tests/auto/uic/baseline/newform.ui.h
+++ b/tests/auto/uic/baseline/newform.ui.h
@@ -1,4 +1,5 @@
-/****************************************************************************
+/*
+*********************************************************************
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: Nokia Corporation (qt-info@nokia.com)
@@ -37,13 +38,14 @@
 ** contact the sales department at http://qt.nokia.com/contact.
 ** $QT_END_LICENSE$
 **
-****************************************************************************/
+*********************************************************************
+*/
 
 /********************************************************************************
 ** Form generated from reading UI file 'newform.ui'
 **
-** Created: Mon Jun 16 17:56:52 2008
-**      by: Qt User Interface Compiler version 4.5.0
+** Created: Tue Aug 18 19:03:31 2009
+**      by: Qt User Interface Compiler version 4.6.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
 ********************************************************************************/
diff --git a/tests/auto/uic/baseline/orderdialog.ui.h b/tests/auto/uic/baseline/orderdialog.ui.h
index 12d551f..6d6efa7 100644
--- a/tests/auto/uic/baseline/orderdialog.ui.h
+++ b/tests/auto/uic/baseline/orderdialog.ui.h
@@ -1,4 +1,5 @@
-/****************************************************************************
+/*
+*********************************************************************
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: Nokia Corporation (qt-info@nokia.com)
@@ -37,13 +38,14 @@
 ** contact the sales department at http://qt.nokia.com/contact.
 ** $QT_END_LICENSE$
 **
-****************************************************************************/
+*********************************************************************
+*/
 
 /********************************************************************************
 ** Form generated from reading UI file 'orderdialog.ui'
 **
-** Created: Mon Jun 16 17:55:54 2008
-**      by: Qt User Interface Compiler version 4.5.0
+** Created: Tue Aug 18 19:03:31 2009
+**      by: Qt User Interface Compiler version 4.6.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
 ********************************************************************************/
diff --git a/tests/auto/uic/baseline/outputpage.ui.h b/tests/auto/uic/baseline/outputpage.ui.h
index 0b68cb9..9f071f0 100644
--- a/tests/auto/uic/baseline/outputpage.ui.h
+++ b/tests/auto/uic/baseline/outputpage.ui.h
@@ -1,8 +1,8 @@
 /********************************************************************************
 ** Form generated from reading UI file 'outputpage.ui'
 **
-** Created: Thu Jul 10 09:47:35 2008
-**      by: Qt User Interface Compiler version 4.5.0
+** Created: Tue Aug 18 19:03:31 2009
+**      by: Qt User Interface Compiler version 4.6.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
 ********************************************************************************/
diff --git a/tests/auto/uic/baseline/pagefold.ui.h b/tests/auto/uic/baseline/pagefold.ui.h
index 5cc5836..d713985 100644
--- a/tests/auto/uic/baseline/pagefold.ui.h
+++ b/tests/auto/uic/baseline/pagefold.ui.h
@@ -1,8 +1,8 @@
 /********************************************************************************
 ** Form generated from reading UI file 'pagefold.ui'
 **
-** Created: Mon Sep 1 09:31:03 2008
-**      by: Qt User Interface Compiler version 4.5.0
+** Created: Tue Aug 18 19:03:31 2009
+**      by: Qt User Interface Compiler version 4.6.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
 ********************************************************************************/
diff --git a/tests/auto/uic/baseline/paletteeditor.ui.h b/tests/auto/uic/baseline/paletteeditor.ui.h
index ad34964..3b62872 100644
--- a/tests/auto/uic/baseline/paletteeditor.ui.h
+++ b/tests/auto/uic/baseline/paletteeditor.ui.h
@@ -1,4 +1,5 @@
-/****************************************************************************
+/*
+*********************************************************************
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: Nokia Corporation (qt-info@nokia.com)
@@ -37,13 +38,14 @@
 ** contact the sales department at http://qt.nokia.com/contact.
 ** $QT_END_LICENSE$
 **
-****************************************************************************/
+*********************************************************************
+*/
 
 /********************************************************************************
 ** Form generated from reading UI file 'paletteeditor.ui'
 **
-** Created: Thu Jul 10 09:47:35 2008
-**      by: Qt User Interface Compiler version 4.5.0
+** Created: Tue Aug 18 19:03:31 2009
+**      by: Qt User Interface Compiler version 4.6.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
 ********************************************************************************/
diff --git a/tests/auto/uic/baseline/paletteeditoradvancedbase.ui.h b/tests/auto/uic/baseline/paletteeditoradvancedbase.ui.h
index 7072b6b..44d03be 100644
--- a/tests/auto/uic/baseline/paletteeditoradvancedbase.ui.h
+++ b/tests/auto/uic/baseline/paletteeditoradvancedbase.ui.h
@@ -1,4 +1,5 @@
-/****************************************************************************
+/*
+*********************************************************************
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: Nokia Corporation (qt-info@nokia.com)
@@ -37,13 +38,14 @@
 ** contact the sales department at http://qt.nokia.com/contact.
 ** $QT_END_LICENSE$
 **
-****************************************************************************/
+*********************************************************************
+*/
 
 /********************************************************************************
 ** Form generated from reading UI file 'paletteeditoradvancedbase.ui'
 **
-** Created: Mon Sep 1 09:31:03 2008
-**      by: Qt User Interface Compiler version 4.5.0
+** Created: Tue Aug 18 19:03:31 2009
+**      by: Qt User Interface Compiler version 4.6.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
 ********************************************************************************/
diff --git a/tests/auto/uic/baseline/passworddialog.ui.h b/tests/auto/uic/baseline/passworddialog.ui.h
index be80298..83beeac 100644
--- a/tests/auto/uic/baseline/passworddialog.ui.h
+++ b/tests/auto/uic/baseline/passworddialog.ui.h
@@ -1,8 +1,8 @@
 /********************************************************************************
 ** Form generated from reading UI file 'passworddialog.ui'
 **
-** Created: Thu Jul 10 09:47:35 2008
-**      by: Qt User Interface Compiler version 4.5.0
+** Created: Tue Aug 18 19:03:31 2009
+**      by: Qt User Interface Compiler version 4.6.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
 ********************************************************************************/
diff --git a/tests/auto/uic/baseline/pathpage.ui.h b/tests/auto/uic/baseline/pathpage.ui.h
index 257c191..7c39073 100644
--- a/tests/auto/uic/baseline/pathpage.ui.h
+++ b/tests/auto/uic/baseline/pathpage.ui.h
@@ -1,8 +1,8 @@
 /********************************************************************************
 ** Form generated from reading UI file 'pathpage.ui'
 **
-** Created: Thu Jul 10 09:47:35 2008
-**      by: Qt User Interface Compiler version 4.5.0
+** Created: Tue Aug 18 19:03:31 2009
+**      by: Qt User Interface Compiler version 4.6.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
 ********************************************************************************/
diff --git a/tests/auto/uic/baseline/phrasebookbox.ui.h b/tests/auto/uic/baseline/phrasebookbox.ui.h
index aa132b3..4826676 100644
--- a/tests/auto/uic/baseline/phrasebookbox.ui.h
+++ b/tests/auto/uic/baseline/phrasebookbox.ui.h
@@ -1,4 +1,5 @@
-/****************************************************************************
+/*
+*********************************************************************
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: Nokia Corporation (qt-info@nokia.com)
@@ -37,13 +38,14 @@
 ** contact the sales department at http://qt.nokia.com/contact.
 ** $QT_END_LICENSE$
 **
-****************************************************************************/
+*********************************************************************
+*/
 
 /********************************************************************************
 ** Form generated from reading UI file 'phrasebookbox.ui'
 **
-** Created: Mon Sep 1 09:31:03 2008
-**      by: Qt User Interface Compiler version 4.5.0
+** Created: Tue Aug 18 19:03:31 2009
+**      by: Qt User Interface Compiler version 4.6.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
 ********************************************************************************/
diff --git a/tests/auto/uic/baseline/plugindialog.ui.h b/tests/auto/uic/baseline/plugindialog.ui.h
index e4f58c1..4b99b6e 100644
--- a/tests/auto/uic/baseline/plugindialog.ui.h
+++ b/tests/auto/uic/baseline/plugindialog.ui.h
@@ -1,4 +1,5 @@
-/****************************************************************************
+/*
+*********************************************************************
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: Nokia Corporation (qt-info@nokia.com)
@@ -37,13 +38,14 @@
 ** contact the sales department at http://qt.nokia.com/contact.
 ** $QT_END_LICENSE$
 **
-****************************************************************************/
+*********************************************************************
+*/
 
 /********************************************************************************
 ** Form generated from reading UI file 'plugindialog.ui'
 **
-** Created: Mon Jun 16 17:52:32 2008
-**      by: Qt User Interface Compiler version 4.5.0
+** Created: Tue Aug 18 19:03:31 2009
+**      by: Qt User Interface Compiler version 4.6.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
 ********************************************************************************/
diff --git a/tests/auto/uic/baseline/preferencesdialog.ui.h b/tests/auto/uic/baseline/preferencesdialog.ui.h
index a1f5ac2..56c5926 100644
--- a/tests/auto/uic/baseline/preferencesdialog.ui.h
+++ b/tests/auto/uic/baseline/preferencesdialog.ui.h
@@ -1,8 +1,8 @@
 /********************************************************************************
 ** Form generated from reading UI file 'preferencesdialog.ui'
 **
-** Created: Thu Jul 10 09:47:35 2008
-**      by: Qt User Interface Compiler version 4.5.0
+** Created: Tue Aug 18 19:03:32 2009
+**      by: Qt User Interface Compiler version 4.6.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
 ********************************************************************************/
diff --git a/tests/auto/uic/baseline/previewconfigurationwidget.ui.h b/tests/auto/uic/baseline/previewconfigurationwidget.ui.h
index 4a7b694..cc56b4c 100644
--- a/tests/auto/uic/baseline/previewconfigurationwidget.ui.h
+++ b/tests/auto/uic/baseline/previewconfigurationwidget.ui.h
@@ -1,8 +1,8 @@
 /********************************************************************************
 ** Form generated from reading UI file 'previewconfigurationwidget.ui'
 **
-** Created: Thu Jul 10 09:47:35 2008
-**      by: Qt User Interface Compiler version 4.5.0
+** Created: Tue Aug 18 19:03:32 2009
+**      by: Qt User Interface Compiler version 4.6.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
 ********************************************************************************/
diff --git a/tests/auto/uic/baseline/previewdialogbase.ui.h b/tests/auto/uic/baseline/previewdialogbase.ui.h
index 822990c..4bb2980 100644
--- a/tests/auto/uic/baseline/previewdialogbase.ui.h
+++ b/tests/auto/uic/baseline/previewdialogbase.ui.h
@@ -1,8 +1,8 @@
 /********************************************************************************
 ** Form generated from reading UI file 'previewdialogbase.ui'
 **
-** Created: Mon Sep 1 09:31:03 2008
-**      by: Qt User Interface Compiler version 4.5.0
+** Created: Tue Aug 18 19:03:32 2009
+**      by: Qt User Interface Compiler version 4.6.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
 ********************************************************************************/
diff --git a/tests/auto/uic/baseline/previewwidget.ui.h b/tests/auto/uic/baseline/previewwidget.ui.h
index 4832430..8076958 100644
--- a/tests/auto/uic/baseline/previewwidget.ui.h
+++ b/tests/auto/uic/baseline/previewwidget.ui.h
@@ -1,4 +1,5 @@
-/****************************************************************************
+/*
+*********************************************************************
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: Nokia Corporation (qt-info@nokia.com)
@@ -37,13 +38,14 @@
 ** contact the sales department at http://qt.nokia.com/contact.
 ** $QT_END_LICENSE$
 **
-****************************************************************************/
+*********************************************************************
+*/
 
 /********************************************************************************
 ** Form generated from reading UI file 'previewwidget.ui'
 **
-** Created: Thu Jul 10 09:47:35 2008
-**      by: Qt User Interface Compiler version 4.5.0
+** Created: Tue Aug 18 19:03:32 2009
+**      by: Qt User Interface Compiler version 4.6.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
 ********************************************************************************/
diff --git a/tests/auto/uic/baseline/previewwidgetbase.ui.h b/tests/auto/uic/baseline/previewwidgetbase.ui.h
index 6a5551e..b8d55c8 100644
--- a/tests/auto/uic/baseline/previewwidgetbase.ui.h
+++ b/tests/auto/uic/baseline/previewwidgetbase.ui.h
@@ -1,4 +1,5 @@
-/****************************************************************************
+/*
+*********************************************************************
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: Nokia Corporation (qt-info@nokia.com)
@@ -37,13 +38,14 @@
 ** contact the sales department at http://qt.nokia.com/contact.
 ** $QT_END_LICENSE$
 **
-****************************************************************************/
+*********************************************************************
+*/
 
 /********************************************************************************
 ** Form generated from reading UI file 'previewwidgetbase.ui'
 **
-** Created: Thu Jul 10 09:47:35 2008
-**      by: Qt User Interface Compiler version 4.5.0
+** Created: Tue Aug 18 19:03:32 2009
+**      by: Qt User Interface Compiler version 4.6.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
 ********************************************************************************/
diff --git a/tests/auto/uic/baseline/proxy.ui.h b/tests/auto/uic/baseline/proxy.ui.h
index d22edef..3542966 100644
--- a/tests/auto/uic/baseline/proxy.ui.h
+++ b/tests/auto/uic/baseline/proxy.ui.h
@@ -1,8 +1,8 @@
 /********************************************************************************
 ** Form generated from reading UI file 'proxy.ui'
 **
-** Created: Thu Jul 10 09:47:35 2008
-**      by: Qt User Interface Compiler version 4.5.0
+** Created: Tue Aug 18 19:03:32 2009
+**      by: Qt User Interface Compiler version 4.6.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
 ********************************************************************************/
diff --git a/tests/auto/uic/baseline/qfiledialog.ui.h b/tests/auto/uic/baseline/qfiledialog.ui.h
index 396e0d0..356183e 100644
--- a/tests/auto/uic/baseline/qfiledialog.ui.h
+++ b/tests/auto/uic/baseline/qfiledialog.ui.h
@@ -1,9 +1,10 @@
-/****************************************************************************
+/*
+*********************************************************************
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QtGui module of the Qt Toolkit.
+** This file is part of the autotests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
@@ -37,13 +38,14 @@
 ** contact the sales department at http://qt.nokia.com/contact.
 ** $QT_END_LICENSE$
 **
-****************************************************************************/
+*********************************************************************
+*/
 
 /********************************************************************************
 ** Form generated from reading UI file 'qfiledialog.ui'
 **
-** Created: Mon Jun 16 17:51:48 2008
-**      by: Qt User Interface Compiler version 4.5.0
+** Created: Tue Aug 18 19:03:32 2009
+**      by: Qt User Interface Compiler version 4.6.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
 ********************************************************************************/
diff --git a/tests/auto/uic/baseline/qpagesetupwidget.ui.h b/tests/auto/uic/baseline/qpagesetupwidget.ui.h
index 4694409..93f5eb4 100644
--- a/tests/auto/uic/baseline/qpagesetupwidget.ui.h
+++ b/tests/auto/uic/baseline/qpagesetupwidget.ui.h
@@ -1,8 +1,8 @@
 /********************************************************************************
 ** Form generated from reading UI file 'qpagesetupwidget.ui'
 **
-** Created: Mon Sep 1 09:31:03 2008
-**      by: Qt User Interface Compiler version 4.5.0
+** Created: Tue Aug 18 19:03:32 2009
+**      by: Qt User Interface Compiler version 4.6.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
 ********************************************************************************/
diff --git a/tests/auto/uic/baseline/qprintpropertieswidget.ui.h b/tests/auto/uic/baseline/qprintpropertieswidget.ui.h
index 626fee7..a2c2e1f 100644
--- a/tests/auto/uic/baseline/qprintpropertieswidget.ui.h
+++ b/tests/auto/uic/baseline/qprintpropertieswidget.ui.h
@@ -1,8 +1,8 @@
 /********************************************************************************
 ** Form generated from reading UI file 'qprintpropertieswidget.ui'
 **
-** Created: Thu Jul 10 09:47:35 2008
-**      by: Qt User Interface Compiler version 4.5.0
+** Created: Tue Aug 18 19:03:32 2009
+**      by: Qt User Interface Compiler version 4.6.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
 ********************************************************************************/
diff --git a/tests/auto/uic/baseline/qprintsettingsoutput.ui.h b/tests/auto/uic/baseline/qprintsettingsoutput.ui.h
index a6360ee..bb00a36 100644
--- a/tests/auto/uic/baseline/qprintsettingsoutput.ui.h
+++ b/tests/auto/uic/baseline/qprintsettingsoutput.ui.h
@@ -1,8 +1,8 @@
 /********************************************************************************
 ** Form generated from reading UI file 'qprintsettingsoutput.ui'
 **
-** Created: Mon Sep 1 09:31:03 2008
-**      by: Qt User Interface Compiler version 4.5.0
+** Created: Tue Aug 18 19:03:32 2009
+**      by: Qt User Interface Compiler version 4.6.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
 ********************************************************************************/
diff --git a/tests/auto/uic/baseline/qprintwidget.ui.h b/tests/auto/uic/baseline/qprintwidget.ui.h
index 99d6486..2600268 100644
--- a/tests/auto/uic/baseline/qprintwidget.ui.h
+++ b/tests/auto/uic/baseline/qprintwidget.ui.h
@@ -1,8 +1,8 @@
 /********************************************************************************
 ** Form generated from reading UI file 'qprintwidget.ui'
 **
-** Created: Mon Sep 1 09:31:03 2008
-**      by: Qt User Interface Compiler version 4.5.0
+** Created: Tue Aug 18 19:03:32 2009
+**      by: Qt User Interface Compiler version 4.6.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
 ********************************************************************************/
diff --git a/tests/auto/uic/baseline/qsqlconnectiondialog.ui.h b/tests/auto/uic/baseline/qsqlconnectiondialog.ui.h
index 165c7d7..37297bf 100644
--- a/tests/auto/uic/baseline/qsqlconnectiondialog.ui.h
+++ b/tests/auto/uic/baseline/qsqlconnectiondialog.ui.h
@@ -1,8 +1,8 @@
 /********************************************************************************
 ** Form generated from reading UI file 'qsqlconnectiondialog.ui'
 **
-** Created: Mon Sep 1 09:31:03 2008
-**      by: Qt User Interface Compiler version 4.5.0
+** Created: Tue Aug 18 19:03:32 2009
+**      by: Qt User Interface Compiler version 4.6.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
 ********************************************************************************/
diff --git a/tests/auto/uic/baseline/qtgradientdialog.ui.h b/tests/auto/uic/baseline/qtgradientdialog.ui.h
index 26ed776..43521e9 100644
--- a/tests/auto/uic/baseline/qtgradientdialog.ui.h
+++ b/tests/auto/uic/baseline/qtgradientdialog.ui.h
@@ -1,4 +1,5 @@
-/****************************************************************************
+/*
+*********************************************************************
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: Nokia Corporation (qt-info@nokia.com)
@@ -37,13 +38,14 @@
 ** contact the sales department at http://qt.nokia.com/contact.
 ** $QT_END_LICENSE$
 **
-****************************************************************************/
+*********************************************************************
+*/
 
 /********************************************************************************
 ** Form generated from reading UI file 'qtgradientdialog.ui'
 **
-** Created: Thu Jul 10 09:47:35 2008
-**      by: Qt User Interface Compiler version 4.5.0
+** Created: Tue Aug 18 19:03:32 2009
+**      by: Qt User Interface Compiler version 4.6.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
 ********************************************************************************/
diff --git a/tests/auto/uic/baseline/qtgradienteditor.ui.h b/tests/auto/uic/baseline/qtgradienteditor.ui.h
index 00a72bd..e1365e4 100644
--- a/tests/auto/uic/baseline/qtgradienteditor.ui.h
+++ b/tests/auto/uic/baseline/qtgradienteditor.ui.h
@@ -1,49 +1,50 @@
-/****************************************************************************
+/*
+*********************************************************************
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the autotests of the Qt Toolkit.
+** This file is part of the tools applications of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the either Technology Preview License Agreement or the
-** Beta Release License Agreement.
+** This file may be used under the terms of the GNU General Public
+** License versions 2.0 or 3.0 as published by the Free Software
+** Foundation and appearing in the files LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file.  Alternatively you may (at
+** your option) use any later version of the GNU General Public
+** License if such license has been publicly approved by Nokia Corporation and/or its subsidiary(-ies)
+** (or its successors, if any) and the KDE Free Qt Foundation. In
+** addition, as a special exception, Trolltech gives you certain
+** additional rights. These rights are described in the Trolltech GPL
+** Exception version 1.2, which can be found at
+** http://qt.nokia.com/products/qt/gplexception/ and in the file
+** GPL_EXCEPTION.txt in 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.
+** Please review the following information to ensure GNU General
+** Public Licensing requirements will be met:
+** http://trolltech.com/products/qt/licenses/licensing/opensource/. If
+** you are unsure which license is appropriate for your use, please
+** review the following information:
+** http://trolltech.com/products/qt/licenses/licensing/licensingoverview
+** or contact the sales department at sales@trolltech.com.
 **
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
+** In addition, as a special exception, Trolltech, as the sole
+** copyright holder for Qt Designer, grants users of the Qt/Eclipse
+** Integration plug-in the right for the Qt/Eclipse Integration to
+** link to functionality provided by Qt Designer and its related
+** libraries.
 **
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
+** This file is provided "AS IS" with NO WARRANTY OF ANY KIND,
+** INCLUDING THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE. Trolltech reserves all rights not expressly
+** granted herein.
 **
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://qt.nokia.com/contact.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+*********************************************************************
+*/
 
 /********************************************************************************
 ** Form generated from reading UI file 'qtgradienteditor.ui'
 **
-** Created: Mon Jun 16 17:50:21 2008
-**      by: Qt User Interface Compiler version 4.5.0
+** Created: Tue Aug 18 19:03:32 2009
+**      by: Qt User Interface Compiler version 4.6.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
 ********************************************************************************/
diff --git a/tests/auto/uic/baseline/qtgradientview.ui.h b/tests/auto/uic/baseline/qtgradientview.ui.h
index 809cf5b..d929d6f 100644
--- a/tests/auto/uic/baseline/qtgradientview.ui.h
+++ b/tests/auto/uic/baseline/qtgradientview.ui.h
@@ -1,8 +1,8 @@
 /********************************************************************************
 ** Form generated from reading UI file 'qtgradientview.ui'
 **
-** Created: Thu Jul 10 09:47:35 2008
-**      by: Qt User Interface Compiler version 4.5.0
+** Created: Tue Aug 18 19:03:32 2009
+**      by: Qt User Interface Compiler version 4.6.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
 ********************************************************************************/
diff --git a/tests/auto/uic/baseline/qtgradientviewdialog.ui.h b/tests/auto/uic/baseline/qtgradientviewdialog.ui.h
index 1f34727..8ace8b7 100644
--- a/tests/auto/uic/baseline/qtgradientviewdialog.ui.h
+++ b/tests/auto/uic/baseline/qtgradientviewdialog.ui.h
@@ -1,4 +1,5 @@
-/****************************************************************************
+/*
+*********************************************************************
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: Nokia Corporation (qt-info@nokia.com)
@@ -37,13 +38,14 @@
 ** contact the sales department at http://qt.nokia.com/contact.
 ** $QT_END_LICENSE$
 **
-****************************************************************************/
+*********************************************************************
+*/
 
 /********************************************************************************
 ** Form generated from reading UI file 'qtgradientviewdialog.ui'
 **
-** Created: Thu Jul 10 09:47:35 2008
-**      by: Qt User Interface Compiler version 4.5.0
+** Created: Tue Aug 18 19:03:32 2009
+**      by: Qt User Interface Compiler version 4.6.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
 ********************************************************************************/
diff --git a/tests/auto/uic/baseline/qtresourceeditordialog.ui.h b/tests/auto/uic/baseline/qtresourceeditordialog.ui.h
index a08a16c..de52a62 100644
--- a/tests/auto/uic/baseline/qtresourceeditordialog.ui.h
+++ b/tests/auto/uic/baseline/qtresourceeditordialog.ui.h
@@ -1,8 +1,8 @@
 /********************************************************************************
 ** Form generated from reading UI file 'qtresourceeditordialog.ui'
 **
-** Created: Mon Jun 16 17:45:38 2008
-**      by: Qt User Interface Compiler version 4.5.0
+** Created: Tue Aug 18 19:03:32 2009
+**      by: Qt User Interface Compiler version 4.6.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
 ********************************************************************************/
diff --git a/tests/auto/uic/baseline/qttoolbardialog.ui.h b/tests/auto/uic/baseline/qttoolbardialog.ui.h
index 9099553..5651abc 100644
--- a/tests/auto/uic/baseline/qttoolbardialog.ui.h
+++ b/tests/auto/uic/baseline/qttoolbardialog.ui.h
@@ -1,8 +1,8 @@
 /********************************************************************************
 ** Form generated from reading UI file 'qttoolbardialog.ui'
 **
-** Created: Mon Jun 16 17:42:37 2008
-**      by: Qt User Interface Compiler version 4.5.0
+** Created: Tue Aug 18 19:03:32 2009
+**      by: Qt User Interface Compiler version 4.6.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
 ********************************************************************************/
diff --git a/tests/auto/uic/baseline/querywidget.ui.h b/tests/auto/uic/baseline/querywidget.ui.h
index 8afcf54..e078ed4 100644
--- a/tests/auto/uic/baseline/querywidget.ui.h
+++ b/tests/auto/uic/baseline/querywidget.ui.h
@@ -1,8 +1,8 @@
 /********************************************************************************
 ** Form generated from reading UI file 'querywidget.ui'
 **
-** Created: Thu Jul 10 09:47:35 2008
-**      by: Qt User Interface Compiler version 4.5.0
+** Created: Tue Aug 18 19:03:32 2009
+**      by: Qt User Interface Compiler version 4.6.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
 ********************************************************************************/
diff --git a/tests/auto/uic/baseline/remotecontrol.ui.h b/tests/auto/uic/baseline/remotecontrol.ui.h
index 3d183f7..eb7adc9 100644
--- a/tests/auto/uic/baseline/remotecontrol.ui.h
+++ b/tests/auto/uic/baseline/remotecontrol.ui.h
@@ -1,8 +1,8 @@
 /********************************************************************************
 ** Form generated from reading UI file 'remotecontrol.ui'
 **
-** Created: Thu Jul 10 09:47:35 2008
-**      by: Qt User Interface Compiler version 4.5.0
+** Created: Tue Aug 18 19:03:32 2009
+**      by: Qt User Interface Compiler version 4.6.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
 ********************************************************************************/
diff --git a/tests/auto/uic/baseline/saveformastemplate.ui.h b/tests/auto/uic/baseline/saveformastemplate.ui.h
index c46b5e6..ef709df 100644
--- a/tests/auto/uic/baseline/saveformastemplate.ui.h
+++ b/tests/auto/uic/baseline/saveformastemplate.ui.h
@@ -1,4 +1,5 @@
-/****************************************************************************
+/*
+*********************************************************************
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: Nokia Corporation (qt-info@nokia.com)
@@ -37,13 +38,14 @@
 ** contact the sales department at http://qt.nokia.com/contact.
 ** $QT_END_LICENSE$
 **
-****************************************************************************/
+*********************************************************************
+*/
 
 /********************************************************************************
 ** Form generated from reading UI file 'saveformastemplate.ui'
 **
-** Created: Mon Sep 1 09:31:03 2008
-**      by: Qt User Interface Compiler version 4.5.0
+** Created: Tue Aug 18 19:03:32 2009
+**      by: Qt User Interface Compiler version 4.6.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
 ********************************************************************************/
diff --git a/tests/auto/uic/baseline/settings.ui.h b/tests/auto/uic/baseline/settings.ui.h
index 98cb6ee..7df5c77 100644
--- a/tests/auto/uic/baseline/settings.ui.h
+++ b/tests/auto/uic/baseline/settings.ui.h
@@ -1,8 +1,8 @@
 /********************************************************************************
 ** Form generated from reading UI file 'settings.ui'
 **
-** Created: Thu Jul 10 09:47:35 2008
-**      by: Qt User Interface Compiler version 4.5.0
+** Created: Tue Aug 18 19:03:32 2009
+**      by: Qt User Interface Compiler version 4.6.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
 ********************************************************************************/
diff --git a/tests/auto/uic/baseline/signalslotdialog.ui.h b/tests/auto/uic/baseline/signalslotdialog.ui.h
index f3ce8bc..f7e9820 100644
--- a/tests/auto/uic/baseline/signalslotdialog.ui.h
+++ b/tests/auto/uic/baseline/signalslotdialog.ui.h
@@ -1,8 +1,8 @@
 /********************************************************************************
 ** Form generated from reading UI file 'signalslotdialog.ui'
 **
-** Created: Mon Jun 16 16:18:52 2008
-**      by: Qt User Interface Compiler version 4.5.0
+** Created: Tue Aug 18 19:03:32 2009
+**      by: Qt User Interface Compiler version 4.6.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
 ********************************************************************************/
diff --git a/tests/auto/uic/baseline/sslclient.ui.h b/tests/auto/uic/baseline/sslclient.ui.h
index aee0224..bf4014d 100644
--- a/tests/auto/uic/baseline/sslclient.ui.h
+++ b/tests/auto/uic/baseline/sslclient.ui.h
@@ -1,8 +1,8 @@
 /********************************************************************************
 ** Form generated from reading UI file 'sslclient.ui'
 **
-** Created: Thu Jul 10 09:47:35 2008
-**      by: Qt User Interface Compiler version 4.5.0
+** Created: Tue Aug 18 19:03:32 2009
+**      by: Qt User Interface Compiler version 4.6.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
 ********************************************************************************/
diff --git a/tests/auto/uic/baseline/sslerrors.ui.h b/tests/auto/uic/baseline/sslerrors.ui.h
index f999be0..3131a21 100644
--- a/tests/auto/uic/baseline/sslerrors.ui.h
+++ b/tests/auto/uic/baseline/sslerrors.ui.h
@@ -1,8 +1,8 @@
 /********************************************************************************
 ** Form generated from reading UI file 'sslerrors.ui'
 **
-** Created: Thu Jul 10 09:47:35 2008
-**      by: Qt User Interface Compiler version 4.5.0
+** Created: Tue Aug 18 19:03:32 2009
+**      by: Qt User Interface Compiler version 4.6.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
 ********************************************************************************/
diff --git a/tests/auto/uic/baseline/statistics.ui.h b/tests/auto/uic/baseline/statistics.ui.h
index 41c31fd..ea9ab00 100644
--- a/tests/auto/uic/baseline/statistics.ui.h
+++ b/tests/auto/uic/baseline/statistics.ui.h
@@ -1,4 +1,5 @@
-/****************************************************************************
+/*
+*********************************************************************
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: Nokia Corporation (qt-info@nokia.com)
@@ -37,13 +38,14 @@
 ** contact the sales department at http://qt.nokia.com/contact.
 ** $QT_END_LICENSE$
 **
-****************************************************************************/
+*********************************************************************
+*/
 
 /********************************************************************************
 ** Form generated from reading UI file 'statistics.ui'
 **
-** Created: Thu Jul 10 09:47:35 2008
-**      by: Qt User Interface Compiler version 4.5.0
+** Created: Tue Aug 18 19:03:32 2009
+**      by: Qt User Interface Compiler version 4.6.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
 ********************************************************************************/
diff --git a/tests/auto/uic/baseline/stringlisteditor.ui.h b/tests/auto/uic/baseline/stringlisteditor.ui.h
index 29f2e28..8f0ba8e 100644
--- a/tests/auto/uic/baseline/stringlisteditor.ui.h
+++ b/tests/auto/uic/baseline/stringlisteditor.ui.h
@@ -1,4 +1,5 @@
-/****************************************************************************
+/*
+*********************************************************************
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: Nokia Corporation (qt-info@nokia.com)
@@ -37,13 +38,14 @@
 ** contact the sales department at http://qt.nokia.com/contact.
 ** $QT_END_LICENSE$
 **
-****************************************************************************/
+*********************************************************************
+*/
 
 /********************************************************************************
 ** Form generated from reading UI file 'stringlisteditor.ui'
 **
-** Created: Mon Sep 1 09:31:03 2008
-**      by: Qt User Interface Compiler version 4.5.0
+** Created: Tue Aug 18 19:03:32 2009
+**      by: Qt User Interface Compiler version 4.6.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
 ********************************************************************************/
diff --git a/tests/auto/uic/baseline/stylesheeteditor.ui.h b/tests/auto/uic/baseline/stylesheeteditor.ui.h
index a99f274..697fbe0 100644
--- a/tests/auto/uic/baseline/stylesheeteditor.ui.h
+++ b/tests/auto/uic/baseline/stylesheeteditor.ui.h
@@ -1,8 +1,8 @@
 /********************************************************************************
 ** Form generated from reading UI file 'stylesheeteditor.ui'
 **
-** Created: Thu Jul 10 09:47:35 2008
-**      by: Qt User Interface Compiler version 4.5.0
+** Created: Tue Aug 18 19:03:32 2009
+**      by: Qt User Interface Compiler version 4.6.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
 ********************************************************************************/
diff --git a/tests/auto/uic/baseline/tabbedbrowser.ui.h b/tests/auto/uic/baseline/tabbedbrowser.ui.h
index bebbc59..f347740 100644
--- a/tests/auto/uic/baseline/tabbedbrowser.ui.h
+++ b/tests/auto/uic/baseline/tabbedbrowser.ui.h
@@ -1,4 +1,5 @@
-/****************************************************************************
+/*
+*********************************************************************
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: Nokia Corporation (qt-info@nokia.com)
@@ -37,13 +38,14 @@
 ** contact the sales department at http://qt.nokia.com/contact.
 ** $QT_END_LICENSE$
 **
-****************************************************************************/
+*********************************************************************
+*/
 
 /********************************************************************************
 ** Form generated from reading UI file 'tabbedbrowser.ui'
 **
-** Created: Thu Jul 10 09:47:35 2008
-**      by: Qt User Interface Compiler version 4.5.0
+** Created: Tue Aug 18 19:03:32 2009
+**      by: Qt User Interface Compiler version 4.6.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
 ********************************************************************************/
diff --git a/tests/auto/uic/baseline/tablewidgeteditor.ui.h b/tests/auto/uic/baseline/tablewidgeteditor.ui.h
index 5cb0341..7e1a39f 100644
--- a/tests/auto/uic/baseline/tablewidgeteditor.ui.h
+++ b/tests/auto/uic/baseline/tablewidgeteditor.ui.h
@@ -1,4 +1,5 @@
-/****************************************************************************
+/*
+*********************************************************************
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: Nokia Corporation (qt-info@nokia.com)
@@ -37,13 +38,14 @@
 ** contact the sales department at http://qt.nokia.com/contact.
 ** $QT_END_LICENSE$
 **
-****************************************************************************/
+*********************************************************************
+*/
 
 /********************************************************************************
 ** Form generated from reading UI file 'tablewidgeteditor.ui'
 **
-** Created: Mon Jun 16 17:48:45 2008
-**      by: Qt User Interface Compiler version 4.5.0
+** Created: Tue Aug 18 19:03:32 2009
+**      by: Qt User Interface Compiler version 4.6.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
 ********************************************************************************/
diff --git a/tests/auto/uic/baseline/tetrixwindow.ui.h b/tests/auto/uic/baseline/tetrixwindow.ui.h
index 50ed416..b6b048b 100644
--- a/tests/auto/uic/baseline/tetrixwindow.ui.h
+++ b/tests/auto/uic/baseline/tetrixwindow.ui.h
@@ -1,8 +1,8 @@
 /********************************************************************************
 ** Form generated from reading UI file 'tetrixwindow.ui'
 **
-** Created: Thu Jul 10 09:47:35 2008
-**      by: Qt User Interface Compiler version 4.5.0
+** Created: Tue Aug 18 19:03:32 2009
+**      by: Qt User Interface Compiler version 4.6.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
 ********************************************************************************/
diff --git a/tests/auto/uic/baseline/textfinder.ui.h b/tests/auto/uic/baseline/textfinder.ui.h
index 546ff17..62c2447 100644
--- a/tests/auto/uic/baseline/textfinder.ui.h
+++ b/tests/auto/uic/baseline/textfinder.ui.h
@@ -1,8 +1,8 @@
 /********************************************************************************
 ** Form generated from reading UI file 'textfinder.ui'
 **
-** Created: Mon Sep 1 09:31:03 2008
-**      by: Qt User Interface Compiler version 4.5.0
+** Created: Tue Aug 18 19:03:32 2009
+**      by: Qt User Interface Compiler version 4.6.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
 ********************************************************************************/
diff --git a/tests/auto/uic/baseline/topicchooser.ui.h b/tests/auto/uic/baseline/topicchooser.ui.h
index 65cf205..9c4cdf0 100644
--- a/tests/auto/uic/baseline/topicchooser.ui.h
+++ b/tests/auto/uic/baseline/topicchooser.ui.h
@@ -1,8 +1,8 @@
 /********************************************************************************
 ** Form generated from reading UI file 'topicchooser.ui'
 **
-** Created: Mon Sep 1 09:31:03 2008
-**      by: Qt User Interface Compiler version 4.5.0
+** Created: Tue Aug 18 19:03:32 2009
+**      by: Qt User Interface Compiler version 4.6.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
 ********************************************************************************/
diff --git a/tests/auto/uic/baseline/translatedialog.ui.h b/tests/auto/uic/baseline/translatedialog.ui.h
index ab9604c..14b7c1b 100644
--- a/tests/auto/uic/baseline/translatedialog.ui.h
+++ b/tests/auto/uic/baseline/translatedialog.ui.h
@@ -1,4 +1,5 @@
-/****************************************************************************
+/*
+*********************************************************************
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: Nokia Corporation (qt-info@nokia.com)
@@ -37,13 +38,14 @@
 ** contact the sales department at http://qt.nokia.com/contact.
 ** $QT_END_LICENSE$
 **
-****************************************************************************/
+*********************************************************************
+*/
 
 /********************************************************************************
 ** Form generated from reading UI file 'translatedialog.ui'
 **
-** Created: Mon Sep 1 09:31:03 2008
-**      by: Qt User Interface Compiler version 4.5.0
+** Created: Tue Aug 18 19:03:32 2009
+**      by: Qt User Interface Compiler version 4.6.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
 ********************************************************************************/
diff --git a/tests/auto/uic/baseline/translationsettings.ui.h b/tests/auto/uic/baseline/translationsettings.ui.h
index e36545e..d0f5257 100644
--- a/tests/auto/uic/baseline/translationsettings.ui.h
+++ b/tests/auto/uic/baseline/translationsettings.ui.h
@@ -1,8 +1,8 @@
 /********************************************************************************
 ** Form generated from reading UI file 'translationsettings.ui'
 **
-** Created: Mon Sep 1 09:31:03 2008
-**      by: Qt User Interface Compiler version 4.5.0
+** Created: Tue Aug 18 19:03:32 2009
+**      by: Qt User Interface Compiler version 4.6.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
 ********************************************************************************/
diff --git a/tests/auto/uic/baseline/treewidgeteditor.ui.h b/tests/auto/uic/baseline/treewidgeteditor.ui.h
index 43b1fcd..e018974 100644
--- a/tests/auto/uic/baseline/treewidgeteditor.ui.h
+++ b/tests/auto/uic/baseline/treewidgeteditor.ui.h
@@ -1,4 +1,5 @@
-/****************************************************************************
+/*
+*********************************************************************
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: Nokia Corporation (qt-info@nokia.com)
@@ -37,13 +38,14 @@
 ** contact the sales department at http://qt.nokia.com/contact.
 ** $QT_END_LICENSE$
 **
-****************************************************************************/
+*********************************************************************
+*/
 
 /********************************************************************************
 ** Form generated from reading UI file 'treewidgeteditor.ui'
 **
-** Created: Mon Jun 16 17:47:26 2008
-**      by: Qt User Interface Compiler version 4.5.0
+** Created: Tue Aug 18 19:03:32 2009
+**      by: Qt User Interface Compiler version 4.6.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
 ********************************************************************************/
diff --git a/tests/auto/uic/baseline/trpreviewtool.ui.h b/tests/auto/uic/baseline/trpreviewtool.ui.h
index 1d8bf5e..cd37fb6 100644
--- a/tests/auto/uic/baseline/trpreviewtool.ui.h
+++ b/tests/auto/uic/baseline/trpreviewtool.ui.h
@@ -1,4 +1,5 @@
-/****************************************************************************
+/*
+*********************************************************************
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: Nokia Corporation (qt-info@nokia.com)
@@ -37,13 +38,14 @@
 ** contact the sales department at http://qt.nokia.com/contact.
 ** $QT_END_LICENSE$
 **
-****************************************************************************/
+*********************************************************************
+*/
 
 /********************************************************************************
 ** Form generated from reading UI file 'trpreviewtool.ui'
 **
-** Created: Thu Jul 10 09:47:35 2008
-**      by: Qt User Interface Compiler version 4.5.0
+** Created: Tue Aug 18 19:03:32 2009
+**      by: Qt User Interface Compiler version 4.6.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
 ********************************************************************************/
diff --git a/tests/auto/uic/baseline/validators.ui.h b/tests/auto/uic/baseline/validators.ui.h
index 07e114a..c82cac5 100644
--- a/tests/auto/uic/baseline/validators.ui.h
+++ b/tests/auto/uic/baseline/validators.ui.h
@@ -1,8 +1,8 @@
 /********************************************************************************
 ** Form generated from reading UI file 'validators.ui'
 **
-** Created: Thu Jul 10 09:47:35 2008
-**      by: Qt User Interface Compiler version 4.5.0
+** Created: Tue Aug 18 19:03:32 2009
+**      by: Qt User Interface Compiler version 4.6.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
 ********************************************************************************/
diff --git a/tests/auto/uic/baseline/wateringconfigdialog.ui.h b/tests/auto/uic/baseline/wateringconfigdialog.ui.h
index 43120a5..0bac30d 100644
--- a/tests/auto/uic/baseline/wateringconfigdialog.ui.h
+++ b/tests/auto/uic/baseline/wateringconfigdialog.ui.h
@@ -1,8 +1,8 @@
 /********************************************************************************
 ** Form generated from reading UI file 'wateringconfigdialog.ui'
 **
-** Created: Thu Jul 10 09:47:35 2008
-**      by: Qt User Interface Compiler version 4.5.0
+** Created: Tue Aug 18 19:03:32 2009
+**      by: Qt User Interface Compiler version 4.6.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
 ********************************************************************************/
diff --git a/tests/auto/utf8/tst_utf8.cpp b/tests/auto/utf8/tst_utf8.cpp
index 0d754b0..f255e6e 100644
--- a/tests/auto/utf8/tst_utf8.cpp
+++ b/tests/auto/utf8/tst_utf8.cpp
@@ -299,10 +299,19 @@ void tst_Utf8::invalidUtf8_data()
 void tst_Utf8::invalidUtf8()
 {
     QFETCH(QByteArray, utf8);
+    QFETCH_GLOBAL(bool, useLocale);
 
     QSharedPointer<QTextDecoder> decoder = QSharedPointer<QTextDecoder>(codec->makeDecoder());
     QString decoded = decoder->toUnicode(utf8);
-    QVERIFY(decoder->hasFailure());
+
+    // Only enforce correctness on our UTF-8 decoder
+    // The system's UTF-8 codec is sometimes buggy
+    //  GNU libc's iconv is known to accept U+FFFF and U+FFFE encoded as UTF-8
+    //  OS X's iconv is known to accept those, plus surrogates and codepoints above U+10FFFF
+    if (!useLocale)
+        QVERIFY(decoder->hasFailure());
+    else if (!decoder->hasFailure())
+        qWarning("System codec does not report failure when it should. Should report bug upstream.");
 }
 
 QTEST_MAIN(tst_Utf8)
diff --git a/translations/qt_ar.ts b/translations/qt_ar.ts
index 3e7a635..9631883 100644
--- a/translations/qt_ar.ts
+++ b/translations/qt_ar.ts
@@ -3024,7 +3024,8 @@ Do you want to delete it anyway?</source>
         <location line="+1"/>
         <source>Hide Details...</source>
         <translation type="unfinished"></translation>
-    </message>.nokiassage>
+    </message>
+    <message>
         <location line="+1570"/>
         <source>&lt;h3&gt;About Qt&lt;/h3&gt;&lt;p&gt;This program uses Qt version %1.&lt;/p&gt;&lt;p&gt;Qt is a C++ toolkit for cross-platform application development.&lt;/p&gt;&lt;p&gt;Qt provides single-source portability across MS&amp;nbsp;Windows, Mac&amp;nbsp;OS&amp;nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qt for Embedded Linux and Qt for Windows CE.&lt;/p&gt;&lt;p&gt;Qt is available under three different licensing options designed to accommodate the needs of our various users.&lt;/p&gt;Qt licensed under our commercial license agreement is appropriate for development of proprietary/commercial software where you do not want to share any source code with third parties or otherwise cannot comply with the terms of the GNU LGPL version 2.1 or GNU GPL version 3.0.&lt;/p&gt;&lt;p&gt;Qt licensed under the GNU LGPL version 2.1 is appropriate for the development of Qt applications (proprietary or open source) provided you can comply with the terms and conditions of the GNU LGPL version 2.1.&lt;/p&gt;&lt;p&gt;Qt licensed under the GNU General Public License version 3.0 is appropriate for the development of Qt applications where you wish to use such applications in combination with software subject to the terms of the GNU GPL version 3.0 or where you are otherwise willing to comply with the terms of the GNU GPL version 3.0.&lt;/p&gt;&lt;p&gt;Please see &lt;a href=&quot;http://qt.nokia.com/products/licensing&quot;&gt;qt.nokia.com/products/licensing&lt;/a&gt; for an overview of Qt licensing.&lt;/p&gt;&lt;p&gt;Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).&lt;/p&gt;&lt;p&gt;Qt is a Nokia product. See &lt;a href=&quot;http://qt.nokia.com/&quot;&gt;qt.nokia.com&lt;/a&gt; for more information.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>