From b4b02fe87679d5fdcaa8b3f6f35f65c9c13b5ee3 Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Tue, 4 Dec 2012 12:36:56 +0100 Subject: MSVC: don't use the variable name LINK in generated makefiles Rename LINK to LINKER. The MSVC linker uses the environment variable LINK to pass additional command line arguments. We must not hide this variable. Task-number: QTBUG-28332 Change-Id: Id78476d1cf4a73175b9f47292c67f38a43ae5ba4 Reviewed-by: Oswald Buddenhagen --- qmake/generators/win32/winmakefile.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'qmake/generators/win32/winmakefile.cpp') diff --git a/qmake/generators/win32/winmakefile.cpp b/qmake/generators/win32/winmakefile.cpp index 2fb1fb952b..10b04ce97c 100644 --- a/qmake/generators/win32/winmakefile.cpp +++ b/qmake/generators/win32/winmakefile.cpp @@ -744,7 +744,7 @@ void Win32MakefileGenerator::writeLibsPart(QTextStream &t) t << "LIBAPP = " << var("QMAKE_LIB") << endl; t << "LIBFLAGS = " << var("QMAKE_LIBFLAGS") << endl; } else { - t << "LINK = " << var("QMAKE_LINK") << endl; + t << "LINKER = " << var("QMAKE_LINK") << endl; t << "LFLAGS = " << var("QMAKE_LFLAGS") << endl; t << "LIBS = " << var("QMAKE_LIBS") << " " << var("QMAKE_LIBS_PRIVATE") << endl; } -- cgit v1.2.3