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

Conflicts:
	tests/auto/qlocalsocket/tst_qlocalsocket.cpp

8 files changed, 94 insertions, 20 deletions

diff --git a/tests/auto/_networkselftest/tst_networkselftest.cpp b/tests/auto/_networkselftest/tst_networkselftest.cpp
index 0e64988932..ad9e172a28 100644
--- a/tests/auto/_networkselftest/tst_networkselftest.cpp
+++ b/tests/auto/_networkselftest/tst_networkselftest.cpp
@@ -198,12 +198,6 @@ static void netChat(int port, const QList<Chat> &chat)
     // now start the chat
     QList<Chat>::ConstIterator it = chat.constBegin();
     for (int i = 1; it != chat.constEnd(); ++it, ++i) {
-        if (it->type != Chat::Reconnect
-            && socket.state() != QAbstractSocket::ConnectedState
-            && socket.state() != QAbstractSocket::ClosingState)
-            QFAIL(QString("Internal error: socket is in invalid state %1 in step %2")
-                  .arg(socket.state()).arg(i).toLocal8Bit());
-
         switch (it->type) {
             case Chat::Expect: {
                     qDebug() << i << "Expecting" << prettyByteArray(it->data);
@@ -485,7 +479,7 @@ void tst_NetworkSelfTest::httpsServer()
             << Chat::expect("200 ")
             << Chat::DiscardUntilDisconnect);
 #else
-    QSKIP("SSL not enabled, cannot test");
+    QSKIP("SSL not enabled, cannot test", SkipAll);
 #endif
 }
 
diff --git a/tests/auto/qcssparser/tst_cssparser.cpp b/tests/auto/qcssparser/tst_cssparser.cpp
index 28ba85ea6b..17df9a2994 100644
--- a/tests/auto/qcssparser/tst_cssparser.cpp
+++ b/tests/auto/qcssparser/tst_cssparser.cpp
@@ -1475,7 +1475,7 @@ void tst_CssParser::extractFontFamily_data()
     QTest::newRow("unquoted-family-name2") << "font-family: Times        New     Roman" << QString("Times New Roman");
     QTest::newRow("multiple") << "font-family: Times New Roman  , foobar, 'baz'" << QString("Times New Roman");
     QTest::newRow("multiple2") << "font-family: invalid,  Times New   Roman " << QString("Times New Roman");
-    QTest::newRow("invalid") << "font-family: invalid" << QFont().family();
+    QTest::newRow("invalid") << "font-family: invalid" << QFontInfo(QFont("invalid font")).family();
     QTest::newRow("shorthand") << "font: 12pt Times New Roman" << QString("Times New Roman");
     QTest::newRow("shorthand multiple quote") << "font: 12pt invalid, \"Times New Roman\" " << QString("Times New Roman");
     QTest::newRow("shorthand multiple") << "font: 12pt invalid, Times New Roman " << QString("Times New Roman");
diff --git a/tests/auto/qdbusmarshall/tst_qdbusmarshall.cpp b/tests/auto/qdbusmarshall/tst_qdbusmarshall.cpp
index ad1a1b8750..58bfabc2b8 100644
--- a/tests/auto/qdbusmarshall/tst_qdbusmarshall.cpp
+++ b/tests/auto/qdbusmarshall/tst_qdbusmarshall.cpp
@@ -84,6 +84,8 @@ private slots:
     void sendArgument_data();
     void sendArgument();
 
+    void sendErrors();
+
 private:
     QProcess proc;
 };
@@ -782,5 +784,28 @@ void tst_QDBusMarshall::sendArgument()
         QCOMPARE(extracted, value);
 }
 
+void tst_QDBusMarshall::sendErrors()
+{
+    QDBusConnection con = QDBusConnection::sessionBus();
+
+    QVERIFY(con.isConnected());
+    QDBusMessage msg = QDBusMessage::createSignal("/foo", "local.interfaceName",
+                                                  "signalName");
+    msg << qVariantFromValue(QDBusObjectPath());
+
+    QTest::ignoreMessage(QtWarningMsg, "QDBusConnection: error: could not send signal path \"/foo\" interface \"local.interfaceName\" member \"signalName\"");
+    QVERIFY(!con.send(msg));
+
+    msg.setArguments(QVariantList());
+    QDBusObjectPath path;
+
+    QTest::ignoreMessage(QtWarningMsg, "QDBusObjectPath: invalid path \"abc\"");
+    path.setPath("abc");
+    msg << qVariantFromValue(path);
+
+    QTest::ignoreMessage(QtWarningMsg, "QDBusConnection: error: could not send signal path \"/foo\" interface \"local.interfaceName\" member \"signalName\"");
+    QVERIFY(!con.send(msg));
+}
+
 QTEST_MAIN(tst_QDBusMarshall)
 #include "tst_qdbusmarshall.moc"
