Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7

Conflicts:
	configure.exe
	src/declarative/util/qdeclarativelistmodel.cpp
	tools/qml/qml.pro

10 files changed, 129 insertions, 7 deletions

diff --git a/tests/auto/qabstractslider/tst_qabstractslider.cpp b/tests/auto/qabstractslider/tst_qabstractslider.cpp
index 293af36..cf069db 100644
--- a/tests/auto/qabstractslider/tst_qabstractslider.cpp
+++ b/tests/auto/qabstractslider/tst_qabstractslider.cpp
@@ -728,7 +728,12 @@ void tst_QAbstractSlider::wheelEvent_data()
                                    << 1                                  // delta
                                    << int(Qt::Vertical)                  // orientation of slider
                                    << int(Qt::Vertical)                  // orientation of wheel
+#ifndef Q_WS_MAC
                                    << 1                                  // expected position after
+#else
+                                   // We don't restrict scrolling to pageStep on Mac
+                                   << 100                                // expected position after
+#endif
                                    << QPoint(1,1);
 
     QTest::newRow("Different orientation") << 0                             // initial position
@@ -742,7 +747,12 @@ void tst_QAbstractSlider::wheelEvent_data()
                                         << 1                             // delta
                                         << int(Qt::Horizontal)           // orientation of slider
                                         << int(Qt::Vertical)             // orientation of wheel
+#ifndef Q_WS_MAC
                                         << 1                             // expected position after
+#else
+                                        // We don't restrict scrolling to pageStep on Mac
+                                        << 100                           // expected position after
+#endif
                                         << QPoint(1,1);
 
     QTest::newRow("Different orientation2")<< 0                             // initial position
@@ -756,7 +766,12 @@ void tst_QAbstractSlider::wheelEvent_data()
                                         << 1                             // delta
                                         << int(Qt::Horizontal)           // orientation of slider
                                         << int(Qt::Vertical)             // orientation of wheel
+#ifndef Q_WS_MAC
                                         << 1                             // expected position after
+#else
+                                        // We don't restrict scrolling to pageStep on Mac
+                                        << 100                           // expected position after
+#endif
                                         << QPoint(0,0);
 
 
diff --git a/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp b/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp
index 4d9f23f..c0ad8bf 100644
--- a/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp
+++ b/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp
@@ -9767,6 +9767,9 @@ void tst_QGraphicsItem::scenePosChange()
     child1->setFlag(QGraphicsItem::ItemSendsScenePositionChanges, true);
     grandChild2->setFlag(QGraphicsItem::ItemSendsScenePositionChanges, true);
 
+    QVERIFY(child1->flags() & QGraphicsItem::ItemSendsScenePositionChanges);
+    QVERIFY(grandChild2->flags() & QGraphicsItem::ItemSendsScenePositionChanges);
+
     QGraphicsScene scene;
     scene.addItem(root);
 
diff --git a/tests/auto/qnetworkreply/tst_qnetworkreply.cpp b/tests/auto/qnetworkreply/tst_qnetworkreply.cpp
index cafeef0..76e69c5 100644
--- a/tests/auto/qnetworkreply/tst_qnetworkreply.cpp
+++ b/tests/auto/qnetworkreply/tst_qnetworkreply.cpp
@@ -237,6 +237,8 @@ private Q_SLOTS:
     void lastModifiedHeaderForFile();
     void lastModifiedHeaderForHttp();
 
+    void httpCanReadLine();
+
     void rateControl_data();
     void rateControl();
 
@@ -3315,6 +3317,21 @@ void tst_QNetworkReply::lastModifiedHeaderForHttp()
     QCOMPARE(header, realDate);
 }
 
