summaryrefslogtreecommitdiffstats
path: root/qmake
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@nokia.com>2012-07-19 18:32:16 +0200
committerQt by Nokia <qt-info@nokia.com>2012-07-28 00:09:45 +0200
commitc451a1087e7d1e1fee256ad9e701295c65f5b3a0 (patch)
treef8a440d1bc6e921f6ac2d0c025ada2d32fa310d7 /qmake
parentad5e583956d839e0022c29add9fe066a2b7d9563 (diff)
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 <Friedemann.Kleint@nokia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Diffstat (limited to 'qmake')
-rw-r--r--qmake/generators/unix/unixmake.cpp5
1 files changed, 3 insertions, 2 deletions
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;
}