diff --git a/tests/auto/qlocalsocket/tst_qlocalsocket.cpp b/tests/auto/qlocalsocket/tst_qlocalsocket.cpp
index 97058d3e32..a8aab191e4 100644
--- a/tests/auto/qlocalsocket/tst_qlocalsocket.cpp
+++ b/tests/auto/qlocalsocket/tst_qlocalsocket.cpp
@@ -124,8 +124,6 @@ tst_QLocalSocket::tst_QLocalSocket()
 #endif
                 ))
         qWarning() << "lackey executable doesn't exists!";
-
-    QLocalServer::removeServer("tst_localsocket");
 }
 
 tst_QLocalSocket::~tst_QLocalSocket()
@@ -150,7 +148,13 @@ public:
     LocalServer() : QLocalServer()
     {
         connect(this, SIGNAL(newConnection()), this, SLOT(slotNewConnection()));
-    };
+    }
+
+    bool listen(const QString &name)
+    {
+        removeServer(name);
+        return QLocalServer::listen(name);
+    }
 
     QList<int> hits;
 
@@ -555,7 +559,7 @@ void tst_QLocalSocket::sendData()
 // QLocalSocket/Server can take a name or path, check that it works as expected
 void tst_QLocalSocket::fullPath()
 {
-    QLocalServer server;
+    LocalServer server;
     QString name = "qlocalsocket_pathtest";
 #if defined(Q_OS_SYMBIAN)
     QString path = "";
@@ -875,7 +879,7 @@ void tst_QLocalSocket::recycleServer()
     unlink("recycletest1");
 #endif
 
-    QLocalServer server;
+    LocalServer server;
     QLocalSocket client;
 
     QVERIFY(server.listen("recycletest1"));
diff --git a/tests/auto/qnetworkdiskcache/tst_qnetworkdiskcache.cpp b/tests/auto/qnetworkdiskcache/tst_qnetworkdiskcache.cpp
index 23837674c8..2f6180f483 100644
--- a/tests/auto/qnetworkdiskcache/tst_qnetworkdiskcache.cpp
+++ b/tests/auto/qnetworkdiskcache/tst_qnetworkdiskcache.cpp
@@ -76,7 +76,7 @@ private slots:
 
     void oldCacheVersionFile_data();
     void oldCacheVersionFile();
-
+    
     void sync();
 };
 
@@ -486,7 +486,7 @@ public:
     void run()
     {
         QByteArray longString = "Hello World, this is some long string, well not really that long";
-        for (int i = 0; i < 10; ++i)
+        for (int j = 0; j < 10; ++j)
             longString += longString;
         QByteArray longString2 = "Help, I am stuck in an autotest!";
         QUrl url(EXAMPLE_URL);
diff --git a/tests/auto/qpainter/tst_qpainter.cpp b/tests/auto/qpainter/tst_qpainter.cpp
index b813d1d801..740cfb1f5b 100644
--- a/tests/auto/qpainter/tst_qpainter.cpp
+++ b/tests/auto/qpainter/tst_qpainter.cpp
@@ -219,6 +219,7 @@ private slots:
     void imageCoordinateLimit();
     void imageBlending_data();
     void imageBlending();
+    void imageBlending_clipped();
 
     void paintOnNullPixmap();
     void checkCompositionMode();
@@ -3795,6 +3796,31 @@ void tst_QPainter::imageBlending()
     }
 }
 
+void tst_QPainter::imageBlending_clipped()
+{
+    QImage src(20, 20, QImage::Format_RGB16);
+    QPainter p(&src);
+    p.fillRect(src.rect(), Qt::red);
+    p.end();
+
+    QImage dst(40, 20, QImage::Format_RGB16);
+    p.begin(&dst);
+    p.fillRect(dst.rect(), Qt::white);
+    p.end();
+
+    QImage expected = dst;
+
+    p.begin(&dst);
+    p.setClipRect(QRect(23, 0, 20, 20));
+
+    // should be completely clipped
+    p.drawImage(QRectF(3, 0, 20, 20), src);
+    p.end();
+
+    // dst should be left unchanged
+    QCOMPARE(dst, expected);
+}
+
 void tst_QPainter::paintOnNullPixmap()
 {
     QPixmap pix(16, 16);
diff --git a/tests/auto/qprogressbar/tst_qprogressbar.cpp b/tests/auto/qprogressbar/tst_qprogressbar.cpp
index d6379d3dc3..cb037e0442 100644
--- a/tests/auto/qprogressbar/tst_qprogressbar.cpp
+++ b/tests/auto/qprogressbar/tst_qprogressbar.cpp
@@ -63,6 +63,7 @@ private slots:
     void setValueRepaint();
     void sizeHint();
 
+    void task245201_testChangeStyleAndDelete_data();
     void task245201_testChangeStyleAndDelete();
 };
 
