Merge remote branch 'origin/1.3'

Trailing whitespace removal re-applied manually.

src/plugins/qmlinspector/qmlinspector.h

@@ -38,13 +38,13 @@ namespace QmlInspector {
 
         const char * const C_INSPECTOR = "QmlInspector";
     };
-    
+
     class StartParameters
     {
     public:
         StartParameters() : port(0) {}
         ~StartParameters() {}
-        
+
         QString address;
         quint16 port;
     };