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

remove dead variable assignments

Browse Source 
Change-Id: I032e9116ca1b7250497f56ea26103f2173f0fc09
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
This commit is contained in:
Oswald Buddenhagen 2012-08-20 16:08:09 +02:00 committed by Qt by Nokia
parent 8a879a6148
commit 7033560e54
4 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
qmake/generators/mac/pbuilder_pbx.cpp
View File

@ -536,7 +536,6 @@ ProjectBuilderMakefileGenerator::writeMakeParts(QTextStream &t)
if(!project->isEmpty("QMAKE_EXTRA_COMPILERS")) { if(!project->isEmpty("QMAKE_EXTRA_COMPILERS")) {
const QStringList &quc = project->values("QMAKE_EXTRA_COMPILERS"); const QStringList &quc = project->values("QMAKE_EXTRA_COMPILERS");
for(QStringList::ConstIterator it = quc.begin(); it != quc.end(); ++it) { for(QStringList::ConstIterator it = quc.begin(); it != quc.end(); ++it) {
QString tmp_out = project->first((*it) + ".output");
if(project->isEmpty((*it) + ".output")) if(project->isEmpty((*it) + ".output"))
continue; continue;
QString name = (*it); QString name = (*it);

2
qmake/generators/makefile.cpp
View File

@ -1262,7 +1262,6 @@ MakefileGenerator::writeInstalls(QTextStream &t, const QString &installs, bool n
} }
bool is_target = (wild == fileFixify(var("TARGET"), FileFixifyAbsolute)); bool is_target = (wild == fileFixify(var("TARGET"), FileFixifyAbsolute));
if(is_target || exists(wild)) { //real file or target if(is_target || exists(wild)) { //real file or target
QString file = wild;
QFileInfo fi(fileInfo(wild)); QFileInfo fi(fileInfo(wild));
QString dst_file = filePrefixRoot(root, dst_dir); QString dst_file = filePrefixRoot(root, dst_dir);
if(fi.isDir() && project->isActiveConfig("copy_dir_files")) { if(fi.isDir() && project->isActiveConfig("copy_dir_files")) {
@ -1822,7 +1821,6 @@ MakefileGenerator::writeExtraCompilerTargets(QTextStream &t)
t << " " << escapeDependencyPath(replaceExtraCompilerVariables(tmp_out, input, QString())); t << " " << escapeDependencyPath(replaceExtraCompilerVariables(tmp_out, input, QString()));
} else { } else {
for(QStringList::ConstIterator input = tmp_inputs.begin(); input != tmp_inputs.end(); ++input) { for(QStringList::ConstIterator input = tmp_inputs.begin(); input != tmp_inputs.end(); ++input) {
QString in = Option::fixPathToTargetOS((*input), false);
t << " " << escapeDependencyPath(replaceExtraCompilerVariables(tmp_out, (*input), QString())); t << " " << escapeDependencyPath(replaceExtraCompilerVariables(tmp_out, (*input), QString()));
} }
} }

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

@ -210,7 +210,6 @@ UnixMakefileGenerator::init()
pchBaseName + project->first("QMAKE_PCH_OUTPUT_EXT")); pchBaseName + project->first("QMAKE_PCH_OUTPUT_EXT"));
} else { } else {
// gcc style (including clang_pch_style) // gcc style (including clang_pch_style)
QString headerPrefix = project->first("QMAKE_PRECOMP_PREFIX");
QString headerSuffix; QString headerSuffix;
if (project->isActiveConfig("clang_pch_style")) if (project->isActiveConfig("clang_pch_style"))
headerSuffix = project->first("QMAKE_PCH_OUTPUT_EXT"); headerSuffix = project->first("QMAKE_PCH_OUTPUT_EXT");

1
qmake/generators/win32/mingw_make.cpp
View File

@ -259,7 +259,6 @@ void MingwMakefileGenerator::init()
project->values("QMAKE_LIBS") += escapeFilePaths(project->values("RES_FILE")); project->values("QMAKE_LIBS") += escapeFilePaths(project->values("RES_FILE"));
} }
QString targetfilename = project->values("TARGET").first();
QStringList &configs = project->values("CONFIG"); QStringList &configs = project->values("CONFIG");
if(project->isActiveConfig("qt_dll")) if(project->isActiveConfig("qt_dll"))