1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qmake: fix warning about duplicate references in project file

Browse Source 
Task-number: QTBUG-59301
Change-Id: I2562b862465a52ecc56f551bcdb98fa7279ebfcf
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@qt.io>
This commit is contained in:
Jake Petroules 2017-06-19 14:27:11 -07:00
parent 922e410ebb
commit 6e2eeee7f5
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
qmake/generators/mac/pbuilder_pbx.cpp
View File

@ -576,13 +576,13 @@ ProjectBuilderMakefileGenerator::writeMakeParts(QTextStream &t)
FileFixifyFromOutdir | FileFixifyAbsolute)); FileFixifyFromOutdir | FileFixifyAbsolute));
//DUMP SOURCES //DUMP SOURCES
QSet<QString> processedSources;
QMap<QString, ProStringList> groups; QMap<QString, ProStringList> groups;
QList<ProjectBuilderSources> sources; QList<ProjectBuilderSources> sources;
sources.append(ProjectBuilderSources("SOURCES", true)); sources.append(ProjectBuilderSources("SOURCES", true));
sources.append(ProjectBuilderSources("GENERATED_SOURCES", true)); sources.append(ProjectBuilderSources("GENERATED_SOURCES", true));
sources.append(ProjectBuilderSources("GENERATED_FILES")); sources.append(ProjectBuilderSources("GENERATED_FILES"));
sources.append(ProjectBuilderSources("HEADERS")); sources.append(ProjectBuilderSources("HEADERS"));
sources.append(ProjectBuilderSources("QMAKE_INTERNAL_INCLUDED_FILES"));
if(!project->isEmpty("QMAKE_EXTRA_COMPILERS")) { if(!project->isEmpty("QMAKE_EXTRA_COMPILERS")) {
const ProStringList &quc = project->values("QMAKE_EXTRA_COMPILERS"); const ProStringList &quc = project->values("QMAKE_EXTRA_COMPILERS");
for (ProStringList::ConstIterator it = quc.begin(); it != quc.end(); ++it) { for (ProStringList::ConstIterator it = quc.begin(); it != quc.end(); ++it) {
@ -626,6 +626,7 @@ ProjectBuilderMakefileGenerator::writeMakeParts(QTextStream &t)
} }
} }
} }
sources.append(ProjectBuilderSources("QMAKE_INTERNAL_INCLUDED_FILES"));
for(int source = 0; source < sources.size(); ++source) { for(int source = 0; source < sources.size(); ++source) {
ProStringList &src_list = project->values(ProKey("QMAKE_PBX_" + sources.at(source).keyName())); ProStringList &src_list = project->values(ProKey("QMAKE_PBX_" + sources.at(source).keyName()));
ProStringList &root_group_list = project->values("QMAKE_PBX_GROUPS"); ProStringList &root_group_list = project->values("QMAKE_PBX_GROUPS");
@ -639,6 +640,9 @@ ProjectBuilderMakefileGenerator::writeMakeParts(QTextStream &t)
continue; continue;
if(file.endsWith(Option::prl_ext)) if(file.endsWith(Option::prl_ext))
continue; continue;
if (processedSources.contains(file))
continue;
processedSources.insert(file);
bool in_root = true; bool in_root = true;
QString src_key = keyFor(file); QString src_key = keyFor(file);