1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix lookup of libraries with a full path but without extension

Browse Source 
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>
This commit is contained in:
Oswald Buddenhagen 2012-07-19 18:32:16 +02:00 committed by Qt by Nokia
parent ad5e583956
commit c451a1087e
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
qmake/generators/unix/unixmake.cpp
View File

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