use isWindowsShell() in the one remaining case.
Change-Id: I25eab398ef50df5a7f4ec808279b83ca900e3c58
Reviewed-by: Mark Brand <mabrand@mabrand.nl>
MingwMakefileGenerator::MingwMakefileGenerator() : Win32MakefileGenerator(), init_flag(false)
{
- if (Option::shellPath.isEmpty())
+ if (isWindowsShell())
quote = "\"";
else
quote = "'";
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
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;
}
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 {