From e5b203dbc7da249e89cc800a7b6a41af8b913ecc Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Thu, 12 Jul 2012 21:46:53 +0200 Subject: dispose of MSVCPROJ_LIBS this way QMAKE_LIBS{,_PRIVATE} can be treated the same as in all other generators, which allows us to: - make the windows generators' findLibraries() be more like the unix version - dispose of QMAKE_INTERNAL_PRL_LIBS handling while reading prl files (because the output always goes to QMAKE_LIBS) - as a side effect, QMAKE_LIBS_PRIVATE are not subjected to prl file resolution any more, which is again consistent with unix - the correctness of that needs to be assessed separately. Change-Id: Ie9bc04d117eff6a7cde846677f98acf3c64aa6ee Reviewed-by: Friedemann Kleint --- 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 ac65bbb4a9..d76295c3df 100644 --- a/qmake/generators/win32/mingw_make.h +++ b/qmake/generators/win32/mingw_make.h @@ -70,7 +70,6 @@ private: QString preCompHeaderOut; virtual bool findLibraries(); - bool findLibraries(const QString &where); void fixTargetExt(); bool init_flag; -- cgit v1.2.3