GenericProjectWizard: Improve project file generation

* Sort the file list once, otherwise there might be some
  inconsistencies with files lists like "AAA.c AAA.h aaa.c aaa.h"
* Append a newline to end of .*files and *.includes as this otherwise
  happens when adding files later

Change-Id: If2b5e81d0f61c1a08c60e8151305534ef991865a
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>

1 files changed, 3 insertions, 0 deletions

diff --git a/src/plugins/genericprojectmanager/genericprojectwizard.cpp b/src/plugins/genericprojectmanager/genericprojectwizard.cpp
index 2b04752f4d4..03bbcd6a8c9 100644
--- a/src/plugins/genericprojectmanager/genericprojectwizard.cpp
+++ b/src/plugins/genericprojectmanager/genericprojectwizard.cpp
@@ -173,6 +173,7 @@ Core::GeneratedFiles GenericProjectWizard::generateFiles(const QWizard *w,
             includePaths.append(relative);
         }
     }
+    includePaths.append(QString()); // ensure newline at EOF
 
     Core::GeneratedFile generatedCreatorFile(creatorFileName);
     generatedCreatorFile.setContents(QLatin1String("[General]\n"));
@@ -181,6 +182,8 @@ Core::GeneratedFiles GenericProjectWizard::generateFiles(const QWizard *w,
     QStringList sources = Utils::transform(wizard->selectedFiles(), &Utils::FileName::toString);
     for (int i = 0; i < sources.length(); ++i)
         sources[i] = dir.relativeFilePath(sources[i]);
+    Utils::sort(sources);
+    sources.append(QString()); // ensure newline at EOF
 
     Core::GeneratedFile generatedFilesFile(filesFileName);
     generatedFilesFile.setContents(sources.join(QLatin1Char('\n')));