dispose of QMAKE_LIBDIR_FLAGS, "demote" QMAKE_FRAMEWORKPATH_FLAGS
authorOswald Buddenhagen <oswald.buddenhagen@nokia.com>
Fri, 13 Jul 2012 11:16:39 +0000 (13:16 +0200)
committerQt by Nokia <qt-info@nokia.com>
Fri, 27 Jul 2012 14:29:18 +0000 (16:29 +0200)
commite38af23470ca4155ff2528ab12fcb97eef7f6f0b
tree85cfad4a96c532ca9431042daa3b4cd31763db8c
parent14bdff32e218663523f3940fe639ae792fdee1b1
dispose of QMAKE_LIBDIR_FLAGS, "demote" QMAKE_FRAMEWORKPATH_FLAGS

merge their content as early as possible into QMAKE_LIBS. that's where
they ultimately end up anyway, and this approach is way simpler.
QMAKE_FRAMEWORKPATH_FLAGS is also used for the compiler flags, so it
remains as such in this second function.

Change-Id: Idc3ba4a9b2569fce3252d5f5ddc3f6ebf93650cf
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
qmake/generators/integrity/gbuild.cpp
qmake/generators/mac/pbuilder_pbx.cpp
qmake/generators/unix/unixmake.cpp
qmake/generators/unix/unixmake2.cpp