diff options
author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-02-02 19:31:57 +0100 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-02 21:33:08 +0100 |
commit | c679b2f0a65a630f7490b37529e2186a8cd9c78b (patch) | |
tree | 3b5d155b51d0ff975fde021e48aa658a315b207a /qmake/option.h | |
parent | a30074bab8446640d41060637b99394136bea7d7 (diff) | |
download | qtbase-c679b2f0a65a630f7490b37529e2186a8cd9c78b.tar.gz |
get rid of Option::user_configs
merge them into before_user_vars. they are evaluated right after another
anyway.
Change-Id: I11859284b363fee01233f6e20989444fef711d0d
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 d1bfcd169b..2d0d1114a9 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; + static QStringList before_user_vars, after_user_vars; 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, |