Merge remote branch 'origin/1.3'

Trailing whitespace removal re-applied manually.

src/libs/utils/savedaction.h

@@ -72,7 +72,7 @@ public:
 
     virtual void readSettings(const QSettings *settings);
     Q_SLOT virtual void writeSettings(QSettings *settings);
-    
+
     virtual void connectWidget(QWidget *widget, ApplyMode applyMode = DeferedApply);
     virtual void disconnectWidget();
     Q_SLOT virtual void apply(QSettings *settings);