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>

3 files changed, 1 insertions, 8 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;
                     }
diff --git a/qmake/generators/win32/mingw_make.cpp b/qmake/generators/win32/mingw_make.cpp
index 70b2e8325b..506aff5c6f 100644
--- a/qmake/generators/win32/mingw_make.cpp
+++ b/qmake/generators/win32/mingw_make.cpp
@@ -79,13 +79,11 @@ bool MingwMakefileGenerator::findLibraries()
         if ((*it).startsWith("-l")) {
             QString steam = (*it).mid(2).toQString();
             ProString out;
-            QString suffix = project->first(ProKey("QMAKE_" + steam.toUpper() + "_SUFFIX")).toQString();
             for (QList<QMakeLocalFileName>::Iterator dir_it = dirs.begin(); dir_it != dirs.end(); ++dir_it) {
                 QString extension;
                 int ver = findHighestVersion((*dir_it).local(), steam);
                 if (ver > 0)
                     extension += QString::number(ver);
-                extension += suffix;
                 if (QMakeMetaInfo::libExists((*dir_it).local() + '/' + steam)
                     || exists((*dir_it).local() + '/' + steam + extension + ".a")
                     || exists((*dir_it).local() + '/' + steam + extension + ".dll.a")) {
diff --git a/qmake/generators/win32/winmakefile.cpp b/qmake/generators/win32/winmakefile.cpp
index 538ab757bd..3d511ea7e8 100644
--- a/qmake/generators/win32/winmakefile.cpp
+++ b/qmake/generators/win32/winmakefile.cpp
@@ -116,14 +116,12 @@ Win32MakefileGenerator::findLibraries()
         } else if(opt.startsWith("-l") || opt.startsWith("/l")) {
             QString lib = opt.right(opt.length() - 2), out;
             if(!lib.isEmpty()) {
-                ProString suffix = project->first(ProKey("QMAKE_" + lib.toUpper() + "_SUFFIX"));
                 for(QList<QMakeLocalFileName>::Iterator it = dirs.begin();
                     it != dirs.end(); ++it) {
                     QString extension;
                     int ver = findHighestVersion((*it).local(), lib);
                     if(ver > 0)
                         extension += QString::number(ver);
-                    extension += suffix;
                     extension += ".lib";
                     if (QMakeMetaInfo::libExists((*it).local() + '/' + lib)
                             || exists((*it).local() + '/' + lib + extension)) {