+void tst_QNetworkReply::httpCanReadLine()
+{
+    QNetworkRequest request(QUrl("http://" + QtNetworkSettings::serverName() + "/qtest/rfc3252.txt"));
+    QNetworkReplyPtr reply = manager.get(request);
+
+    connect(reply, SIGNAL(finished()), &QTestEventLoop::instance(), SLOT(exitLoop()));
+    QTestEventLoop::instance().enterLoop(10);
+    QVERIFY(!QTestEventLoop::instance().timeout());
+    QCOMPARE(reply->error(), QNetworkReply::NoError);
+
+    QVERIFY(reply->canReadLine());
+    QVERIFY(!reply->readAll().isEmpty());
+    QVERIFY(!reply->canReadLine());
+}
+
 void tst_QNetworkReply::rateControl_data()
 {
     QTest::addColumn<int>("rate");
diff --git a/tests/auto/qscriptclass/tst_qscriptclass.cpp b/tests/auto/qscriptclass/tst_qscriptclass.cpp
index 41c674c..aca33ce 100644
--- a/tests/auto/qscriptclass/tst_qscriptclass.cpp
+++ b/tests/auto/qscriptclass/tst_qscriptclass.cpp
@@ -688,6 +688,7 @@ void tst_QScriptClass::getAndSetProperty()
         QCOMPARE(obj1.propertyFlags(foo2), foo2Pflags);
         QVERIFY(cls.lastQueryPropertyObject().strictlyEquals(obj1));
         QVERIFY(cls.lastQueryPropertyName() == foo2);
+        QEXPECT_FAIL("", "classObject.getOwnPropertyDescriptor() reads the property value", Continue);
         QVERIFY(!cls.lastPropertyObject().isValid());
         QVERIFY(cls.lastPropertyFlagsObject().strictlyEquals(obj1));
         QVERIFY(cls.lastPropertyFlagsName() == foo2);
diff --git a/tests/auto/qscriptengine/tst_qscriptengine.cpp b/tests/auto/qscriptengine/tst_qscriptengine.cpp
index 8658240..d9beb45 100644
--- a/tests/auto/qscriptengine/tst_qscriptengine.cpp
+++ b/tests/auto/qscriptengine/tst_qscriptengine.cpp
@@ -155,6 +155,7 @@ private slots:
     void nativeFunctionScopes();
     void evaluateProgram();
     void collectGarbageAfterConnect();
+    void promoteThisObjectToQObjectInConstructor();
 
     void qRegExpInport_data();
     void qRegExpInport();
@@ -4461,6 +4462,25 @@ void tst_QScriptEngine::collectGarbageAfterConnect()
     QVERIFY(widget == 0);
 }
 
+static QScriptValue constructQObjectFromThisObject(QScriptContext *ctx, QScriptEngine *eng)
+{
+    Q_ASSERT(ctx->isCalledAsConstructor());
+    return eng->newQObject(ctx->thisObject(), new QObject, QScriptEngine::ScriptOwnership);
+}
+
+void tst_QScriptEngine::promoteThisObjectToQObjectInConstructor()
+{
+    QScriptEngine engine;
+    QScriptValue ctor = engine.newFunction(constructQObjectFromThisObject);
+    engine.globalObject().setProperty("Ctor", ctor);
+    QScriptValue object = engine.evaluate("new Ctor");
+    QVERIFY(!object.isError());
+    QVERIFY(object.isQObject());
+    QVERIFY(object.toQObject() != 0);
+    QVERIFY(object.property("objectName").isString());
+    QVERIFY(object.property("deleteLater").isFunction());
+}
+
 static QRegExp minimal(QRegExp r) { r.setMinimal(true); return r; }
 
 void tst_QScriptEngine::qRegExpInport_data()
diff --git a/tests/auto/qscriptengineagent/tst_qscriptengineagent.cpp b/tests/auto/qscriptengineagent/tst_qscriptengineagent.cpp
index ac9ca46..a0f10dd 100644
--- a/tests/auto/qscriptengineagent/tst_qscriptengineagent.cpp
+++ b/tests/auto/qscriptengineagent/tst_qscriptengineagent.cpp
@@ -1245,6 +1245,7 @@ void tst_QScriptEngineAgent::positionChange_1()
         QCOMPARE(spy->at(1).type, ScriptEngineEvent::PositionChange);
         QCOMPARE(spy->at(1).scriptId, spy->at(0).scriptId);
         QCOMPARE(spy->at(1).lineNumber, lineNumber);
