diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-07-13 13:16:39 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-07-27 16:29:18 +0200 |
| commit | e38af23470ca4155ff2528ab12fcb97eef7f6f0b (patch) | |
| tree | 85cfad4a96c532ca9431042daa3b4cd31763db8c /qmake/generators/integrity | |
| parent | 14bdff32e218663523f3940fe639ae792fdee1b1 (diff) | |
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>
Diffstat (limited to 'qmake/generators/integrity')
| -rw-r--r-- | qmake/generators/integrity/gbuild.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/qmake/generators/integrity/gbuild.cpp b/qmake/generators/integrity/gbuild.cpp index 219b6a2d5d..1275693168 100644 --- a/qmake/generators/integrity/gbuild.cpp +++ b/qmake/generators/integrity/gbuild.cpp @@ -278,7 +278,7 @@ GBuildMakefileGenerator::write() if (project->first("TEMPLATE") == "app") { /* include linker flags if it's an application */ - QString src[] = { "QMAKE_LFLAGS", "QMAKE_FRAMEWORKPATH_FLAGS", "QMAKE_LIBDIR_FLAGS", "QMAKE_LIBS", "LIBS", QString() }; + QString src[] = { "QMAKE_LFLAGS", "QMAKE_LIBS", "LIBS", QString() }; for (int i = 0; !src[i].isNull(); i++) { /* skip target libraries for native tools */ if (isnativebin && (i == 0)) |