From 6efec23b100291dfea52a79626e2a577a49c10e5 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Date: Thu, 16 Aug 2012 21:20:02 +0200
Subject: remove handling of QMAKE_FILETAGS

it was unused for a decade. and broken, of course.

Change-Id: I9713d595d95c5b074ef96dfe9b1c314b9198bd7e
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
---
 qmake/generators/unix/unixmake.cpp     |  7 -------
 qmake/generators/win32/winmakefile.cpp | 18 ------------------
 qmake/generators/win32/winmakefile.h   |  1 -
 3 files changed, 26 deletions(-)

(limited to 'qmake/generators')

diff --git a/qmake/generators/unix/unixmake.cpp b/qmake/generators/unix/unixmake.cpp
index e7f8b6156f..ac458b66dc 100644
--- a/qmake/generators/unix/unixmake.cpp
+++ b/qmake/generators/unix/unixmake.cpp
@@ -169,13 +169,6 @@ UnixMakefileGenerator::init()
         }
     }
 
-    project->values("QMAKE_FILETAGS") << "SOURCES" << "GENERATED_SOURCES" << "TARGET" << "DESTDIR";
-    if(!project->isEmpty("QMAKE_EXTRA_COMPILERS")) {
-        const QStringList &quc = project->values("QMAKE_EXTRA_COMPILERS");
-        for(int i = 0; i < quc.size(); ++i)
-            project->values("QMAKE_FILETAGS") += project->values(quc[i]+".input");
-    }
-
     if(project->isActiveConfig("GNUmake") && !project->isEmpty("QMAKE_CFLAGS_DEPS"))
         include_deps = true; //do not generate deps
     if(project->isActiveConfig("compile_libtool"))
diff --git a/qmake/generators/win32/winmakefile.cpp b/qmake/generators/win32/winmakefile.cpp
index ca0995c735..b49ce82a92 100644
--- a/qmake/generators/win32/winmakefile.cpp
+++ b/qmake/generators/win32/winmakefile.cpp
@@ -303,7 +303,6 @@ void Win32MakefileGenerator::processVars()
 
     fixTargetExt();
     processRcFileVar();
-    processFileTagsVar();
 
     QStringList &incDir = project->values("INCLUDEPATH");
     for(QStringList::Iterator incDir_it = incDir.begin(); incDir_it != incDir.end(); ++incDir_it) {
@@ -520,23 +519,6 @@ void Win32MakefileGenerator::processRcFileVar()
     }
 }
 
-void Win32MakefileGenerator::processFileTagsVar()
-{
-    QStringList tags;
-    tags << "SOURCES" << "GENERATED_SOURCES" << "DEF_FILE" << "RC_FILE"
-         << "TARGET" << "QMAKE_LIBS" << "DESTDIR" << "DLLDESTDIR" << "INCLUDEPATH";
-    if(!project->isEmpty("QMAKE_EXTRA_COMPILERS")) {
-        const QStringList &quc = project->values("QMAKE_EXTRA_COMPILERS");
-        for(QStringList::ConstIterator it = quc.begin(); it != quc.end(); ++it)
-            tags += project->values((*it)+".input");
-    }
-
-    //clean path
-    QStringList &filetags = project->values("QMAKE_FILETAGS");
-    for(int i = 0; i < tags.size(); ++i)
-        filetags += Option::fixPathToTargetOS(tags.at(i), false);
-}
-
 void Win32MakefileGenerator::writeCleanParts(QTextStream &t)
 {
     t << "clean: compiler_clean " << var("CLEAN_DEPS");
diff --git a/qmake/generators/win32/winmakefile.h b/qmake/generators/win32/winmakefile.h
index 26a7208dee..930050ebd6 100644
--- a/qmake/generators/win32/winmakefile.h
+++ b/qmake/generators/win32/winmakefile.h
@@ -71,7 +71,6 @@ protected:
     void processVars();
     void fixTargetExt();
     void processRcFileVar();
-    void processFileTagsVar();
     virtual QString getLibTarget();
 };
 
-- 
cgit v1.2.3