diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-02-21 12:44:27 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-02 08:43:21 +0100 |
| commit | 93ee903da7b10326b40bc43d5f5c659d527e8814 (patch) | |
| tree | db887263060408bee2e40efe92075e888ee39dae /qmake/option.h | |
| parent | 74a6669fa7c0d6e2cb7d34d56332d620d2a07755 (diff) | |
clean up build pass project initialization
instead of messing with the Option singleton, add a way to inject
extra config values into QMakeProject.
Change-Id: Ia347dcc38af2c72913e30ebf5c2b4044f93b4f5f
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
Diffstat (limited to 'qmake/option.h')
| -rw-r--r-- | qmake/option.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/qmake/option.h b/qmake/option.h index 96549bb5bc..d1bfcd169b 100644 --- a/qmake/option.h +++ b/qmake/option.h @@ -173,7 +173,7 @@ struct Option static int warn_level; 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; + static QStringList before_user_vars, after_user_vars, user_configs; 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, |