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

qmake: Prevent duplicate libaries from being added to the link phase

Browse Source 
Change-Id: I5ec7acb8f060e9d9bbd8cdb95d40ace03cffe9c7
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
This commit is contained in:
Tor Arne Vestbø 2013-02-26 13:12:25 +01:00
parent c6eae1acf8
commit 883efa10cd
1 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -906,21 +906,23 @@ ProjectBuilderMakefileGenerator::writeMakeParts(QTextStream &t)
library = fileFixify(library); library = fileFixify(library);
QString filetype = xcodeFiletypeForFilename(library); QString filetype = xcodeFiletypeForFilename(library);
QString key = keyFor(library); QString key = keyFor(library);
t << "\t\t" << key << " = {" << "\n" if (!project->values("QMAKE_PBX_LIBRARIES").contains(key)) {
<< "\t\t\t" << writeSettings("isa", "PBXFileReference", SettingsNoQuote) << ";" << "\n" t << "\t\t" << key << " = {" << "\n"
<< "\t\t\t" << writeSettings("name", escapeFilePath(name)) << ";" << "\n" << "\t\t\t" << writeSettings("isa", "PBXFileReference", SettingsNoQuote) << ";" << "\n"
<< "\t\t\t" << writeSettings("path", escapeFilePath(library)) << ";" << "\n" << "\t\t\t" << writeSettings("name", escapeFilePath(name)) << ";" << "\n"
<< "\t\t\t" << writeSettings("sourceTree", sourceTreeForFile(library)) << ";" << "\n"; << "\t\t\t" << writeSettings("path", escapeFilePath(library)) << ";" << "\n"
if (!filetype.isNull()) << "\t\t\t" << writeSettings("sourceTree", sourceTreeForFile(library)) << ";" << "\n";
t << "\t\t\t" << writeSettings("lastKnownFileType", filetype) << ";" << "\n"; if (!filetype.isNull())
t << "\t\t" << "};" << "\n"; t << "\t\t\t" << writeSettings("lastKnownFileType", filetype) << ";" << "\n";
project->values("QMAKE_PBX_LIBRARIES").append(key); t << "\t\t" << "};" << "\n";
QString build_key = keyFor(library + ".BUILDABLE"); project->values("QMAKE_PBX_LIBRARIES").append(key);
t << "\t\t" << build_key << " = {" << "\n" QString build_key = keyFor(library + ".BUILDABLE");
<< "\t\t\t" << writeSettings("fileRef", key) << ";" << "\n" t << "\t\t" << build_key << " = {" << "\n"
<< "\t\t\t" << writeSettings("isa", "PBXBuildFile", SettingsNoQuote) << ";" << "\n" << "\t\t\t" << writeSettings("fileRef", key) << ";" << "\n"
<< "\t\t" << "};" << "\n"; << "\t\t\t" << writeSettings("isa", "PBXBuildFile", SettingsNoQuote) << ";" << "\n"
project->values("QMAKE_PBX_BUILD_LIBRARIES").append(build_key); << "\t\t" << "};" << "\n";
project->values("QMAKE_PBX_BUILD_LIBRARIES").append(build_key);
}
} }
if(remove) if(remove)
tmp.removeAt(x); tmp.removeAt(x);