diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2018-08-23 20:21:24 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-08-30 05:30:17 +0000 |
| commit | 999d4d5777b098f9c1f311af4addad910e44ab62 (patch) | |
| tree | 0a65c22bf5b46b60089e9a9f7551174680bb87bd /qmake/generators/win32 | |
| parent | 19b12ac9c21f4dd079e482c4ed926f51c1776e52 (diff) | |
qmake: rework .prl filename construction
instead of trying to reverse-engineer it from the final target including
extension and possible bundle path, construct the basename explicitly.
this avoids that we mangle the filename if the actual target contains a
period for some reason.
Task-number: QTBUG-70097
Change-Id: I0bae9f010ab82e258680830250f8e28656f09d67
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'qmake/generators/win32')
| -rw-r--r-- | qmake/generators/win32/mingw_make.cpp | 2 | ||||
| -rw-r--r-- | qmake/generators/win32/winmakefile.cpp | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/qmake/generators/win32/mingw_make.cpp b/qmake/generators/win32/mingw_make.cpp index 95f69dbbc3..13412e971a 100644 --- a/qmake/generators/win32/mingw_make.cpp +++ b/qmake/generators/win32/mingw_make.cpp @@ -204,8 +204,6 @@ void MingwMakefileGenerator::init() return; } - project->values("TARGET_PRL").append(project->first("TARGET")); - processVars(); project->values("QMAKE_LIBS") += project->values("RES_FILE"); diff --git a/qmake/generators/win32/winmakefile.cpp b/qmake/generators/win32/winmakefile.cpp index 3c730299be..1388e120e7 100644 --- a/qmake/generators/win32/winmakefile.cpp +++ b/qmake/generators/win32/winmakefile.cpp @@ -185,7 +185,8 @@ void Win32MakefileGenerator::processVars() if (project->first("TEMPLATE").endsWith("aux")) return; - project->values("QMAKE_ORIG_TARGET") = project->values("TARGET"); + project->values("PRL_TARGET") = + project->values("QMAKE_ORIG_TARGET") = project->values("TARGET"); if (project->isEmpty("QMAKE_PROJECT_NAME")) project->values("QMAKE_PROJECT_NAME") = project->values("QMAKE_ORIG_TARGET"); else if (project->first("TEMPLATE").startsWith("vc")) |