Merge commit 'qt/master-stable' into 4.6-merged

Conflicts:
	.gitignore
	configure.exe
	src/corelib/concurrent/qtconcurrentthreadengine.h
	src/corelib/global/qnamespace.h
	src/gui/graphicsview/qgraphicssceneevent.h
	src/gui/kernel/qapplication.cpp
	src/gui/kernel/qapplication.h
	src/gui/kernel/qapplication_p.h
	src/gui/kernel/qapplication_qws.cpp
	src/gui/kernel/qwidget.h
	src/gui/painting/qpaintengine_raster.cpp
	src/gui/text/qfontdatabase.cpp
	src/network/access/qnetworkaccesshttpbackend.cpp
	tests/auto/network-settings.h
	tests/auto/qscriptjstestsuite/qscriptjstestsuite.pro
	tests/auto/qvariant/tst_qvariant.cpp

1 files changed, 6 insertions, 25 deletions

diff --git a/tests/auto/qurl/tst_qurl.cpp b/tests/auto/qurl/tst_qurl.cpp
index 5a79792..ea551da 100644
--- a/tests/auto/qurl/tst_qurl.cpp
+++ b/tests/auto/qurl/tst_qurl.cpp
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the test suite of the Qt Toolkit.
 **
@@ -34,7 +34,7 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
+** contact the sales department at http://www.qtsoftware.com/contact.
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
@@ -608,18 +608,6 @@ void tst_QUrl::setUrl()
     }
 
     {
-        QString bigStr(QLatin1String("abcdefghijklmnopqrstuvwxzyABCDEFGHIJKLMNOPQRSTUVWXYZ"
-                                     "abcdefghijklmnopqrstuvwxzyABCDEFGHIJKLMNOPQRSTUVWXYZ"
-                                     "abcdefghijklmnopqrstuvwxzyABCDEFGHIJKLMNOPQRSTUVWXYZ"
-                                     "abcdefghijklmnopqrstuvwxzyABCDEFGHIJKLMNOPQRSTUVWXYZ"
-                                     "abcdefghijklmnopqrstuvwxzyABCDEFGHIJKLMNOPQRSTUVWXYZ"));
-        QUrl url;
-        url.setHost(bigStr);
-        QVERIFY(url.isValid());
-        QCOMPARE(url.host().toLower(), bigStr.toLower());
-    }
-
-    {
         QUrl url;
         url.setUrl("hello.com#?");
         QVERIFY(url.isValid());
@@ -1398,8 +1386,6 @@ void tst_QUrl::i18n_data()
 
     QTest::newRow("øl") << QString::fromLatin1("http://ole:passord@www.øl.no/index.html?ole=æsemann&ilder gud=hei#top")
                      <<          QByteArray("http://ole:passord@www.xn--l-4ga.no/index.html?ole=%C3%A6semann&ilder%20gud=hei#top");
-    QTest::newRow("øl") << QString::fromLatin1("http://ole:passord@www.øl.no/index.html?ole=æsemann&ilder gud=hei#top")
-                     <<          QByteArray("http://ole:passord@www.xn--l-4ga.no/index.html?ole=%C3%A6semann&ilder%20gud=hei#top");
     QTest::newRow("räksmörgås") << QString::fromLatin1("http://www.räksmörgås.no/")
                              << QByteArray("http://www.xn--rksmrgs-5wao1o.no/");
     QTest::newRow("bühler") << QString::fromLatin1("http://www.bühler.no/")
@@ -2412,9 +2398,7 @@ void tst_QUrl::hasQueryItem()
 void tst_QUrl::nameprep()
 {
     QUrl url(QString::fromUtf8("http://www.fu""\xc3""\x9f""ball.de/"));
-    QUrl url2 = QUrl::fromEncoded("http://www.xn--fuball-cta.de/");
-    QCOMPARE(url2.toString(), QString::fromLatin1("http://www.fussball.de/"));
-    QCOMPARE(url.toString(), url2.toString()); // should be identical
+    QCOMPARE(url.toString(), QString::fromLatin1("http://www.fussball.de/"));
 }
 
 void tst_QUrl::isValid()
@@ -2425,19 +2409,18 @@ void tst_QUrl::isValid()
         QCOMPARE(url.path(), QString("A=B"));
     }
     {
-        QUrl url = QUrl::fromEncoded("http://strange<username>@ok_hostname/", QUrl::StrictMode);
+        QUrl url = QUrl::fromEncoded("http://strange<username>@ok-hostname/", QUrl::StrictMode);
         QVERIFY(!url.isValid());
         // < and > are not allowed in userinfo in strict mode
     }
     {
-        QUrl url = QUrl::fromEncoded("http://strange<username>@ok_hostname/");
+        QUrl url = QUrl::fromEncoded("http://strange<username>@ok-hostname/");
         QVERIFY(url.isValid());
         // < and > are allowed in tolerant mode
     }
     {
         QUrl url = QUrl::fromEncoded("http://strange;hostname/here");
-        QVERIFY(url.isValid());
-        QCOMPARE(url.host(), QString("strange;hostname"));
+        QVERIFY(!url.isValid());
         QCOMPARE(url.path(), QString("/here"));
     }
 }
@@ -3488,7 +3471,6 @@ void tst_QUrl::setAuthority_data()
     QTest::addColumn<QString>("authority");
     QTest::addColumn<QString>("url");
     QTest::newRow("Plain auth") << QString("62.70.27.22:21") << QString("//62.70.27.22:21");
-    QTest::newRow("Auth with empty port") << QString("62.70.27.22:") << QString("//62.70.27.22:");
     QTest::newRow("Yet another plain auth") << QString("192.168.1.1:21") << QString("//192.168.1.1:21");
     QTest::newRow("Auth without port") << QString("192.168.1.1") << QString("//192.168.1.1");
     QTest::newRow("Auth w/full hostname without port") << QString("shusaku.troll.no") << QString("//shusaku.troll.no");
@@ -3496,7 +3478,6 @@ void tst_QUrl::setAuthority_data()
     QTest::newRow("Auth w/full hostname that ends with number, without port") << QString("shusaku.troll.no.2") << QString("//shusaku.troll.no.2");
     QTest::newRow("Auth w/hostname that ends with number, without port") << QString("shusaku2") << QString("//shusaku2");
     QTest::newRow("Empty auth") << QString() << QString();
-    QTest::newRow("Single") << QString(":") << QString("//:");
 }
 
 void tst_QUrl::setAuthority()