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

qmake: Remove dead code

Browse Source 
Silences a clang warning

Change-Id: I5ade49326afcce964ffb5c24b5708977950d123e
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
This commit is contained in:
Kai Koehne 2019-04-04 16:47:29 +02:00
parent 4e24bb24a2
commit 5f7b0e5ff4
5 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
qmake/generators/mac/pbuilder_pbx.cpp
View File

@ -856,7 +856,7 @@ ProjectBuilderMakefileGenerator::writeMakeParts(QTextStream &t)
QString lib_file = QMakeMetaInfo::checkLib(Option::normalizePath( QString lib_file = QMakeMetaInfo::checkLib(Option::normalizePath(
(*lit) + Option::dir_sep + lib + Option::prl_ext)); (*lit) + Option::dir_sep + lib + Option::prl_ext));
if (!lib_file.isEmpty()) { if (!lib_file.isEmpty()) {
QMakeMetaInfo libinfo(project); QMakeMetaInfo libinfo;
if(libinfo.readLib(lib_file)) { if(libinfo.readLib(lib_file)) {
if(!libinfo.isEmpty("QMAKE_PRL_TARGET")) { if(!libinfo.isEmpty("QMAKE_PRL_TARGET")) {
library = (*lit) + Option::dir_sep + libinfo.first("QMAKE_PRL_TARGET"); library = (*lit) + Option::dir_sep + libinfo.first("QMAKE_PRL_TARGET");

2
qmake/generators/makefile.cpp
View File

@ -912,7 +912,7 @@ MakefileGenerator::processPrlFileCore(QString &origFile, const QStringRef &origN
const QString meta_file = QMakeMetaInfo::checkLib(fixedFile); const QString meta_file = QMakeMetaInfo::checkLib(fixedFile);
if (meta_file.isEmpty()) if (meta_file.isEmpty())
return false; return false;
QMakeMetaInfo libinfo(project); QMakeMetaInfo libinfo;
debug_msg(1, "Processing PRL file: %s", meta_file.toLatin1().constData()); debug_msg(1, "Processing PRL file: %s", meta_file.toLatin1().constData());
if (!libinfo.readLib(meta_file)) { if (!libinfo.readLib(meta_file)) {
fprintf(stderr, "Error processing meta file %s\n", meta_file.toLatin1().constData()); fprintf(stderr, "Error processing meta file %s\n", meta_file.toLatin1().constData());

2
qmake/generators/unix/unixmake2.cpp
View File

@ -407,7 +407,7 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t)
const ProStringList &l = project->values("QMAKE_PRL_INTERNAL_FILES"); const ProStringList &l = project->values("QMAKE_PRL_INTERNAL_FILES");
ProStringList::ConstIterator it; ProStringList::ConstIterator it;
for(it = l.begin(); it != l.end(); ++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")) { if (libinfo.readLib((*it).toQString()) && !libinfo.isEmpty("QMAKE_PRL_BUILD_DIR")) {
ProString dir; ProString dir;
int slsh = (*it).lastIndexOf(Option::dir_sep); int slsh = (*it).lastIndexOf(Option::dir_sep);

7
qmake/meta.cpp
View File

@ -35,13 +35,6 @@ QT_BEGIN_NAMESPACE
QHash<QString, ProValueMap> QMakeMetaInfo::cache_vars; QHash<QString, ProValueMap> QMakeMetaInfo::cache_vars;
QMakeMetaInfo::QMakeMetaInfo(QMakeProject *_conf)
: conf(_conf)
{
}
bool bool
QMakeMetaInfo::readLib(const QString &meta_file) QMakeMetaInfo::readLib(const QString &meta_file)
{ {

2
qmake/meta.h
View File

@ -41,11 +41,9 @@ class QMakeProject;
class QMakeMetaInfo class QMakeMetaInfo
{ {
QMakeProject *conf;
ProValueMap vars; ProValueMap vars;
static QHash<QString, ProValueMap> cache_vars; static QHash<QString, ProValueMap> cache_vars;
public: public:
QMakeMetaInfo(QMakeProject *_conf);
// These functions expect the path to be normalized // These functions expect the path to be normalized
static QString checkLib(const QString &lib); static QString checkLib(const QString &lib);