1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qmake: prune pkg-config reader stub from QMakeMetaInfo

Browse Source 
this code operates way below the level integrating with a package
manager makes sense. consequently, remove the "TODO item".
support at a higher level is actually implemented anyway.

Change-Id: I8e1e43911dd40aa7585e49c1ad1e37b999779308
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
This commit is contained in:
Oswald Buddenhagen 2018-07-09 17:23:06 +02:00
parent 88867e39bc
commit 317b5d9553
2 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
qmake/meta.cpp
View File

@ -52,10 +52,7 @@ QMakeMetaInfo::readLib(const QString &meta_file)
bool ret = false; bool ret = false;
if(!meta_file.isNull()) { if(!meta_file.isNull()) {
if(meta_file.endsWith(Option::pkgcfg_ext)) { if (meta_file.endsWith(Option::libtool_ext)) {
if((ret=readPkgCfgFile(meta_file)))
meta_type = "pkgcfg";
} else if(meta_file.endsWith(Option::libtool_ext)) {
if((ret=readLibtoolFile(meta_file))) if((ret=readLibtoolFile(meta_file)))
meta_type = "libtool"; meta_type = "libtool";
} else if(meta_file.endsWith(Option::prl_ext)) { } else if(meta_file.endsWith(Option::prl_ext)) {
@ -80,7 +77,7 @@ QString
QMakeMetaInfo::findLib(const QString &lib) QMakeMetaInfo::findLib(const QString &lib)
{ {
QString ret; QString ret;
QString extns[] = { Option::prl_ext, /*Option::pkgcfg_ext, Option::libtool_ext,*/ QString() }; QString extns[] = { Option::prl_ext, /*Option::libtool_ext,*/ QString() };
for(int extn = 0; !extns[extn].isNull(); extn++) { for(int extn = 0; !extns[extn].isNull(); extn++) {
if(lib.endsWith(extns[extn])) if(lib.endsWith(extns[extn]))
ret = QFile::exists(lib) ? lib : QString(); ret = QFile::exists(lib) ? lib : QString();
@ -169,11 +166,4 @@ QMakeMetaInfo::readLibtoolFile(const QString &f)
return true; return true;
} }
bool
QMakeMetaInfo::readPkgCfgFile(const QString &f)
{
fprintf(stderr, "Must implement reading in pkg-config files (%s)!!!\n", f.toLatin1().constData());
return false;
}
QT_END_NAMESPACE QT_END_NAMESPACE

1
qmake/meta.h
View File

@ -42,7 +42,6 @@ class QMakeProject;
class QMakeMetaInfo class QMakeMetaInfo
{ {
bool readLibtoolFile(const QString &f); bool readLibtoolFile(const QString &f);
bool readPkgCfgFile(const QString &f);
QMakeProject *conf; QMakeProject *conf;
ProValueMap vars; ProValueMap vars;
QString meta_type; QString meta_type;