From ab0d55e361778177eed60964dcddbfe0809b9fbe Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Fri, 1 Jun 2012 11:26:34 +0200 Subject: purge unused VcprojGenerator::findTemplate() it looked fishy for years. now i know why. ;) Change-Id: I822cadecaf8d914f383f9f907b92507852e434b4 --- qmake/generators/win32/msvc_vcproj.cpp | 16 ---------------- qmake/generators/win32/msvc_vcproj.h | 1 - 2 files changed, 17 deletions(-) diff --git a/qmake/generators/win32/msvc_vcproj.cpp b/qmake/generators/win32/msvc_vcproj.cpp index cd45ea6cee..b228917692 100644 --- a/qmake/generators/win32/msvc_vcproj.cpp +++ b/qmake/generators/win32/msvc_vcproj.cpp @@ -1577,22 +1577,6 @@ QString VcprojGenerator::fixFilename(QString ofile) const return ofile; } -QString VcprojGenerator::findTemplate(QString file) -{ - QString ret; - if(!exists((ret = file)) && - !exists((ret = QString((project->isHostBuild() - ? Option::mkfile::qmakespec : Option::mkfile::xqmakespec) + '/' + file))) && - !exists((ret = QString(QLibraryInfo::location(QLibraryInfo::HostDataPath) + "/win32-msvc.net/" + file))) && - !exists((ret = QString(QLibraryInfo::location(QLibraryInfo::HostDataPath) + "/win32-msvc2002/" + file))) && - !exists((ret = QString(QLibraryInfo::location(QLibraryInfo::HostDataPath) + "/win32-msvc2003/" + file))) && - !exists((ret = QString(QLibraryInfo::location(QLibraryInfo::HostDataPath) + "/win32-msvc2005/" + file))) && - !exists((ret = QString(QLibraryInfo::location(QLibraryInfo::HostDataPath) + "/win32-msvc2008/" + file)))) - return ""; - debug_msg(1, "Generator: MSVC.NET: Found template \'%s\'", ret.toLatin1().constData()); - return ret; -} - void VcprojGenerator::outputVariables() { #if 0 diff --git a/qmake/generators/win32/msvc_vcproj.h b/qmake/generators/win32/msvc_vcproj.h index 30b149f8f5..416e233614 100644 --- a/qmake/generators/win32/msvc_vcproj.h +++ b/qmake/generators/win32/msvc_vcproj.h @@ -63,7 +63,6 @@ class VcprojGenerator : public Win32MakefileGenerator bool writeMakefile(QTextStream &); bool writeProjectMakefile(); - QString findTemplate(QString file); void init(); public: -- cgit v1.2.3