diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-08-30 16:55:31 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-09-05 03:03:15 +0200 |
| commit | d7cfd02082cff3be6622b95fd71ddea77c3401ee (patch) | |
| tree | 8ac4d84b2235e77b8a0cf9dff49a02487686b62c /qmake | |
| parent | fe0ff5d68965c1ff8be3d2a87b817c34a85fbcff (diff) | |
| download | qtbase-d7cfd02082cff3be6622b95fd71ddea77c3401ee.tar.gz | |
restore support for QMAKE_LIBDIR_FLAGS
unexpectedly, this internal variable is documented. grumble.
Change-Id: I272c1f553b56f253d2f59f875de78d5bc279186a
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Diffstat (limited to 'qmake')
| -rw-r--r-- | qmake/generators/unix/unixmake.cpp | 12 |
1 files changed, 7 insertions, 5 deletions
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"); } |