diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-11 01:00:09 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-11 01:00:20 +0200 |
| commit | 0131462861ef2aef9fef97a4490dc12f07b7545a (patch) | |
| tree | bbcfc40e90b39aacf7d62538416a70115165b293 /qmake/generators/unix/unixmake2.cpp | |
| parent | 49362d064fffe350600f5324fb510b381578d04a (diff) | |
| parent | dc4ecf0641de34836c51947a14abdc419204ef6d (diff) | |
Merge "Merge remote-tracking branch 'origin/5.14' into 5.15"
Diffstat (limited to 'qmake/generators/unix/unixmake2.cpp')
| -rw-r--r-- | qmake/generators/unix/unixmake2.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/qmake/generators/unix/unixmake2.cpp b/qmake/generators/unix/unixmake2.cpp index 8b4f2bf58f..ccb601d4b8 100644 --- a/qmake/generators/unix/unixmake2.cpp +++ b/qmake/generators/unix/unixmake2.cpp @@ -1199,8 +1199,10 @@ void UnixMakefileGenerator::init2() project->values("QMAKE_FRAMEWORK_VERSION").append(project->first("VER_MAJ")); if (project->first("TEMPLATE") == "aux") { - project->values("PRL_TARGET") = - project->values("TARGET").first().prepend(project->first("QMAKE_PREFIX_STATICLIB")); + project->values("PRL_TARGET") = { + project->first("QMAKE_PREFIX_STATICLIB") + + project->first("TARGET") + }; } else if (!project->values("QMAKE_APP_FLAG").isEmpty()) { if(!project->isEmpty("QMAKE_BUNDLE")) { ProString bundle_loc = project->first("QMAKE_BUNDLE_LOCATION"); |