Merge branch 'custom_shaders' of ../qt-graphics-team into custom-shaders

Conflicts:
	src/gui/graphicsview/qgraphicsitem_p.h

24 files changed, 861 insertions, 303 deletions

diff --git a/tests/auto/bic/tst_bic.cpp b/tests/auto/bic/tst_bic.cpp
index cec5e76..36c35ff 100644
--- a/tests/auto/bic/tst_bic.cpp
+++ b/tests/auto/bic/tst_bic.cpp
@@ -43,6 +43,10 @@
 #include <QtCore/QtCore>
 #include <QtTest/QtTest>
 
+#ifdef QT_NO_PROCESS
+QTEST_NOOP_MAIN
+#else
+
 #include "qbic.h"
 
 #include <stdlib.h>
@@ -367,4 +371,4 @@ void tst_Bic::sizesAndVTables()
 QTEST_APPLESS_MAIN(tst_Bic)
 
 #include "tst_bic.moc"
-
+#endif
diff --git a/tests/auto/compilerwarnings/tst_compilerwarnings.cpp b/tests/auto/compilerwarnings/tst_compilerwarnings.cpp
index 57795c9..d5fef1b 100644
--- a/tests/auto/compilerwarnings/tst_compilerwarnings.cpp
+++ b/tests/auto/compilerwarnings/tst_compilerwarnings.cpp
@@ -47,6 +47,10 @@
 
 #include <QtTest/QtTest>
 
+#ifdef QT_NO_PROCESS
+QTEST_NOOP_MAIN
+#else
+
 #include <stdlib.h>
 
 QT_USE_NAMESPACE
@@ -248,4 +252,4 @@ void tst_CompilerWarnings::warnings()
 QTEST_APPLESS_MAIN(tst_CompilerWarnings)
 
 #include "tst_compilerwarnings.moc"
-
+#endif // QT_NO_PROCESS
diff --git a/tests/auto/moc/tst_moc.cpp b/tests/auto/moc/tst_moc.cpp
index 3a40ae0..d66791f 100644
--- a/tests/auto/moc/tst_moc.cpp
+++ b/tests/auto/moc/tst_moc.cpp
@@ -488,6 +488,7 @@ private slots:
     void warnOnPropertyWithoutREAD();
     void constructors();
     void typenameWithUnsigned();
+    void warnOnVirtualSignal();
 
 signals:
     void sigWithUnsignedArg(unsigned foo);
@@ -510,7 +511,7 @@ private:
 
 void tst_Moc::initTestCase()
 {
-#if defined(Q_OS_UNIX)
+#if defined(Q_OS_UNIX) && !defined(QT_NO_PROCESS)
     QProcess proc;
     proc.start("qmake", QStringList() << "-query" << "QT_INSTALL_HEADERS");
     QVERIFY(proc.waitForFinished());
@@ -555,7 +556,7 @@ void tst_Moc::oldStyleCasts()
 #ifdef MOC_CROSS_COMPILED
     QSKIP("Not tested when cross-compiled", SkipAll);
 #endif
-#if defined(Q_OS_LINUX) && defined(Q_CC_GNU)
+#if defined(Q_OS_LINUX) && defined(Q_CC_GNU) && !defined(QT_NO_PROCESS)
     QProcess proc;
     proc.start("moc", QStringList(srcify("/oldstyle-casts.h")));
     QVERIFY(proc.waitForFinished());
@@ -585,7 +586,7 @@ void tst_Moc::warnOnExtraSignalSlotQualifiaction()
 #ifdef MOC_CROSS_COMPILED
     QSKIP("Not tested when cross-compiled", SkipAll);
 #endif
-#if defined(Q_OS_LINUX) && defined(Q_CC_GNU)
+#if defined(Q_OS_LINUX) && defined(Q_CC_GNU) && !defined(QT_NO_PROCESS)
     QProcess proc;
     proc.start("moc", QStringList(srcify("extraqualification.h")));
     QVERIFY(proc.waitForFinished());
@@ -627,7 +628,7 @@ void tst_Moc::inputFileNameWithDotsButNoExtension()
 #ifdef MOC_CROSS_COMPILED
     QSKIP("Not tested when cross-compiled", SkipAll);
 #endif
-#if defined(Q_OS_LINUX) && defined(Q_CC_GNU)
+#if defined(Q_OS_LINUX) && defined(Q_CC_GNU) && !defined(QT_NO_PROCESS)
     QProcess proc;
     proc.setWorkingDirectory(QString(SRCDIR) + "/task71021");
     proc.start("moc", QStringList("../Header"));
@@ -835,7 +836,7 @@ void tst_Moc::warnOnMultipleInheritance()
 #ifdef MOC_CROSS_COMPILED
     QSKIP("Not tested when cross-compiled", SkipAll);
 #endif
-#if defined(Q_OS_LINUX) && defined(Q_CC_GNU)
+#if defined(Q_OS_LINUX) && defined(Q_CC_GNU) && !defined(QT_NO_PROCESS)
     QProcess proc;
     QStringList args;
     args << "-I" << qtIncludePath + "/QtGui"
@@ -858,7 +859,7 @@ void tst_Moc::forgottenQInterface()
 #ifdef MOC_CROSS_COMPILED
     QSKIP("Not tested when cross-compiled", SkipAll);
 #endif
-#if defined(Q_OS_LINUX) && defined(Q_CC_GNU)
+#if defined(Q_OS_LINUX) && defined(Q_CC_GNU) && !defined(QT_NO_PROCESS)
     QProcess proc;
     QStringList args;
     args << "-I" << qtIncludePath + "/QtCore"
@@ -940,7 +941,7 @@ void tst_Moc::frameworkSearchPath()
 #ifdef MOC_CROSS_COMPILED
     QSKIP("Not tested when cross-compiled", SkipAll);
 #endif
-#if defined(Q_OS_UNIX)
+#if defined(Q_OS_UNIX) && !defined(QT_NO_PROCESS)
     QStringList args;
     args << "-F" << srcify(".")
          << srcify("interface-from-framework.h")
@@ -978,7 +979,7 @@ void tst_Moc::templateGtGt()
 #ifdef MOC_CROSS_COMPILED
     QSKIP("Not tested when cross-compiled", SkipAll);
 #endif
-#if defined(Q_OS_LINUX) && defined(Q_CC_GNU)
+#if defined(Q_OS_LINUX) && defined(Q_CC_GNU) && !defined(QT_NO_PROCESS)
     QProcess proc;
     proc.start("moc", QStringList(srcify("template-gtgt.h")));
     QVERIFY(proc.waitForFinished());
@@ -994,7 +995,7 @@ void tst_Moc::templateGtGt()
 
 void tst_Moc::defineMacroViaCmdline()
 {
-#if defined(Q_OS_LINUX) && defined(Q_CC_GNU)
+#if defined(Q_OS_LINUX) && defined(Q_CC_GNU) && !defined(QT_NO_PROCESS)
     QProcess proc;
 
     QStringList args;
@@ -1082,7 +1083,7 @@ void tst_Moc::warnOnPropertyWithoutREAD()
 #ifdef MOC_CROSS_COMPILED
     QSKIP("Not tested when cross-compiled", SkipAll);
 #endif
-#if defined(Q_OS_LINUX) && defined(Q_CC_GNU)
+#if defined(Q_OS_LINUX) && defined(Q_CC_GNU) && !defined(QT_NO_PROCESS)
     QProcess proc;
     proc.start("moc", QStringList(srcify("warn-on-property-without-read.h")));
     QVERIFY(proc.waitForFinished());
@@ -1180,6 +1181,27 @@ void tst_Moc::typenameWithUnsigned()
     QVERIFY(mobj->indexOfSlot("l(unsignedQImage)") != -1);
 }
 
+
+void tst_Moc::warnOnVirtualSignal()
+{
+#ifdef MOC_CROSS_COMPILED
+    QSKIP("Not tested when cross-compiled", SkipAll);
+#endif
+#if defined(Q_OS_LINUX) && defined(Q_CC_GNU) && !defined(QT_NO_PROCESS)
+    QProcess proc;
+    proc.start("moc", QStringList(srcify("pure-virtual-signals.h")));
+    QVERIFY(proc.waitForFinished());
+    QCOMPARE(proc.exitCode(), 0);
+    QByteArray mocOut = proc.readAllStandardOutput();
+    QVERIFY(!mocOut.isEmpty());
+    QString mocWarning = QString::fromLocal8Bit(proc.readAllStandardError());
+    QCOMPARE(mocWarning, QString(SRCDIR) + QString("/pure-virtual-signals.h:48: Warning: Signals cannot be declared virtual\n") +
+                         QString(SRCDIR) + QString("/pure-virtual-signals.h:50: Warning: Signals cannot be declared virtual\n"));
+#else
+    QSKIP("Only tested on linux/gcc", SkipAll);
+#endif
+}
+
 QTEST_MAIN(tst_Moc)
 #include "tst_moc.moc"
 
diff --git a/tests/auto/qapplication/tst_qapplication.cpp b/tests/auto/qapplication/tst_qapplication.cpp
index 8532723..7cb6bfa 100644
--- a/tests/auto/qapplication/tst_qapplication.cpp
+++ b/tests/auto/qapplication/tst_qapplication.cpp
@@ -1382,6 +1382,7 @@ void tst_QApplication::testDeleteLaterProcessEvents()
 */
 void tst_QApplication::desktopSettingsAware()
 {
+#ifndef QT_NO_PROCESS
     QProcess testProcess;
 #ifdef Q_OS_WINCE
     int argc = 0;
@@ -1399,6 +1400,7 @@ void tst_QApplication::desktopSettingsAware()
     QVERIFY(testProcess.waitForFinished(10000));
     QCOMPARE(int(testProcess.state()), int(QProcess::NotRunning));
     QVERIFY(int(testProcess.error()) != int(QProcess::Crashed));
+#endif
 }
 
 void tst_QApplication::setActiveWindow()
diff --git a/tests/auto/qbytearray/tst_qbytearray.cpp b/tests/auto/qbytearray/tst_qbytearray.cpp
index 78fbf32..b7e4717 100644
--- a/tests/auto/qbytearray/tst_qbytearray.cpp
+++ b/tests/auto/qbytearray/tst_qbytearray.cpp
@@ -235,6 +235,8 @@ void tst_QByteArray::qUncompress()
     QSKIP("Corrupt data causes this tests to lock up on HP-UX / PA-RISC with gcc", SkipAll);
 #elif defined Q_OS_SOLARIS
     QSKIP("Corrupt data causes this tests to lock up on Solaris", SkipAll);
+#elif defined Q_OS_QNX
+    QSKIP("Currupt data cuases this test to lock up on QNX", SkipAll);
 #endif
 
     QTEST(::qUncompress(in), "out");
diff --git a/tests/auto/qclipboard/tst_qclipboard.cpp b/tests/auto/qclipboard/tst_qclipboard.cpp
index f400754..bcdf043 100644
--- a/tests/auto/qclipboard/tst_qclipboard.cpp
+++ b/tests/auto/qclipboard/tst_qclipboard.cpp
@@ -192,6 +192,7 @@ void tst_QClipboard::testSignals()
 */
 void tst_QClipboard::copy_exit_paste()
 {
+#ifndef QT_NO_PROCESS
 #if defined Q_WS_X11 || defined Q_WS_QWS
     QSKIP("This test does not make sense on X11 and embedded, copied data disappears from the clipboard when the application exits ", SkipAll);
     // ### It's still possible to test copy/paste - just keep the apps running
@@ -205,6 +206,7 @@ void tst_QClipboard::copy_exit_paste()
     QTest::qWait(100);
 #endif
     QCOMPARE(QProcess::execute("paster/paster", stringArgument), 0);
+#endif
 }
 
 void tst_QClipboard::setMimeData()
diff --git a/tests/auto/qcopchannel/tst_qcopchannel.cpp b/tests/auto/qcopchannel/tst_qcopchannel.cpp
index d07898a..ce97eae 100644
--- a/tests/auto/qcopchannel/tst_qcopchannel.cpp
+++ b/tests/auto/qcopchannel/tst_qcopchannel.cpp
@@ -42,7 +42,7 @@
 
 #include <QtTest/QtTest>
 
-#ifdef Q_WS_QWS
+#if defined(Q_WS_QWS) && !defined(QT_NO_PROCESS)
 
 //TESTED_CLASS=
 //TESTED_FILES=
diff --git a/tests/auto/qdir/tst_qdir.cpp b/tests/auto/qdir/tst_qdir.cpp
index 1fd5e88..e5b23ab 100644
--- a/tests/auto/qdir/tst_qdir.cpp
+++ b/tests/auto/qdir/tst_qdir.cpp
@@ -571,10 +571,21 @@ void tst_QDir::entryList()
         return;
     }
 
-    for (int i=0; i<max; ++i)
-        QCOMPARE(actual[i], expected[i]);
+    bool doContentCheck = true;
+#ifdef Q_OS_UNIX
+    if (qstrcmp(QTest::currentDataTag(), "QDir::AllEntries | QDir::Writable") == 0) {
+        // for root, everything is writeable
+        if (::getuid() == 0)
+            doContentCheck = false;
+    }
+#endif
 
-    QCOMPARE(actual.count(), expected.count());
+    if (doContentCheck) {
+        for (int i=0; i<max; ++i)
+            QCOMPARE(actual[i], expected[i]);
+
+        QCOMPARE(actual.count(), expected.count());
+    }
 
     QFile::remove(SRCDIR "entrylist/writable");
     QFile::remove(SRCDIR "entrylist/linktofile");
diff --git a/tests/auto/qdirectpainter/tst_qdirectpainter.cpp b/tests/auto/qdirectpainter/tst_qdirectpainter.cpp
index e300244..d5c0ef8 100644
--- a/tests/auto/qdirectpainter/tst_qdirectpainter.cpp
+++ b/tests/auto/qdirectpainter/tst_qdirectpainter.cpp
@@ -175,6 +175,9 @@ void tst_QDirectPainter::setGeometry()
 
 void tst_QDirectPainter::regionSynchronization()
 {
+#ifdef QT_NO_PROCESS
+    QSKIP("Test requires QProcess", SkipAll);
+#else
     QRect dpRect(10, 10, 50, 50);
 
     // Start the direct painter in a different process
@@ -211,6 +214,7 @@ void tst_QDirectPainter::regionSynchronization()
     QVERIFY(i > 100); // sanity check
 
     proc.kill();
+#endif
 }
 
 class MyObject : public QObject
diff --git a/tests/auto/qfile/tst_qfile.cpp b/tests/auto/qfile/tst_qfile.cpp
index 8d9c2be..66f29dd 100644
--- a/tests/auto/qfile/tst_qfile.cpp
+++ b/tests/auto/qfile/tst_qfile.cpp
@@ -382,6 +382,12 @@ void tst_QFile::open()
 
     QFETCH( bool, ok );
 
+#ifdef Q_OS_UNIX
+    if (::getuid() == 0)
+        // root and Chuck Norris don't care for file permissions. Skip.
+        QSKIP("Running this test as root doesn't make sense", SkipAll);
+#endif
+
 #if defined(Q_OS_WIN32) || defined(Q_OS_WINCE)
     QEXPECT_FAIL("noreadfile", "Windows does not currently support non-readable files.", Abort);
 #endif
@@ -2493,14 +2499,20 @@ void tst_QFile::map()
 
     file.close();
 
-    // Change permissions on a file, just to confirm it would fail
-    QFile::Permissions originalPermissions = file.permissions();
-    QVERIFY(file.setPermissions(QFile::ReadOther));
-    QVERIFY(!file.open(QFile::ReadWrite));
-    memory = file.map(offset, size);
-    QCOMPARE(file.error(), QFile::PermissionsError);
-    QVERIFY(!memory);
-    QVERIFY(file.setPermissions(originalPermissions));
+#ifdef Q_OS_UNIX
+    if (::getuid() != 0)
+        // root always has permissions
+#endif
+    {
+        // Change permissions on a file, just to confirm it would fail
+        QFile::Permissions originalPermissions = file.permissions();
+        QVERIFY(file.setPermissions(QFile::ReadOther));
+        QVERIFY(!file.open(QFile::ReadWrite));
+        memory = file.map(offset, size);
+        QCOMPARE(file.error(), QFile::PermissionsError);
+        QVERIFY(!memory);
+        QVERIFY(file.setPermissions(originalPermissions));
+    }
 
     QVERIFY(file.remove());
 }
