summaryrefslogtreecommitdiffstats
path: root/qmake/generators/win32/mingw_make.h
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@nokia.com>2012-07-12 21:46:53 +0200
committerQt by Nokia <qt-info@nokia.com>2012-07-24 12:45:02 +0200
commite5b203dbc7da249e89cc800a7b6a41af8b913ecc (patch)
tree6232e80c69c0bc10fd9ac54c6c791604b4ea6372 /qmake/generators/win32/mingw_make.h
parentc1056c80fbeadee4b910df00998c837d3c2b44a1 (diff)
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 <Friedemann.Kleint@nokia.com>
Diffstat (limited to 'qmake/generators/win32/mingw_make.h')
-rw-r--r--qmake/generators/win32/mingw_make.h1
1 files changed, 0 insertions, 1 deletions
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;