From c451a1087e7d1e1fee256ad9e701295c65f5b3a0 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Thu, 19 Jul 2012 18:32:16 +0200 Subject: fix lookup of libraries with a full path but without extension 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 Reviewed-by: Joerg Bornemann --- qmake/generators/unix/unixmake.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'qmake') diff --git a/qmake/generators/unix/unixmake.cpp b/qmake/generators/unix/unixmake.cpp index 63a7a5b8cd..e24b523187 100644 --- a/qmake/generators/unix/unixmake.cpp +++ b/qmake/generators/unix/unixmake.cpp @@ -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; } -- cgit v1.2.3