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, 6 insertions, 6 deletions

diff --git a/tests/auto/qhttp/tst_qhttp.cpp b/tests/auto/qhttp/tst_qhttp.cpp
index a6bec39..37ce256 100644
--- a/tests/auto/qhttp/tst_qhttp.cpp
+++ b/tests/auto/qhttp/tst_qhttp.cpp
@@ -198,9 +198,9 @@ void tst_QHttp::initTestCase_data()
     QTest::addColumn<int>("proxyType");
 
     QTest::newRow("WithoutProxy") << false << 0;
-#ifdef TEST_QNETWORK_PROXY        
+#ifdef TEST_QNETWORK_PROXY
     QTest::newRow("WithSocks5Proxy") << true << int(QNetworkProxy::Socks5Proxy);
-#endif        
+#endif
 }
 
 void tst_QHttp::initTestCase()
@@ -426,7 +426,7 @@ void tst_QHttp::head_data()
 
     QTest::newRow( "failprot_01" ) << QtNetworkSettings::serverName() << 80u
 	<< QString("/t") << 1 << 404 << 0u;
-	
+
     QTest::newRow( "failprot_02" ) << QtNetworkSettings::serverName() << 80u
 	<< QString("qtest/rfc3252.txt") << 1 << 400 << 0u;
 
@@ -1242,11 +1242,11 @@ void tst_QHttp::unexpectedRemoteClose()
     QCoreApplication::instance()->processEvents();
 
     QEventLoop loop;
-#ifndef Q_OS_SYMBIAN    
+#ifndef Q_OS_SYMBIAN
     QTimer::singleShot(3000, &loop, SLOT(quit()));
-#else   
+#else
     QTimer::singleShot(30000, &loop, SLOT(quit()));
-#endif   
+#endif
 
     QHttp http;
     QObject::connect(&http, SIGNAL(done(bool)), &loop, SLOT(quit()));