AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

restore support for QMAKE_LIBDIR_FLAGS

Browse Source 
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>
This commit is contained in:
Oswald Buddenhagen 2012-08-30 16:55:31 +02:00 committed by Qt by Nokia
parent fe0ff5d689
commit d7cfd02082
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
qmake/generators/unix/unixmake.cpp
View File

@ -149,13 +149,15 @@ UnixMakefileGenerator::init()
for(int i = 0; i < libdirs.size(); ++i) { for(int i = 0; i < libdirs.size(); ++i) {
if(!project->isEmpty("QMAKE_LFLAGS_RPATH") && project->isActiveConfig("rpath_libdirs")) if(!project->isEmpty("QMAKE_LFLAGS_RPATH") && project->isActiveConfig("rpath_libdirs"))
project->values("QMAKE_LFLAGS") += var("QMAKE_LFLAGS_RPATH") + libdirs[i]; 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")) { ldadd += project->values("QMAKE_LIBDIR_FLAGS");
const QStringList &fwdirs = project->values("QMAKE_FRAMEWORKPATH"); if (project->isActiveConfig("macx")) {
for(int i = 0; i < fwdirs.size(); ++i) { if (!project->isEmpty("QMAKE_FRAMEWORKPATH")) {
project->values("QMAKE_FRAMEWORKPATH_FLAGS") += "-F" + escapeFilePath(fwdirs[i]); 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"); ldadd += project->values("QMAKE_FRAMEWORKPATH_FLAGS");
} }