diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-09-06 12:21:38 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-09-07 15:39:31 +0200 |
| commit | df175f190d17b3473ef4257cd393eda679060651 (patch) | |
| tree | 5b134c26e27001a2f349a779e7d351d8d4aa6d04 /qmake/option.cpp | |
| parent | 9c29beb9eaa35a0c62aca9abb369540fe4edc4d5 (diff) | |
introduce qmake variable abstractions
this is preparation for adapting to a new evaluator.
Change-Id: I6fc59f5525735754a00afa6629fbfe257e84db97
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Diffstat (limited to 'qmake/option.cpp')
| -rw-r--r-- | qmake/option.cpp | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/qmake/option.cpp b/qmake/option.cpp index 1a663c14c5..570b54de43 100644 --- a/qmake/option.cpp +++ b/qmake/option.cpp @@ -534,21 +534,21 @@ void Option::prepareProject(const QString &pfile) bool Option::postProcessProject(QMakeProject *project) { - Option::cpp_ext = project->values("QMAKE_EXT_CPP"); - Option::h_ext = project->values("QMAKE_EXT_H"); - Option::c_ext = project->values("QMAKE_EXT_C"); - Option::res_ext = project->first("QMAKE_EXT_RES"); - Option::pkgcfg_ext = project->first("QMAKE_EXT_PKGCONFIG"); - Option::libtool_ext = project->first("QMAKE_EXT_LIBTOOL"); - Option::prl_ext = project->first("QMAKE_EXT_PRL"); - Option::ui_ext = project->first("QMAKE_EXT_UI"); - Option::cpp_moc_ext = project->first("QMAKE_EXT_CPP_MOC"); - Option::lex_ext = project->first("QMAKE_EXT_LEX"); - Option::yacc_ext = project->first("QMAKE_EXT_YACC"); - Option::obj_ext = project->first("QMAKE_EXT_OBJ"); - Option::h_moc_mod = project->first("QMAKE_H_MOD_MOC"); - Option::lex_mod = project->first("QMAKE_MOD_LEX"); - Option::yacc_mod = project->first("QMAKE_MOD_YACC"); + Option::cpp_ext = project->values("QMAKE_EXT_CPP").toQStringList(); + Option::h_ext = project->values("QMAKE_EXT_H").toQStringList(); + Option::c_ext = project->values("QMAKE_EXT_C").toQStringList(); + Option::res_ext = project->first("QMAKE_EXT_RES").toQString(); + Option::pkgcfg_ext = project->first("QMAKE_EXT_PKGCONFIG").toQString(); + Option::libtool_ext = project->first("QMAKE_EXT_LIBTOOL").toQString(); + Option::prl_ext = project->first("QMAKE_EXT_PRL").toQString(); + Option::ui_ext = project->first("QMAKE_EXT_UI").toQString(); + Option::cpp_moc_ext = project->first("QMAKE_EXT_CPP_MOC").toQString(); + Option::lex_ext = project->first("QMAKE_EXT_LEX").toQString(); + Option::yacc_ext = project->first("QMAKE_EXT_YACC").toQString(); + Option::obj_ext = project->first("QMAKE_EXT_OBJ").toQString(); + Option::h_moc_mod = project->first("QMAKE_H_MOD_MOC").toQString(); + Option::lex_mod = project->first("QMAKE_MOD_LEX").toQString(); + Option::yacc_mod = project->first("QMAKE_MOD_YACC").toQString(); if (Option::output_dir.startsWith(project->buildRoot())) Option::mkfile::cachefile_depth = |