Merge remote branch 'origin/4.7' into qt-master-from-4.7

Conflicts:
	examples/webkit/imageanalyzer/imageanalyzer.h
	examples/webkit/imageanalyzer/mainwindow.h
	mkspecs/unsupported/qws/linux-x86-openkode-g++/qplatformdefs.h
	src/corelib/io/qfsfileengine_iterator_unix.cpp
	src/corelib/io/qfsfileengine_iterator_win.cpp
	src/corelib/kernel/qcoreapplication.cpp
	src/network/access/qnetworkaccessdatabackend.cpp
	src/plugins/bearer/connman/qconnmanservice_linux.cpp
	src/plugins/platforms/openvglite/qwindowsurface_vglite.h
	src/s60installs/bwins/QtCoreu.def
	src/s60installs/eabi/QtCoreu.def
	src/s60installs/s60installs.pro
	tools/assistant/tools/assistant/helpviewer_qwv.h
	tools/qdoc3/test/qt-html-templates.qdocconf

1 files changed, 8 insertions, 8 deletions

diff --git a/tests/auto/qhttpnetworkconnection/tst_qhttpnetworkconnection.cpp b/tests/auto/qhttpnetworkconnection/tst_qhttpnetworkconnection.cpp
index a9b501c..0b72139 100644
--- a/tests/auto/qhttpnetworkconnection/tst_qhttpnetworkconnection.cpp
+++ b/tests/auto/qhttpnetworkconnection/tst_qhttpnetworkconnection.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
@@ -180,7 +180,7 @@ void tst_QHttpNetworkConnection::head()
     QHttpNetworkConnection connection(host, port, encrypt);
     QCOMPARE(connection.port(), port);
     QCOMPARE(connection.hostName(), host);
-    QCOMPARE(connection.isEncrypted(), encrypt);
+    QCOMPARE(connection.isSsl(), encrypt);
 
     QHttpNetworkRequest request(protocol + host + path, QHttpNetworkRequest::Head);
     QHttpNetworkReply *reply = connection.sendRequest(request);
@@ -238,7 +238,7 @@ void tst_QHttpNetworkConnection::get()
     QHttpNetworkConnection connection(host, port, encrypt);
     QCOMPARE(connection.port(), port);
     QCOMPARE(connection.hostName(), host);
-    QCOMPARE(connection.isEncrypted(), encrypt);
+    QCOMPARE(connection.isSsl(), encrypt);
 
     QHttpNetworkRequest request(protocol + host + path);
     QHttpNetworkReply *reply = connection.sendRequest(request);
@@ -316,7 +316,7 @@ void tst_QHttpNetworkConnection::put()
     QHttpNetworkConnection connection(host, port, encrypt);
     QCOMPARE(connection.port(), port);
     QCOMPARE(connection.hostName(), host);
-    QCOMPARE(connection.isEncrypted(), encrypt);
+    QCOMPARE(connection.isSsl(), encrypt);
 
     QHttpNetworkRequest request(protocol + host + path, QHttpNetworkRequest::Put);
 
@@ -404,7 +404,7 @@ void tst_QHttpNetworkConnection::post()
     QHttpNetworkConnection connection(host, port, encrypt);
     QCOMPARE(connection.port(), port);
     QCOMPARE(connection.hostName(), host);
-    QCOMPARE(connection.isEncrypted(), encrypt);
+    QCOMPARE(connection.isSsl(), encrypt);
 
     QHttpNetworkRequest request(protocol + host + path, QHttpNetworkRequest::Post);
 
@@ -541,7 +541,7 @@ void tst_QHttpNetworkConnection::get401()
     QHttpNetworkConnection connection(host, port, encrypt);
     QCOMPARE(connection.port(), port);
     QCOMPARE(connection.hostName(), host);
-    QCOMPARE(connection.isEncrypted(), encrypt);
+    QCOMPARE(connection.isSsl(), encrypt);
     connection.setProperty("setCredentials", setCredentials);
     connection.setProperty("username", username);
     connection.setProperty("password", password);
@@ -611,7 +611,7 @@ void tst_QHttpNetworkConnection::compression()
     QHttpNetworkConnection connection(host, port, encrypt);
     QCOMPARE(connection.port(), port);
     QCOMPARE(connection.hostName(), host);
-    QCOMPARE(connection.isEncrypted(), encrypt);
+    QCOMPARE(connection.isSsl(), encrypt);
 
     QHttpNetworkRequest request(protocol + host + path);
     if (!autoCompress)
@@ -703,7 +703,7 @@ void tst_QHttpNetworkConnection::ignoresslerror()
     QCOMPARE(connection.hostName(), host);
     if (ignoreInit)
         connection.ignoreSslErrors();
-    QCOMPARE(connection.isEncrypted(), encrypt);
+    QCOMPARE(connection.isSsl(), encrypt);
     connection.setProperty("ignoreFromSignal", ignoreFromSignal);
 
     QHttpNetworkRequest request(protocol + host + path);