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

remove handling of QMAKE_FILETAGS

Browse Source 
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>
This commit is contained in:
Oswald Buddenhagen 2012-08-16 21:20:02 +02:00 committed by Qt by Nokia
parent b2d574e83f
commit 6efec23b10
3 changed files with 0 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
qmake/generators/unix/unixmake.cpp
View File

@ -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")) if(project->isActiveConfig("GNUmake") && !project->isEmpty("QMAKE_CFLAGS_DEPS"))
include_deps = true; //do not generate deps include_deps = true; //do not generate deps
if(project->isActiveConfig("compile_libtool")) if(project->isActiveConfig("compile_libtool"))

18
qmake/generators/win32/winmakefile.cpp
View File

@ -303,7 +303,6 @@ void Win32MakefileGenerator::processVars()
fixTargetExt(); fixTargetExt();
processRcFileVar(); processRcFileVar();
processFileTagsVar();
QStringList &incDir = project->values("INCLUDEPATH"); QStringList &incDir = project->values("INCLUDEPATH");
for(QStringList::Iterator incDir_it = incDir.begin(); incDir_it != incDir.end(); ++incDir_it) { 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) void Win32MakefileGenerator::writeCleanParts(QTextStream &t)
{ {
t << "clean: compiler_clean " << var("CLEAN_DEPS"); t << "clean: compiler_clean " << var("CLEAN_DEPS");

1
qmake/generators/win32/winmakefile.h
View File

@ -71,7 +71,6 @@ protected:
void processVars(); void processVars();
void fixTargetExt(); void fixTargetExt();
void processRcFileVar(); void processRcFileVar();
void processFileTagsVar();
virtual QString getLibTarget(); virtual QString getLibTarget();
}; };