diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-03-21 01:00:07 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-03-21 01:00:07 +0100 |
| commit | 19510477b49d4c4953b124a3e3765168795cea43 (patch) | |
| tree | bc751e41eee12ad371427daecf39b06bda10c830 /tests/auto/tools/qmake/testcompiler.cpp | |
| parent | e8cb52f035d93ab4c52d7fa88ed30ad324133f65 (diff) | |
| parent | 12978d4ad03af753130ba7c40b6203491cd86cd5 (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Change-Id: Ie7f68dcd5650e0037b6c3313cc9ffdcd7c494fbe
Diffstat (limited to 'tests/auto/tools/qmake/testcompiler.cpp')
| -rw-r--r-- | tests/auto/tools/qmake/testcompiler.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/tests/auto/tools/qmake/testcompiler.cpp b/tests/auto/tools/qmake/testcompiler.cpp index da76b3f2ca..3276d97354 100644 --- a/tests/auto/tools/qmake/testcompiler.cpp +++ b/tests/auto/tools/qmake/testcompiler.cpp @@ -67,7 +67,9 @@ static QString targetName( BuildType buildMode, const QString& target, const QSt break; case Dll: // dll targetName.prepend("lib"); - targetName.append("." + version + ".dylib"); + if (!version.isEmpty()) + targetName.append('.' + version); + targetName.append(".dylib"); break; case Lib: // lib targetName.prepend("lib"); |