Merge remote branch 'origin/1.3'

Trailing whitespace removal re-applied manually.

src/plugins/designer/formwindoweditor.cpp

@@ -374,7 +374,7 @@ QString FormWindowEditor::contents() const
         return QString::null;
 //  Activate once all Qt branches around have integrated 4.5.2
 //  (Kinetic)
-/*  
+/*
 #if QT_VERSION > 0x040501
     // Quiet save as of Qt 4.5.2
     qdesigner_internal::FormWindowBase *fwb = qobject_cast<qdesigner_internal::FormWindowBase *>(m_formWindow);