make .prl processing less convoluted

don't look up the files and normalize the paths multiple times, as this
is inefficient and hard to understand.
on the way, processPrlFile() got unnested, and libExists() got nuked.

note that a missing QMAKE_PRL_TARGET will be now complained about, which
really should never happen.

Change-Id: Ibcd77a7f963204c013548496ecd2d635e1a4baba
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>

1 files changed, 4 insertions, 7 deletions

diff --git a/qmake/meta.h b/qmake/meta.h
index a1a30fbfa8..7c91ffda44 100644
--- a/qmake/meta.h
+++ b/qmake/meta.h
@@ -55,11 +55,11 @@ class QMakeMetaInfo
 public:
     QMakeMetaInfo(QMakeProject *_conf);
 
-    bool readLib(QString lib);
-    static QString findLib(QString lib);
-    static bool libExists(QString lib);
-    QString type() const;
+    // These functions expect the path to be normalized
+    static QString findLib(const QString &lib);
+    bool readLib(const QString &meta_file);
 
+    QString type() const;
     bool isEmpty(const ProKey &v);
     ProStringList &values(const ProKey &v);
     ProString first(const ProKey &v);
@@ -91,9 +91,6 @@ inline ProString QMakeMetaInfo::first(const ProKey &v)
 inline ProValueMap &QMakeMetaInfo::variables()
 { return vars; }
 
-inline bool QMakeMetaInfo::libExists(QString lib)
-{ return !findLib(lib).isNull(); }
-
 QT_END_NAMESPACE
 
 #endif // META_H