qmake: refactor QMakeMetaInfo::findLib() interface

move the logic for trying different extensions to
MakefileGenerator::processPrlFile(), which is the only user of that
functionality. that makes findLib() rather trivial and a bit of a
misnomer, so rename it to checkLib().

Change-Id: If9738cc17367452853ab8d3866fa36b5d4b57213
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>

1 files changed, 11 insertions, 7 deletions

diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp
index 035493b9ce..e7b7a7a10e 100644
--- a/qmake/generators/makefile.cpp
+++ b/qmake/generators/makefile.cpp
@@ -880,15 +880,19 @@ MakefileGenerator::processPrlFile(QString &file)
 {
     bool try_replace_file = false;
     QString f = fileFixify(file, FileFixifyBackwards);
-    QString meta_file = QMakeMetaInfo::findLib(f);
-    if (!meta_file.isEmpty()) {
+    QString meta_file;
+    if (f.endsWith(Option::prl_ext)) {
+        meta_file = QMakeMetaInfo::checkLib(f);
         try_replace_file = true;
     } else {
-        QString tmp = f;
-        int ext = tmp.lastIndexOf('.');
-        if(ext != -1)
-            tmp = tmp.left(ext);
-        meta_file = QMakeMetaInfo::findLib(tmp);
+        meta_file = QMakeMetaInfo::checkLib(f + Option::prl_ext);
+        if (!meta_file.isEmpty()) {
+            try_replace_file = true;
+        } else {
+            int ext = f.lastIndexOf('.');
+            if (ext != -1)
+                meta_file = QMakeMetaInfo::checkLib(f.left(ext) + Option::prl_ext);
+        }
     }
     if (meta_file.isEmpty())
         return false;