Merge remote branch 'origin/1.3'

Trailing whitespace removal re-applied manually.

src/plugins/qmljseditor/qmljseditorplugin.cpp

@@ -133,7 +133,7 @@ bool QmlJSEditorPlugin::initialize(const QStringList & /*arguments*/, QString *e
     m_completion->setCaseSensitivity(caseSensitive ? Qt::CaseSensitive : Qt::CaseInsensitive);
     settings->endGroup();
     settings->endGroup();
-    
+
     error_message->clear();
 
     return true;