+        QEXPECT_FAIL("", "With JSC-based back-end, column number is always reported as 1", Continue);
         QCOMPARE(spy->at(1).columnNumber, 8);
 
         // 5 + 6
@@ -1279,6 +1280,7 @@ void tst_QScriptEngineAgent::positionChange_2()
         QCOMPARE(spy->at(1).type, ScriptEngineEvent::PositionChange);
         QVERIFY(spy->at(1).scriptId != spy->at(0).scriptId);
         QCOMPARE(spy->at(1).lineNumber, lineNumber);
+        QEXPECT_FAIL("", "With JSC-based back-end, column number is always reported as 1", Continue);
         QCOMPARE(spy->at(1).columnNumber, 18);
     }
 
@@ -1297,6 +1299,7 @@ void tst_QScriptEngineAgent::positionChange_2()
         QCOMPARE(spy->at(1).type, ScriptEngineEvent::PositionChange);
         QCOMPARE(spy->at(1).scriptId, spy->at(0).scriptId);
         QCOMPARE(spy->at(1).lineNumber, 1);
+        QEXPECT_FAIL("", "With JSC-based back-end, column number is always reported as 1", Continue);
         QCOMPARE(spy->at(1).columnNumber, 11);
     }
 
@@ -1327,12 +1330,14 @@ void tst_QScriptEngineAgent::positionChange_2()
         QCOMPARE(spy->at(1).type, ScriptEngineEvent::PositionChange);
         QCOMPARE(spy->at(1).scriptId, spy->at(0).scriptId);
         QCOMPARE(spy->at(1).lineNumber, 1);
+        QEXPECT_FAIL("", "With JSC-based back-end, column number is always reported as 1", Continue);
         QCOMPARE(spy->at(1).columnNumber, 31);
 
         // void(i)
         QCOMPARE(spy->at(2).type, ScriptEngineEvent::PositionChange);
         QCOMPARE(spy->at(2).scriptId, spy->at(0).scriptId);
         QCOMPARE(spy->at(2).lineNumber, 1);
+        QEXPECT_FAIL("", "With JSC-based back-end, column number is always reported as 1", Continue);
         QCOMPARE(spy->at(2).columnNumber, 31);
     }
 
@@ -1351,18 +1356,21 @@ void tst_QScriptEngineAgent::positionChange_2()
         QCOMPARE(spy->at(1).type, ScriptEngineEvent::PositionChange);
         QCOMPARE(spy->at(1).scriptId, spy->at(0).scriptId);
         QCOMPARE(spy->at(1).lineNumber, 1);
+        QEXPECT_FAIL("", "With JSC-based back-end, column number is always reported as 1", Continue);
         QCOMPARE(spy->at(1).columnNumber, 12);
 
         // ++i
         QCOMPARE(spy->at(2).type, ScriptEngineEvent::PositionChange);
         QCOMPARE(spy->at(2).scriptId, spy->at(0).scriptId);
         QCOMPARE(spy->at(2).lineNumber, 1);
+        QEXPECT_FAIL("", "With JSC-based back-end, column number is always reported as 1", Continue);
         QCOMPARE(spy->at(2).columnNumber, 28);
 
         // ++i
         QCOMPARE(spy->at(3).type, ScriptEngineEvent::PositionChange);
         QCOMPARE(spy->at(3).scriptId, spy->at(0).scriptId);
         QCOMPARE(spy->at(3).lineNumber, 1);
+        QEXPECT_FAIL("", "With JSC-based back-end, column number is always reported as 1", Continue);
         QCOMPARE(spy->at(3).columnNumber, 28);
     }
 
@@ -1381,24 +1389,28 @@ void tst_QScriptEngineAgent::positionChange_2()
         QCOMPARE(spy->at(1).type, ScriptEngineEvent::PositionChange);
         QCOMPARE(spy->at(1).scriptId, spy->at(0).scriptId);
         QCOMPARE(spy->at(1).lineNumber, 1);
+        QEXPECT_FAIL("", "With JSC-based back-end, column number is always reported as 1", Continue);
         QCOMPARE(spy->at(1).columnNumber, 12);
 
         // ++i
         QCOMPARE(spy->at(2).type, ScriptEngineEvent::PositionChange);
         QCOMPARE(spy->at(2).scriptId, spy->at(0).scriptId);
         QCOMPARE(spy->at(2).lineNumber, 1);
