summaryrefslogtreecommitdiffstats
path: root/qmake
diff options
context:
space:
mode:
authorKai Koehne <kai.koehne@qt.io>2019-04-04 16:47:29 +0200
committerKai Koehne <kai.koehne@qt.io>2019-04-05 07:48:34 +0000
commit5f7b0e5ff4410a596168ee667b71afaa7b18eee8 (patch)
treee7f056e49cd3cd305e59389275c5174d0f9c9775 /qmake
parent4e24bb24a234ee85fca25f9a117de7380083f593 (diff)
qmake: Remove dead code
Silences a clang warning Change-Id: I5ade49326afcce964ffb5c24b5708977950d123e Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'qmake')
-rw-r--r--qmake/generators/mac/pbuilder_pbx.cpp2
-rw-r--r--qmake/generators/makefile.cpp2
-rw-r--r--qmake/generators/unix/unixmake2.cpp2
-rw-r--r--qmake/meta.cpp7
-rw-r--r--qmake/meta.h2
5 files changed, 3 insertions, 12 deletions
diff --git a/qmake/generators/mac/pbuilder_pbx.cpp b/qmake/generators/mac/pbuilder_pbx.cpp
index 5407ed6c69..07832041a7 100644
--- a/qmake/generators/mac/pbuilder_pbx.cpp
+++ b/qmake/generators/mac/pbuilder_pbx.cpp
@@ -856,7 +856,7 @@ ProjectBuilderMakefileGenerator::writeMakeParts(QTextStream &t)
QString lib_file = QMakeMetaInfo::checkLib(Option::normalizePath(
(*lit) + Option::dir_sep + lib + Option::prl_ext));
if (!lib_file.isEmpty()) {
- QMakeMetaInfo libinfo(project);
+ QMakeMetaInfo libinfo;
if(libinfo.readLib(lib_file)) {
if(!libinfo.isEmpty("QMAKE_PRL_TARGET")) {
library = (*lit) + Option::dir_sep + libinfo.first("QMAKE_PRL_TARGET");
diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp
index ab261d02f1..e9dccf0c46 100644
--- a/qmake/generators/makefile.cpp
+++ b/qmake/generators/makefile.cpp
@@ -912,7 +912,7 @@ MakefileGenerator::processPrlFileCore(QString &origFile, const QStringRef &origN
const QString meta_file = QMakeMetaInfo::checkLib(fixedFile);
if (meta_file.isEmpty())
return false;
- QMakeMetaInfo libinfo(project);
+ QMakeMetaInfo libinfo;
debug_msg(1, "Processing PRL file: %s", meta_file.toLatin1().constData());
if (!libinfo.readLib(meta_file)) {
fprintf(stderr, "Error processing meta file %s\n", meta_file.toLatin1().constData());
diff --git a/qmake/generators/unix/unixmake2.cpp b/qmake/generators/unix/unixmake2.cpp
index 4b33713a75..24215ae7b0 100644
--- a/qmake/generators/unix/unixmake2.cpp
+++ b/qmake/generators/unix/unixmake2.cpp
@@ -407,7 +407,7 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t)
const ProStringList &l = project->values("QMAKE_PRL_INTERNAL_FILES");
ProStringList::ConstIterator it;
for(it = l.begin(); it != l.end(); ++it) {
- QMakeMetaInfo libinfo(project);
+ QMakeMetaInfo libinfo;
if (libinfo.readLib((*it).toQString()) && !libinfo.isEmpty("QMAKE_PRL_BUILD_DIR")) {
ProString dir;
int slsh = (*it).lastIndexOf(Option::dir_sep);
diff --git a/qmake/meta.cpp b/qmake/meta.cpp
index 2e8759b8ba..c5c14d9b56 100644
--- a/qmake/meta.cpp
+++ b/qmake/meta.cpp
@@ -35,13 +35,6 @@ QT_BEGIN_NAMESPACE
QHash<QString, ProValueMap> QMakeMetaInfo::cache_vars;
-QMakeMetaInfo::QMakeMetaInfo(QMakeProject *_conf)
- : conf(_conf)
-{
-
-}
-
-
bool
QMakeMetaInfo::readLib(const QString &meta_file)
{
diff --git a/qmake/meta.h b/qmake/meta.h
index 4721085fd2..5f41a37df0 100644
--- a/qmake/meta.h
+++ b/qmake/meta.h
@@ -41,11 +41,9 @@ class QMakeProject;
class QMakeMetaInfo
{
- QMakeProject *conf;
ProValueMap vars;
static QHash<QString, ProValueMap> cache_vars;
public:
- QMakeMetaInfo(QMakeProject *_conf);
// These functions expect the path to be normalized
static QString checkLib(const QString &lib);