diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-11-21 23:59:03 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-11-22 01:53:29 +0100 |
| commit | bf58c70546c5f9cb66d99b82abfde9ba1a056192 (patch) | |
| tree | df3675d3377ef6576f82fb167ebd67fcc900a91b /qmake/generators | |
| parent | 37f617c405ae4f26cbb6bb4f08d61d6ccc111a98 (diff) | |
| parent | 41cba737a98b16a2767c55cda0532f38b6b6a37d (diff) | |
Merge remote-tracking branch 'origin/5.12' into dev
Conflicts:
src/corelib/io/qdir.cpp
src/corelib/kernel/qtimer.cpp
src/corelib/kernel/qtimer.h
Done-With: Edward Welbourne <edward.welbourne@qt.io>
Change-Id: I683d897760ec06593136d77955f8bc87fdef3f9f
Diffstat (limited to 'qmake/generators')
| -rw-r--r-- | qmake/generators/makefile.cpp | 2 | ||||
| -rw-r--r-- | qmake/generators/unix/unixmake2.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp index e41e391cad..b7e591d2ab 100644 --- a/qmake/generators/makefile.cpp +++ b/qmake/generators/makefile.cpp @@ -1101,8 +1101,6 @@ QString MakefileGenerator::prlFileName(bool fixify) { 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(!project->isEmpty("DESTDIR")) ret.prepend(project->first("DESTDIR").toQString()); diff --git a/qmake/generators/unix/unixmake2.cpp b/qmake/generators/unix/unixmake2.cpp index 976751b02c..d3abedb50b 100644 --- a/qmake/generators/unix/unixmake2.cpp +++ b/qmake/generators/unix/unixmake2.cpp @@ -1225,6 +1225,8 @@ void UnixMakefileGenerator::init2() else ar_cmd.append("$(AR) $(TARGETA) $(OBJECTS)"); 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"); if(!bundle_loc.isEmpty() && !bundle_loc.startsWith("/")) bundle_loc.prepend("/"); |