diff options
Diffstat (limited to 'qmake')
| -rw-r--r-- | qmake/generators/unix/unixmake.cpp | 14 | ||||
| -rw-r--r-- | qmake/generators/win32/winmakefile.cpp | 14 |
2 files changed, 1 insertions, 27 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"); diff --git a/qmake/generators/win32/winmakefile.cpp b/qmake/generators/win32/winmakefile.cpp index 2ef2d82b5a..0ad0f09bce 100644 --- a/qmake/generators/win32/winmakefile.cpp +++ b/qmake/generators/win32/winmakefile.cpp @@ -274,20 +274,6 @@ Win32MakefileGenerator::processPrlFiles() void Win32MakefileGenerator::processVars() { - //If the TARGET looks like a path split it into DESTDIR and the resulting TARGET - if(!project->isEmpty("TARGET")) { - ProString targ = 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"); if (project->isEmpty("QMAKE_PROJECT_NAME")) project->values("QMAKE_PROJECT_NAME") = project->values("QMAKE_ORIG_TARGET"); |