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

repurpose -unix/-macx/-win32 options

Browse Source 
they have been deprecated long enough, so we can mess with them now.
don't make them set the target mode any more; the makespec can do that
autoritatively. instead, they can be used to override the host mode for
debugging purposes.

Change-Id: Ife5fdcf4f1b6b926901a80896ac92b7d821278d1
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
This commit is contained in:
Oswald Buddenhagen 2012-04-16 17:02:57 +02:00
parent 16785c4c14
commit fc1bca8608
3 changed files with 0 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
qmake/generators/makefile.cpp
View File

@ -2196,14 +2196,6 @@ QString MakefileGenerator::buildArgs(const QString &outdir)
ret += " -spec " + fixifySpecdir(Option::mkfile::qmakespec, outdir); ret += " -spec " + fixifySpecdir(Option::mkfile::qmakespec, outdir);
if (!Option::mkfile::xqmakespec_commandline.isEmpty()) if (!Option::mkfile::xqmakespec_commandline.isEmpty())
ret += " -xspec " + fixifySpecdir(Option::mkfile::xqmakespec, outdir); ret += " -xspec " + fixifySpecdir(Option::mkfile::xqmakespec, outdir);
if (Option::target_mode_overridden) {
if (Option::target_mode == Option::TARG_MACX_MODE)
ret += " -macx";
else if (Option::target_mode == Option::TARG_UNIX_MODE)
ret += " -unix";
else if (Option::target_mode == Option::TARG_WIN_MODE)
ret += " -win32";
}
//arguments //arguments
for(QStringList::Iterator it = Option::before_user_vars.begin(); for(QStringList::Iterator it = Option::before_user_vars.begin();

10
qmake/option.cpp
View File

@ -94,7 +94,6 @@ QString Option::user_template_prefix;
QStringList Option::shellPath; QStringList Option::shellPath;
Option::HOST_MODE Option::host_mode = Option::HOST_UNKNOWN_MODE; Option::HOST_MODE Option::host_mode = Option::HOST_UNKNOWN_MODE;
Option::TARG_MODE Option::target_mode = Option::TARG_UNKNOWN_MODE; Option::TARG_MODE Option::target_mode = Option::TARG_UNKNOWN_MODE;
bool Option::target_mode_overridden = false;
//QMAKE_*_PROPERTY stuff //QMAKE_*_PROPERTY stuff
QStringList Option::prop::properties; QStringList Option::prop::properties;
@ -262,20 +261,11 @@ Option::parseCommandLine(int argc, char **argv, int skip)
} else if(opt == "tp" || opt == "template_prefix") { } else if(opt == "tp" || opt == "template_prefix") {
Option::user_template_prefix = argv[++x]; Option::user_template_prefix = argv[++x];
} else if(opt == "macx") { } else if(opt == "macx") {
fprintf(stderr, "-macx is deprecated.\n");
Option::host_mode = HOST_MACX_MODE; Option::host_mode = HOST_MACX_MODE;
Option::target_mode = TARG_MACX_MODE;
Option::target_mode_overridden = true;
} else if(opt == "unix") { } else if(opt == "unix") {
fprintf(stderr, "-unix is deprecated.\n");
Option::host_mode = HOST_UNIX_MODE; Option::host_mode = HOST_UNIX_MODE;
Option::target_mode = TARG_UNIX_MODE;
Option::target_mode_overridden = true;
} else if(opt == "win32") { } else if(opt == "win32") {
fprintf(stderr, "-win32 is deprecated.\n");
Option::host_mode = HOST_WIN_MODE; Option::host_mode = HOST_WIN_MODE;
Option::target_mode = TARG_WIN_MODE;
Option::target_mode_overridden = true;
} else if(opt == "integrity") { } else if(opt == "integrity") {
Option::target_mode = TARG_INTEGRITY_MODE; Option::target_mode = TARG_INTEGRITY_MODE;
} else if(opt == "d") { } else if(opt == "d") {

1
qmake/option.h
View File

@ -177,7 +177,6 @@ struct Option
enum TARG_MODE { TARG_UNKNOWN_MODE, TARG_UNIX_MODE, TARG_WIN_MODE, TARG_MACX_MODE, enum TARG_MODE { TARG_UNKNOWN_MODE, TARG_UNIX_MODE, TARG_WIN_MODE, TARG_MACX_MODE,
TARG_INTEGRITY_MODE }; TARG_INTEGRITY_MODE };
static TARG_MODE target_mode; static TARG_MODE target_mode;
static bool target_mode_overridden;
static QString user_template, user_template_prefix; static QString user_template, user_template_prefix;
static QStringList shellPath; static QStringList shellPath;