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

remove some symbian cruft

Browse Source 
- Option::mmp_ext
- references to dead QMAKE_INTERNAL_ET_PARSED_* variables

Change-Id: I863605b23798cbca3f6c8ab5a154fd432f1f4dcc
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
This commit is contained in:
Oswald Buddenhagen 2012-04-20 20:10:38 +02:00
parent 7d44bd0646
commit a07d4f8fb3
3 changed files with 0 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
qmake/generators/makefile.cpp
View File

@ -1771,10 +1771,6 @@ MakefileGenerator::writeExtraTargets(QTextStream &t)
if(!cmd.isEmpty()) if(!cmd.isEmpty())
t << "\n\t" << cmd; t << "\n\t" << cmd;
t << endl << endl; t << endl << endl;
project->values(QLatin1String("QMAKE_INTERNAL_ET_PARSED_TARGETS.") + (*it)) << escapeDependencyPath(targ);
project->values(QLatin1String("QMAKE_INTERNAL_ET_PARSED_DEPS.") + (*it) + escapeDependencyPath(targ)) << deps.split(" ", QString::SkipEmptyParts);
project->values(QLatin1String("QMAKE_INTERNAL_ET_PARSED_CMD.") + (*it) + escapeDependencyPath(targ)) << cmd;
} }
} }
@ -1973,17 +1969,13 @@ MakefileGenerator::writeExtraCompilerTargets(QTextStream &t)
QString cmd = replaceExtraCompilerVariables(tmp_cmd, escapeFilePaths(inputs), QStringList(tmp_out)); QString cmd = replaceExtraCompilerVariables(tmp_cmd, escapeFilePaths(inputs), QStringList(tmp_out));
t << escapeDependencyPath(tmp_out) << ":"; t << escapeDependencyPath(tmp_out) << ":";
project->values(QLatin1String("QMAKE_INTERNAL_ET_PARSED_TARGETS.") + (*it)) << escapeDependencyPath(tmp_out);
// compiler.CONFIG+=explicit_dependencies means that ONLY compiler.depends gets to cause Makefile dependencies // compiler.CONFIG+=explicit_dependencies means that ONLY compiler.depends gets to cause Makefile dependencies
if(project->values((*it) + ".CONFIG").indexOf("explicit_dependencies") != -1) { if(project->values((*it) + ".CONFIG").indexOf("explicit_dependencies") != -1) {
t << " " << valList(escapeDependencyPaths(fileFixify(tmp_dep, Option::output_dir, Option::output_dir))); t << " " << valList(escapeDependencyPaths(fileFixify(tmp_dep, Option::output_dir, Option::output_dir)));
project->values(QLatin1String("QMAKE_INTERNAL_ET_PARSED_DEPS.") + (*it) + escapeDependencyPath(tmp_out)) << tmp_dep;
} else { } else {
t << " " << valList(escapeDependencyPaths(inputs)) << " " << valList(escapeDependencyPaths(deps)); t << " " << valList(escapeDependencyPaths(inputs)) << " " << valList(escapeDependencyPaths(deps));
project->values(QLatin1String("QMAKE_INTERNAL_ET_PARSED_DEPS.") + (*it) + escapeDependencyPath(tmp_out)) << inputs << deps;
} }
t << "\n\t" << cmd << endl << endl; t << "\n\t" << cmd << endl << endl;
project->values(QLatin1String("QMAKE_INTERNAL_ET_PARSED_CMD.") + (*it) + escapeDependencyPath(tmp_out)) << cmd;
continue; continue;
} }
for(QStringList::ConstIterator input = tmp_inputs.begin(); input != tmp_inputs.end(); ++input) { for(QStringList::ConstIterator input = tmp_inputs.begin(); input != tmp_inputs.end(); ++input) {
@ -2087,9 +2079,6 @@ MakefileGenerator::writeExtraCompilerTargets(QTextStream &t)
} }
t << escapeDependencyPath(out) << ": " << valList(escapeDependencyPaths(deps)) << "\n\t" t << escapeDependencyPath(out) << ": " << valList(escapeDependencyPaths(deps)) << "\n\t"
<< cmd << endl << endl; << cmd << endl << endl;
project->values(QLatin1String("QMAKE_INTERNAL_ET_PARSED_TARGETS.") + (*it)) << escapeDependencyPath(out);
project->values(QLatin1String("QMAKE_INTERNAL_ET_PARSED_DEPS.") + (*it) + escapeDependencyPath(out)) << deps;
project->values(QLatin1String("QMAKE_INTERNAL_ET_PARSED_CMD.") + (*it) + escapeDependencyPath(out)) << cmd;
} }
} }
t << "compiler_clean: " << clean_targets << endl << endl; t << "compiler_clean: " << clean_targets << endl << endl;

2
qmake/option.cpp
View File

@ -67,7 +67,6 @@ QString Option::obj_ext;
QString Option::lex_ext; QString Option::lex_ext;
QString Option::yacc_ext; QString Option::yacc_ext;
QString Option::pro_ext; QString Option::pro_ext;
QString Option::mmp_ext;
QString Option::dir_sep; QString Option::dir_sep;
QString Option::dirlist_sep; QString Option::dirlist_sep;
QString Option::h_moc_mod; QString Option::h_moc_mod;
@ -436,7 +435,6 @@ Option::init(int argc, char **argv)
Option::lex_ext = ".l"; Option::lex_ext = ".l";
Option::yacc_ext = ".y"; Option::yacc_ext = ".y";
Option::pro_ext = ".pro"; Option::pro_ext = ".pro";
Option::mmp_ext = ".mmp";
#ifdef Q_OS_WIN #ifdef Q_OS_WIN
Option::dirlist_sep = ";"; Option::dirlist_sep = ";";
Option::shellPath = detectShellPath(); Option::shellPath = detectShellPath();

1
qmake/option.h
View File

@ -93,7 +93,6 @@ struct Option
static QString dirlist_sep; static QString dirlist_sep;
static QString sysenv_mod; static QString sysenv_mod;
static QString pro_ext; static QString pro_ext;
static QString mmp_ext;
static QString res_ext; static QString res_ext;
static char field_sep; static char field_sep;
static const char *application_argv0; static const char *application_argv0;