From 022f8ebd1387623c5d524c7dc71ae3237ff05d81 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Mon, 16 Jul 2012 14:29:48 +0200 Subject: merge QMAKE_LIBDIR into QMAKE_LIBS early dealing with the directories separately doesn't buy us anything. it's easier to mix them into the libs, as that contains some paths, too, both in projects and in prl files. this brings the windows generators in line with the unix ones. Change-Id: I1f58f7edd8e21d28bfabf04384bac2e315aaf446 Reviewed-by: Friedemann Kleint Reviewed-by: Joerg Bornemann --- qmake/generators/win32/mingw_make.h | 1 - 1 file changed, 1 deletion(-) (limited to 'qmake/generators/win32/mingw_make.h') diff --git a/qmake/generators/win32/mingw_make.h b/qmake/generators/win32/mingw_make.h index 376eacd667..3d05c2809d 100644 --- a/qmake/generators/win32/mingw_make.h +++ b/qmake/generators/win32/mingw_make.h @@ -60,7 +60,6 @@ private: void writeMingwParts(QTextStream &); void writeIncPart(QTextStream &t); void writeLibsPart(QTextStream &t); - void writeLibDirPart(QTextStream &t); void writeObjectsPart(QTextStream &t); void writeBuildRulesPart(QTextStream &t); void writeRcFilePart(QTextStream &t); -- cgit v1.2.3