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

Check if the file is already used in the .pro file.

Browse Source 
And refuse to add it twice. The check is pretty simplistic in that it
doesn't take scopes or which variable it's exactly in into account.
But in those cases you need to edit the .pro file manually anyway.

Task-Nr: QTCREATORBUG-932
Task-Nr: QTCREATORBUG-891
Task-Nr: QTCREATORBUG-653
This commit is contained in:
dt
2010-05-18 16:29:41 +02:00
parent 8e11d1d18a
commit 02e1b8694b
1 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/plugins/qt4projectmanager/qt4nodes.cpp
View File

@@ -576,9 +576,23 @@ bool Qt4PriFileNode::removeSubProjects(const QStringList &proFilePaths)
bool Qt4PriFileNode::addFiles(const FileType fileType, const QStringList &filePaths,
QStringList *notAdded)
{
QStringList failedFiles;
// If a file is already referenced in the .pro file then we don't add them.
// That ignores scopes and which variable was used to reference the file
// So it's obviously a bit limited, but in those cases you need to edit the
// project files manually anyway.
changeFiles(fileType, filePaths, &failedFiles, AddToProFile);
ProjectExplorer::FindAllFilesVisitor visitor;
accept(&visitor);
const QStringList &allFiles = visitor.filePaths();
QStringList uniqueFilePaths;
foreach (const QString &file, filePaths) {
if(!allFiles.contains(file))
uniqueFilePaths.append(file);
}
QStringList failedFiles;
changeFiles(fileType, uniqueFilePaths, &failedFiles, AddToProFile);
if (notAdded)
*notAdded = failedFiles;
return failedFiles.isEmpty();