diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-01-31 18:36:18 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-06-19 16:37:49 +0200 |
| commit | 14bbab09c158e3eb54169b42c4a303d396a32f0e (patch) | |
| tree | fd4706e980c1440eb6b91868d71979060af2398c /qmake/option.h | |
| parent | 528192a78b3250964ee99efab42b6683da02eb11 (diff) | |
introduce ability to build projects for the host system
when qmake runs into the new option(host_build) command, it will restart
the project evaluation with a host spec.
the new default host spec is called default-host (gasp!). it is
overridden with the pre-exising -spec / -platform option, while the new
-xspec / -xplatform option overrides the pre-existing default spec.
specifying -spec but not -xspec will set the xspec, too, so the behavior
is backwards-compatible. same for the XQMAKESPEC override read from
.qmake.cache and the environment variable.
the cleaner solution would be adding -hostspec, to be symmetrical with
the override semantics, but that would deviate from configure in turn.
Change-Id: I4297c873780af16ab7928421b434ce0f1d3820da
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Diffstat (limited to 'qmake/option.h')
| -rw-r--r-- | qmake/option.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/qmake/option.h b/qmake/option.h index 0ec6a36a29..f6f5dbbb9d 100644 --- a/qmake/option.h +++ b/qmake/option.h @@ -196,6 +196,7 @@ struct Option //QMAKE_GENERATE_MAKEFILE options struct mkfile { static QString qmakespec; + static QString xqmakespec; static bool do_cache; static bool do_deps; static bool do_mocs; @@ -206,6 +207,7 @@ struct Option static int cachefile_depth; static QStringList project_files; static QString qmakespec_commandline; + static QString xqmakespec_commandline; }; private: |