Merge remote branch 'origin/1.3'

Trailing whitespace removal re-applied manually.

1 files changed, 2 insertions, 2 deletions

diff --git a/src/plugins/qt4projectmanager/wizards/guiappwizard.cpp b/src/plugins/qt4projectmanager/wizards/guiappwizard.cpp
index c6359576c4..3b72ed5dc5 100644
--- a/src/plugins/qt4projectmanager/wizards/guiappwizard.cpp
+++ b/src/plugins/qt4projectmanager/wizards/guiappwizard.cpp
@@ -94,7 +94,7 @@ QWizard *GuiAppWizard::createWizardDialog(QWidget *parent,
     // Order! suffixes first to generate files correctly
     dialog->setLowerCaseFiles(QtWizard::lowerCaseFiles());
     dialog->setSuffixes(headerSuffix(), sourceSuffix(), formSuffix());
-    dialog->setBaseClasses(baseClasses());    
+    dialog->setBaseClasses(baseClasses());
     return dialog;
 }
 
@@ -157,7 +157,7 @@ Core::GeneratedFiles GuiAppWizard::generateFiles(const QWizard *w,
         form = QSharedPointer<Core::GeneratedFile>(new Core::GeneratedFile(formName));
         if (!parametrizeTemplate(templatePath, QLatin1String("widget.ui"), params, &contents, errorMessage))
             return Core::GeneratedFiles();
-        form->setContents(contents);        
+        form->setContents(contents);
         if (!generateFormClass(params, *form, &formSource, &formHeader, errorMessage))
             return Core::GeneratedFiles();
     } else {