+        QEXPECT_FAIL("", "With JSC-based back-end, column number is always reported as 1", Continue);
         QCOMPARE(spy->at(2).columnNumber, 17);
 
         // do
         QCOMPARE(spy->at(3).type, ScriptEngineEvent::PositionChange);
         QCOMPARE(spy->at(3).scriptId, spy->at(0).scriptId);
         QCOMPARE(spy->at(3).lineNumber, 1);
+        QEXPECT_FAIL("", "With JSC-based back-end, column number is always reported as 1", Continue);
         QCOMPARE(spy->at(3).columnNumber, 12);
 
         // ++i
         QCOMPARE(spy->at(4).type, ScriptEngineEvent::PositionChange);
         QCOMPARE(spy->at(4).scriptId, spy->at(0).scriptId);
         QCOMPARE(spy->at(4).lineNumber, 1);
+        QEXPECT_FAIL("", "With JSC-based back-end, column number is always reported as 1", Continue);
         QCOMPARE(spy->at(4).columnNumber, 17);
     }
 
@@ -1429,6 +1441,7 @@ void tst_QScriptEngineAgent::positionChange_2()
         QCOMPARE(spy->at(1).type, ScriptEngineEvent::PositionChange);
         QCOMPARE(spy->at(1).scriptId, spy->at(0).scriptId);
         QCOMPARE(spy->at(1).lineNumber, 1);
+        QEXPECT_FAIL("", "With JSC-based back-end, column number is always reported as 1", Continue);
         QCOMPARE(spy->at(1).columnNumber, 15);
     }
 
@@ -1447,12 +1460,14 @@ void tst_QScriptEngineAgent::positionChange_2()
         QCOMPARE(spy->at(1).type, ScriptEngineEvent::PositionChange);
         QCOMPARE(spy->at(1).scriptId, spy->at(0).scriptId);
         QCOMPARE(spy->at(1).lineNumber, 1);
+        QEXPECT_FAIL("", "With JSC-based back-end, column number is always reported as 1", Continue);
         QCOMPARE(spy->at(1).columnNumber, 32);
 
         // continue
         QCOMPARE(spy->at(2).type, ScriptEngineEvent::PositionChange);
         QCOMPARE(spy->at(2).scriptId, spy->at(0).scriptId);
         QCOMPARE(spy->at(2).lineNumber, 1);
+        QEXPECT_FAIL("", "With JSC-based back-end, column number is always reported as 1", Continue);
         QCOMPARE(spy->at(2).columnNumber, 32);
     }
 
@@ -1495,6 +1510,7 @@ void tst_QScriptEngineAgent::positionChange_2()
         QCOMPARE(spy->at(1).type, ScriptEngineEvent::PositionChange);
         QCOMPARE(spy->at(1).scriptId, spy->at(0).scriptId);
         QCOMPARE(spy->at(1).lineNumber, 1);
+        QEXPECT_FAIL("", "With JSC-based back-end, column number is always reported as 1", Continue);
         QCOMPARE(spy->at(1).columnNumber, 31);
     }
 
@@ -1513,12 +1529,14 @@ void tst_QScriptEngineAgent::positionChange_2()
         QCOMPARE(spy->at(1).type, ScriptEngineEvent::PositionChange);
         QCOMPARE(spy->at(1).scriptId, spy->at(0).scriptId);
         QCOMPARE(spy->at(1).lineNumber, 1);
+        QEXPECT_FAIL("", "With JSC-based back-end, column number is always reported as 1", Continue);
         QCOMPARE(spy->at(1).columnNumber, 38);
 
         // break
         QCOMPARE(spy->at(2).type, ScriptEngineEvent::PositionChange);
         QCOMPARE(spy->at(2).scriptId, spy->at(0).scriptId);
         QCOMPARE(spy->at(2).lineNumber, 1);
+        QEXPECT_FAIL("", "With JSC-based back-end, column number is always reported as 1", Continue);
         QCOMPARE(spy->at(2).columnNumber, 45);
     }
 
