AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

qmake: Prevent Obj-C sources from building both as extra compiler and in Xcode

Browse Source 
We already assume that if a source is buildable and should end up in OBJECTS we
can let Xcode build it, so we skip this input for the extra compiler.

Change-Id: I17b2408925b8e6513f0fa0d2459ec539bf7381d3
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
This commit is contained in:
Tor Arne Vestbø 2012-12-22 19:57:10 +01:00
parent 0e548b5856
commit f6d13a45c8
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -557,10 +557,13 @@ ProjectBuilderMakefileGenerator::writeMakeParts(QTextStream &t)
for (ProStringList::ConstIterator it = quc.begin(); it != quc.end(); ++it) { for (ProStringList::ConstIterator it = quc.begin(); it != quc.end(); ++it) {
if (project->isEmpty(ProKey(*it + ".output"))) if (project->isEmpty(ProKey(*it + ".output")))
continue; continue;
const ProStringList &inputs = project->values(ProKey(*it + ".input")); ProStringList &inputs = project->values(ProKey(*it + ".input"));
for(int input = 0; input < inputs.size(); ++input) { int input = 0;
if (project->isEmpty(inputs.at(input).toKey())) while (input < inputs.size()) {
if (project->isEmpty(inputs.at(input).toKey())) {
++input;
continue; continue;
}
bool duplicate = false; bool duplicate = false;
bool isObj = project->values(ProKey(*it + ".CONFIG")).indexOf("no_link") == -1; bool isObj = project->values(ProKey(*it + ".CONFIG")).indexOf("no_link") == -1;
if (!isObj) { if (!isObj) {
@ -581,7 +584,14 @@ ProjectBuilderMakefileGenerator::writeMakeParts(QTextStream &t)
} }
sources.append(ProjectBuilderSources(inputs.at(input).toQString(), true, sources.append(ProjectBuilderSources(inputs.at(input).toQString(), true,
QString(), (*it).toQString(), isObj)); QString(), (*it).toQString(), isObj));
if (isObj) {
inputs.removeAt(input);
continue;
}
} }
++input;
} }
} }
} }