diff --git a/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp b/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp
index f58cad2..011e480 100644
--- a/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp
+++ b/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp
@@ -76,6 +76,46 @@ Q_DECLARE_METATYPE(QRectF)
 #define Q_CHECK_PAINTEVENTS
 #endif
 
+class EventSpy : public QGraphicsWidget
+{
+    Q_OBJECT
+public:
+    EventSpy(QObject *watched, QEvent::Type type)
+        : _count(0), spied(type)
+    {
+        watched->installEventFilter(this);
+    }
+
+    EventSpy(QGraphicsScene *scene, QGraphicsItem *watched, QEvent::Type type)
+        : _count(0), spied(type)
+    {
+        scene->addItem(this);
+        watched->installSceneEventFilter(this);
+    }
+
+    int count() const { return _count; }
+
+protected:
+    bool eventFilter(QObject *watched, QEvent *event)
+    {
+        Q_UNUSED(watched);
+        if (event->type() == spied)
+            ++_count;
+        return false;
+    }
+
+    bool sceneEventFilter(QGraphicsItem *watched, QEvent *event)
+    {
+        Q_UNUSED(watched);
+        if (event->type() == spied)
+            ++_count;
+        return false;
+    }
+
+    int _count;
+    QEvent::Type spied;
+};
+
 class EventTester : public QGraphicsItem
 {
 public:
@@ -234,6 +274,7 @@ private slots:
     void sorting();
     void itemHasNoContents();
     void hitTestUntransformableItem();
+    void focusProxy();
 
     // task specific tests below me
     void task141694_textItemEnsureVisible();
@@ -7344,5 +7385,84 @@ void tst_QGraphicsItem::hitTestUntransformableItem()
     QCOMPARE(items.at(0), static_cast<QGraphicsItem*>(item3));
 }
 
+void tst_QGraphicsItem::focusProxy()
+{
+    QGraphicsScene scene;
+    QGraphicsItem *item = scene.addRect(0, 0, 10, 10);
+    item->setFlag(QGraphicsItem::ItemIsFocusable);
+    QVERIFY(!item->focusProxy());
+
+    QGraphicsItem *item2 = scene.addRect(0, 0, 10, 10);
+    item2->setFlag(QGraphicsItem::ItemIsFocusable);
+    item->setFocusProxy(item2);
+    QCOMPARE(item->focusProxy(), item2);
+
+    item->setFocus();
+    QVERIFY(item->hasFocus());
+    QVERIFY(item2->hasFocus());
+
+    // Try to make a focus chain loop
+    QString err;
+    QTextStream stream(&err);
+    stream << "QGraphicsItem::setFocusProxy: "
+           << (void*)item << " is already in the focus proxy chain" << flush;
+    QTest::ignoreMessage(QtWarningMsg, err.toLatin1().constData());
+    item2->setFocusProxy(item); // fails
+    QCOMPARE(item->focusProxy(), (QGraphicsItem *)item2);
+    QCOMPARE(item2->focusProxy(), (QGraphicsItem *)0);
+
+    // Try to assign self as focus proxy
+    QTest::ignoreMessage(QtWarningMsg, "QGraphicsItem::setFocusProxy: cannot assign self as focus proxy");
+    item->setFocusProxy(item); // fails
+    QCOMPARE(item->focusProxy(), (QGraphicsItem *)item2);
+    QCOMPARE(item2->focusProxy(), (QGraphicsItem *)0);
+
+    // Reset the focus proxy
+    item->setFocusProxy(0);
+    QCOMPARE(item->focusProxy(), (QGraphicsItem *)0);
+    QVERIFY(!item->hasFocus());
+    QVERIFY(item2->hasFocus());
+
+    // Test deletion
+    item->setFocusProxy(item2);
+    QCOMPARE(item->focusProxy(), (QGraphicsItem *)item2);
+    delete item2;
+    QCOMPARE(item->focusProxy(), (QGraphicsItem *)0);
+
+    // Test event delivery
+    item2 = scene.addRect(0, 0, 10, 10);
+    item2->setFlag(QGraphicsItem::ItemIsFocusable);
+    item->setFocusProxy(item2);
+    item->clearFocus();
+
+    EventSpy focusInSpy(&scene, item, QEvent::FocusIn);
+    EventSpy focusOutSpy(&scene, item, QEvent::FocusOut);
+    EventSpy focusInSpy2(&scene, item2, QEvent::FocusIn);
+    EventSpy focusOutSpy2(&scene, item2, QEvent::FocusOut);
+    QCOMPARE(focusInSpy.count(), 0);
+    QCOMPARE(focusOutSpy.count(), 0);
+    QCOMPARE(focusInSpy2.count(), 0);
+    QCOMPARE(focusOutSpy2.count(), 0);
+
+    item->setFocus();
+    QCOMPARE(focusInSpy.count(), 0);
+    QCOMPARE(focusInSpy2.count(), 1);
+    item->clearFocus();
+    QCOMPARE(focusOutSpy.count(), 0);
+    QCOMPARE(focusOutSpy2.count(), 1);
+
+    // Test two items proxying one item.
+    QGraphicsItem *item3 = scene.addRect(0, 0, 10, 10);
+    item3->setFlag(QGraphicsItem::ItemIsFocusable);
+    item3->setFocusProxy(item2); // item and item3 use item2 as proxy
+
+    QCOMPARE(item->focusProxy(), item2);
+    QCOMPARE(item2->focusProxy(), (QGraphicsItem *)0);
+    QCOMPARE(item3->focusProxy(), item2);
+    delete item2;
+    QCOMPARE(item->focusProxy(), (QGraphicsItem *)0);
+    QCOMPARE(item3->focusProxy(), (QGraphicsItem *)0);
+}
+
 QTEST_MAIN(tst_QGraphicsItem)
 #include "tst_qgraphicsitem.moc"
diff --git a/tests/auto/qnetworkreply/tst_qnetworkreply.cpp b/tests/auto/qnetworkreply/tst_qnetworkreply.cpp
index b67c727..788be1e 100644
--- a/tests/auto/qnetworkreply/tst_qnetworkreply.cpp
+++ b/tests/auto/qnetworkreply/tst_qnetworkreply.cpp
@@ -114,6 +114,7 @@ class tst_QNetworkReply: public QObject
     MyCookieJar *cookieJar;
 #ifndef QT_NO_OPENSSL
     QSslConfiguration storedSslConfiguration;
+    QList<QSslError> storedExpectedSslErrors;
 #endif
 
 public:
@@ -126,9 +127,11 @@ public Q_SLOTS:
     void gotError();
     void authenticationRequired(QNetworkReply*,QAuthenticator*);
     void proxyAuthenticationRequired(const QNetworkProxy &,QAuthenticator*);
+
 #ifndef QT_NO_OPENSSL
     void sslErrors(QNetworkReply*,const QList<QSslError> &);
     void storeSslConfiguration();
+    void ignoreSslErrorListSlot(QNetworkReply *reply, const QList<QSslError> &);
 #endif
 
 protected Q_SLOTS:
@@ -247,6 +250,13 @@ private Q_SLOTS:
     void httpConnectionCount();
     void httpDownloadPerformance_data();
     void httpDownloadPerformance();
+
+#ifndef QT_NO_OPENSSL
+    void ignoreSslErrorsList_data();
+    void ignoreSslErrorsList();
+    void ignoreSslErrorsListWithSlot_data();
+    void ignoreSslErrorsListWithSlot();
+#endif
 };
 
 QT_BEGIN_NAMESPACE
@@ -3540,7 +3550,7 @@ void tst_QNetworkReply::httpProxyCommands_data()
         << QUrl("http://0.0.0.0:4443/http-request")
         << QByteArray("HTTP/1.0 200 OK\r\nProxy-Connection: close\r\nContent-Length: 1\r\n\r\n1")
         << "GET http://0.0.0.0:4443/http-request HTTP/1.";
-#ifndef QT_NO_SSL
+#ifndef QT_NO_OPENSSL
     QTest::newRow("https")
         << QUrl("https://0.0.0.0:4443/https-request")
         << QByteArray("HTTP/1.0 200 Connection Established\r\n\r\n")
@@ -3832,5 +3842,81 @@ void tst_QNetworkReply::httpDownloadPerformance()
     delete reply;
 }
 
+#ifndef QT_NO_OPENSSL
+void tst_QNetworkReply::ignoreSslErrorsList_data()
+{
+    QTest::addColumn<QString>("url");
+    QTest::addColumn<QList<QSslError> >("expectedSslErrors");
+    QTest::addColumn<QNetworkReply::NetworkError>("expectedNetworkError");
+
+    QList<QSslError> expectedSslErrors;
+    // apparently, because of some weird behaviour of SRCDIR, the file name below needs to start with a slash
+    QList<QSslCertificate> certs = QSslCertificate::fromPath(QLatin1String(SRCDIR "/../qsslsocket/certs/qt-test-server-cacert.pem"));
+    QSslError rightError(QSslError::SelfSignedCertificate, certs.at(0));
+    QSslError wrongError(QSslError::SelfSignedCertificate);
+
+    QTest::newRow("SSL-failure-empty-list") << "https://" + QtNetworkSettings::serverName() + "/index.html" << expectedSslErrors << QNetworkReply::SslHandshakeFailedError;
+    expectedSslErrors.append(wrongError);
+    QTest::newRow("SSL-failure-wrong-error") << "https://" + QtNetworkSettings::serverName() + "/index.html" << expectedSslErrors << QNetworkReply::SslHandshakeFailedError;
+    expectedSslErrors.append(rightError);
+    QTest::newRow("allErrorsInExpectedList1") << "https://" + QtNetworkSettings::serverName() + "/index.html" << expectedSslErrors << QNetworkReply::NoError;
+    expectedSslErrors.removeAll(wrongError);
+    QTest::newRow("allErrorsInExpectedList2") << "https://" + QtNetworkSettings::serverName() + "/index.html" << expectedSslErrors << QNetworkReply::NoError;
+    expectedSslErrors.removeAll(rightError);
+    QTest::newRow("SSL-failure-empty-list-again") << "https://" + QtNetworkSettings::serverName() + "/index.html" << expectedSslErrors << QNetworkReply::SslHandshakeFailedError;
+}
+
+void tst_QNetworkReply::ignoreSslErrorsList()
+{
+    QFETCH(QString, url);
+    QNetworkRequest request(url);
+    QNetworkReply *reply = manager.get(request);
+
+    QFETCH(QList<QSslError>, expectedSslErrors);
+    reply->ignoreSslErrors(expectedSslErrors);
+
+    connect(reply, SIGNAL(finished()), &QTestEventLoop::instance(), SLOT(exitLoop()));
+    QTestEventLoop::instance().enterLoop(10);
+    QVERIFY(!QTestEventLoop::instance().timeout());
+
+    QFETCH(QNetworkReply::NetworkError, expectedNetworkError);
+    QCOMPARE(reply->error(), expectedNetworkError);
+}
+
+void tst_QNetworkReply::ignoreSslErrorsListWithSlot_data()
+{
+    ignoreSslErrorsList_data();
+}
+
+// this is not a test, just a slot called in the test below
+void tst_QNetworkReply::ignoreSslErrorListSlot(QNetworkReply *reply, const QList<QSslError> &)
+{
+    reply->ignoreSslErrors(storedExpectedSslErrors);
+}
+
+// do the same as in ignoreSslErrorsList, but ignore the errors in the slot
+void tst_QNetworkReply::ignoreSslErrorsListWithSlot()
+{
+    QFETCH(QString, url);
+    QNetworkRequest request(url);
+    QNetworkReply *reply = manager.get(request);
+
+    QFETCH(QList<QSslError>, expectedSslErrors);
+    // store the errors to ignore them later in the slot connected below
+    storedExpectedSslErrors = expectedSslErrors;
+    connect(&manager, SIGNAL(sslErrors(QNetworkReply *, const QList<QSslError> &)),
+            this, SLOT(ignoreSslErrorListSlot(QNetworkReply *, const QList<QSslError> &)));
+
+
+    connect(reply, SIGNAL(finished()), &QTestEventLoop::instance(), SLOT(exitLoop()));
+    QTestEventLoop::instance().enterLoop(10);
+    QVERIFY(!QTestEventLoop::instance().timeout());
+
+    QFETCH(QNetworkReply::NetworkError, expectedNetworkError);
+    QCOMPARE(reply->error(), expectedNetworkError);
+}
+
+#endif // QT_NO_OPENSSL
+
 QTEST_MAIN(tst_QNetworkReply)
 #include "tst_qnetworkreply.moc"
diff --git a/tests/auto/qobject/tst_qobject.cpp b/tests/auto/qobject/tst_qobject.cpp
index 8ce7c3a..4f25af6 100644
--- a/tests/auto/qobject/tst_qobject.cpp
+++ b/tests/auto/qobject/tst_qobject.cpp
@@ -2426,11 +2426,15 @@ void tst_QObject::dynamicProperties()
 
 void tst_QObject::recursiveSignalEmission()
 {
+#ifdef QT_NO_PROCESS
+    QSKIP("Test requires QProcess", SkipAll);
+#else
     QProcess proc;
     proc.start("./signalbug");
     QVERIFY(proc.waitForFinished());
     QVERIFY(proc.exitStatus() == QProcess::NormalExit);
     QCOMPARE(proc.exitCode(), 0);
+#endif
 }
 
 void tst_QObject::blockingQueuedConnection()
diff --git a/tests/auto/qprocess/tst_qprocess.cpp b/tests/auto/qprocess/tst_qprocess.cpp
index c19d0a5..1ae5b12 100644
--- a/tests/auto/qprocess/tst_qprocess.cpp
+++ b/tests/auto/qprocess/tst_qprocess.cpp
@@ -50,6 +50,10 @@
 #include <QtNetwork/QHostInfo>
 #include <stdlib.h>
 
+#ifdef QT_NO_PROCESS
+QTEST_NOOP_MAIN
+#else
+
 #if defined(Q_OS_WIN)
 #include <windows.h>
 #endif
@@ -143,6 +147,7 @@ private slots:
     void startFinishStartFinish();
     void invalidProgramString_data();
     void invalidProgramString();
+    void processEventsInAReadyReadSlot();
 
     // keep these at the end, since they use lots of processes and sometimes
     // caused obscure failures to occur in tests that followed them (esp. on the Mac)
@@ -156,6 +161,7 @@ protected slots:
     void restartProcess();
     void waitForReadyReadInAReadyReadSlotSlot();
     void waitForBytesWrittenInABytesWrittenSlotSlot();
+    void processEventsInAReadyReadSlotSlot();
     
 private:
     QProcess *process;
@@ -2130,5 +2136,35 @@ void tst_QProcess::invalidProgramString()
     QVERIFY(!QProcess::startDetached(programString));
 }
 
+//-----------------------------------------------------------------------------
+void tst_QProcess::processEventsInAReadyReadSlot()
+{
+#ifdef Q_OS_WINCE
+    QSKIP("Reading and writing to a process is not supported on Qt/CE", SkipAll);
+#endif
+
+    QProcess process;
+    QVERIFY(QObject::connect(&process, SIGNAL(readyReadStandardOutput()), this, SLOT(processEventsInAReadyReadSlotSlot())));
+
+    for (int i = 0; i < 10; ++i) {
+        QCOMPARE(process.state(), QProcess::NotRunning);
+
+#ifdef Q_OS_MAC
+        process.start("testProcessOutput/testProcessOutput.app");
+#else
+        process.start("testProcessOutput/testProcessOutput");
+#endif
+
+        QVERIFY(process.waitForFinished(10000));
+    }
+}
+
+//-----------------------------------------------------------------------------
+void tst_QProcess::processEventsInAReadyReadSlotSlot()
+{
+    qApp->processEvents();
+}
+
 QTEST_MAIN(tst_QProcess)
 #include "tst_qprocess.moc"
