diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-12-16 09:38:46 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-12-16 09:45:16 +0100 |
| commit | 9bfe3ab71e5291445e66be96d6cd1f63934a2d83 (patch) | |
| tree | a3b5580d8788de658f39d5bdb23d84a447999bee /qmake/generators/win32/winmakefile.cpp | |
| parent | 28dffdecdad4f3458b9aacec1a04803c7b5483a1 (diff) | |
| parent | 179045f36a16ce2f6cfaad1dbd9443b52b1bf8d3 (diff) | |
Merge remote-tracking branch 'origin/5.8.0' into 5.8
Conflicts:
doc/global/qt-cpp-defines.qdocconf
src/plugins/platforms/android/qandroidplatformopenglcontext.h
src/plugins/platforms/android/qandroidplatformtheme.h
Change-Id: I13d51cc66f708138ff4d667ceea7d515992e58a4
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"); |