@@ -1543,18 +1561,21 @@ void tst_QScriptEngineAgent::positionChange_2()
         QCOMPARE(spy->at(0).type, ScriptEngineEvent::PositionChange);
         QVERIFY(spy->at(0).scriptId != -1);
         QCOMPARE(spy->at(0).lineNumber, 1);
+        QEXPECT_FAIL("", "With JSC-based back-end, column number is always reported as 1", Continue);
         QCOMPARE(spy->at(0).columnNumber, 7);
 
         // i = e
         QCOMPARE(spy->at(1).type, ScriptEngineEvent::PositionChange);
         QCOMPARE(spy->at(1).scriptId, spy->at(0).scriptId);
         QCOMPARE(spy->at(1).lineNumber, 1);
+        QEXPECT_FAIL("", "With JSC-based back-end, column number is always reported as 1", Continue);
         QCOMPARE(spy->at(1).columnNumber, 29);
 
         // i = 2
         QCOMPARE(spy->at(2).type, ScriptEngineEvent::PositionChange);
         QCOMPARE(spy->at(2).scriptId, spy->at(0).scriptId);
         QCOMPARE(spy->at(2).lineNumber, 1);
+        QEXPECT_FAIL("", "With JSC-based back-end, column number is always reported as 1", Continue);
         QCOMPARE(spy->at(2).columnNumber, 48);
     }
 
@@ -1567,12 +1588,14 @@ void tst_QScriptEngineAgent::positionChange_2()
         QCOMPARE(spy->at(0).type, ScriptEngineEvent::PositionChange);
         QVERIFY(spy->at(0).scriptId != -1);
         QCOMPARE(spy->at(0).lineNumber, 1);
+        QEXPECT_FAIL("", "With JSC-based back-end, column number is always reported as 1", Continue);
         QCOMPARE(spy->at(0).columnNumber, 7);
 
         // i = 3
         QCOMPARE(spy->at(1).type, ScriptEngineEvent::PositionChange);
         QCOMPARE(spy->at(1).scriptId, spy->at(0).scriptId);
         QCOMPARE(spy->at(1).lineNumber, 1);
+        QEXPECT_FAIL("", "With JSC-based back-end, column number is always reported as 1", Continue);
         QCOMPARE(spy->at(1).columnNumber, 46);
     }
 
@@ -1594,6 +1617,7 @@ void tst_QScriptEngineAgent::positionChange_2()
         QCOMPARE(spy->at(1).type, ScriptEngineEvent::PositionChange);
         QCOMPARE(spy->at(1).scriptId, spy->at(0).scriptId);
         QCOMPARE(spy->at(1).lineNumber, 1);
+        QEXPECT_FAIL("", "With JSC-based back-end, column number is always reported as 1", Continue);
         QCOMPARE(spy->at(1).columnNumber, 20);
     }
     delete spy;
diff --git a/tests/auto/qscriptvalue/tst_qscriptvalue.cpp b/tests/auto/qscriptvalue/tst_qscriptvalue.cpp
index f83cf58..5b79340 100644
--- a/tests/auto/qscriptvalue/tst_qscriptvalue.cpp
+++ b/tests/auto/qscriptvalue/tst_qscriptvalue.cpp
@@ -2047,7 +2047,9 @@ void tst_QScriptValue::getSetProperty()
     }
     // should still be deletable from C++
     object.setProperty("undeletableProperty", QScriptValue());
+    QEXPECT_FAIL("", "With JSC-based back-end, undeletable properties can't be deleted from C++", Continue);
     QVERIFY(!object.property("undeletableProperty").isValid());
+    QEXPECT_FAIL("", "With JSC-based back-end, undeletable properties can't be deleted from C++", Continue);
     QCOMPARE(object.propertyFlags("undeletableProperty"), 0);
 
   // SkipInEnumeration
@@ -2082,11 +2084,11 @@ void tst_QScriptValue::getSetProperty()
     object.setProperty("flagProperty", str, QScriptValue::ReadOnly);
     QCOMPARE(object.propertyFlags("flagProperty"), QScriptValue::ReadOnly);
 
