From a47c6e5ea02e46eb08a40273ad07efa078bdfc28 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Thu, 3 May 2012 20:53:10 +0200 Subject: dispose of Option::shellPath use isWindowsShell() in the one remaining case. Change-Id: I25eab398ef50df5a7f4ec808279b83ca900e3c58 Reviewed-by: Mark Brand --- qmake/generators/win32/mingw_make.cpp | 2 +- qmake/option.cpp | 2 -- qmake/option.h | 1 - 3 files changed, 1 insertion(+), 4 deletions(-) (limited to 'qmake') diff --git a/qmake/generators/win32/mingw_make.cpp b/qmake/generators/win32/mingw_make.cpp index c579c88109..e7dbc6a274 100644 --- a/qmake/generators/win32/mingw_make.cpp +++ b/qmake/generators/win32/mingw_make.cpp @@ -51,7 +51,7 @@ QT_BEGIN_NAMESPACE MingwMakefileGenerator::MingwMakefileGenerator() : Win32MakefileGenerator(), init_flag(false) { - if (Option::shellPath.isEmpty()) + if (isWindowsShell()) quote = "\""; else quote = "'"; diff --git a/qmake/option.cpp b/qmake/option.cpp index 91ff4050d1..9be604f944 100644 --- a/qmake/option.cpp +++ b/qmake/option.cpp @@ -88,7 +88,6 @@ QStringList Option::before_user_vars; QStringList Option::after_user_vars; QString Option::user_template; QString Option::user_template_prefix; -QStringList Option::shellPath; Option::HOST_MODE Option::host_mode = Option::HOST_UNKNOWN_MODE; //QMAKE_*_PROPERTY stuff @@ -572,7 +571,6 @@ bool Option::postProcessProject(QMakeProject *project) Option::lex_mod = project->first("QMAKE_MOD_LEX"); Option::yacc_mod = project->first("QMAKE_MOD_YACC"); Option::dir_sep = project->first("QMAKE_DIR_SEP"); - Option::shellPath = project->values("QMAKE_SH"); return true; } diff --git a/qmake/option.h b/qmake/option.h index bd220a8376..683c10b5f3 100644 --- a/qmake/option.h +++ b/qmake/option.h @@ -171,7 +171,6 @@ struct Option enum HOST_MODE { HOST_UNKNOWN_MODE, HOST_UNIX_MODE, HOST_WIN_MODE, HOST_MACX_MODE }; static HOST_MODE host_mode; static QString user_template, user_template_prefix; - static QStringList shellPath; //QMAKE_*_PROPERTY options struct prop { -- cgit v1.2.3