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

remove unused member Option::application_argv0

Browse Source 
Use QMakeGlobals::qmake_abslocation instead.

Change-Id: I1d0f39549b477ede674730937d879c492407fb28
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
This commit is contained in:
Joerg Bornemann 2013-02-28 15:31:57 +01:00 committed by The Qt Project
parent 3ef2daf6ce
commit dbe74582a6
2 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
qmake/option.cpp
View File

@ -57,7 +57,6 @@ ProFileCache *Option::proFileCache;
QMakeParser *Option::parser; QMakeParser *Option::parser;
//convenience //convenience
const char *Option::application_argv0 = 0;
QString Option::prf_ext; QString Option::prf_ext;
QString Option::prl_ext; QString Option::prl_ext;
QString Option::libtool_ext; QString Option::libtool_ext;
@ -318,13 +317,11 @@ Option::parseCommandLine(QStringList &args, QMakeCmdLineParserState &state)
int int
Option::init(int argc, char **argv) Option::init(int argc, char **argv)
{ {
Option::application_argv0 = 0;
Option::prf_ext = ".prf"; Option::prf_ext = ".prf";
Option::pro_ext = ".pro"; Option::pro_ext = ".pro";
Option::field_sep = ' '; Option::field_sep = ' ';
if(argc && argv) { if(argc && argv) {
Option::application_argv0 = argv[0];
QString argv0 = argv[0]; QString argv0 = argv[0];
if(Option::qmake_mode == Option::QMAKE_GENERATE_NOTHING) if(Option::qmake_mode == Option::QMAKE_GENERATE_NOTHING)
Option::qmake_mode = default_mode(argv0); Option::qmake_mode = default_mode(argv0);

1
qmake/option.h
View File

@ -109,7 +109,6 @@ struct Option
static QString pro_ext; static QString pro_ext;
static QString res_ext; static QString res_ext;
static char field_sep; static char field_sep;
static const char *application_argv0;
enum CmdLineFlags { enum CmdLineFlags {
QMAKE_CMDLINE_SUCCESS = 0x00, QMAKE_CMDLINE_SUCCESS = 0x00,