diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-10-24 12:48:39 +0200 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-10-24 12:48:42 +0200 |
commit | 840f6a40e6218992b5b9d451ee3c0886a4846c89 (patch) | |
tree | 2b808decc7adf5218b810d2de6b45c5a8b4cfc42 /qmake/generators/unix/unixmake.cpp | |
parent | 109bf980b37fed405c6c1eb14cb9c83ff897e389 (diff) | |
parent | 2e3870fe37d36ccf4bd84eb90e1d5e08ad00c1bc (diff) |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: Ie56539b2e0be611a363b5f15ae5412a78d6945a2
Diffstat (limited to 'qmake/generators/unix/unixmake.cpp')
-rw-r--r-- | qmake/generators/unix/unixmake.cpp | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/qmake/generators/unix/unixmake.cpp b/qmake/generators/unix/unixmake.cpp index adeb55af86..1c95392932 100644 --- a/qmake/generators/unix/unixmake.cpp +++ b/qmake/generators/unix/unixmake.cpp @@ -106,20 +106,8 @@ UnixMakefileGenerator::init() return; /* subdirs is done */ } - //If the TARGET looks like a path split it into DESTDIR and the resulting TARGET - if(!project->isEmpty("TARGET")) { + if (!project->isEmpty("TARGET")) project->values("TARGET") = escapeFilePaths(project->values("TARGET")); - ProString targ = unescapeFilePath(project->first("TARGET")); - int slsh = qMax(targ.lastIndexOf('/'), targ.lastIndexOf(Option::dir_sep)); - if(slsh != -1) { - if(project->isEmpty("DESTDIR")) - project->values("DESTDIR").append(""); - else if(project->first("DESTDIR").right(1) != Option::dir_sep) - project->values("DESTDIR") = ProStringList(project->first("DESTDIR") + Option::dir_sep); - project->values("DESTDIR") = ProStringList(project->first("DESTDIR") + targ.left(slsh+1)); - project->values("TARGET") = ProStringList(targ.mid(slsh+1)); - } - } project->values("QMAKE_ORIG_TARGET") = project->values("TARGET"); project->values("QMAKE_ORIG_DESTDIR") = project->values("DESTDIR"); |