diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2010-02-22 18:59:00 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2010-02-26 14:31:02 +0100 |
| commit | f5b19c173109c53bf3d8167573f7276cf39262d2 (patch) | |
| tree | c88224e2e4ac7afeaa00093d8a8dc0f636e1ef2f /qmake/option.h | |
| parent | 7e9cf4a4b3e04e4268e6920aef263a85b5b3de70 (diff) | |
decouple host platform mode from target platform mode
derive the host mode from the generator - this doesn't work *too* well
if the mode is different from the real host platform, so it's only for
testing.
get the target platform mode from the qmakespec, falling back to the
host platform mode.
Reviewed-by: mariusSO
Diffstat (limited to 'qmake/option.h')
| -rw-r--r-- | qmake/option.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/qmake/option.h b/qmake/option.h index d9e3c39412..953d91efb7 100644 --- a/qmake/option.h +++ b/qmake/option.h @@ -152,8 +152,11 @@ struct Option enum QMAKE_RECURSIVE { QMAKE_RECURSIVE_DEFAULT, QMAKE_RECURSIVE_YES, QMAKE_RECURSIVE_NO }; static QMAKE_RECURSIVE recursive; static QStringList before_user_vars, after_user_vars, user_configs, after_user_configs; - enum TARG_MODE { TARG_UNIX_MODE, TARG_WIN_MODE, TARG_MACX_MODE }; + enum HOST_MODE { HOST_UNKNOWN_MODE, HOST_UNIX_MODE, HOST_WIN_MODE, HOST_MACX_MODE }; + static HOST_MODE host_mode; + enum TARG_MODE { TARG_UNKNOWN_MODE, TARG_UNIX_MODE, TARG_WIN_MODE, TARG_MACX_MODE }; static TARG_MODE target_mode; + static bool target_mode_overridden; static QString user_template, user_template_prefix; static QStringList shellPath; |