From d7cfd02082cff3be6622b95fd71ddea77c3401ee Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Thu, 30 Aug 2012 16:55:31 +0200 Subject: restore support for QMAKE_LIBDIR_FLAGS unexpectedly, this internal variable is documented. grumble. Change-Id: I272c1f553b56f253d2f59f875de78d5bc279186a Reviewed-by: Joerg Bornemann Reviewed-by: Daniel Teske --- qmake/generators/unix/unixmake.cpp | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'qmake/generators') diff --git a/qmake/generators/unix/unixmake.cpp b/qmake/generators/unix/unixmake.cpp index ac458b66dc..01b15b9ee1 100644 --- a/qmake/generators/unix/unixmake.cpp +++ b/qmake/generators/unix/unixmake.cpp @@ -149,13 +149,15 @@ UnixMakefileGenerator::init() for(int i = 0; i < libdirs.size(); ++i) { if(!project->isEmpty("QMAKE_LFLAGS_RPATH") && project->isActiveConfig("rpath_libdirs")) project->values("QMAKE_LFLAGS") += var("QMAKE_LFLAGS_RPATH") + libdirs[i]; - ldadd << "-L" + escapeFilePath(libdirs[i]); + project->values("QMAKE_LIBDIR_FLAGS") += "-L" + escapeFilePath(libdirs[i]); } } - if(project->isActiveConfig("macx") && !project->isEmpty("QMAKE_FRAMEWORKPATH")) { - const QStringList &fwdirs = project->values("QMAKE_FRAMEWORKPATH"); - for(int i = 0; i < fwdirs.size(); ++i) { - project->values("QMAKE_FRAMEWORKPATH_FLAGS") += "-F" + escapeFilePath(fwdirs[i]); + ldadd += project->values("QMAKE_LIBDIR_FLAGS"); + if (project->isActiveConfig("macx")) { + if (!project->isEmpty("QMAKE_FRAMEWORKPATH")) { + const QStringList &fwdirs = project->values("QMAKE_FRAMEWORKPATH"); + for (int i = 0; i < fwdirs.size(); ++i) + project->values("QMAKE_FRAMEWORKPATH_FLAGS") += "-F" + escapeFilePath(fwdirs[i]); } ldadd += project->values("QMAKE_FRAMEWORKPATH_FLAGS"); } -- cgit v1.2.3