diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2016-11-08 17:01:01 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2016-11-15 22:44:09 +0000 |
| commit | 4e96c4c5334fb744b1a4c8df96db0d3b2f921168 (patch) | |
| tree | 619de901b0917673e0737a5cd06db701665aac6b /qmake | |
| parent | 71fd04031860517c72de5487b6aa46793aad7d44 (diff) | |
qmake: fix file name treatment in emission of extra targets
that is, adjust path separators and don't quote them. we already did
that to some degree, but totally inconsistently, so it just didn't work
for any targets with "fancy" file names.
note that we don't bother doing that for recursive targets, as these are
assumed to be identifiers.
Change-Id: Ic75f003b71abc6fed03a4121b903ad5ee8253ed2
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'qmake')
| -rw-r--r-- | qmake/generators/makefile.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp index 5d7700ec82..4450e619b9 100644 --- a/qmake/generators/makefile.cpp +++ b/qmake/generators/makefile.cpp @@ -2623,8 +2623,8 @@ MakefileGenerator::writeSubTargets(QTextStream &t, QList<MakefileGenerator::SubT for (ProStringList::ConstIterator dep_it = deplist.begin(); dep_it != deplist.end(); ++dep_it) { QString dep = var(ProKey(*dep_it + ".target")); if(dep.isEmpty()) - dep = Option::fixPathToTargetOS((*dep_it).toQString(), false); - deps += ' ' + escapeDependencyPath(dep); + dep = (*dep_it).toQString(); + deps += ' ' + escapeDependencyPath(Option::fixPathToTargetOS(dep, false)); } if (config.indexOf("recursive") != -1) { QSet<QString> recurse; @@ -2690,7 +2690,7 @@ MakefileGenerator::writeSubTargets(QTextStream &t, QList<MakefileGenerator::SubT } if (config.indexOf("phony") != -1) deps += " FORCE"; - t << targ << ":" << deps << "\n"; + t << escapeDependencyPath(Option::fixPathToTargetOS(targ, false)) << ":" << deps << "\n"; if(!cmd.isEmpty()) t << "\t" << cmd << endl; } |