Merge remote branch 'origin/1.3'

Trailing whitespace removal re-applied manually.

src/plugins/projectexplorer/toolchain.cpp

@@ -399,7 +399,7 @@ QByteArray MSVCToolChain::predefinedMacros()
                 }
                 QByteArray newDefine = "#define " + key + " " + value + '\n';
                 m_predefinedMacros.append(newDefine);
-            }            
+            }
         }
         QFile::remove(tmpFilePath);
     }