diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-12-08 08:20:36 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-12-08 08:20:36 +0100 |
| commit | cae32bd04d117ba2423a8c4db12f8d2d5b809bcb (patch) | |
| tree | 179cc91b4b34b9e7ec587d576e42d89fc13fec43 /qmake/generators/win32/winmakefile.cpp | |
| parent | e1a70ce495928e8d81e80b11d7dbd4c4913ee438 (diff) | |
| parent | 04f68053df5c90dca6947c6d2a5bb4e6851e62bb (diff) | |
Merge remote-tracking branch 'origin/5.7' into 5.8.0
Change-Id: I576187a9905802c177ae483e6c29d0f55cf7034d
Diffstat (limited to 'qmake/generators/win32/winmakefile.cpp')
| -rw-r--r-- | qmake/generators/win32/winmakefile.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/qmake/generators/win32/winmakefile.cpp b/qmake/generators/win32/winmakefile.cpp index 48df4ff916..3c029c8004 100644 --- a/qmake/generators/win32/winmakefile.cpp +++ b/qmake/generators/win32/winmakefile.cpp @@ -165,6 +165,9 @@ Win32MakefileGenerator::findLibraries(bool linkPrl, bool mergeLflags) void Win32MakefileGenerator::processVars() { + if (project->first("TEMPLATE").endsWith("aux")) + return; + project->values("QMAKE_ORIG_TARGET") = project->values("TARGET"); if (project->isEmpty("QMAKE_PROJECT_NAME")) project->values("QMAKE_PROJECT_NAME") = project->values("QMAKE_ORIG_TARGET"); |