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

remove dead variables

Browse Source 
Change-Id: I6c48a2e64027c432a87767782669c30a8876b0d6
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
This commit is contained in:
Oswald Buddenhagen 2014-11-13 15:58:53 +01:00
parent a5c197bee7
commit eb9db750e9
3 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -950,7 +950,6 @@ ProjectBuilderMakefileGenerator::writeMakeParts(QTextStream &t)
libdirs += path; libdirs += path;
} }
library = fileFixify(library); library = fileFixify(library);
QString filetype = xcodeFiletypeForFilename(library);
QString key = keyFor(library); QString key = keyFor(library);
if (!project->values("QMAKE_PBX_LIBRARIES").contains(key)) { if (!project->values("QMAKE_PBX_LIBRARIES").contains(key)) {
bool is_frmwrk = (library.endsWith(".framework")); bool is_frmwrk = (library.endsWith(".framework"));
@ -1224,8 +1223,6 @@ ProjectBuilderMakefileGenerator::writeMakeParts(QTextStream &t)
} else { } else {
t << "\t\t\t" << writeSettings("explicitFileType", "compiled.mach-o.executable") << ";\n"; t << "\t\t\t" << writeSettings("explicitFileType", "compiled.mach-o.executable") << ";\n";
} }
QString app = (!project->isEmpty("DESTDIR") ? project->first("DESTDIR") + project->first("QMAKE_ORIG_TARGET") :
qmake_getpwd()) + Option::dir_sep + targ;
t << "\t\t\t" << writeSettings("path", escapeFilePath(targ)) << ";\n"; t << "\t\t\t" << writeSettings("path", escapeFilePath(targ)) << ";\n";
} else { } else {
ProString lib = project->first("QMAKE_ORIG_TARGET"); ProString lib = project->first("QMAKE_ORIG_TARGET");

2
qmake/generators/unix/unixmake2.cpp
View File

@ -167,7 +167,7 @@ UnixMakefileGenerator::writeSubTargets(QTextStream &t, QList<MakefileGenerator::
void void
UnixMakefileGenerator::writeMakeParts(QTextStream &t) UnixMakefileGenerator::writeMakeParts(QTextStream &t)
{ {
QString deps = fileFixify(Option::output.fileName()), target_deps, prl; QString deps = fileFixify(Option::output.fileName()), target_deps;
bool do_incremental = (project->isActiveConfig("incremental") && bool do_incremental = (project->isActiveConfig("incremental") &&
!project->values("QMAKE_INCREMENTAL").isEmpty() && !project->values("QMAKE_INCREMENTAL").isEmpty() &&
(!project->values("QMAKE_APP_FLAG").isEmpty() || (!project->values("QMAKE_APP_FLAG").isEmpty() ||

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

@ -250,8 +250,6 @@ void MingwMakefileGenerator::init()
project->values("QMAKE_LIBS") += escapeFilePaths(project->values("RES_FILE")); project->values("QMAKE_LIBS") += escapeFilePaths(project->values("RES_FILE"));
} }
ProStringList &configs = project->values("CONFIG");
if (project->isActiveConfig("dll")) { if (project->isActiveConfig("dll")) {
QString destDir = ""; QString destDir = "";
if(!project->first("DESTDIR").isEmpty()) if(!project->first("DESTDIR").isEmpty())