fix lookup of libraries with a full path but without extension
authorOswald Buddenhagen <oswald.buddenhagen@nokia.com>
Thu, 19 Jul 2012 16:32:16 +0000 (18:32 +0200)
committerQt by Nokia <qt-info@nokia.com>
Fri, 27 Jul 2012 22:09:45 +0000 (00:09 +0200)
given that nobody noticed so far how broken this was, this doesn't
appear to be a particularly common path. but anyway ...

Change-Id: Ic17b239d724a4d69ff414a24be2e8588732bc8dd
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
qmake/generators/unix/unixmake.cpp

index 63a7a5b..e24b523 100644 (file)
@@ -538,8 +538,9 @@ UnixMakefileGenerator::findLibraries()
                             }
                         }
                     } else {
-                        if(exists(project->values("QMAKE_PREFIX_SHLIB").first() + stub + "." + (*extit))) {
-                            (*it) = project->values("QMAKE_PREFIX_SHLIB").first() + stub + "." + (*extit);
+                        QString lib = dir + project->values("QMAKE_PREFIX_SHLIB").first() + stub + "." + (*extit);
+                        if (exists(lib)) {
+                            (*it) = lib;
                             found = true;
                             break;
                         }