Merge remote branch 'origin/1.3'

Trailing whitespace removal re-applied manually.

src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.cpp

@@ -178,7 +178,7 @@ void copyRecursive(const QDir& from, const QDir& to, const QString& dir)
     }
     foreach(const QString& roDir, src.entryList(QDir::NoDotAndDotDot|QDir::Dirs)) {
         copyRecursive(src, dest, QDir(roDir).dirName());
-    }   
+    }
 }
 } // namespace