remove the most blatant tmake compat paths

Reviewed-By: mariusSO

3 files changed, 2 insertions, 12 deletions

diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp
index b0a8011..991e1ec 100644
--- a/qmake/generators/makefile.cpp
+++ b/qmake/generators/makefile.cpp
@@ -2681,8 +2681,6 @@ MakefileGenerator::writeMakeQmake(QTextStream &t)
             if(!specdir().isEmpty()) {
                 if(exists(Option::fixPathToLocalOS(specdir()+QDir::separator()+"qmake.conf")))
                     t << escapeDependencyPath(specdir() + Option::dir_sep + "qmake.conf") << " ";
-                else if(exists(Option::fixPathToLocalOS(specdir()+QDir::separator()+"tmake.conf")))
-                    t << escapeDependencyPath(specdir() + Option::dir_sep + "tmake.conf") << " ";
             }
             const QStringList &included = project->values("QMAKE_INTERNAL_INCLUDED_FILES");
             t << escapeDependencyPaths(included).join(" \\\n\t\t") << "\n\t"
diff --git a/qmake/generators/win32/msvc_vcproj.cpp b/qmake/generators/win32/msvc_vcproj.cpp
index 47986f5..3536a02 100644
--- a/qmake/generators/win32/msvc_vcproj.cpp
+++ b/qmake/generators/win32/msvc_vcproj.cpp
@@ -1721,8 +1721,7 @@ QString VcprojGenerator::findTemplate(QString file)
        !exists((ret = QString(QLibraryInfo::location(QLibraryInfo::DataPath) + "/win32-msvc2002/" + file))) &&
        !exists((ret = QString(QLibraryInfo::location(QLibraryInfo::DataPath) + "/win32-msvc2003/" + file))) &&
        !exists((ret = QString(QLibraryInfo::location(QLibraryInfo::DataPath) + "/win32-msvc2005/" + file))) &&
-       !exists((ret = QString(QLibraryInfo::location(QLibraryInfo::DataPath) + "/win32-msvc2008/" + file))) &&
-       !exists((ret = (QString(qgetenv("HOME")) + "/.tmake/" + file))))
+       !exists((ret = QString(QLibraryInfo::location(QLibraryInfo::DataPath) + "/win32-msvc2008/" + file))))
         return "";
     debug_msg(1, "Generator: MSVC.NET: Found template \'%s\'", ret.toLatin1().constData());
     return ret;
diff --git a/qmake/project.cpp b/qmake/project.cpp
index 4ce8ba4..04951c3 100644
--- a/qmake/project.cpp
+++ b/qmake/project.cpp
@@ -183,9 +183,7 @@ static QString remove_quotes(const QString &arg)
 static QString varMap(const QString &x)
 {
     QString ret(x);
-    if(ret.startsWith("TMAKE")) //tmake no more!
-        ret = "QMAKE" + ret.mid(5);
-    else if(ret == "INTERFACES")
+    if(ret == "INTERFACES")
         ret = "FORMS";
     else if(ret == "QMAKE_POST_BUILD")
         ret = "QMAKE_POST_LINK";
@@ -1456,9 +1454,6 @@ QMakeProject::read(uchar cmd)
             while(qmakespec.endsWith(QString(QChar(QDir::separator()))))
                 qmakespec.truncate(qmakespec.length()-1);
             QString spec = qmakespec + QDir::separator() + "qmake.conf";
-            if(!QFile::exists(spec) &&
-               QFile::exists(qmakespec + QDir::separator() + "tmake.conf"))
-                spec = qmakespec + QDir::separator() + "tmake.conf";
             debug_msg(1, "QMAKESPEC conf: reading %s", spec.toLatin1().constData());
             if(!read(spec, base_vars)) {
                 fprintf(stderr, "Failure to read QMAKESPEC conf file %s.\n", spec.toLatin1().constData());
@@ -3080,8 +3075,6 @@ QStringList &QMakeProject::values(const QString &_var, QMap<QString, QStringList
             QString orig_template = place["TEMPLATE"].first(), real_template;
             if(!Option::user_template_prefix.isEmpty() && !orig_template.startsWith(Option::user_template_prefix))
                 real_template = Option::user_template_prefix + orig_template;
-            if(real_template.endsWith(".t"))
-                real_template = real_template.left(real_template.length()-2);
             if(!real_template.isEmpty()) {
                 var = ".BUILTIN." + var;
                 place[var] = QStringList(real_template);