+#endif
diff --git a/tests/auto/qprogressbar/tst_qprogressbar.cpp b/tests/auto/qprogressbar/tst_qprogressbar.cpp
index 403b56b..911d6b7 100644
--- a/tests/auto/qprogressbar/tst_qprogressbar.cpp
+++ b/tests/auto/qprogressbar/tst_qprogressbar.cpp
@@ -62,6 +62,8 @@ private slots:
     void format();
     void setValueRepaint();
     void sizeHint();
+    void formatedText_data();
+    void formatedText();
 
     void task245201_testChangeStyleAndDelete_data();
     void task245201_testChangeStyleAndDelete();
@@ -174,7 +176,7 @@ void tst_QProgressBar::format()
     bar.repainted = false;
     bar.setFormat("%v of %m (%p%)");
     qApp->processEvents();
-#ifndef Q_WS_MAC 
+#ifndef Q_WS_MAC
     // The Mac scroll bar is animated, which means we get paint events all the time.
     QVERIFY(!bar.repainted);
 #endif
@@ -225,6 +227,34 @@ void tst_QProgressBar::sizeHint()
     QCOMPARE(barSize.height(), size.height());
 }
 
+void tst_QProgressBar::formatedText_data()
+{
+    QTest::addColumn<int>("minimum");
+    QTest::addColumn<int>("maximum");
+    QTest::addColumn<int>("value");
+    QTest::addColumn<QString>("format");
+    QTest::addColumn<QString>("text");
+
+    QTest::newRow("1") <<  -100 << 100 << 0 << QString::fromLatin1(" %p - %v - %m ") << QString::fromLatin1(" 50 - 0 - 200 ");
+    QTest::newRow("2") <<  -100 << 0 << -25 << QString::fromLatin1(" %p - %v - %m ") << QString::fromLatin1(" 75 - -25 - 100 ");
+    QTest::newRow("3") <<  10 << 10 << 10 << QString::fromLatin1(" %p - %v - %m ") << QString::fromLatin1(" 100 - 10 - 0 ");
+    QTest::newRow("task152227") <<  INT_MIN << INT_MAX << 42 << QString::fromLatin1(" %p - %v - %m ") << QString::fromLatin1(" 50 - 42 - 4294967295 ");
+}
+
+void tst_QProgressBar::formatedText()
+{
+    QFETCH(int, minimum);
+    QFETCH(int, maximum);
+    QFETCH(int, value);
+    QFETCH(QString, format);
+    QFETCH(QString, text);
+    QProgressBar bar;
+    bar.setRange(minimum, maximum);
+    bar.setValue(value);
+    bar.setFormat(format);
+    QCOMPARE(bar.text(), text);
+}
+
 void tst_QProgressBar::task245201_testChangeStyleAndDelete_data()
 {
     QTest::addColumn<QString>("style1_str");
diff --git a/tests/auto/qsettings/tst_qsettings.cpp b/tests/auto/qsettings/tst_qsettings.cpp
index 77fef1f..5b9e9e1 100644
--- a/tests/auto/qsettings/tst_qsettings.cpp
+++ b/tests/auto/qsettings/tst_qsettings.cpp
@@ -716,6 +716,9 @@ void tst_QSettings::testErrorHandling()
 #ifdef QT_BUILD_INTERNAL
 #ifdef Q_OS_WIN
     QSKIP("Windows doesn't support most file modes, including read-only directories, so this test is moot.", SkipAll);
+#elif defined(Q_OS_UNIX)
+    if (::getuid() == 0)
+        QSKIP("Running this test as root doesn't work, since file perms do not bother him", SkipAll);
 #else
     QFETCH(int, filePerms);
     QFETCH(int, dirPerms);
@@ -724,8 +727,7 @@ void tst_QSettings::testErrorHandling()
     QFETCH(int, statusAfterGet);
     QFETCH(int, statusAfterSetAndSync);
 
-
-	system(QString("chmod 700 %1 2>/dev/null").arg(settingsPath("someDir")).toLatin1());
+    system(QString("chmod 700 %1 2>/dev/null").arg(settingsPath("someDir")).toLatin1());
     system(QString("chmod -R u+rwx %1 2>/dev/null").arg(settingsPath("someDir")).toLatin1());
     system(QString("rm -fr %1").arg(settingsPath("someDir")).toLatin1());
 
diff --git a/tests/auto/qsslsocket/certs/qt-test-server-cacert.pem b/tests/auto/qsslsocket/certs/qt-test-server-cacert.pem
index 83adca2..25bd404 100644
--- a/tests/auto/qsslsocket/certs/qt-test-server-cacert.pem
+++ b/tests/auto/qsslsocket/certs/qt-test-server-cacert.pem
@@ -1,22 +1,17 @@
 -----BEGIN CERTIFICATE-----
-MIIDuDCCAyGgAwIBAgIJAM17QpZu2GP7MA0GCSqGSIb3DQEBBAUAMIGaMQ4wDAYD
-VQQKEwVOb2tpYTEUMBIGA1UECxMLUXQgU29mdHdhcmUxIjAgBgkqhkiG9w0BCQEW
-E25vYm9keUBub2RvbWFpbi5vcmcxDTALBgNVBAcTBE9zbG8xDTALBgNVBAgTBE9z
-bG8xCzAJBgNVBAYTAk5PMSMwIQYDVQQDExpxdC10ZXN0LXNlcnZlci5xdC10ZXN0
-LW5ldDAeFw0wODEyMDIxNDQ3MjZaFw0xODExMzAxNDQ3MjZaMIGaMQ4wDAYDVQQK
-EwVOb2tpYTEUMBIGA1UECxMLUXQgU29mdHdhcmUxIjAgBgkqhkiG9w0BCQEWE25v
-Ym9keUBub2RvbWFpbi5vcmcxDTALBgNVBAcTBE9zbG8xDTALBgNVBAgTBE9zbG8x
-CzAJBgNVBAYTAk5PMSMwIQYDVQQDExpxdC10ZXN0LXNlcnZlci5xdC10ZXN0LW5l
-dDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAz7dQ0l6IYpwVUcvj0mQxvG80
-yzoRzYr+alh7HMmOFI6/xjBHD6zAEEmLBafY7M/xe8PGH7ds2l2BFJkz0OS+IJRX
-8CdOoeFvmVyp+L84tzXk81NKnMQ3y8DiFc6aUkfnyybA0whIv/TlqNyrYeQUin+t
-61dPf1vr0LAAm5HdeYECAwEAAaOCAQIwgf8wDAYDVR0TBAUwAwEB/zAdBgNVHQ4E
-FgQUwhEr5xV4r0deMQd3XwFkFtwls20wgc8GA1UdIwSBxzCBxIAUwhEr5xV4r0de
-MQd3XwFkFtwls22hgaCkgZ0wgZoxDjAMBgNVBAoTBU5va2lhMRQwEgYDVQQLEwtR
-dCBTb2Z0d2FyZTEiMCAGCSqGSIb3DQEJARYTbm9ib2R5QG5vZG9tYWluLm9yZzEN
-MAsGA1UEBxMET3NsbzENMAsGA1UECBMET3NsbzELMAkGA1UEBhMCTk8xIzAhBgNV
-BAMTGnF0LXRlc3Qtc2VydmVyLnF0LXRlc3QtbmV0ggkAzXtClm7YY/swDQYJKoZI
-hvcNAQEEBQADgYEAQ/8YDtHrUoEsu9j5J6GY8iuuT8jvs/W1se5vXzoITgld+vLM
-RWzxz35Hwzy2n31MNmUagRyQsTNOvEtJTxPCP97eLLxxrHDAbRmY/PPcZfolfOQf
-xKQYf9naBv2F9Bs0WcY9z0Dgdl27szTAN67vGddYx5HpU9UE8Or5hdFJI3I=
+MIICrTCCAhYCCQCdDn5rci6VDjANBgkqhkiG9w0BAQQFADCBmjEOMAwGA1UEChMF
+Tm9raWExFDASBgNVBAsTC1F0IFNvZnR3YXJlMSIwIAYJKoZIhvcNAQkBFhNub2Jv
+ZHlAbm9kb21haW4ub3JnMQ0wCwYDVQQHEwRPc2xvMQ0wCwYDVQQIEwRPc2xvMQsw
+CQYDVQQGEwJOTzEjMCEGA1UEAxMacXQtdGVzdC1zZXJ2ZXIucXQtdGVzdC1uZXQw
+HhcNMDkwNzEwMDc0MTIzWhcNMTkwNzA4MDc0MTIzWjCBmjEOMAwGA1UEChMFTm9r
+aWExFDASBgNVBAsTC1F0IFNvZnR3YXJlMSIwIAYJKoZIhvcNAQkBFhNub2JvZHlA
+bm9kb21haW4ub3JnMQ0wCwYDVQQHEwRPc2xvMQ0wCwYDVQQIEwRPc2xvMQswCQYD
+VQQGEwJOTzEjMCEGA1UEAxMacXQtdGVzdC1zZXJ2ZXIucXQtdGVzdC1uZXQwgZ8w
+DQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAM2q22/WNMmn8cC+5EEYGeICySLmp9W6
+Ay6eKHr0Xxp3X3epETuPfvAuxp7rOtkS18EMUegkUj8jw0IMEcbyHKFC/rTCaYOt
+93CxGBXMIChiMPAsFeYzGa/D6xzAkfcRaJRQ+Ek3CDLXPnXfo7xpABXezYcPXAJr
+gsgBfWrwHdxzAgMBAAEwDQYJKoZIhvcNAQEEBQADgYEAy7YOLCZABQy2Ygkchq1I
++TUpvMn+gLwAyW8TNErM1V4lNY2+K78RawzKx3SqM97ymCy4TD45EA3A2gmi32NI
+xSKBNjFyzngUqsXBdcSasALiowlZCiJrGwlGX5qCkBlxXvJeUEbuJLPYVl5FBjXZ
+6o00K4cSPCqtqUez7WSmDZU=
 -----END CERTIFICATE-----
diff --git a/tests/auto/qsslsocket/tst_qsslsocket.cpp b/tests/auto/qsslsocket/tst_qsslsocket.cpp
index 066b950..23eee29 100644
--- a/tests/auto/qsslsocket/tst_qsslsocket.cpp
+++ b/tests/auto/qsslsocket/tst_qsslsocket.cpp
@@ -173,6 +173,10 @@ private slots:
     void disconnectFromHostWhenConnecting();
     void disconnectFromHostWhenConnected();
     void resetProxy();
+    void ignoreSslErrorsList_data();
+    void ignoreSslErrorsList();
+    void ignoreSslErrorsListWithSlot_data();
+    void ignoreSslErrorsListWithSlot();
 
     static void exitLoop()
     {
@@ -194,9 +198,11 @@ protected slots:
         if (errors.size() == 1 && errors.first().error() == QSslError::CertificateUntrusted)
             socket->ignoreSslErrors();
     }
+    void ignoreErrorListSlot(const QList<QSslError> &errors);
 
 private:
     QSslSocket *socket;
+    QList<QSslError> storedExpectedSslErrors;
 #endif // QT_NO_OPENSSL
 private:
     static int loopLevel;
@@ -609,7 +615,7 @@ void tst_QSslSocket::connectToHostEncryptedWithVerificationPeerName()
     QSslSocketPtr socket = newSocket();
     this->socket = socket;
 
-    socket->addCaCertificates(QLatin1String("certs/qt-test-server-cacert.pem"));
+    socket->addCaCertificates(QLatin1String(SRCDIR "certs/qt-test-server-cacert.pem"));
 #ifdef QSSLSOCKET_CERTUNTRUSTED_WORKAROUND
     connect(&socket, SIGNAL(sslErrors(QList<QSslError>)),
             this, SLOT(untrustedWorkaroundSlot(QList<QSslError>)));
@@ -1417,9 +1423,7 @@ void tst_QSslSocket::verifyMode()
     QVERIFY(!socket.waitForEncrypted());
 
     QList<QSslError> expectedErrors = QList<QSslError>()
-                                      << QSslError(QSslError::UnableToGetLocalIssuerCertificate, socket.peerCertificate())
-                                      << QSslError(QSslError::CertificateUntrusted, socket.peerCertificate())
-                                      << QSslError(QSslError::UnableToVerifyFirstCertificate, socket.peerCertificate());
+                                      << QSslError(QSslError::SelfSignedCertificate, socket.peerCertificate());
     QCOMPARE(socket.sslErrors(), expectedErrors);
     socket.abort();
 
@@ -1539,6 +1543,82 @@ void tst_QSslSocket::resetProxy()
     QVERIFY2(socket2.waitForConnected(10000), qPrintable(socket.errorString()));
 }
 
+void tst_QSslSocket::ignoreSslErrorsList_data()
+{
+    QTest::addColumn<QList<QSslError> >("expectedSslErrors");
+    QTest::addColumn<int>("expectedSslErrorSignalCount");
+
+    // construct the list of errors that we will get with the SSL handshake and that we will ignore
+    QList<QSslError> expectedSslErrors;
+    // fromPath gives us a list of certs, but it actually only contains one
+    QList<QSslCertificate> certs = QSslCertificate::fromPath(QLatin1String(SRCDIR "certs/qt-test-server-cacert.pem"));
+    QSslError rightError(QSslError::SelfSignedCertificate, certs.at(0));
+    QSslError wrongError(QSslError::SelfSignedCertificate);
+
+
+    QTest::newRow("SSL-failure-empty-list") << expectedSslErrors << 1;
+    expectedSslErrors.append(wrongError);
+    QTest::newRow("SSL-failure-wrong-error") << expectedSslErrors << 1;
+    expectedSslErrors.append(rightError);
+    QTest::newRow("allErrorsInExpectedList1") << expectedSslErrors << 0;
+    expectedSslErrors.removeAll(wrongError);
+    QTest::newRow("allErrorsInExpectedList2") << expectedSslErrors << 0;
+    expectedSslErrors.removeAll(rightError);
+    QTest::newRow("SSL-failure-empty-list-again") << expectedSslErrors << 1;
+}
+
+void tst_QSslSocket::ignoreSslErrorsList()
+{
+    QSslSocket socket;
+    connect(&socket, SIGNAL(proxyAuthenticationRequired(QNetworkProxy,QAuthenticator*)),
+            this, SLOT(proxyAuthenticationRequired(QNetworkProxy,QAuthenticator*)));
+
+//    this->socket = &socket;
+    QSslCertificate cert;
+
+    QFETCH(QList<QSslError>, expectedSslErrors);
+    socket.ignoreSslErrors(expectedSslErrors);
+
+    QFETCH(int, expectedSslErrorSignalCount);
+    QSignalSpy sslErrorsSpy(&socket, SIGNAL(error(QAbstractSocket::SocketError)));
+
+    socket.connectToHostEncrypted(QtNetworkSettings::serverName(), 443);
+
+    bool expectEncryptionSuccess = (expectedSslErrorSignalCount == 0);
+    QCOMPARE(socket.waitForEncrypted(10000), expectEncryptionSuccess);
+    QCOMPARE(sslErrorsSpy.count(), expectedSslErrorSignalCount);
+}
+
+void tst_QSslSocket::ignoreSslErrorsListWithSlot_data()
+{
+    ignoreSslErrorsList_data();
+}
+
+// this is not a test, just a slot called in the test below
+void tst_QSslSocket::ignoreErrorListSlot(const QList<QSslError> &)
+{
+    socket->ignoreSslErrors(storedExpectedSslErrors);
+}
+
+void tst_QSslSocket::ignoreSslErrorsListWithSlot()
+{
+    QSslSocket socket;
+    this->socket = &socket;
+
+    QFETCH(QList<QSslError>, expectedSslErrors);
+    // store the errors to ignore them later in the slot connected below
+    storedExpectedSslErrors = expectedSslErrors;
+    connect(&socket, SIGNAL(proxyAuthenticationRequired(QNetworkProxy,QAuthenticator*)),
+            this, SLOT(proxyAuthenticationRequired(QNetworkProxy,QAuthenticator*)));
+    connect(&socket, SIGNAL(sslErrors(const QList<QSslError> &)),
+            this, SLOT(ignoreErrorListSlot(const QList<QSslError> &)));
+    socket.connectToHostEncrypted(QtNetworkSettings::serverName(), 443);
+
+    QFETCH(int, expectedSslErrorSignalCount);
+    bool expectEncryptionSuccess = (expectedSslErrorSignalCount == 0);
+    QCOMPARE(socket.waitForEncrypted(10000), expectEncryptionSuccess);
+}
+
 #endif // QT_NO_OPENSSL
 
 QTEST_MAIN(tst_QSslSocket)
