diff options
author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2018-10-08 18:24:14 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2018-10-12 18:06:33 +0000 |
commit | 405c73e49580cd5931576d60424e8f239dd51ef5 (patch) | |
tree | 44f236faa83a47aec378b0c94cdc4a937cd40baa /qmake/generators/win32/msvc_nmake.cpp | |
parent | 2a3695b7e07a40e413f045e2dcc4f3c36ca15287 (diff) |
qmake: make sure QMAKE_LIBS{,_PRIVATE} comes after LIBS{,_PRIVATE}
the early merging of LIBS* into QMAKE_LIBS* meant that we could not
interleave them properly. defer the merging until the points of use.
Task-number: QTBUG-70779
Started-by: BogDan Vatra <bogdan@kdab.com>
Change-Id: I890f98016c3721396a1f0f6f149a9e2b37d56d8e
Reviewed-by: Liang Qi <liang.qi@qt.io>
Diffstat (limited to 'qmake/generators/win32/msvc_nmake.cpp')
-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 fa7ee1b98a..f2cd7c633b 100644 --- a/qmake/generators/win32/msvc_nmake.cpp +++ b/qmake/generators/win32/msvc_nmake.cpp @@ -383,7 +383,7 @@ void NmakeMakefileGenerator::init() processVars(); - project->values("QMAKE_LIBS") += project->values("RES_FILE"); + project->values("LIBS") += project->values("RES_FILE"); if (!project->values("DEF_FILE").isEmpty()) { QString defFileName = fileFixify(project->first("DEF_FILE").toQString()); |