diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2018-07-09 19:15:42 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2018-07-16 15:44:23 +0000 |
| commit | caaceb30e6d998939f13eb6caccef6dbd49b9558 (patch) | |
| tree | 5f7a31c3d80440fbf827532fb0c7e37eedb30518 /qmake/meta.cpp | |
| parent | eb9da60f0c87cb4a3b2b26a66888c0f95cdfa6b4 (diff) | |
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>
Diffstat (limited to 'qmake/meta.cpp')
| -rw-r--r-- | qmake/meta.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/qmake/meta.cpp b/qmake/meta.cpp index a3e5024137..2e8759b8ba 100644 --- a/qmake/meta.cpp +++ b/qmake/meta.cpp @@ -60,13 +60,9 @@ QMakeMetaInfo::readLib(const QString &meta_file) QString -QMakeMetaInfo::findLib(const QString &lib) +QMakeMetaInfo::checkLib(const QString &lib) { - QString ret; - if (lib.endsWith(Option::prl_ext)) - ret = QFile::exists(lib) ? lib : QString(); - else if (QFile::exists(lib + Option::prl_ext)) - ret = lib + Option::prl_ext; + QString ret = QFile::exists(lib) ? lib : QString(); if(ret.isNull()) { debug_msg(2, "QMakeMetaInfo: Cannot find info file for %s", lib.toLatin1().constData()); } else { |