diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-04-16 17:02:57 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-06-27 09:39:49 +0200 |
| commit | fc1bca86081dc0698a7dd3f9c955edd194d5a798 (patch) | |
| tree | 1c091c82f52b62b7281b9f237643d0fa9700e55b /qmake/generators | |
| parent | 16785c4c149d0e7188924fa5e01b153d4baeabfd (diff) | |
repurpose -unix/-macx/-win32 options
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>
Diffstat (limited to 'qmake/generators')
| -rw-r--r-- | qmake/generators/makefile.cpp | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp index f126da3280..2a21aa9880 100644 --- a/qmake/generators/makefile.cpp +++ b/qmake/generators/makefile.cpp @@ -2196,14 +2196,6 @@ QString MakefileGenerator::buildArgs(const QString &outdir) ret += " -spec " + fixifySpecdir(Option::mkfile::qmakespec, outdir); if (!Option::mkfile::xqmakespec_commandline.isEmpty()) 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 for(QStringList::Iterator it = Option::before_user_vars.begin(); |