diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-04-20 19:53:14 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-06-27 14:35:25 +0200 |
| commit | 1b1aa3b4f8413bb467409aeadb5934c442b0835a (patch) | |
| tree | c58cb39b681a3eb99d659b8967358405f1ab6bc0 /qmake/option.cpp | |
| parent | 621b42e53db83726102f160b13e9764592c95bba (diff) | |
remove QMAKE_EXT_H_MOC and QMAKE_CPP_MOD_MOC from Option
these are not actually used inside qmake since ever the code was factored
into moc.prf.
Change-Id: I545f4857ca3f0b4bf2439703700069ac67ad4ca2
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Diffstat (limited to 'qmake/option.cpp')
| -rw-r--r-- | qmake/option.cpp | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/qmake/option.cpp b/qmake/option.cpp index 3c5a57f56b..27f0018b74 100644 --- a/qmake/option.cpp +++ b/qmake/option.cpp @@ -60,7 +60,6 @@ QString Option::pkgcfg_ext; QString Option::ui_ext; QStringList Option::h_ext; QString Option::cpp_moc_ext; -QString Option::h_moc_ext; QStringList Option::cpp_ext; QStringList Option::c_ext; QString Option::obj_ext; @@ -70,7 +69,6 @@ QString Option::pro_ext; QString Option::dir_sep; QString Option::dirlist_sep; QString Option::h_moc_mod; -QString Option::cpp_moc_mod; QString Option::yacc_mod; QString Option::lex_mod; QString Option::res_ext; @@ -405,7 +403,6 @@ Option::init(int argc, char **argv) Option::host_mode = Option::HOST_WIN_MODE; #endif Option::application_argv0 = 0; - Option::cpp_moc_mod = ""; Option::h_moc_mod = "moc_"; Option::lex_mod = "_lex"; Option::yacc_mod = "_yacc"; @@ -420,7 +417,6 @@ Option::init(int argc, char **argv) Option::h_ext << ".H"; #endif Option::cpp_moc_ext = ".moc"; - Option::h_moc_ext = ".cpp"; Option::cpp_ext << ".cpp" << ".cc" << ".cxx"; #ifndef Q_OS_WIN Option::cpp_ext << ".C"; @@ -615,8 +611,6 @@ bool Option::postProcessProject(QMakeProject *project) Option::ui_ext = project->first("QMAKE_EXT_UI"); if(!project->isEmpty("QMAKE_EXT_CPP_MOC")) Option::cpp_moc_ext = project->first("QMAKE_EXT_CPP_MOC"); - if(!project->isEmpty("QMAKE_EXT_H_MOC")) - Option::h_moc_ext = project->first("QMAKE_EXT_H_MOC"); if(!project->isEmpty("QMAKE_EXT_LEX")) Option::lex_ext = project->first("QMAKE_EXT_LEX"); if(!project->isEmpty("QMAKE_EXT_YACC")) @@ -625,8 +619,6 @@ bool Option::postProcessProject(QMakeProject *project) Option::obj_ext = project->first("QMAKE_EXT_OBJ"); if(!project->isEmpty("QMAKE_H_MOD_MOC")) Option::h_moc_mod = project->first("QMAKE_H_MOD_MOC"); - if(!project->isEmpty("QMAKE_CPP_MOD_MOC")) - Option::cpp_moc_mod = project->first("QMAKE_CPP_MOD_MOC"); if(!project->isEmpty("QMAKE_MOD_LEX")) Option::lex_mod = project->first("QMAKE_MOD_LEX"); if(!project->isEmpty("QMAKE_MOD_YACC")) |