merge QMAKE_LIBDIR into QMAKE_LIBS early
authorOswald Buddenhagen <oswald.buddenhagen@nokia.com>
Mon, 16 Jul 2012 12:29:48 +0000 (14:29 +0200)
committerQt by Nokia <qt-info@nokia.com>
Fri, 27 Jul 2012 14:29:38 +0000 (16:29 +0200)
commit022f8ebd1387623c5d524c7dc71ae3237ff05d81
tree157c99d9f3f4b4b40820522f3adca79cce8d9397
parent10fba42d714ad97538bbd0be6bc0b7fcb19d4688
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 <Friedemann.Kleint@nokia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
qmake/generators/win32/mingw_make.cpp
qmake/generators/win32/mingw_make.h
qmake/generators/win32/msvc_nmake.cpp
qmake/generators/win32/msvc_nmake.h
qmake/generators/win32/msvc_vcproj.cpp
qmake/generators/win32/winmakefile.cpp
qmake/generators/win32/winmakefile.h