diff options
-rw-r--r-- | qmake/generators/makefile.cpp | 23 | ||||
-rw-r--r-- | qmake/generators/makefile.h | 1 |
2 files changed, 0 insertions, 24 deletions
diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp index 8b96e7ac4c..dff5eaae2c 100644 --- a/qmake/generators/makefile.cpp +++ b/qmake/generators/makefile.cpp @@ -2798,29 +2798,6 @@ MakefileGenerator::fileFixify(const QString& file, const QString &out_d, const Q 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 MakefileGenerator::fixPathForFile(const QMakeLocalFileName &file, bool forOpen) { diff --git a/qmake/generators/makefile.h b/qmake/generators/makefile.h index 47d04b0a12..054ac96e65 100644 --- a/qmake/generators/makefile.h +++ b/qmake/generators/makefile.h @@ -83,7 +83,6 @@ class MakefileGenerator : protected QMakeSourceFileInfo QHash<QString, bool> init_compiler_already; QString chkdir, chkfile, chkglue; QString build_args(const QString &outdir=QString()); - void checkMultipleDefinition(const QString &, const QString &); //internal caches mutable QHash<QString, QMakeLocalFileName> depHeuristicsCache; |