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

remove unused checkMultipleDefinition()

Browse Source 
Change-Id: I533c2091333942f145063ad04f4420b7a2de0a37
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
This commit is contained in:
Oswald Buddenhagen 2012-08-17 11:11:48 +02:00 committed by Qt by Nokia
parent 7033560e54
commit 7251683085
2 changed files with 0 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
qmake/generators/makefile.cpp
View File

@ -2798,29 +2798,6 @@ MakefileGenerator::fileFixify(const QString& file, const QString &out_d, const Q
return ret; return ret;
} }
void
MakefileGenerator::checkMultipleDefinition(const QString &f, const QString &w)
{
if(!(Option::warn_level & WarnLogic))
return;
QString file = f;
int slsh = f.lastIndexOf(Option::dir_sep);
if(slsh != -1)
file.remove(0, slsh + 1);
const QStringList &l = project->values(w);
for (QStringList::ConstIterator val_it = l.begin(); val_it != l.end(); ++val_it) {
QString file2((*val_it));
slsh = file2.lastIndexOf(Option::dir_sep);
if(slsh != -1)
file2.remove(0, slsh + 1);
if(file2 == file) {
warn_msg(WarnLogic, "Found potential symbol conflict of %s (%s) in %s",
file.toLatin1().constData(), (*val_it).toLatin1().constData(), w.toLatin1().constData());
break;
}
}
}
QMakeLocalFileName QMakeLocalFileName
MakefileGenerator::fixPathForFile(const QMakeLocalFileName &file, bool forOpen) MakefileGenerator::fixPathForFile(const QMakeLocalFileName &file, bool forOpen)
{ {

1
qmake/generators/makefile.h
View File

@ -83,7 +83,6 @@ class MakefileGenerator : protected QMakeSourceFileInfo
QHash<QString, bool> init_compiler_already; QHash<QString, bool> init_compiler_already;
QString chkdir, chkfile, chkglue; QString chkdir, chkfile, chkglue;
QString build_args(const QString &outdir=QString()); QString build_args(const QString &outdir=QString());
void checkMultipleDefinition(const QString &, const QString &);
//internal caches //internal caches
mutable QHash<QString, QMakeLocalFileName> depHeuristicsCache; mutable QHash<QString, QMakeLocalFileName> depHeuristicsCache;