qmake: prune pkg-config reader stub from QMakeMetaInfo

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 <[email protected]>
boris-fx · Jul 16, 2018 · 317b5d9 · 317b5d9
1 parent 88867e3
commit 317b5d9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 13 deletions.
diff --git a/qmake/meta.cpp b/qmake/meta.cpp
@@ -52,10 +52,7 @@ QMakeMetaInfo::readLib(const QString &meta_file)
 
     bool ret = false;
     if(!meta_file.isNull()) {
-        if(meta_file.endsWith(Option::pkgcfg_ext)) {
-            if((ret=readPkgCfgFile(meta_file)))
-                meta_type = "pkgcfg";
-        } else if(meta_file.endsWith(Option::libtool_ext)) {
+        if (meta_file.endsWith(Option::libtool_ext)) {
             if((ret=readLibtoolFile(meta_file)))
                 meta_type = "libtool";
         } else if(meta_file.endsWith(Option::prl_ext)) {
@@ -80,7 +77,7 @@ QString
 QMakeMetaInfo::findLib(const QString &lib)
 {
     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++) {
         if(lib.endsWith(extns[extn]))
             ret = QFile::exists(lib) ? lib : QString();
@@ -169,11 +166,4 @@ QMakeMetaInfo::readLibtoolFile(const QString &f)
     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
diff --git a/qmake/meta.h b/qmake/meta.h
@@ -42,7 +42,6 @@ class QMakeProject;
 class QMakeMetaInfo
 {
     bool readLibtoolFile(const QString &f);
-    bool readPkgCfgFile(const QString &f);
     QMakeProject *conf;
     ProValueMap vars;
     QString meta_type;