unify default search paths between findLibraries() & processPrlFiles()
authorOswald Buddenhagen <oswald.buddenhagen@nokia.com>
Thu, 19 Jul 2012 16:49:40 +0000 (18:49 +0200)
committerQt by Nokia <qt-info@nokia.com>
Fri, 27 Jul 2012 22:09:45 +0000 (00:09 +0200)
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>
qmake/generators/unix/unixmake.cpp

index e24b523..22a763d 100644 (file)
@@ -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]);