From c00e11d573447c0247f5db4a1141f6c307e0b36d Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Tue, 22 Sep 2015 12:47:19 +0200 Subject: 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 Reviewed-by: Oswald Buddenhagen --- qmake/meta.cpp | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'qmake/meta.cpp') diff --git a/qmake/meta.cpp b/qmake/meta.cpp index 73414df73e..719b2c060f 100644 --- a/qmake/meta.cpp +++ b/qmake/meta.cpp @@ -48,10 +48,8 @@ QMakeMetaInfo::QMakeMetaInfo(QMakeProject *_conf) bool -QMakeMetaInfo::readLib(QString lib) +QMakeMetaInfo::readLib(const QString &meta_file) { - QString meta_file = findLib(lib); - if(cache_vars.contains(meta_file)) { vars = cache_vars[meta_file]; return true; @@ -84,10 +82,8 @@ QMakeMetaInfo::readLib(QString lib) QString -QMakeMetaInfo::findLib(QString lib) +QMakeMetaInfo::findLib(const QString &lib) { - lib = Option::normalizePath(lib); - QString ret; QString extns[] = { Option::prl_ext, /*Option::pkgcfg_ext, Option::libtool_ext,*/ QString() }; for(int extn = 0; !extns[extn].isNull(); extn++) { -- cgit v1.2.3