feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

GenericProjectWizard: Improve project file generation

Browse Source 
* 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>
This commit is contained in:
Andre Hartmann
2016-08-10 12:25:20 +02:00
committed by André Hartmann
parent 112bdc0f88
commit 7158ef3ffd
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/genericprojectmanager/genericprojectwizard.cpp
View File

@@ -173,6 +173,7 @@ Core::GeneratedFiles GenericProjectWizard::generateFiles(const QWizard *w,
includePaths.append(relative); includePaths.append(relative);
} }
} }
includePaths.append(QString()); // ensure newline at EOF
Core::GeneratedFile generatedCreatorFile(creatorFileName); Core::GeneratedFile generatedCreatorFile(creatorFileName);
generatedCreatorFile.setContents(QLatin1String("[General]\n")); 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); QStringList sources = Utils::transform(wizard->selectedFiles(), &Utils::FileName::toString);
for (int i = 0; i < sources.length(); ++i) for (int i = 0; i < sources.length(); ++i)
sources[i] = dir.relativeFilePath(sources[i]); sources[i] = dir.relativeFilePath(sources[i]);
Utils::sort(sources);
sources.append(QString()); // ensure newline at EOF
Core::GeneratedFile generatedFilesFile(filesFileName); Core::GeneratedFile generatedFilesFile(filesFileName);
generatedFilesFile.setContents(sources.join(QLatin1Char('\n'))); generatedFilesFile.setContents(sources.join(QLatin1Char('\n')));