Merge commit 'origin/master'

Conflicts:
	tests/auto/qfilesystemmodel/qfilesystemmodel.pro
	tests/auto/qfontdialog/tst_qfontdialog.cpp
	tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp
	tests/auto/qgraphicslayout/tst_qgraphicslayout.cpp
	tests/auto/qsqldriver/qsqldriver.pro
	tests/auto/qsqlquery/qsqlquery.pro
	tests/auto/qsqlrelationaltablemodel/qsqlrelationaltablemodel.pro
	tests/auto/qsqltablemodel/qsqltablemodel.pro
	tests/auto/qsqlthread/qsqlthread.pro
	tests/auto/qstatemachine/tst_qstatemachine.cpp
	tests/auto/qtcpsocket/tst_qtcpsocket.cpp

1 files changed, 21 insertions, 21 deletions

diff --git a/tests/auto/qnetworkreply/tst_qnetworkreply.cpp b/tests/auto/qnetworkreply/tst_qnetworkreply.cpp
index a4c3b80..ea493c7 100644
--- a/tests/auto/qnetworkreply/tst_qnetworkreply.cpp
+++ b/tests/auto/qnetworkreply/tst_qnetworkreply.cpp
@@ -974,7 +974,7 @@ tst_QNetworkReply::tst_QNetworkReply()
 }
 
 tst_QNetworkReply::~tst_QNetworkReply()
-{ 
+{
 }
 
 
@@ -1823,11 +1823,11 @@ void tst_QNetworkReply::ioGetFromFtp()
     DataReader reader(reply);
 
     connect(reply, SIGNAL(finished()), &QTestEventLoop::instance(), SLOT(exitLoop()));
-#ifdef Q_OS_SYMBIAN        
+#ifdef Q_OS_SYMBIAN
     QTestEventLoop::instance().enterLoop(20);
 #else
-    QTestEventLoop::instance().enterLoop(10);        
-#endif        
+    QTestEventLoop::instance().enterLoop(10);
+#endif
     QVERIFY(!QTestEventLoop::instance().timeout());
 
     QCOMPARE(reply->url(), request.url());
@@ -1857,19 +1857,19 @@ void tst_QNetworkReply::ioGetFromFtpWithReuse()
     QSignalSpy spy(reply1, SIGNAL(finished()));
 
     connect(reply2, SIGNAL(finished()), &QTestEventLoop::instance(), SLOT(exitLoop()));
-#ifdef Q_OS_SYMBIAN        
+#ifdef Q_OS_SYMBIAN
     QTestEventLoop::instance().enterLoop(20);
 #else
-    QTestEventLoop::instance().enterLoop(10);        
-#endif 
+    QTestEventLoop::instance().enterLoop(10);
+#endif
     QVERIFY(!QTestEventLoop::instance().timeout());
     if (spy.count() == 0) {
         connect(reply1, SIGNAL(finished()), &QTestEventLoop::instance(), SLOT(exitLoop()));
-#ifdef Q_OS_SYMBIAN        
+#ifdef Q_OS_SYMBIAN
         QTestEventLoop::instance().enterLoop(20);
 #else
-        QTestEventLoop::instance().enterLoop(10);        
-#endif 
+        QTestEventLoop::instance().enterLoop(10);
+#endif
         QVERIFY(!QTestEventLoop::instance().timeout());
     }
 
@@ -2558,11 +2558,11 @@ void tst_QNetworkReply::ioGetWithManyProxies()
             SLOT(sslErrors(QNetworkReply*,QList<QSslError>)));
 #endif
 
-#ifndef Q_OS_SYMBIAN    
+#ifndef Q_OS_SYMBIAN
     QTestEventLoop::instance().enterLoop(10);
-#else   
+#else
     QTestEventLoop::instance().enterLoop(60);
-#endif     
+#endif
     QVERIFY(!QTestEventLoop::instance().timeout());
 
     manager.disconnect(SIGNAL(proxyAuthenticationRequired(QNetworkProxy,QAuthenticator*)),
@@ -3447,11 +3447,11 @@ void tst_QNetworkReply::downloadProgress()
         QVERIFY2(sender->waitForBytesWritten(2000), "Network timeout");
 
         spy.clear();
-#ifdef Q_OS_SYMBIAN        
+#ifdef Q_OS_SYMBIAN
         QTestEventLoop::instance().enterLoop(5);
 #else
         QTestEventLoop::instance().enterLoop(2);
-#endif            
+#endif
         QVERIFY(!QTestEventLoop::instance().timeout());
         QVERIFY(spy.count() > 0);
         QVERIFY(!reply->isFinished());
@@ -3466,11 +3466,11 @@ void tst_QNetworkReply::downloadProgress()
     delete sender;
 
     spy.clear();
-#ifdef Q_OS_SYMBIAN        
+#ifdef Q_OS_SYMBIAN
     QTestEventLoop::instance().enterLoop(5);
 #else
     QTestEventLoop::instance().enterLoop(2);
-#endif    
+#endif
     QVERIFY(!QTestEventLoop::instance().timeout());
     QVERIFY(spy.count() > 0);
     QVERIFY(!reply->isRunning());
@@ -3487,7 +3487,7 @@ void tst_QNetworkReply::uploadProgress_data()
 }
 
 void tst_QNetworkReply::uploadProgress()
-{  
+{
     QFETCH(QByteArray, data);
     QTcpServer server;
     QVERIFY(server.listen());
@@ -3759,11 +3759,11 @@ void tst_QNetworkReply::httpProxyCommands()
     // wait for the finished signal
     connect(reply, SIGNAL(finished()), &QTestEventLoop::instance(), SLOT(exitLoop()));
 
-#ifdef Q_OS_SYMBIAN        
+#ifdef Q_OS_SYMBIAN
     QTestEventLoop::instance().enterLoop(5);
 #else
-    QTestEventLoop::instance().enterLoop(1);        
-#endif        
+    QTestEventLoop::instance().enterLoop(1);
+#endif
 
     QVERIFY(!QTestEventLoop::instance().timeout());