remove questionable libtool "compatibility" code from prl processing

this code would get enabled when *not* compiling with libtool, and would
try to use the real library in .libs/ when one tried to link the .la
file (i.e., it would reproduce libtool's functionality). that directory
structure is found only in build directories, so this code was
apparently meant to support mixed projects. that doesn't sound useful.

on top of that, the other code paths that were supposed to treat .la
files like .prl files were disabled before initial release (because
Somebody (TM) noticed that their code "doesn't behave well"). this code
here did the same thing, but at the wrong abstraction level.

as a side effect, this removes an infinite recursion problem in that
code.

Task-number: QTBUG-46910
Change-Id: If5291f5ff42c1412075c195753162c54598a250e
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>

1 files changed, 2 insertions, 11 deletions

diff --git a/qmake/generators/unix/unixmake.cpp b/qmake/generators/unix/unixmake.cpp
index d58cb352ae..3b0080313b 100644
--- a/qmake/generators/unix/unixmake.cpp
+++ b/qmake/generators/unix/unixmake.cpp
@@ -508,17 +508,8 @@ UnixMakefileGenerator::processPrlFiles()
                     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) {
-                        const QMakeLocalFileName &lfn = libdirs[dep_i];
-                        if(!project->isActiveConfig("compile_libtool")) { //give them the .libs..
-                            QString la = lfn.local() + '/' + project->first("QMAKE_PREFIX_SHLIB") + lib + Option::libtool_ext;
-                            if (exists(la) && QFile::exists(lfn.local() + "/.libs")) {
-                                QString dot_libs = lfn.real() + Option::dir_sep + ".libs";
-                                l.append("-L" + dot_libs);
-                                libdirs.insert(libidx++, QMakeLocalFileName(dot_libs));
-                            }
-                        }
-
-                        QString prl = lfn.local() + '/' + project->first("QMAKE_PREFIX_SHLIB") + lib + prl_ext;
+                        QString prl = libdirs[dep_i].local() + '/'
+                                      + project->first("QMAKE_PREFIX_SHLIB") + lib + prl_ext;
                         if (processPrlFile(prl))
                             break;
                     }