1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qmake: fix .prl file generation for bundles

Browse Source 
amends 2b27646146a.

Fixes: QTBUG-70444
Change-Id: I8bd310f5624ea0ac9260c7d9ea0d29b0c9caa077
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
This commit is contained in:
Oswald Buddenhagen 2018-09-11 10:38:43 +02:00 committed by Jani Heikkinen
parent efc7e02911
commit 1dd6433b19
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
qmake/generators/makefile.cpp
View File

@ -1101,8 +1101,6 @@ QString
MakefileGenerator::prlFileName(bool fixify) MakefileGenerator::prlFileName(bool fixify)
{ {
QString ret = project->first("PRL_TARGET") + Option::prl_ext; QString ret = project->first("PRL_TARGET") + Option::prl_ext;
if(!project->isEmpty("QMAKE_BUNDLE"))
ret.prepend(project->first("QMAKE_BUNDLE") + Option::dir_sep);
if(fixify) { if(fixify) {
if(!project->isEmpty("DESTDIR")) if(!project->isEmpty("DESTDIR"))
ret.prepend(project->first("DESTDIR").toQString()); ret.prepend(project->first("DESTDIR").toQString());

2
qmake/generators/unix/unixmake2.cpp
View File

@ -1225,6 +1225,8 @@ void UnixMakefileGenerator::init2()
else else
ar_cmd.append("$(AR) $(TARGETA) $(OBJECTS)"); ar_cmd.append("$(AR) $(TARGETA) $(OBJECTS)");
if (!project->isEmpty("QMAKE_BUNDLE")) { if (!project->isEmpty("QMAKE_BUNDLE")) {
project->values("PRL_TARGET").prepend(
project->first("QMAKE_BUNDLE") + Option::dir_sep + project->first("TARGET"));
ProString bundle_loc = project->first("QMAKE_BUNDLE_LOCATION"); ProString bundle_loc = project->first("QMAKE_BUNDLE_LOCATION");
if(!bundle_loc.isEmpty() && !bundle_loc.startsWith("/")) if(!bundle_loc.isEmpty() && !bundle_loc.startsWith("/"))
bundle_loc.prepend("/"); bundle_loc.prepend("/");