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

dispose of Option::shellPath

Browse Source 
use isWindowsShell() in the one remaining case.

Change-Id: I25eab398ef50df5a7f4ec808279b83ca900e3c58
Reviewed-by: Mark Brand <mabrand@mabrand.nl>
This commit is contained in:
Oswald Buddenhagen 2012-05-03 20:53:10 +02:00
parent e18ceca47e
commit a47c6e5ea0
3 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
qmake/generators/win32/mingw_make.cpp
View File

@ -51,7 +51,7 @@ QT_BEGIN_NAMESPACE
MingwMakefileGenerator::MingwMakefileGenerator() : Win32MakefileGenerator(), init_flag(false) MingwMakefileGenerator::MingwMakefileGenerator() : Win32MakefileGenerator(), init_flag(false)
{ {
if (Option::shellPath.isEmpty()) if (isWindowsShell())
quote = "\""; quote = "\"";
else else
quote = "'"; quote = "'";

2
qmake/option.cpp
View File

@ -88,7 +88,6 @@ QStringList Option::before_user_vars;
QStringList Option::after_user_vars; QStringList Option::after_user_vars;
QString Option::user_template; QString Option::user_template;
QString Option::user_template_prefix; QString Option::user_template_prefix;
QStringList Option::shellPath;
Option::HOST_MODE Option::host_mode = Option::HOST_UNKNOWN_MODE; Option::HOST_MODE Option::host_mode = Option::HOST_UNKNOWN_MODE;
//QMAKE_*_PROPERTY stuff //QMAKE_*_PROPERTY stuff
@ -572,7 +571,6 @@ bool Option::postProcessProject(QMakeProject *project)
Option::lex_mod = project->first("QMAKE_MOD_LEX"); Option::lex_mod = project->first("QMAKE_MOD_LEX");
Option::yacc_mod = project->first("QMAKE_MOD_YACC"); Option::yacc_mod = project->first("QMAKE_MOD_YACC");
Option::dir_sep = project->first("QMAKE_DIR_SEP"); Option::dir_sep = project->first("QMAKE_DIR_SEP");
Option::shellPath = project->values("QMAKE_SH");
return true; return true;
} }

1
qmake/option.h
View File

@ -171,7 +171,6 @@ struct Option
enum HOST_MODE { HOST_UNKNOWN_MODE, HOST_UNIX_MODE, HOST_WIN_MODE, HOST_MACX_MODE }; enum HOST_MODE { HOST_UNKNOWN_MODE, HOST_UNIX_MODE, HOST_WIN_MODE, HOST_MACX_MODE };
static HOST_MODE host_mode; static HOST_MODE host_mode;
static QString user_template, user_template_prefix; static QString user_template, user_template_prefix;
static QStringList shellPath;
//QMAKE_*_PROPERTY options //QMAKE_*_PROPERTY options
struct prop { struct prop {