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/qwidget/tst_qwidget.cpp b/tests/auto/qwidget/tst_qwidget.cpp
index 0b2da10..98a5e73 100644
--- a/tests/auto/qwidget/tst_qwidget.cpp
+++ b/tests/auto/qwidget/tst_qwidget.cpp
@@ -3466,7 +3466,7 @@ QString textPropertyToString(Display *display, XTextProperty& text_prop)
 static CCoeControl* GetStatusPaneControl( TInt aPaneId )
 {
     const TUid paneUid = { aPaneId };
-    
+
     CEikStatusPane* statusPane = CEikonEnv::Static()->AppUiFactory()->StatusPane();
     if (statusPane && statusPane->PaneCapabilities(paneUid).IsPresent()){
 		CCoeControl* control = NULL;
@@ -3476,17 +3476,17 @@ static CCoeControl* GetStatusPaneControl( TInt aPaneId )
     }
     return NULL;
 }
-// Returns the application's title pane, if not present returns NULL. 
+// Returns the application's title pane, if not present returns NULL.
 static CAknTitlePane* TitlePane()
 {
     return static_cast<CAknTitlePane*>(GetStatusPaneControl(EEikStatusPaneUidTitle));
 }
-    
-// Returns the application's title pane, if not present returns NULL. 
+
+// Returns the application's title pane, if not present returns NULL.
 static CAknContextPane* ContextPane()
 {
     return static_cast<CAknContextPane*>(GetStatusPaneControl(EEikStatusPaneUidContext));
-}    
+}
 #endif
 
 static QString visibleWindowTitle(QWidget *window, Qt::WindowState state = Qt::WindowNoState)
@@ -3551,7 +3551,7 @@ static QString visibleWindowTitle(QWidget *window, Qt::WindowState state = Qt::W
     if (win)
         vTitle = win->caption();
     }
-#elif defined (Q_WS_S60)    
+#elif defined (Q_WS_S60)
     CAknTitlePane* titlePane = TitlePane();
     if(titlePane)
         {