summaryrefslogtreecommitdiffstats
path: root/qmake
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@nokia.com>2012-07-19 18:49:40 +0200
committerQt by Nokia <qt-info@nokia.com>2012-07-28 00:09:45 +0200
commitb9a41f963057e91631e459a86fbf3d34a8080b40 (patch)
treec2526ae1c3d14702b62715edb3eca83a41743d25 /qmake
parentc451a1087e7d1e1fee256ad9e701295c65f5b3a0 (diff)
unify default search paths between findLibraries() & processPrlFiles()
i see no reason why they should deviate Change-Id: Iaa0445b79a95d348f51df74a74c7c89216c468ec Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Diffstat (limited to 'qmake')
-rw-r--r--qmake/generators/unix/unixmake.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/qmake/generators/unix/unixmake.cpp b/qmake/generators/unix/unixmake.cpp
index e24b523187..22a763df59 100644
--- a/qmake/generators/unix/unixmake.cpp
+++ b/qmake/generators/unix/unixmake.cpp
@@ -475,6 +475,8 @@ UnixMakefileGenerator::findLibraries()
if (libArg == "-L")
libArg.clear();
QList<QMakeLocalFileName> libdirs;
+ foreach (const QString &dlib, project->values("QMAKE_DEFAULT_LIBDIRS"))
+ libdirs.append(QMakeLocalFileName(dlib));
const QString lflags[] = { "QMAKE_LIBS", "QMAKE_LIBS_PRIVATE", QString() };
for(int i = 0; !lflags[i].isNull(); i++) {
QStringList &l = project->values(lflags[i]);