-    object.setProperty("flagProperty", str, object.propertyFlags("flagProperty") | QScriptValue::Undeletable);
-    QCOMPARE(object.propertyFlags("flagProperty"), QScriptValue::ReadOnly | QScriptValue::Undeletable);
+    object.setProperty("flagProperty", str, object.propertyFlags("flagProperty") | QScriptValue::SkipInEnumeration);
+    QCOMPARE(object.propertyFlags("flagProperty"), QScriptValue::ReadOnly | QScriptValue::SkipInEnumeration);
 
     object.setProperty("flagProperty", str, QScriptValue::KeepExistingFlags);
-    QCOMPARE(object.propertyFlags("flagProperty"), QScriptValue::ReadOnly | QScriptValue::Undeletable);
+    QCOMPARE(object.propertyFlags("flagProperty"), QScriptValue::ReadOnly | QScriptValue::SkipInEnumeration);
 
     object.setProperty("flagProperty", str, QScriptValue::UserRange);
     QCOMPARE(object.propertyFlags("flagProperty"), QScriptValue::UserRange);
diff --git a/tests/auto/qscriptvalueiterator/tst_qscriptvalueiterator.cpp b/tests/auto/qscriptvalueiterator/tst_qscriptvalueiterator.cpp
index 5ca7a3d..55773f0 100644
--- a/tests/auto/qscriptvalueiterator/tst_qscriptvalueiterator.cpp
+++ b/tests/auto/qscriptvalueiterator/tst_qscriptvalueiterator.cpp
@@ -255,8 +255,14 @@ void tst_QScriptValueIterator::iterateArray()
         QVERIFY(it.value().strictlyEquals(array.property(propertyNames.at(i))));
         QCOMPARE(it.value().toString(), propertyValues.at(i));
     }
-    QCOMPARE(it.hasNext(), false);
+    QVERIFY(it.hasNext());
+    it.next();
+    QCOMPARE(it.name(), QString::fromLatin1("length"));
+    QVERIFY(it.value().isNumber());
+    QCOMPARE(it.value().toInt32(), length);
+    QCOMPARE(it.flags(), QScriptValue::SkipInEnumeration | QScriptValue::Undeletable);
 
+    it.previous();
     QCOMPARE(it.hasPrevious(), length > 0);
     for (int i = length - 1; i >= 0; --i) {
         it.previous();
@@ -301,7 +307,9 @@ void tst_QScriptValueIterator::iterateArray()
             QVERIFY(it.value().strictlyEquals(array.property(propertyNames.at(i))));
             QCOMPARE(it.value().toString(), propertyValues.at(i));
         }
-        QCOMPARE(it.hasNext(), false);
+        QCOMPARE(it.hasNext(), true);
+        it.next();
+        QCOMPARE(it.name(), QString::fromLatin1("length"));
     }
 }
 
@@ -420,9 +428,15 @@ void tst_QScriptValueIterator::iterateString()
         QCOMPARE(it.flags(), obj.propertyFlags(indexStr));
         QCOMPARE(it.value().strictlyEquals(obj.property(indexStr)), true);
     }
-    QCOMPARE(it.hasNext(), false);
+    QVERIFY(it.hasNext());
+    it.next();
+    QCOMPARE(it.name(), QString::fromLatin1("length"));
+    QVERIFY(it.value().isNumber());
+    QCOMPARE(it.value().toInt32(), length);
+    QCOMPARE(it.flags(), QScriptValue::ReadOnly | QScriptValue::SkipInEnumeration | QScriptValue::Undeletable);
 
