diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-08-14 18:55:04 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-10-01 16:19:56 +0000 |
| commit | b39cda2ec2f8ffcd2e26c7a2f1a9f19d47f46b30 (patch) | |
| tree | 501945dccb4dd5114361a891e54719e6e8aba1f9 /qmake/generators/unix/unixmake.cpp | |
| parent | 119cb65017680fcf5b480fedd516256196b7d78e (diff) | |
remove QMAKE_<lib>_SUFFIX support
this feature was added with a dubious commit message a decade ago, was
undocumented, and there are no public traces of it being used.
if i had to guess what it was meant for: to be able to consistently use
-lfoo throughout a project and centrally (e.g., in .qmake.cache) choose
to use foo<bar> (bar possibly being "d") instead. however, more explicit
methods are being used instead, including in qt itself.
Change-Id: Ic3a98dc3aec59876f26909fbf9f7aba32baa05bf
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
Diffstat (limited to 'qmake/generators/unix/unixmake.cpp')
| -rw-r--r-- | qmake/generators/unix/unixmake.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/qmake/generators/unix/unixmake.cpp b/qmake/generators/unix/unixmake.cpp index 2b69e8fad9..25f686646b 100644 --- a/qmake/generators/unix/unixmake.cpp +++ b/qmake/generators/unix/unixmake.cpp @@ -398,7 +398,6 @@ UnixMakefileGenerator::findLibraries() libdirs.insert(libidx++, f); } else if(opt.startsWith("-l")) { QString lib = opt.mid(2); - lib += project->first(ProKey("QMAKE_" + lib.toUpper() + "_SUFFIX")).toQString(); bool found = false; ProStringList extens; extens << project->first("QMAKE_EXTENSION_SHLIB") << "a"; @@ -409,7 +408,6 @@ UnixMakefileGenerator::findLibraries() + project->first("QMAKE_PREFIX_SHLIB") + lib + '.' + (*extit)); if (exists(pathToLib)) { - (*it) = "-l" + lib; found = true; break; } @@ -448,10 +446,9 @@ UnixMakefileGenerator::processPrlFiles() libdirs.insert(libidx++, l); } else if(opt.startsWith("-l")) { QString lib = opt.right(opt.length() - 2); - QString prl_ext = project->first(ProKey("QMAKE_" + lib.toUpper() + "_SUFFIX")).toQString(); for(int dep_i = 0; dep_i < libdirs.size(); ++dep_i) { QString prl = libdirs[dep_i].local() + '/' - + project->first("QMAKE_PREFIX_SHLIB") + lib + prl_ext; + + project->first("QMAKE_PREFIX_SHLIB") + lib; if (processPrlFile(prl)) break; } |