diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-03-30 01:00:07 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-03-30 01:00:07 +0100 |
| commit | 0a7302abbc47a0db25f119ee4f5144bbaf0d9d6f (patch) | |
| tree | e4b05a56e09bb6401a9ee863725da2f0e52858f1 /qmake | |
| parent | 8d154810f56b9d831f78f454fb2b05e98c246313 (diff) | |
| parent | 20b7e18146e28e73cba52a63a3415c6828f1f6f5 (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Change-Id: I9935bacae0d6ba532418fc3d28adbc7ca1463604
Diffstat (limited to 'qmake')
| -rw-r--r-- | qmake/generators/win32/msvc_nmake.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/qmake/generators/win32/msvc_nmake.cpp b/qmake/generators/win32/msvc_nmake.cpp index a6e850a036..650c0888c7 100644 --- a/qmake/generators/win32/msvc_nmake.cpp +++ b/qmake/generators/win32/msvc_nmake.cpp @@ -254,7 +254,7 @@ void NmakeMakefileGenerator::init() ProString tgt = project->first("DESTDIR") + project->first("TARGET") + project->first("TARGET_VERSION_EXT"); - if(project->isActiveConfig("shared")) { + if (project->first("TEMPLATE") == "lib" && project->isActiveConfig("shared")) { project->values("QMAKE_CLEAN").append(tgt + ".exp"); project->values("QMAKE_DISTCLEAN").append(tgt + ".lib"); } |