-    QVERIFY(it.hasPrevious());
+    it.previous();
+    QCOMPARE(it.hasPrevious(), length > 0);
     for (int i = length - 1; i >= 0; --i) {
         it.previous();
         QString indexStr = QScriptValue(&engine, i).toString();
diff --git a/tests/auto/qsslsocket/tst_qsslsocket.cpp b/tests/auto/qsslsocket/tst_qsslsocket.cpp
index ad2b50d..4397ab1 100644
--- a/tests/auto/qsslsocket/tst_qsslsocket.cpp
+++ b/tests/auto/qsslsocket/tst_qsslsocket.cpp
@@ -666,6 +666,21 @@ void tst_QSslSocket::isEncrypted()
 
 void tst_QSslSocket::localCertificate()
 {
+    if (!QSslSocket::supportsSsl())
+        return;
+
+    // This test does not make 100% sense yet. We just set some local CA/cert/key and use it
+    // to authenticate ourselves against the server. The server does not actually check this
+    // values. This test should just run the codepath inside qsslsocket_openssl.cpp
+
+    QSslSocketPtr socket = newSocket();
+    QList<QSslCertificate> localCert = QSslCertificate::fromPath(SRCDIR "certs/qt-test-server-cacert.pem");
+    socket->setCaCertificates(localCert);
+    socket->setLocalCertificate(QLatin1String(SRCDIR "certs/fluke.cert"));
+    socket->setPrivateKey(QLatin1String(SRCDIR "certs/fluke.key"));
+
+    socket->connectToHostEncrypted(QtNetworkSettings::serverName(), 443);
+    QVERIFY(socket->waitForEncrypted(5000));
 }
 
 void tst_QSslSocket::mode()
diff --git a/tests/auto/qzip/tst_qzip.cpp b/tests/auto/qzip/tst_qzip.cpp
index d7fc2f7..cb3acf5 100644
--- a/tests/auto/qzip/tst_qzip.cpp
+++ b/tests/auto/qzip/tst_qzip.cpp
@@ -77,6 +77,7 @@ void tst_QZip::basicUnpack()
     QCOMPARE(files.count(), 2);
 
     QZipReader::FileInfo fi = files.at(0);
+    QVERIFY(fi.isValid());
     QCOMPARE(fi.filePath, QString("test/"));
     QCOMPARE(uint(fi.isDir), (uint) 1);
     QCOMPARE(uint(fi.isFile), (uint) 0);
@@ -85,7 +86,10 @@ void tst_QZip::basicUnpack()
     QCOMPARE(fi.permissions,QFile::Permissions(  QFile::ReadOwner | QFile::WriteOwner | QFile::ExeOwner
                                                  | QFile::ReadUser  | QFile::WriteUser | QFile::ExeUser   ));
 
+    QCOMPARE(fi.lastModified, QDateTime::fromString("2005.11.11 13:08:02", "yyyy.MM.dd HH:mm:ss"));
+
     fi = files.at(1);
+    QVERIFY(fi.isValid());
     QCOMPARE(fi.filePath, QString("test/test.txt"));
     QCOMPARE(uint(fi.isDir), (uint) 0);
     QCOMPARE(uint(fi.isFile), (uint) 1);
@@ -94,7 +98,12 @@ void tst_QZip::basicUnpack()
     QVERIFY(fi.permissions == QFile::Permissions(  QFile::ReadOwner | QFile::WriteOwner
                                                  | QFile::ReadUser  | QFile::WriteUser ));
 
+    QCOMPARE(fi.lastModified, QDateTime::fromString("2005.11.11 13:08:02", "yyyy.MM.dd HH:mm:ss"));
+
     QCOMPARE(zip.fileData("test/test.txt"), QByteArray("content\n"));
+
+    fi = files.at(-1);
+    QVERIFY(!fi.isValid());
 }
 
 void tst_QZip::symlinks()
@@ -104,6 +113,7 @@ void tst_QZip::symlinks()
     QCOMPARE(files.count(), 2);
 
     QZipReader::FileInfo fi = files.at(0);
+    QVERIFY(fi.isValid());
     QCOMPARE(fi.filePath, QString("symlink"));
     QVERIFY(!fi.isDir);
     QVERIFY(!fi.isFile);
@@ -112,6 +122,7 @@ void tst_QZip::symlinks()
     QCOMPARE(zip.fileData("symlink"), QByteArray("destination"));
 
     fi = files.at(1);
+    QVERIFY(fi.isValid());
     QCOMPARE(fi.filePath, QString("destination"));
     QVERIFY(!fi.isDir);
     QVERIFY(fi.isFile);