diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-03-31 12:39:42 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-03-31 12:39:42 +0200 |
| commit | 29f01b32f58573b23bd35857376f6f92e15382a3 (patch) | |
| tree | b1a044f87e4b18d5ddd779dc1b63161ded1c3d1a /qmake | |
| parent | 300940a6c9eb0f74cefda7d76a5d19f56ec50253 (diff) | |
| parent | 0a7302abbc47a0db25f119ee4f5144bbaf0d9d6f (diff) | |
Merge remote-tracking branch 'origin/5.13' into dev
Conflicts:
src/corelib/configure.json
Change-Id: I93ac67f3bf4844bc7c691183e94bceb922b7b919
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"); } |