diff --git a/tests/auto/qstate/tst_qstate.cpp b/tests/auto/qstate/tst_qstate.cpp
index ab87767..78b9853 100644
--- a/tests/auto/qstate/tst_qstate.cpp
+++ b/tests/auto/qstate/tst_qstate.cpp
@@ -60,10 +60,10 @@ tst_QState::~tst_QState()
 void tst_QState::test()
 {
     QStateMachine machine;
-    QState *s1 = new QState(machine.rootState());
+    QState *s1 = new QState(&machine);
 
     QCOMPARE(s1->machine(), &machine);
-    QCOMPARE(s1->parentState(), machine.rootState());
+    QCOMPARE(s1->parentState(), &machine);
     QCOMPARE(s1->initialState(), (QState*)0);
     QVERIFY(s1->childStates().isEmpty());
     QVERIFY(s1->transitions().isEmpty());
@@ -218,7 +218,7 @@ void tst_QState::assignProperty()
     QObject *object = new QObject();
     object->setProperty("fooBar", 10);
 
-    QState *s1 = new QState(machine.rootState());
+    QState *s1 = new QState(&machine);
     s1->assignProperty(object, "fooBar", 20);
     
     machine.setInitialState(s1);
@@ -235,7 +235,7 @@ void tst_QState::assignPropertyTwice()
     QObject *object = new QObject();
     object->setProperty("fooBar", 10);
 
-    QState *s1 = new QState(machine.rootState());
+    QState *s1 = new QState(&machine);
     s1->assignProperty(object, "fooBar", 20);
     s1->assignProperty(object, "fooBar", 30);
     
@@ -271,9 +271,9 @@ void tst_QState::historyInitialState()
 {
     QStateMachine machine;
 
-    QState *s1 = new QState(machine.rootState());
+    QState *s1 = new QState(&machine);
     
-    QState *s2 = new QState(machine.rootState());
+    QState *s2 = new QState(&machine);
     QHistoryState *h1 = new QHistoryState(s2);
     
     s2->setInitialState(h1);
diff --git a/tests/auto/qstatemachine/tst_qstatemachine.cpp b/tests/auto/qstatemachine/tst_qstatemachine.cpp
index efcb983..7f4d9f5 100644
--- a/tests/auto/qstatemachine/tst_qstatemachine.cpp
+++ b/tests/auto/qstatemachine/tst_qstatemachine.cpp
@@ -127,6 +127,7 @@ private slots:
     void targetStateWithNoParent();
     void targetStateDeleted();
     void transitionToRootState();
+    void transitionFromRootState();
     void transitionEntersParent();
     
     void defaultErrorState();
@@ -189,6 +190,8 @@ private slots:
 //    void overrideDefaultSourceAnimationWithSpecific();
 //    void overrideDefaultTargetAnimationWithSpecific();
 //    void overrideDefaultTargetAnimationWithSource();
+
+    void nestedStateMachines();
 };
 
 tst_QStateMachine::tst_QStateMachine()
@@ -258,13 +261,17 @@ private:
 void tst_QStateMachine::transitionToRootState()
 {
     QStateMachine machine;
+    machine.setObjectName("machine");
 
     QState *initialState = new QState();
+    initialState->setObjectName("initial");
     machine.addState(initialState);
     machine.setInitialState(initialState);
 
-    QTest::ignoreMessage(QtWarningMsg, "QAbstractTransition::setTargetStates: root state cannot be target of transition");
-    initialState->addTransition(new EventTransition(QEvent::User, machine.rootState()));
+    QAbstractTransition *trans = initialState->addTransition(new EventTransition(QEvent::User, &machine));
+    QVERIFY(trans != 0);
+    QCOMPARE(trans->sourceState(), initialState);
+    QCOMPARE(trans->targetState(), &machine);
 
     machine.start();
     QCoreApplication::processEvents();
@@ -273,10 +280,21 @@ void tst_QStateMachine::transitionToRootState()
     QVERIFY(machine.configuration().contains(initialState));
 
     machine.postEvent(new QEvent(QEvent::User));
+    QTest::ignoreMessage(QtWarningMsg, "Unrecoverable error detected in running state machine: No common ancestor for targets and source of transition from state 'initial'");
     QCoreApplication::processEvents();
+    QVERIFY(machine.configuration().isEmpty());
+    QVERIFY(!machine.isRunning());
+}
 
-    QCOMPARE(machine.configuration().count(), 1);
-    QVERIFY(machine.configuration().contains(initialState));
+void tst_QStateMachine::transitionFromRootState()
+{
+    QStateMachine machine;
+    QState *root = &machine;
+    QState *s1 = new QState(root);
+    EventTransition *trans = new EventTransition(QEvent::User, s1);
+    QCOMPARE(root->addTransition(trans), trans);
+    QCOMPARE(trans->sourceState(), root);
+    QCOMPARE(trans->targetState(), s1);
 }
 
 void tst_QStateMachine::transitionEntersParent()
@@ -658,7 +676,7 @@ void tst_QStateMachine::errorStateIsRootState()
 {
     QStateMachine machine;
     QTest::ignoreMessage(QtWarningMsg, "QStateMachine::setErrorState: root state cannot be error state");
-    machine.setErrorState(machine.rootState());
+    machine.setErrorState(&machine);
 
     QState *initialState = new QState();
     initialState->setObjectName("initialState");
@@ -759,7 +777,7 @@ void tst_QStateMachine::errorStateEntersParentFirst()
 void tst_QStateMachine::customErrorStateIsNull()
 {
     QStateMachine machine;
-    machine.rootState()->setErrorState(0);
+    machine.setErrorState(0);
 
     QState *initialState = new QState();
     machine.addState(initialState);
@@ -785,9 +803,9 @@ void tst_QStateMachine::customErrorStateIsNull()
 void tst_QStateMachine::clearError()
 {
     QStateMachine machine;    
-    machine.setErrorState(new QState(machine.rootState())); // avoid warnings
+    machine.setErrorState(new QState(&machine)); // avoid warnings
     
-    QState *brokenState = new QState(machine.rootState());
+    QState *brokenState = new QState(&machine);
     brokenState->setObjectName("brokenState");
     machine.setInitialState(brokenState);
     new QState(brokenState);
@@ -809,13 +827,13 @@ void tst_QStateMachine::historyStateAsInitialState()
 {
     QStateMachine machine;
 
-    QHistoryState *hs = new QHistoryState(machine.rootState());
+    QHistoryState *hs = new QHistoryState(&machine);
     machine.setInitialState(hs);
 
-    QState *s1 = new QState(machine.rootState());
+    QState *s1 = new QState(&machine);
     hs->setDefaultState(s1);
 
-    QState *s2 = new QState(machine.rootState());
+    QState *s2 = new QState(&machine);
 
     QHistoryState *s2h = new QHistoryState(s2);
     s2->setInitialState(s2h);
@@ -843,11 +861,11 @@ void tst_QStateMachine::historyStateHasNowhereToGo()
 {
     QStateMachine machine;
 
-    QState *initialState = new QState(machine.rootState());
+    QState *initialState = new QState(&machine);
     machine.setInitialState(initialState);
-    machine.setErrorState(new QState(machine.rootState())); // avoid warnings
+    machine.setErrorState(new QState(&machine)); // avoid warnings
 
-    QState *brokenState = new QState(machine.rootState());
+    QState *brokenState = new QState(&machine);
     brokenState->setObjectName("brokenState");
     brokenState->setInitialState(new QState(brokenState));
 
@@ -877,14 +895,14 @@ void tst_QStateMachine::brokenStateIsNeverEntered()
     entryController->setProperty("childStateEntered", false);
     entryController->setProperty("errorStateEntered", false);
 
-    QState *initialState = new QState(machine.rootState());    
+    QState *initialState = new QState(&machine);    
     machine.setInitialState(initialState);
 
-    QState *errorState = new QState(machine.rootState());
+    QState *errorState = new QState(&machine);
     errorState->assignProperty(entryController, "errorStateEntered", true);
     machine.setErrorState(errorState); 
 
-    QState *brokenState = new QState(machine.rootState());
+    QState *brokenState = new QState(&machine);
     brokenState->assignProperty(entryController, "brokenStateEntered", true);
     brokenState->setObjectName("brokenState");
     
@@ -908,7 +926,7 @@ void tst_QStateMachine::transitionToStateNotInGraph()
 {
     QStateMachine machine;    
 
-    QState *initialState = new QState(machine.rootState());
+    QState *initialState = new QState(&machine);
     initialState->setObjectName("initialState");
     machine.setInitialState(initialState);
 
@@ -933,7 +951,7 @@ void tst_QStateMachine::customErrorStateNotInGraph()
     machine.setErrorState(&errorState);
     QCOMPARE(machine.errorState(), reinterpret_cast<QAbstractState *>(0));
 
-    QState *initialBrokenState = new QState(machine.rootState());
+    QState *initialBrokenState = new QState(&machine);
     initialBrokenState->setObjectName("initialBrokenState");
     machine.setInitialState(initialBrokenState);
     new QState(initialBrokenState);
@@ -999,25 +1017,22 @@ void tst_QStateMachine::restoreProperties()
 void tst_QStateMachine::rootState()
 {
     QStateMachine machine;
-    QVERIFY(machine.rootState() != 0);
-    QVERIFY(qobject_cast<QState*>(machine.rootState()) != 0);
-    QCOMPARE(qobject_cast<QState*>(machine.rootState())->parentState(), (QState*)0);
-    QCOMPARE(machine.rootState()->parent(), (QObject*)&machine);
-    QCOMPARE(machine.rootState()->machine(), &machine);
+    QCOMPARE(qobject_cast<QState*>(machine.parentState()), (QState*)0);
+    QCOMPARE(machine.machine(), (QStateMachine*)0);
 
-    QState *s1 = new QState(machine.rootState());
-    QCOMPARE(s1->parentState(), machine.rootState());
+    QState *s1 = new QState(&machine);
+    QCOMPARE(s1->parentState(), &machine);
 
     QState *s2 = new QState();
     s2->setParent(&machine);
-    QCOMPARE(s2->parentState(), machine.rootState());
+    QCOMPARE(s2->parentState(), &machine);
 }
 
 void tst_QStateMachine::addAndRemoveState()
 {
 #ifdef QT_BUILD_INTERNAL
     QStateMachine machine;
-    QStatePrivate *root_d = QStatePrivate::get(machine.rootState());
+    QStatePrivate *root_d = QStatePrivate::get(&machine);
     QCOMPARE(root_d->childStates().size(), 0); 
 
     QTest::ignoreMessage(QtWarningMsg, "QStateMachine::addState: cannot add null state");
@@ -1028,7 +1043,7 @@ void tst_QStateMachine::addAndRemoveState()
     QCOMPARE(s1->machine(), (QStateMachine*)0);
     machine.addState(s1);
     QCOMPARE(s1->machine(), &machine);
-    QCOMPARE(s1->parentState(), machine.rootState());
+    QCOMPARE(s1->parentState(), &machine);
     QCOMPARE(root_d->childStates().size(), 1);
     QCOMPARE(root_d->childStates().at(0), (QAbstractState*)s1);
 
@@ -1038,7 +1053,7 @@ void tst_QStateMachine::addAndRemoveState()
     QState *s2 = new QState();
     QCOMPARE(s2->parentState(), (QState*)0);
     machine.addState(s2);
-    QCOMPARE(s2->parentState(), machine.rootState());
+    QCOMPARE(s2->parentState(), &machine);
     QCOMPARE(root_d->childStates().size(), 2);
     QCOMPARE(root_d->childStates().at(0), (QAbstractState*)s1);
     QCOMPARE(root_d->childStates().at(1), (QAbstractState*)s2);
@@ -1063,13 +1078,13 @@ void tst_QStateMachine::addAndRemoveState()
         {
             QString warning;
             warning.sprintf("QStateMachine::removeState: state %p's machine (%p) is different from this machine (%p)",
-                            machine2.rootState(), &machine2, &machine);
+                            &machine2, (void*)0, &machine);
             QTest::ignoreMessage(QtWarningMsg, qPrintable(warning));
-            machine.removeState(machine2.rootState());
+            machine.removeState(&machine2);
         }
         // ### check this behavior
-        machine.addState(machine2.rootState());
-        QCOMPARE(machine2.rootState()->parent(), (QObject*)machine.rootState());
+        machine.addState(&machine2);
+        QCOMPARE(machine2.parent(), (QObject*)&machine);
     }
 
     delete s1;
@@ -1085,7 +1100,7 @@ void tst_QStateMachine::stateEntryAndExit()
     {
         QStateMachine machine;
 
-        TestState *s1 = new TestState(machine.rootState());
+        TestState *s1 = new TestState(&machine);
         QTest::ignoreMessage(QtWarningMsg, "QState::addTransition: cannot add transition to null state");
         s1->addTransition((QAbstractState*)0);
         QTest::ignoreMessage(QtWarningMsg, "QState::addTransition: cannot add null transition");
@@ -1093,8 +1108,8 @@ void tst_QStateMachine::stateEntryAndExit()
         QTest::ignoreMessage(QtWarningMsg, "QState::removeTransition: cannot remove null transition");
         s1->removeTransition((QAbstractTransition*)0);
 
-        TestState *s2 = new TestState(machine.rootState());
-        QFinalState *s3 = new QFinalState(machine.rootState());
+        TestState *s2 = new TestState(&machine);
+        QFinalState *s3 = new QFinalState(&machine);
 
         TestTransition *t = new TestTransition(s2);
         QCOMPARE(t->machine(), (QStateMachine*)0);
@@ -1143,9 +1158,9 @@ void tst_QStateMachine::stateEntryAndExit()
         QCOMPARE(machine.initialState(), (QAbstractState*)s1);
         {
             QString warning;
-            warning.sprintf("QState::setInitialState: state %p is not a child of this state (%p)", machine.rootState(), machine.rootState());
+            warning.sprintf("QState::setInitialState: state %p is not a child of this state (%p)", &machine, &machine);
             QTest::ignoreMessage(QtWarningMsg, qPrintable(warning));
-            machine.setInitialState(machine.rootState());
+            machine.setInitialState(&machine);
             QCOMPARE(machine.initialState(), (QAbstractState*)s1);
         }
         QVERIFY(machine.configuration().isEmpty());
@@ -1192,11 +1207,11 @@ void tst_QStateMachine::stateEntryAndExit()
     {
         QStateMachine machine;
 
-        TestState *s1 = new TestState(machine.rootState());
+        TestState *s1 = new TestState(&machine);
         TestState *s11 = new TestState(s1);
         TestState *s12 = new TestState(s1);
-        TestState *s2 = new TestState(machine.rootState());
-        QFinalState *s3 = new QFinalState(machine.rootState());
+        TestState *s2 = new TestState(&machine);
+        QFinalState *s3 = new QFinalState(&machine);
         s1->setInitialState(s11);
         TestTransition *t1 = new TestTransition(s12);
         s11->addTransition(t1);
@@ -1255,13 +1270,13 @@ void tst_QStateMachine::stateEntryAndExit()
 void tst_QStateMachine::assignProperty()
 {
     QStateMachine machine;
-    QState *s1 = new QState(machine.rootState());
+    QState *s1 = new QState(&machine);
 
     QTest::ignoreMessage(QtWarningMsg, "QState::assignProperty: cannot assign property 'foo' of null object");
     s1->assignProperty(0, "foo", QVariant());
 
     s1->assignProperty(s1, "objectName", "s1");
-    QFinalState *s2 = new QFinalState(machine.rootState());
+    QFinalState *s2 = new QFinalState(&machine);
     s1->addTransition(s2);
     machine.setInitialState(s1);
     machine.start();
@@ -1307,9 +1322,9 @@ void tst_QStateMachine::assignPropertyWithAnimation()
         QObject obj;
         obj.setProperty("foo", 321);
         obj.setProperty("bar", 654);
-        QState *s1 = new QState(machine.rootState());
+        QState *s1 = new QState(&machine);
         s1->assignProperty(&obj, "foo", 123);
-        QState *s2 = new QState(machine.rootState());
+        QState *s2 = new QState(&machine);
         s2->assignProperty(&obj, "foo", 456);
         s2->assignProperty(&obj, "bar", 789);
         QAbstractTransition *trans = s1->addTransition(s2);
@@ -1329,7 +1344,7 @@ void tst_QStateMachine::assignPropertyWithAnimation()
         trans->addAnimation(&anim);
         QCOMPARE(trans->animations().size(), 1);
         QCOMPARE(trans->animations().at(0), (QAbstractAnimation*)&anim);
-        QFinalState *s3 = new QFinalState(machine.rootState());
+        QFinalState *s3 = new QFinalState(&machine);
         s2->addTransition(s2, SIGNAL(polished()), s3);
 
         machine.setInitialState(s1);
@@ -1345,9 +1360,9 @@ void tst_QStateMachine::assignPropertyWithAnimation()
         QObject obj;
         obj.setProperty("foo", 321);
         obj.setProperty("bar", 654);
-        QState *s1 = new QState(machine.rootState());
+        QState *s1 = new QState(&machine);
         s1->assignProperty(&obj, "foo", 123);
-        QState *s2 = new QState(machine.rootState());
+        QState *s2 = new QState(&machine);
         s2->assignProperty(&obj, "foo", 456);
         s2->assignProperty(&obj, "bar", 789);
         QAbstractTransition *trans = s1->addTransition(s2);
@@ -1357,7 +1372,7 @@ void tst_QStateMachine::assignPropertyWithAnimation()
         QPropertyAnimation anim2(&obj, "bar");
         anim2.setDuration(150);
         trans->addAnimation(&anim2);
-        QFinalState *s3 = new QFinalState(machine.rootState());
+        QFinalState *s3 = new QFinalState(&machine);
         s2->addTransition(s2, SIGNAL(polished()), s3);
 
         machine.setInitialState(s1);
@@ -1373,10 +1388,10 @@ void tst_QStateMachine::assignPropertyWithAnimation()
         QObject obj;
         obj.setProperty("foo", 321);
         obj.setProperty("bar", 654);
-        QState *s1 = new QState(machine.rootState());
+        QState *s1 = new QState(&machine);
         s1->assignProperty(&obj, "foo", 123);
         s1->assignProperty(&obj, "bar", 321);
-        QState *s2 = new QState(machine.rootState());
+        QState *s2 = new QState(&machine);
         s2->assignProperty(&obj, "foo", 456);
         s2->assignProperty(&obj, "bar", 654);
         s2->assignProperty(&obj, "baz", 789);
@@ -1385,7 +1400,7 @@ void tst_QStateMachine::assignPropertyWithAnimation()
         group.addAnimation(new QPropertyAnimation(&obj, "foo"));
         group.addAnimation(new QPropertyAnimation(&obj, "bar"));
         trans->addAnimation(&group);
-        QFinalState *s3 = new QFinalState(machine.rootState());
+        QFinalState *s3 = new QFinalState(&machine);
         s2->addTransition(s2, SIGNAL(polished()), s3);
 
         machine.setInitialState(s1);
@@ -1402,7 +1417,7 @@ void tst_QStateMachine::assignPropertyWithAnimation()
         QObject obj;
         obj.setProperty("foo", 321);
         obj.setProperty("bar", 654);
-        QState *s1 = new QState(machine.rootState());
+        QState *s1 = new QState(&machine);
         QCOMPARE(s1->childMode(), QState::ExclusiveStates);
         s1->setChildMode(QState::ParallelStates);
         QCOMPARE(s1->childMode(), QState::ParallelStates);
@@ -1412,7 +1427,7 @@ void tst_QStateMachine::assignPropertyWithAnimation()
         s1->setObjectName("s1");
         s1->assignProperty(&obj, "foo", 123);
         s1->assignProperty(&obj, "bar", 456);
-        QState *s2 = new QState(machine.rootState());
+        QState *s2 = new QState(&machine);
         s2->setObjectName("s2");
         s2->assignProperty(&obj, "foo", 321);
         QState *s21 = new QState(s2);
@@ -1434,7 +1449,7 @@ void tst_QStateMachine::assignPropertyWithAnimation()
 
         s21->addTransition(s21, SIGNAL(polished()), s22);
 
-        QFinalState *s3 = new QFinalState(machine.rootState());
+        QFinalState *s3 = new QFinalState(&machine);
         s22->addTransition(s2, SIGNAL(polished()), s3);
 
         machine.setInitialState(s1);
@@ -1451,7 +1466,7 @@ void tst_QStateMachine::assignPropertyWithAnimation()
         QObject obj;
         obj.setProperty("foo", 321);
         obj.setProperty("bar", 654);
-        QState *group = new QState(machine.rootState());
+        QState *group = new QState(&machine);
         QState *s1 = new QState(group);
         group->setInitialState(s1);
         s1->assignProperty(&obj, "foo", 123);
@@ -1577,12 +1592,12 @@ void tst_QStateMachine::postEvent()
 void tst_QStateMachine::stateFinished()
 {
     QStateMachine machine;
-    QState *s1 = new QState(machine.rootState());
+    QState *s1 = new QState(&machine);
     QState *s1_1 = new QState(s1);
     QFinalState *s1_2 = new QFinalState(s1);
     s1_1->addTransition(s1_2);
     s1->setInitialState(s1_1);
-    QFinalState *s2 = new QFinalState(machine.rootState());
+    QFinalState *s2 = new QFinalState(&machine);
     s1->addTransition(s1, SIGNAL(finished()), s2);
     machine.setInitialState(s1);
     QSignalSpy finishedSpy(&machine, SIGNAL(finished()));
@@ -1632,7 +1647,7 @@ void tst_QStateMachine::parallelStates()
 void tst_QStateMachine::parallelRootState()
 {
     QStateMachine machine;
-    QState *root = machine.rootState();
+    QState *root = &machine;
     QCOMPARE(root->childMode(), QState::ExclusiveStates);
     root->setChildMode(QState::ParallelStates);
     QCOMPARE(root->childMode(), QState::ParallelStates);
@@ -1655,7 +1670,7 @@ void tst_QStateMachine::parallelRootState()
 void tst_QStateMachine::allSourceToTargetConfigurations()
 {
     QStateMachine machine;
-    QState *s0 = new QState(machine.rootState());
+    QState *s0 = new QState(&machine);
     s0->setObjectName("s0");
     QState *s1 = new QState(s0);
     s1->setObjectName("s1");
@@ -1667,7 +1682,7 @@ void tst_QStateMachine::allSourceToTargetConfigurations()
     s21->setObjectName("s21");
     QState *s211 = new QState(s21);
     s211->setObjectName("s211");
-    QFinalState *f = new QFinalState(machine.rootState());
+    QFinalState *f = new QFinalState(&machine);
     f->setObjectName("f");
 
     s0->setInitialState(s1);
@@ -1741,7 +1756,7 @@ void tst_QStateMachine::signalTransitions()
 {
     {
         QStateMachine machine;
-        QState *s0 = new QState(machine.rootState());
+        QState *s0 = new QState(&machine);
         QTest::ignoreMessage(QtWarningMsg, "QState::addTransition: sender cannot be null");
         QCOMPARE(s0->addTransition(0, SIGNAL(noSuchSignal()), 0), (QSignalTransition*)0);
 
@@ -1752,7 +1767,7 @@ void tst_QStateMachine::signalTransitions()
         QTest::ignoreMessage(QtWarningMsg, "QState::addTransition: cannot add transition to null state");
         QCOMPARE(s0->addTransition(&emitter, SIGNAL(signalWithNoArg()), 0), (QSignalTransition*)0);
 
-        QFinalState *s1 = new QFinalState(machine.rootState());
+        QFinalState *s1 = new QFinalState(&machine);
         QTest::ignoreMessage(QtWarningMsg, "QState::addTransition: no such signal SignalEmitter::noSuchSignal()");
         QCOMPARE(s0->addTransition(&emitter, SIGNAL(noSuchSignal()), s1), (QSignalTransition*)0);
 
@@ -1803,8 +1818,8 @@ void tst_QStateMachine::signalTransitions()
     }
     {
         QStateMachine machine;
-        QState *s0 = new QState(machine.rootState());
-        QFinalState *s1 = new QFinalState(machine.rootState());
+        QState *s0 = new QState(&machine);
+        QFinalState *s1 = new QFinalState(&machine);
         SignalEmitter emitter;
         QSignalTransition *trans = s0->addTransition(&emitter, "signalWithNoArg()", s1);
         QVERIFY(trans != 0);
@@ -1831,8 +1846,8 @@ void tst_QStateMachine::signalTransitions()
     }
     {
         QStateMachine machine;
-        QState *s0 = new QState(machine.rootState());
-        QFinalState *s1 = new QFinalState(machine.rootState());
+        QState *s0 = new QState(&machine);
+        QFinalState *s1 = new QFinalState(&machine);
         SignalEmitter emitter;
         TestSignalTransition *trans = new TestSignalTransition(&emitter, SIGNAL(signalWithIntArg(int)), s1);
         s0->addTransition(trans);
@@ -1850,8 +1865,8 @@ void tst_QStateMachine::signalTransitions()
     }
     {
         QStateMachine machine;
-        QState *s0 = new QState(machine.rootState());
-        QFinalState *s1 = new QFinalState(machine.rootState());
+        QState *s0 = new QState(&machine);
+        QFinalState *s1 = new QFinalState(&machine);
         SignalEmitter emitter;
         TestSignalTransition *trans = new TestSignalTransition(&emitter, SIGNAL(signalWithStringArg(QString)), s1);
         s0->addTransition(trans);
@@ -1870,8 +1885,8 @@ void tst_QStateMachine::signalTransitions()
     }
     {
         QStateMachine machine;
-        QState *s0 = new QState(machine.rootState());
-        QFinalState *s1 = new QFinalState(machine.rootState());
+        QState *s0 = new QState(&machine);
+        QFinalState *s1 = new QFinalState(&machine);
 
         TestSignalTransition *trans = new TestSignalTransition();
         QCOMPARE(trans->senderObject(), (QObject*)0);
@@ -1898,8 +1913,8 @@ void tst_QStateMachine::signalTransitions()
     {
         QStateMachine machine;
         SignalEmitter emitter;
-        QState *s0 = new QState(machine.rootState());
-        QState *s1 = new QState(machine.rootState());
+        QState *s0 = new QState(&machine);
+        QState *s1 = new QState(&machine);
         QSignalTransition *t0 = s0->addTransition(&emitter, SIGNAL(signalWithNoArg()), s1);
         QSignalTransition *t1 = s1->addTransition(&emitter, SIGNAL(signalWithNoArg()), s0);
 
@@ -1943,12 +1958,12 @@ void tst_QStateMachine::signalTransitions()
     {
         QStateMachine machine;
         SignalEmitter emitter;
-        QState *s0 = new QState(machine.rootState());
-        QFinalState *s1 = new QFinalState(machine.rootState());
+        QState *s0 = new QState(&machine);
+        QFinalState *s1 = new QFinalState(&machine);
         s0->addTransition(&emitter, SIGNAL(signalWithNoArg()), s1);
-        QFinalState *s2 = new QFinalState(machine.rootState());
+        QFinalState *s2 = new QFinalState(&machine);
         s0->addTransition(&emitter, SIGNAL(signalWithIntArg(int)), s2);
-        QFinalState *s3 = new QFinalState(machine.rootState());
+        QFinalState *s3 = new QFinalState(&machine);
         s0->addTransition(&emitter, SIGNAL(signalWithStringArg(QString)), s3);
 
         QSignalSpy startedSpy(&machine, SIGNAL(started()));
@@ -1980,8 +1995,8 @@ void tst_QStateMachine::signalTransitions()
     {
         QStateMachine machine;
         SignalEmitter emitter;
-        QState *s0 = new QState(machine.rootState());
-        QFinalState *s1 = new QFinalState(machine.rootState());
+        QState *s0 = new QState(&machine);
+        QFinalState *s1 = new QFinalState(&machine);
         QSignalTransition *t0 = s0->addTransition(&emitter, SIGNAL( signalWithNoArg( ) ), s1);
         QVERIFY(t0 != 0);
         QCOMPARE(t0->signal(), QByteArray(SIGNAL( signalWithNoArg( ) )));
@@ -2008,8 +2023,8 @@ void tst_QStateMachine::eventTransitions()
     QPushButton button;
     for (int x = 0; x < 2; ++x) {
         QStateMachine machine;
-        QState *s0 = new QState(machine.rootState());
-        QFinalState *s1 = new QFinalState(machine.rootState());
+        QState *s0 = new QState(&machine);
+        QFinalState *s1 = new QFinalState(&machine);
 
         QMouseEventTransition *trans;
         if (x == 0) {
@@ -2057,8 +2072,8 @@ void tst_QStateMachine::eventTransitions()
     }
     for (int x = 0; x < 3; ++x) {
         QStateMachine machine;
-        QState *s0 = new QState(machine.rootState());
-        QFinalState *s1 = new QFinalState(machine.rootState());
+        QState *s0 = new QState(&machine);
+        QFinalState *s1 = new QFinalState(&machine);
 
         QEventTransition *trans;
         if (x == 0) {
@@ -2092,8 +2107,8 @@ void tst_QStateMachine::eventTransitions()
     }
     {
         QStateMachine machine;
-        QState *s0 = new QState(machine.rootState());
-        QFinalState *s1 = new QFinalState(machine.rootState());
+        QState *s0 = new QState(&machine);
+        QFinalState *s1 = new QFinalState(&machine);
 
         QMouseEventTransition *trans = new QMouseEventTransition();
         QCOMPARE(trans->eventObject(), (QObject*)0);
@@ -2118,8 +2133,8 @@ void tst_QStateMachine::eventTransitions()
 
     {
         QStateMachine machine;
-        QState *s0 = new QState(machine.rootState());
-        QFinalState *s1 = new QFinalState(machine.rootState());
+        QState *s0 = new QState(&machine);
+        QFinalState *s1 = new QFinalState(&machine);
 
         QKeyEventTransition *trans = new QKeyEventTransition(&button, QEvent::KeyPress, Qt::Key_A);
         QCOMPARE(trans->eventType(), QEvent::KeyPress);
@@ -2139,8 +2154,8 @@ void tst_QStateMachine::eventTransitions()
     }
     {
         QStateMachine machine;
-        QState *s0 = new QState(machine.rootState());
-        QFinalState *s1 = new QFinalState(machine.rootState());
+        QState *s0 = new QState(&machine);
+        QFinalState *s1 = new QFinalState(&machine);
 
         QKeyEventTransition *trans = new QKeyEventTransition();
         QCOMPARE(trans->eventObject(), (QObject*)0);
@@ -2165,8 +2180,8 @@ void tst_QStateMachine::eventTransitions()
     // Multiple transitions for same (object,event)
     {
         QStateMachine machine;
-        QState *s0 = new QState(machine.rootState());
-        QState *s1 = new QState(machine.rootState());
+        QState *s0 = new QState(&machine);
+        QState *s1 = new QState(&machine);
         QEventTransition *t0 = new QEventTransition(&button, QEvent::MouseButtonPress);
         t0->setTargetState(s1);
         s0->addTransition(t0);
@@ -2213,9 +2228,9 @@ void tst_QStateMachine::eventTransitions()
     // multiple event transitions from same source
     {
         QStateMachine machine;
-        QState *s0 = new QState(machine.rootState());
-        QFinalState *s1 = new QFinalState(machine.rootState());
-        QFinalState *s2 = new QFinalState(machine.rootState());
+        QState *s0 = new QState(&machine);
+        QFinalState *s1 = new QFinalState(&machine);
+        QFinalState *s2 = new QFinalState(&machine);
         QEventTransition *t0 = new QEventTransition(&button, QEvent::MouseButtonPress);
         t0->setTargetState(s1);
         s0->addTransition(t0);
@@ -2244,8 +2259,8 @@ void tst_QStateMachine::eventTransitions()
     // custom event
     {
         QStateMachine machine;
-        QState *s0 = new QState(machine.rootState());
-        QFinalState *s1 = new QFinalState(machine.rootState());
+        QState *s0 = new QState(&machine);
+        QFinalState *s1 = new QFinalState(&machine);
 
         QEventTransition *trans = new QEventTransition(&button, QEvent::Type(QEvent::User+1));
         trans->setTargetState(s1);
@@ -2263,7 +2278,7 @@ void tst_QStateMachine::historyStates()
 {
     for (int x = 0; x < 2; ++x) {
         QStateMachine machine;
-        QState *root = machine.rootState();
+        QState *root = &machine;
           QState *s0 = new QState(root);
             QState *s00 = new QState(s0);
             QState *s01 = new QState(s0);
@@ -2347,7 +2362,7 @@ void tst_QStateMachine::startAndStop()
     QCOMPARE(stoppedSpy.count(), 0);
     QCOMPARE(finishedSpy.count(), 0);
 
-    QState *s1 = new QState(machine.rootState());
+    QState *s1 = new QState(&machine);
     machine.setInitialState(s1);
     machine.start();
     QTRY_COMPARE(machine.isRunning(), true);
@@ -2378,7 +2393,7 @@ void tst_QStateMachine::startAndStop()
 void tst_QStateMachine::targetStateWithNoParent()
 {
     QStateMachine machine;
-    QState *s1 = new QState(machine.rootState());
+    QState *s1 = new QState(&machine);
     s1->setObjectName("s1");
     QState s2;
     s1->addTransition(&s2);
@@ -2398,9 +2413,9 @@ void tst_QStateMachine::targetStateWithNoParent()
 void tst_QStateMachine::targetStateDeleted()
 {
     QStateMachine machine;
-    QState *s1 = new QState(machine.rootState());
+    QState *s1 = new QState(&machine);
     s1->setObjectName("s1");
-    QState *s2 = new QState(machine.rootState());
+    QState *s2 = new QState(&machine);
     QAbstractTransition *trans = s1->addTransition(s2);
     delete s2;
     QCOMPARE(trans->targetState(), (QAbstractState*)0);
@@ -2415,13 +2430,13 @@ void tst_QStateMachine::defaultGlobalRestorePolicy()
     propertyHolder->setProperty("a", 1);
     propertyHolder->setProperty("b", 2);
 
-    QState *s1 = new QState(machine.rootState());
+    QState *s1 = new QState(&machine);
     s1->assignProperty(propertyHolder, "a", 3);
 
-    QState *s2 = new QState(machine.rootState());
+    QState *s2 = new QState(&machine);
     s2->assignProperty(propertyHolder, "b", 4);
 
-    QState *s3 = new QState(machine.rootState());
+    QState *s3 = new QState(&machine);
 
     s1->addTransition(new EventTransition(QEvent::User, s2));
     s2->addTransition(new EventTransition(QEvent::User, s3));
@@ -2450,11 +2465,12 @@ void tst_QStateMachine::noInitialStateForInitialState()
 {
     QStateMachine machine;
 
-    QState *initialState = new QState(machine.rootState());
+    QState *initialState = new QState(&machine);
     initialState->setObjectName("initialState");
     machine.setInitialState(initialState);
 
     QState *childState = new QState(initialState);
+    (void)childState;
 
     QTest::ignoreMessage(QtWarningMsg, "Unrecoverable error detected in running state machine: "
                                        "Missing initial state in compound state 'initialState'");
@@ -2474,7 +2490,7 @@ void tst_QStateMachine::restorePolicyNotInherited()
     propertyHolder->setProperty("a", 1);
     propertyHolder->setProperty("b", 2);
 
-    QState *parentState = new QState(machine.rootState());
+    QState *parentState = new QState(&machine);
     parentState->setObjectName("parentState");
     parentState->setRestorePolicy(QState::RestoreProperties);
 
@@ -2523,13 +2539,13 @@ void tst_QStateMachine::globalRestorePolicySetToDoNotRestore()
     propertyHolder->setProperty("a", 1);
     propertyHolder->setProperty("b", 2);
 
-    QState *s1 = new QState(machine.rootState());
+    QState *s1 = new QState(&machine);
     s1->assignProperty(propertyHolder, "a", 3);
 
-    QState *s2 = new QState(machine.rootState());
+    QState *s2 = new QState(&machine);
     s2->assignProperty(propertyHolder, "b", 4);
 
-    QState *s3 = new QState(machine.rootState());
+    QState *s3 = new QState(&machine);
 
     s1->addTransition(new EventTransition(QEvent::User, s2));
     s2->addTransition(new EventTransition(QEvent::User, s3));
@@ -2633,7 +2649,7 @@ void tst_QStateMachine::restorePolicyOnChildState()
     propertyHolder->setProperty("a", 1);
     propertyHolder->setProperty("b", 2);
 
-    QState *parentState = new QState(machine.rootState());
+    QState *parentState = new QState(&machine);
     parentState->setObjectName("parentState");
 
     QState *s1 = new QState(parentState);
@@ -2684,13 +2700,13 @@ void tst_QStateMachine::globalRestorePolicySetToRestore()
     propertyHolder->setProperty("a", 1);
     propertyHolder->setProperty("b", 2);
 
-    QState *s1 = new QState(machine.rootState());
+    QState *s1 = new QState(&machine);
     s1->assignProperty(propertyHolder, "a", 3);
 
-    QState *s2 = new QState(machine.rootState());
+    QState *s2 = new QState(&machine);
     s2->assignProperty(propertyHolder, "b", 4);
 
-    QState *s3 = new QState(machine.rootState());
+    QState *s3 = new QState(&machine);
 
     s1->addTransition(new EventTransition(QEvent::User, s2));
     s2->addTransition(new EventTransition(QEvent::User, s3));
@@ -2723,19 +2739,19 @@ void tst_QStateMachine::mixedRestoreProperties()
     QObject *propertyHolder = new QObject();
     propertyHolder->setProperty("a", 1);    
 
-    QState *s1 = new QState(machine.rootState());
+    QState *s1 = new QState(&machine);
     s1->setRestorePolicy(QState::RestoreProperties);
     s1->assignProperty(propertyHolder, "a", 3);
 
-    QState *s2 = new QState(machine.rootState());
+    QState *s2 = new QState(&machine);
     s2->assignProperty(propertyHolder, "a", 4);
 
-    QState *s3 = new QState(machine.rootState());
+    QState *s3 = new QState(&machine);
 
-    QState *s4 = new QState(machine.rootState());
+    QState *s4 = new QState(&machine);
     s4->assignProperty(propertyHolder, "a", 5);
 
-    QState *s5 = new QState(machine.rootState());
+    QState *s5 = new QState(&machine);
     s5->setRestorePolicy(QState::RestoreProperties);
     s5->assignProperty(propertyHolder, "a", 6);
 
@@ -2787,8 +2803,8 @@ void tst_QStateMachine::mixedRestoreProperties()
 void tst_QStateMachine::transitionWithParent()
 {
     QStateMachine machine;
-    QState *s1 = new QState(machine.rootState());
-    QState *s2 = new QState(machine.rootState());
+    QState *s1 = new QState(&machine);
+    QState *s2 = new QState(&machine);
     EventTransition *trans = new EventTransition(QEvent::User, s2, s1);
     QCOMPARE(trans->sourceState(), s1);
     QCOMPARE(trans->targetState(), (QAbstractState*)s2);
@@ -2803,8 +2819,8 @@ void tst_QStateMachine::simpleAnimation()
     QObject *object = new QObject(&machine);
     object->setProperty("fooBar", 1.0);
 
-    QState *s1 = new QState(machine.rootState());
-    QState *s2 = new QState(machine.rootState());
+    QState *s1 = new QState(&machine);
+    QState *s2 = new QState(&machine);
     s2->assignProperty(object, "fooBar", 2.0);
 
     EventTransition *et = new EventTransition(QEvent::User, s2);
@@ -2812,7 +2828,7 @@ void tst_QStateMachine::simpleAnimation()
     et->addAnimation(animation);
     s1->addTransition(et);
 
-    QState *s3 = new QState(machine.rootState());
+    QState *s3 = new QState(&machine);
     s2->addTransition(animation, SIGNAL(finished()), s3);
     QObject::connect(s3, SIGNAL(entered()), QCoreApplication::instance(), SLOT(quit()));
 
@@ -2847,8 +2863,8 @@ void tst_QStateMachine::twoAnimations()
     object->setProperty("foo", 1.0);
     object->setProperty("bar", 3.0);
 
-    QState *s1 = new QState(machine.rootState());
-    QState *s2 = new QState(machine.rootState());
+    QState *s1 = new QState(&machine);
+    QState *s2 = new QState(&machine);
     s2->assignProperty(object, "foo", 2.0);
     s2->assignProperty(object, "bar", 10.0);
 
@@ -2865,7 +2881,7 @@ void tst_QStateMachine::twoAnimations()
     et->addAnimation(animationBar);
     s1->addTransition(et);
 
-    QState *s3 = new QState(machine.rootState());
+    QState *s3 = new QState(&machine);
     QObject::connect(s3, SIGNAL(entered()), QCoreApplication::instance(), SLOT(quit()));
     s2->addTransition(s2, SIGNAL(polished()), s3);
 
@@ -2890,23 +2906,23 @@ void tst_QStateMachine::twoAnimatedTransitions()
     QObject *object = new QObject(&machine);
     object->setProperty("foo", 1.0);
 
-    QState *s1 = new QState(machine.rootState());
+    QState *s1 = new QState(&machine);
 
-    QState *s2 = new QState(machine.rootState());
+    QState *s2 = new QState(&machine);
     s2->assignProperty(object, "foo", 5.0);
     QPropertyAnimation *fooAnimation = new QPropertyAnimation(object, "foo", s2);
     s1->addTransition(new EventTransition(QEvent::User, s2))->addAnimation(fooAnimation);
 
-    QState *s3 = new QState(machine.rootState());
+    QState *s3 = new QState(&machine);
     QObject::connect(s3, SIGNAL(entered()), QCoreApplication::instance(), SLOT(quit()));
     s2->addTransition(fooAnimation, SIGNAL(finished()), s3);
 
-    QState *s4 = new QState(machine.rootState());
+    QState *s4 = new QState(&machine);
     s4->assignProperty(object, "foo", 2.0);
     QPropertyAnimation *fooAnimation2 = new QPropertyAnimation(object, "foo", s4);
     s3->addTransition(new EventTransition(QEvent::User, s4))->addAnimation(fooAnimation2);
 
-    QState *s5 = new QState(machine.rootState());
+    QState *s5 = new QState(&machine);
     QObject::connect(s5, SIGNAL(entered()), QApplication::instance(), SLOT(quit()));
     s4->addTransition(fooAnimation2, SIGNAL(finished()), s5);
 
@@ -2934,22 +2950,22 @@ void tst_QStateMachine::playAnimationTwice()
     QObject *object = new QObject(&machine);
     object->setProperty("foo", 1.0);
 
-    QState *s1 = new QState(machine.rootState());
+    QState *s1 = new QState(&machine);
 
-    QState *s2 = new QState(machine.rootState());
+    QState *s2 = new QState(&machine);
     s2->assignProperty(object, "foo", 5.0);
     QPropertyAnimation *fooAnimation = new QPropertyAnimation(object, "foo", s2);
     s1->addTransition(new EventTransition(QEvent::User, s2))->addAnimation(fooAnimation);
 
-    QState *s3 = new QState(machine.rootState());
+    QState *s3 = new QState(&machine);
     QObject::connect(s3, SIGNAL(entered()), QCoreApplication::instance(), SLOT(quit()));
     s2->addTransition(fooAnimation, SIGNAL(finished()), s3);
 
-    QState *s4 = new QState(machine.rootState());
+    QState *s4 = new QState(&machine);
     s4->assignProperty(object, "foo", 2.0);
     s3->addTransition(new EventTransition(QEvent::User, s4))->addAnimation(fooAnimation);
 
-    QState *s5 = new QState(machine.rootState());
+    QState *s5 = new QState(&machine);
     QObject::connect(s5, SIGNAL(entered()), QApplication::instance(), SLOT(quit()));
     s4->addTransition(fooAnimation, SIGNAL(finished()), s5);
 
@@ -2980,8 +2996,8 @@ void tst_QStateMachine::nestedTargetStateForAnimation()
 
     SlotCalledCounter counter;
 
-    QState *s1 = new QState(machine.rootState());
-    QState *s2 = new QState(machine.rootState());
+    QState *s1 = new QState(&machine);
+    QState *s2 = new QState(&machine);
 
     s2->assignProperty(object, "foo", 2.0);
 
@@ -3008,7 +3024,7 @@ void tst_QStateMachine::nestedTargetStateForAnimation()
     connect(animation, SIGNAL(finished()), &counter, SLOT(slot()));
     at->addAnimation(animation);
     
-    QState *s3 = new QState(machine.rootState());
+    QState *s3 = new QState(&machine);
     s2->addTransition(s2Child, SIGNAL(polished()), s3);
 
     QObject::connect(s3, SIGNAL(entered()), QCoreApplication::instance(), SLOT(quit()));
@@ -3036,13 +3052,13 @@ void tst_QStateMachine::animatedGlobalRestoreProperty()
 
     SlotCalledCounter counter;
 
-    QState *s1 = new QState(machine.rootState());
-    QState *s2 = new QState(machine.rootState());
+    QState *s1 = new QState(&machine);
+    QState *s2 = new QState(&machine);
     s2->assignProperty(object, "foo", 2.0);
 
-    QState *s3 = new QState(machine.rootState());
+    QState *s3 = new QState(&machine);
 
-    QState *s4 = new QState(machine.rootState());
+    QState *s4 = new QState(&machine);
     QObject::connect(s4, SIGNAL(entered()), QCoreApplication::instance(), SLOT(quit()));
 
     QAbstractTransition *at = s1->addTransition(new EventTransition(QEvent::User, s2));
@@ -3080,16 +3096,16 @@ void tst_QStateMachine::specificTargetValueOfAnimation()
     QObject *object = new QObject(&machine);
     object->setProperty("foo", 1.0);
 
-    QState *s1 = new QState(machine.rootState());
+    QState *s1 = new QState(&machine);
 
-    QState *s2 = new QState(machine.rootState());
+    QState *s2 = new QState(&machine);
     s2->assignProperty(object, "foo", 2.0);
 
     QPropertyAnimation *anim = new QPropertyAnimation(object, "foo");
     anim->setEndValue(10.0);
     s1->addTransition(new EventTransition(QEvent::User, s2))->addAnimation(anim);
 
-    QState *s3 = new QState(machine.rootState());
+    QState *s3 = new QState(&machine);
     QObject::connect(s3, SIGNAL(entered()), QCoreApplication::instance(), SLOT(quit()));
     s2->addTransition(anim, SIGNAL(finished()), s3);    
 
@@ -3103,6 +3119,8 @@ void tst_QStateMachine::specificTargetValueOfAnimation()
     QVERIFY(machine.configuration().contains(s3));
     QCOMPARE(object->property("foo").toDouble(), 2.0);
     QCOMPARE(anim->endValue().toDouble(), 10.0);
+
+    delete anim;
 }
 
 void tst_QStateMachine::addDefaultAnimation()
@@ -3112,12 +3130,12 @@ void tst_QStateMachine::addDefaultAnimation()
     QObject *object = new QObject();
     object->setProperty("foo", 1.0);
 
-    QState *s1 = new QState(machine.rootState());
+    QState *s1 = new QState(&machine);
 
-    QState *s2 = new QState(machine.rootState());
+    QState *s2 = new QState(&machine);
     s2->assignProperty(object, "foo", 2.0);
 
-    QState *s3 = new QState(machine.rootState());
+    QState *s3 = new QState(&machine);
     QObject::connect(s3, SIGNAL(entered()), QCoreApplication::instance(), SLOT(quit()));
     
     s1->addTransition(new EventTransition(QEvent::User, s2));
@@ -3135,6 +3153,8 @@ void tst_QStateMachine::addDefaultAnimation()
 
     QVERIFY(machine.configuration().contains(s3));
     QCOMPARE(object->property("foo").toDouble(), 2.0);
+
+    delete object;
 }
 
 void tst_QStateMachine::addDefaultAnimationWithUnusedAnimation()
@@ -3147,12 +3167,12 @@ void tst_QStateMachine::addDefaultAnimationWithUnusedAnimation()
 
     SlotCalledCounter counter;
 
-    QState *s1 = new QState(machine.rootState());
+    QState *s1 = new QState(&machine);
 
-    QState *s2 = new QState(machine.rootState());
+    QState *s2 = new QState(&machine);
     s2->assignProperty(object, "foo", 2.0);
 
-    QState *s3 = new QState(machine.rootState());
+    QState *s3 = new QState(&machine);
     QObject::connect(s3, SIGNAL(entered()), QCoreApplication::instance(), SLOT(quit()));
     
     s1->addTransition(new EventTransition(QEvent::User, s2));
@@ -3214,6 +3234,9 @@ void tst_QStateMachine::removeDefaultAnimation()
 
     machine.removeDefaultAnimation(anim2);
     QCOMPARE(machine.defaultAnimations().size(), 0);
+
+    delete anim;
+    delete anim2;
 }
 
 void tst_QStateMachine::overrideDefaultAnimationWithSpecific()
@@ -3225,13 +3248,13 @@ void tst_QStateMachine::overrideDefaultAnimationWithSpecific()
 
     SlotCalledCounter counter;
 
-    QState *s1 = new QState(machine.rootState());
+    QState *s1 = new QState(&machine);
     machine.setInitialState(s1);
 
-    QState *s2 = new QState(machine.rootState());
+    QState *s2 = new QState(&machine);
     s2->assignProperty(object, "foo", 2.0);
 
-    QState *s3 = new QState(machine.rootState());
+    QState *s3 = new QState(&machine);
     QObject::connect(s3, SIGNAL(entered()), QCoreApplication::instance(), SLOT(quit()));
 
     QAbstractTransition *at = s1->addTransition(new EventTransition(QEvent::User, s2));
@@ -3254,6 +3277,9 @@ void tst_QStateMachine::overrideDefaultAnimationWithSpecific()
 
     QVERIFY(machine.configuration().contains(s3));
     QCOMPARE(counter.counter, 2); // specific animation started and stopped
+
+    delete defaultAnimation;
+    delete moreSpecificAnimation;
 }
 
 /*
@@ -3264,12 +3290,12 @@ void tst_QStateMachine::addDefaultAnimationForSource()
     QObject *object = new QObject();
     object->setProperty("foo", 1.0);
 
-    QState *s1 = new QState(machine.rootState());
+    QState *s1 = new QState(&machine);
 
-    QState *s2 = new QState(machine.rootState());
+    QState *s2 = new QState(&machine);
     s2->assignProperty(object, "foo", 2.0);
 
-    QState *s3 = new QState(machine.rootState());
+    QState *s3 = new QState(&machine);
     QObject::connect(s3, SIGNAL(entered()), QCoreApplication::instance(), SLOT(quit()));
     
     s1->addTransition(new EventTransition(QEvent::User, s2));
@@ -3296,12 +3322,12 @@ void tst_QStateMachine::addDefaultAnimationForTarget()
     QObject *object = new QObject();
     object->setProperty("foo", 1.0);
 
-    QState *s1 = new QState(machine.rootState());
+    QState *s1 = new QState(&machine);
 
-    QState *s2 = new QState(machine.rootState());
+    QState *s2 = new QState(&machine);
     s2->assignProperty(object, "foo", 2.0);
 
-    QState *s3 = new QState(machine.rootState());
+    QState *s3 = new QState(&machine);
     QObject::connect(s3, SIGNAL(entered()), QCoreApplication::instance(), SLOT(quit()));
     
     s1->addTransition(new EventTransition(QEvent::User, s2));
@@ -3325,88 +3351,88 @@ void tst_QStateMachine::removeDefaultAnimationForSource()
 {
     QStateMachine machine;
 
-    QCOMPARE(machine.defaultAnimationsForSourceState(machine.rootState()).size(), 0);
+    QCOMPARE(machine.defaultAnimationsForSourceState(&machine).size(), 0);
 
     QPropertyAnimation *anim = new QPropertyAnimation(this, "foo");
 
-    machine.addDefaultAnimationForSourceState(machine.rootState(), anim);
+    machine.addDefaultAnimationForSourceState(&machine, anim);
 
     QCOMPARE(machine.defaultAnimations().size(), 0);
-    QCOMPARE(machine.defaultAnimationsForTargetState(machine.rootState()).size(), 0);
-    QCOMPARE(machine.defaultAnimationsForSourceState(machine.rootState()).size(), 1);
-    QVERIFY(machine.defaultAnimationsForSourceState(machine.rootState()).contains(anim));
+    QCOMPARE(machine.defaultAnimationsForTargetState(&machine).size(), 0);
+    QCOMPARE(machine.defaultAnimationsForSourceState(&machine).size(), 1);
+    QVERIFY(machine.defaultAnimationsForSourceState(&machine).contains(anim));
 
-    machine.removeDefaultAnimationForTargetState(machine.rootState(), anim);
+    machine.removeDefaultAnimationForTargetState(&machine, anim);
 
     QCOMPARE(machine.defaultAnimations().size(), 0);
-    QCOMPARE(machine.defaultAnimationsForTargetState(machine.rootState()).size(), 0);
-    QCOMPARE(machine.defaultAnimationsForSourceState(machine.rootState()).size(), 1);
-    QVERIFY(machine.defaultAnimationsForSourceState(machine.rootState()).contains(anim));
+    QCOMPARE(machine.defaultAnimationsForTargetState(&machine).size(), 0);
+    QCOMPARE(machine.defaultAnimationsForSourceState(&machine).size(), 1);
+    QVERIFY(machine.defaultAnimationsForSourceState(&machine).contains(anim));
 
-    machine.removeDefaultAnimationForSourceState(machine.rootState(), anim);
+    machine.removeDefaultAnimationForSourceState(&machine, anim);
 
-    QCOMPARE(machine.defaultAnimationsForSourceState(machine.rootState()).size(), 0);
+    QCOMPARE(machine.defaultAnimationsForSourceState(&machine).size(), 0);
 
-    machine.addDefaultAnimationForSourceState(machine.rootState(), anim);
+    machine.addDefaultAnimationForSourceState(&machine, anim);
     
     QPropertyAnimation *anim2 = new QPropertyAnimation(this, "foo");
-    machine.addDefaultAnimationForSourceState(machine.rootState(), anim2);
+    machine.addDefaultAnimationForSourceState(&machine, anim2);
 
-    QCOMPARE(machine.defaultAnimationsForSourceState(machine.rootState()).size(), 2);
-    QVERIFY(machine.defaultAnimationsForSourceState(machine.rootState()).contains(anim));
-    QVERIFY(machine.defaultAnimationsForSourceState(machine.rootState()).contains(anim2));
+    QCOMPARE(machine.defaultAnimationsForSourceState(&machine).size(), 2);
+    QVERIFY(machine.defaultAnimationsForSourceState(&machine).contains(anim));
+    QVERIFY(machine.defaultAnimationsForSourceState(&machine).contains(anim2));
 
-    machine.removeDefaultAnimationForSourceState(machine.rootState(), anim);
+    machine.removeDefaultAnimationForSourceState(&machine, anim);
 
-    QCOMPARE(machine.defaultAnimationsForSourceState(machine.rootState()).size(), 1);
-    QVERIFY(machine.defaultAnimationsForSourceState(machine.rootState()).contains(anim2));
+    QCOMPARE(machine.defaultAnimationsForSourceState(&machine).size(), 1);
+    QVERIFY(machine.defaultAnimationsForSourceState(&machine).contains(anim2));
 
-    machine.removeDefaultAnimationForSourceState(machine.rootState(), anim2);
-    QCOMPARE(machine.defaultAnimationsForSourceState(machine.rootState()).size(), 0);
+    machine.removeDefaultAnimationForSourceState(&machine, anim2);
+    QCOMPARE(machine.defaultAnimationsForSourceState(&machine).size(), 0);
 }
 
 void tst_QStateMachine::removeDefaultAnimationForTarget()
 {
     QStateMachine machine;
 
-    QCOMPARE(machine.defaultAnimationsForTargetState(machine.rootState()).size(), 0);
+    QCOMPARE(machine.defaultAnimationsForTargetState(&machine).size(), 0);
 
     QPropertyAnimation *anim = new QPropertyAnimation(this, "foo");
 
-    machine.addDefaultAnimationForTargetState(machine.rootState(), anim);
+    machine.addDefaultAnimationForTargetState(&machine, anim);
 
     QCOMPARE(machine.defaultAnimations().size(), 0);
-    QCOMPARE(machine.defaultAnimationsForSourceState(machine.rootState()).size(), 0);
-    QCOMPARE(machine.defaultAnimationsForTargetState(machine.rootState()).size(), 1);
-    QVERIFY(machine.defaultAnimationsForTargetState(machine.rootState()).contains(anim));
+    QCOMPARE(machine.defaultAnimationsForSourceState(&machine).size(), 0);
+    QCOMPARE(machine.defaultAnimationsForTargetState(&machine).size(), 1);
+    QVERIFY(machine.defaultAnimationsForTargetState(&machine).contains(anim));
 
-    machine.removeDefaultAnimationForSourceState(machine.rootState(), anim);
+    machine.removeDefaultAnimationForSourceState(&machine, anim);
 
     QCOMPARE(machine.defaultAnimations().size(), 0);
-    QCOMPARE(machine.defaultAnimationsForSourceState(machine.rootState()).size(), 0);
-    QCOMPARE(machine.defaultAnimationsForTargetState(machine.rootState()).size(), 1);
-    QVERIFY(machine.defaultAnimationsForTargetState(machine.rootState()).contains(anim));
+    QCOMPARE(machine.defaultAnimationsForSourceState(&machine).size(), 0);
+    QCOMPARE(machine.defaultAnimationsForTargetState(&machine).size(), 1);
+    QVERIFY(machine.defaultAnimationsForTargetState(&machine).contains(anim));
 
-    machine.removeDefaultAnimationForTargetState(machine.rootState(), anim);
+    machine.removeDefaultAnimationForTargetState(&machine, anim);
 
-    QCOMPARE(machine.defaultAnimationsForTargetState(machine.rootState()).size(), 0);
+    QCOMPARE(machine.defaultAnimationsForTargetState(&machine).size(), 0);
 
-    machine.addDefaultAnimationForTargetState(machine.rootState(), anim);
+    machine.addDefaultAnimationForTargetState(&machine, anim);
     
     QPropertyAnimation *anim2 = new QPropertyAnimation(this, "foo");
-    machine.addDefaultAnimationForTargetState(machine.rootState(), anim2);
+    machine.addDefaultAnimationForTargetState(&machine, anim2);
 
-    QCOMPARE(machine.defaultAnimationsForTargetState(machine.rootState()).size(), 2);
-    QVERIFY(machine.defaultAnimationsForTargetState(machine.rootState()).contains(anim));
-    QVERIFY(machine.defaultAnimationsForTargetState(machine.rootState()).contains(anim2));
+    QCOMPARE(machine.defaultAnimationsForTargetState(&machine).size(), 2);
+    QVERIFY(machine.defaultAnimationsForTargetState(&machine).contains(anim));
+    QVERIFY(machine.defaultAnimationsForTargetState(&machine).contains(anim2));
 
-    machine.removeDefaultAnimationForTargetState(machine.rootState(), anim);
+    machine.removeDefaultAnimationForTargetState(&machine, anim);
 
-    QCOMPARE(machine.defaultAnimationsForTargetState(machine.rootState()).size(), 1);
-    QVERIFY(machine.defaultAnimationsForTargetState(machine.rootState()).contains(anim2));
+    QCOMPARE(machine.defaultAnimationsForTargetState(&machine).size(), 1);
+    QVERIFY(machine.defaultAnimationsForTargetState(&machine).contains(anim2));
 
-    machine.removeDefaultAnimationForTargetState(machine.rootState(), anim2);
-    QCOMPARE(machine.defaultAnimationsForTargetState(machine.rootState()).size(), 0);
+    machine.removeDefaultAnimationForTargetState(&machine, anim2);
+    QCOMPARE(machine.defaultAnimationsForTargetState(&machine).size(), 0);
 }
 
 void tst_QStateMachine::overrideDefaultAnimationWithSource()
@@ -3418,13 +3444,13 @@ void tst_QStateMachine::overrideDefaultAnimationWithSource()
 
     SlotCalledCounter counter;
 
-    QState *s1 = new QState(machine.rootState());
+    QState *s1 = new QState(&machine);
     machine.setInitialState(s1);
 
-    QState *s2 = new QState(machine.rootState());
+    QState *s2 = new QState(&machine);
     s2->assignProperty(object, "foo", 2.0);
 
-    QState *s3 = new QState(machine.rootState());
+    QState *s3 = new QState(&machine);
     QObject::connect(s3, SIGNAL(entered()), QCoreApplication::instance(), SLOT(quit()));
 
     s1->addTransition(new EventTransition(QEvent::User, s2));    
@@ -3458,13 +3484,13 @@ void tst_QStateMachine::overrideDefaultAnimationWithTarget()
 
     SlotCalledCounter counter;
 
-    QState *s1 = new QState(machine.rootState());
+    QState *s1 = new QState(&machine);
     machine.setInitialState(s1);
 
-    QState *s2 = new QState(machine.rootState());
+    QState *s2 = new QState(&machine);
     s2->assignProperty(object, "foo", 2.0);
 
-    QState *s3 = new QState(machine.rootState());
+    QState *s3 = new QState(&machine);
     QObject::connect(s3, SIGNAL(entered()), QCoreApplication::instance(), SLOT(quit()));
 
     s1->addTransition(new EventTransition(QEvent::User, s2));    
@@ -3499,13 +3525,13 @@ void tst_QStateMachine::overrideDefaultSourceAnimationWithSpecific()
 
     SlotCalledCounter counter;
 
-    QState *s1 = new QState(machine.rootState());
+    QState *s1 = new QState(&machine);
     machine.setInitialState(s1);
 
-    QState *s2 = new QState(machine.rootState());
+    QState *s2 = new QState(&machine);
     s2->assignProperty(object, "foo", 2.0);
 
-    QState *s3 = new QState(machine.rootState());
+    QState *s3 = new QState(&machine);
     QObject::connect(s3, SIGNAL(entered()), QCoreApplication::instance(), SLOT(quit()));
 
     QAbstractTransition *at = s1->addTransition(new EventTransition(QEvent::User, s2));
@@ -3539,13 +3565,13 @@ void tst_QStateMachine::overrideDefaultTargetAnimationWithSpecific()
 
     SlotCalledCounter counter;
 
-    QState *s1 = new QState(machine.rootState());
+    QState *s1 = new QState(&machine);
     machine.setInitialState(s1);
 
-    QState *s2 = new QState(machine.rootState());
+    QState *s2 = new QState(&machine);
     s2->assignProperty(object, "foo", 2.0);
 
-    QState *s3 = new QState(machine.rootState());
+    QState *s3 = new QState(&machine);
     QObject::connect(s3, SIGNAL(entered()), QCoreApplication::instance(), SLOT(quit()));
 
     QAbstractTransition *at = s1->addTransition(new EventTransition(QEvent::User, s2));
@@ -3579,13 +3605,13 @@ void tst_QStateMachine::overrideDefaultTargetAnimationWithSource()
 
     SlotCalledCounter counter;
 
-    QState *s1 = new QState(machine.rootState());
+    QState *s1 = new QState(&machine);
     machine.setInitialState(s1);
 
-    QState *s2 = new QState(machine.rootState());
+    QState *s2 = new QState(&machine);
     s2->assignProperty(object, "foo", 2.0);
 
-    QState *s3 = new QState(machine.rootState());
+    QState *s3 = new QState(&machine);
     QObject::connect(s3, SIGNAL(entered()), QCoreApplication::instance(), SLOT(quit()));
 
     s1->addTransition(new EventTransition(QEvent::User, s2));
@@ -3621,10 +3647,10 @@ void tst_QStateMachine::parallelStateAssignmentsDone()
     propertyHolder->setProperty("bar", 456);
     propertyHolder->setProperty("zoot", 789);
 
-    QState *s1 = new QState(machine.rootState());
+    QState *s1 = new QState(&machine);
     machine.setInitialState(s1);
 
-    QState *parallelState = new QState(QState::ParallelStates, machine.rootState());
+    QState *parallelState = new QState(QState::ParallelStates, &machine);
     parallelState->assignProperty(propertyHolder, "foo", 321);
 
     QState *s2 = new QState(parallelState);
@@ -3653,10 +3679,10 @@ void tst_QStateMachine::transitionsFromParallelStateWithNoChildren()
 {
     QStateMachine machine;
     
-    QState *parallelState = new QState(QState::ParallelStates, machine.rootState());
+    QState *parallelState = new QState(QState::ParallelStates, &machine);
     machine.setInitialState(parallelState);
 
-    QState *s1 = new QState(machine.rootState());    
+    QState *s1 = new QState(&machine);    
     parallelState->addTransition(new EventTransition(QEvent::User, s1));
     
     machine.start();
@@ -3677,7 +3703,7 @@ void tst_QStateMachine::parallelStateTransition()
 {
     QStateMachine machine;
 
-    QState *parallelState = new QState(QState::ParallelStates, machine.rootState());
+    QState *parallelState = new QState(QState::ParallelStates, &machine);
     machine.setInitialState(parallelState);
 
     QState *s1 = new QState(parallelState);
@@ -3726,10 +3752,10 @@ void tst_QStateMachine::nestedRestoreProperties()
     propertyHolder->setProperty("foo", 1);
     propertyHolder->setProperty("bar", 2);
 
-    QState *s1 = new QState(machine.rootState());
+    QState *s1 = new QState(&machine);
     machine.setInitialState(s1);
 
-    QState *s2 = new QState(machine.rootState());
+    QState *s2 = new QState(&machine);
     s2->assignProperty(propertyHolder, "foo", 3);
 
     QState *s21 = new QState(s2);
@@ -3778,10 +3804,10 @@ void tst_QStateMachine::nestedRestoreProperties2()
     propertyHolder->setProperty("foo", 1);
     propertyHolder->setProperty("bar", 2);
 
-    QState *s1 = new QState(machine.rootState());
+    QState *s1 = new QState(&machine);
     machine.setInitialState(s1);
 
-    QState *s2 = new QState(machine.rootState());
+    QState *s2 = new QState(&machine);
     s2->assignProperty(propertyHolder, "foo", 3);
 
     QState *s21 = new QState(s2);
@@ -3833,6 +3859,46 @@ void tst_QStateMachine::nestedRestoreProperties2()
 
 }
 
+void tst_QStateMachine::nestedStateMachines()
+{
+    QStateMachine machine;
+    QState *group = new QState(&machine);
+    group->setChildMode(QState::ParallelStates);
+    QStateMachine *subMachines[3];
+    for (int i = 0; i < 3; ++i) {
+        QState *subGroup = new QState(group);
+        QStateMachine *subMachine = new QStateMachine(subGroup);
+        {
+            QState *initial = new QState(subMachine);
+            QFinalState *done = new QFinalState(subMachine);
+            initial->addTransition(new EventTransition(QEvent::User, done));
+            subMachine->setInitialState(initial);
+        }
+        QFinalState *subMachineDone = new QFinalState(subGroup);
+        subMachine->addTransition(subMachine, SIGNAL(finished()), subMachineDone);
+        subGroup->setInitialState(subMachine);
+        subMachines[i] = subMachine;
+    }
+    QFinalState *final = new QFinalState(&machine);
+    group->addTransition(group, SIGNAL(finished()), final);
+    machine.setInitialState(group);
+
+    QSignalSpy startedSpy(&machine, SIGNAL(started()));
+    QSignalSpy finishedSpy(&machine, SIGNAL(finished()));
+    machine.start();
+    QTRY_COMPARE(startedSpy.count(), 1);
+    QTRY_COMPARE(machine.configuration().count(), 1+2*3);
+    QVERIFY(machine.configuration().contains(group));
+    for (int i = 0; i < 3; ++i)
+        QVERIFY(machine.configuration().contains(subMachines[i]));
+
+    QCoreApplication::processEvents(); // starts the submachines
+
+    for (int i = 0; i < 3; ++i)
+        subMachines[i]->postEvent(new QEvent(QEvent::User));
+
+    QTRY_COMPARE(finishedSpy.count(), 1);
+}
 
 QTEST_MAIN(tst_QStateMachine)
 #include "tst_qstatemachine.moc"
diff --git a/tests/auto/qtextcodec/tst_qtextcodec.cpp b/tests/auto/qtextcodec/tst_qtextcodec.cpp
index f2da1ec..9f51805 100644
--- a/tests/auto/qtextcodec/tst_qtextcodec.cpp
+++ b/tests/auto/qtextcodec/tst_qtextcodec.cpp
@@ -1875,6 +1875,9 @@ void tst_QTextCodec::codecForUtfText()
 #ifdef Q_OS_UNIX
 void tst_QTextCodec::toLocal8Bit()
 {
+#ifdef QT_NO_PROCESS
+    QSKIP("This test requires QProcess", SkipAll);
+#else
     QProcess process;
     process.start("echo/echo");
     QString string(QChar(0x410));
@@ -1884,6 +1887,7 @@ void tst_QTextCodec::toLocal8Bit()
     process.waitForFinished();
     QCOMPARE(process.exitStatus(), QProcess::NormalExit);
     QCOMPARE(process.exitCode(), 0);
+#endif
 }
 #endif
 
diff --git a/tests/auto/qtoolbar/tst_qtoolbar.cpp b/tests/auto/qtoolbar/tst_qtoolbar.cpp
index 002ea04..856a935 100644
--- a/tests/auto/qtoolbar/tst_qtoolbar.cpp
+++ b/tests/auto/qtoolbar/tst_qtoolbar.cpp
@@ -797,8 +797,8 @@ void tst_QToolBar::toolButtonStyle()
         QCOMPARE(tb.toolButtonStyle(), Qt::ToolButtonTextUnderIcon);
         QCOMPARE(spy.count(), 0);
 
-        tb.setToolButtonStyle(Qt::ToolButtonSystemDefault);
-        QCOMPARE(tb.toolButtonStyle(), Qt::ToolButtonSystemDefault);
+        tb.setToolButtonStyle(Qt::ToolButtonFollowStyle);
+        QCOMPARE(tb.toolButtonStyle(), Qt::ToolButtonFollowStyle);
         QCOMPARE(spy.count(), 1);
     }
 
diff --git a/tests/auto/qurl/tst_qurl.cpp b/tests/auto/qurl/tst_qurl.cpp
index 723f882..78ea146 100644
--- a/tests/auto/qurl/tst_qurl.cpp
+++ b/tests/auto/qurl/tst_qurl.cpp
@@ -162,6 +162,8 @@ private slots:
     void nameprep_testsuite();
     void ace_testsuite_data();
     void ace_testsuite();
+    void std3violations_data();
+    void std3violations();
     void tldRestrictions_data();
     void tldRestrictions();
     void emptyQueryOrFragment();
@@ -3059,7 +3061,8 @@ void tst_QUrl::nameprep_testsuite_data()
 
 #ifdef QT_BUILD_INTERNAL
 QT_BEGIN_NAMESPACE
-extern QString qt_nameprep(const QString &source);
+extern void qt_nameprep(QString *source, int from);
+extern bool qt_check_std3rules(const QChar *, int);
 QT_END_NAMESPACE
 #endif
 
@@ -3084,7 +3087,8 @@ void tst_QUrl::nameprep_testsuite()
                  "Investigate further", Continue);
     QEXPECT_FAIL("Larger test (expanding)",
                  "Investigate further", Continue);
-    QCOMPARE(qt_nameprep(in), out);
+    qt_nameprep(&in, 0);
+    QCOMPARE(in, out);
 #endif
 }
 
@@ -3100,6 +3104,11 @@ void tst_QUrl::ace_testsuite_data()
     QTest::newRow("ascii-upper") << "FLUKE" << "fluke" << "fluke" << "fluke";
 
     QTest::newRow("asciifolded") << QString::fromLatin1("stra\337e") << "strasse" << "." << "strasse";
+    QTest::newRow("asciifolded-dotcom") << QString::fromLatin1("stra\337e.example.com") << "strasse.example.com" << "." << "strasse.example.com";
+    QTest::newRow("greek-mu") << QString::fromLatin1("\265V")
+                              <<"xn--v-lmb"
+                              << "."
+                              << QString::fromUtf8("\316\274v");
 
     QTest::newRow("non-ascii-lower") << QString::fromLatin1("alqualond\353")
                                      << "xn--alqualond-34a"
@@ -3132,6 +3141,9 @@ void tst_QUrl::ace_testsuite_data()
     QTest::newRow("idn-upper") << "XN--ALQUALOND-34A" << "xn--alqualond-34a"
                                << QString::fromLatin1("alqualond\353")
                                << QString::fromLatin1("alqualond\353");
+
+    QTest::newRow("separator-3002") << QString::fromUtf8("example\343\200\202com")
+                                    << "example.com" << "." << "example.com";
 }
 
 void tst_QUrl::ace_testsuite()
@@ -3142,23 +3154,83 @@ void tst_QUrl::ace_testsuite()
     QFETCH(QString, fromace);
     QFETCH(QString, unicode);
 
-    QString domain = in + canonsuffix;
-    QCOMPARE(QString::fromLatin1(QUrl::toAce(domain)), toace + canonsuffix);
+    const char *suffix = canonsuffix;
+    if (toace.contains('.'))
+        suffix = 0;
+
+    QString domain = in + suffix;
+    QCOMPARE(QString::fromLatin1(QUrl::toAce(domain)), toace + suffix);
     if (fromace != ".")
-        QCOMPARE(QUrl::fromAce(domain.toLatin1()), fromace + canonsuffix);
-    QCOMPARE(QUrl::fromAce(QUrl::toAce(domain)), unicode + canonsuffix);
+        QCOMPARE(QUrl::fromAce(domain.toLatin1()), fromace + suffix);
+    QCOMPARE(QUrl::fromAce(QUrl::toAce(domain)), unicode + suffix);
 
-    domain = in + ".troll.No";
-    QCOMPARE(QString::fromLatin1(QUrl::toAce(domain)), toace + canonsuffix);
+    domain = in + (suffix ? ".troll.No" : "");
+    QCOMPARE(QString::fromLatin1(QUrl::toAce(domain)), toace + suffix);
     if (fromace != ".")
-        QCOMPARE(QUrl::fromAce(domain.toLatin1()), fromace + canonsuffix);
-    QCOMPARE(QUrl::fromAce(QUrl::toAce(domain)), unicode + canonsuffix);
+        QCOMPARE(QUrl::fromAce(domain.toLatin1()), fromace + suffix);
+    QCOMPARE(QUrl::fromAce(QUrl::toAce(domain)), unicode + suffix);
 
-    domain = in + ".troll.NO";
-    QCOMPARE(QString::fromLatin1(QUrl::toAce(domain)), toace + canonsuffix);
+    domain = in + (suffix ? ".troll.NO" : "");
+    QCOMPARE(QString::fromLatin1(QUrl::toAce(domain)), toace + suffix);
     if (fromace != ".")
-        QCOMPARE(QUrl::fromAce(domain.toLatin1()), fromace + canonsuffix);
-    QCOMPARE(QUrl::fromAce(QUrl::toAce(domain)), unicode + canonsuffix);
+        QCOMPARE(QUrl::fromAce(domain.toLatin1()), fromace + suffix);
+    QCOMPARE(QUrl::fromAce(QUrl::toAce(domain)), unicode + suffix);
+}
+
+void tst_QUrl::std3violations_data()
+{
+    QTest::addColumn<QString>("source");
+    QTest::addColumn<bool>("validUrl");
+
+    QTest::newRow("too-long") << "this-domain-is-far-too-long-for-its-own-good-and-should-have-been-limited-to-63-chars" << false;
+    QTest::newRow("dash-begin") << "-x-foo" << false;
+    QTest::newRow("dash-end") << "x-foo-" << false;
+    QTest::newRow("dash-begin-end") << "-foo-" << false;
+
+    QTest::newRow("control") << "\033foo" << false;
+    QTest::newRow("bang") << "foo!" << false;
+    QTest::newRow("plus") << "foo+bar" << false;
+    QTest::newRow("dot") << "foo.bar";
+    QTest::newRow("slash") << "foo/bar" << true;
+    QTest::newRow("colon") << "foo:80" << true;
+    QTest::newRow("question") << "foo?bar" << true;
+    QTest::newRow("at") << "foo@bar" << true;
+    QTest::newRow("backslash") << "foo\\bar" << false;
+    QTest::newRow("underline") << "foo_bar" << false;
+
+    // these characters are transformed by NFKC to non-LDH characters
+    QTest::newRow("dot-like") << QString::fromUtf8("foo\342\200\244bar") << false;  // U+2024 ONE DOT LEADER
+    QTest::newRow("slash-like") << QString::fromUtf8("foo\357\274\217bar") << false;    // U+FF0F FULLWIDTH SOLIDUS
+
+    // The following should be invalid but isn't
+    // the DIVISON SLASH doesn't case-fold to a slash
+    // is this a problem with RFC 3490?
+    //QTest::newRow("slash-like2") << QString::fromUtf8("foo\342\210\225bar") << false; // U+2215 DIVISION SLASH
+}
+
+void tst_QUrl::std3violations()
+{
+    QFETCH(QString, source);
+
+    {
+        QString prepped = source;
+        qt_nameprep(&prepped, 0);
+        QVERIFY(!qt_check_std3rules(prepped.constData(), prepped.length()));
+    }
+
+    if (source.contains('.'))
+        return; // this test ends here
+
+    QUrl url;
+    url.setHost(source);
+    QVERIFY(url.host().isEmpty());
+
+    QFETCH(bool, validUrl);
+    if (validUrl)
+        return;  // test ends here for these cases
+
+    url = QUrl("http://" + source + "/some/path");
+    QVERIFY(!url.isValid());
 }
 
 void tst_QUrl::tldRestrictions_data()
diff --git a/tests/auto/test.pl b/tests/auto/test.pl
index 9fd5c9d..a9e3da8 100755
--- a/tests/auto/test.pl
+++ b/tests/auto/test.pl
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
 use strict;
 use Cwd;