@@ -224,15 +225,30 @@ void tst_QProgressBar::sizeHint()
     QCOMPARE(barSize.height(), size.height());
 }
 
+void tst_QProgressBar::task245201_testChangeStyleAndDelete_data()
+{
+    QTest::addColumn<QString>("style1_str");
+    QTest::addColumn<QString>("style2_str");
+
+    QTest::newRow("plastique-windows") << QString::fromLatin1("plastique") << QString::fromLatin1("windows");
+    QTest::newRow("mlotif-windows") << QString::fromLatin1("motif") << QString::fromLatin1("windows");
+    QTest::newRow("cleanlooks-cde") << QString::fromLatin1("cleanlooks") << QString::fromLatin1("cde");
+    QTest::newRow("gtk-plastique") << QString::fromLatin1("gtk") << QString::fromLatin1("plastique");
+}
+
 void tst_QProgressBar::task245201_testChangeStyleAndDelete()
 {
+    QFETCH(QString, style1_str);
+    QFETCH(QString, style2_str);
+
     QProgressBar *bar = new QProgressBar;
 
-    QStyle *style = QStyleFactory::create("plastique");
+    QStyle *style = QStyleFactory::create(style1_str);
     bar->setStyle(style);
     bar->show();
-    QStyle *style2 = QStyleFactory::create("windows");
+    QStyle *style2 = QStyleFactory::create(style2_str);
     bar->setStyle(style2);
+    QTest::qWait(10);
 
     delete bar;
     QTest::qWait(100); //should not crash
diff --git a/tests/auto/qtextcodec/tst_qtextcodec.cpp b/tests/auto/qtextcodec/tst_qtextcodec.cpp
index ff4b4bbefc..fa41f436d3 100644
--- a/tests/auto/qtextcodec/tst_qtextcodec.cpp
+++ b/tests/auto/qtextcodec/tst_qtextcodec.cpp
@@ -1537,7 +1537,7 @@ void tst_QTextCodec::utfHeaders_data()
         << QByteArray("\xef\xbb\xbfhello")
         << (QString(QChar(0xfeff)) + QString::fromLatin1("hello"))
         << true;
-    QTest::newRow("utf8 nobom")
+    QTest::newRow("utf8 nobom ignore header")
         << QByteArray("UTF-8")
         << (int)QTextCodec::IgnoreHeader
         << QByteArray("hello")
@@ -1719,14 +1719,23 @@ void tst_QTextCodec::utfHeaders()
 
     QFETCH(bool, toUnicode);
 
+    QLatin1String ignoreReverseTestOn = (QSysInfo::ByteOrder == QSysInfo::BigEndian) ? QLatin1String(" le") : QLatin1String(" be");
+    QString rowName(QTest::currentDataTag());
+
     for (int i = 0; i < encoded.length(); ++i)
         qDebug() << hex << "    " << (uint)(uchar)encoded.at(i);
     if (toUnicode) {
         QString result = codec->toUnicode(encoded.constData(), encoded.length(), &state);
-    for (int i = 0; i < result.length(); ++i)
-        qDebug() << hex << "    " << (uint)result.at(i).unicode();
+        for (int i = 0; i < result.length(); ++i)
+            qDebug() << hex << "    " << (uint)result.at(i).unicode();
         QCOMPARE(result.length(), unicode.length());
         QCOMPARE(result, unicode);
+
+        if (!rowName.endsWith("nobom") && !rowName.contains(ignoreReverseTestOn)) {
+            QTextCodec::ConverterState state2(cFlags);
+            QByteArray reencoded = codec->fromUnicode(unicode.unicode(), unicode.length(), &state2);
+            QCOMPARE(reencoded, encoded);
+        }
     } else {
         QByteArray result = codec->fromUnicode(unicode.unicode(), unicode.length(), &state);
         QCOMPARE(result, encoded);