diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-04-17 12:15:39 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-06-27 09:39:50 +0200 |
| commit | 4753958db707001d1e14fa8312708dc1e891bacc (patch) | |
| tree | a08250cc5e1c79fd2c8622dd42dbaff8b114bb4e /qmake/option.cpp | |
| parent | 777fa561ab3af83ac78dbe55a22ae28097f0dfbd (diff) | |
revamp handling of qmake target mode
the project evaluator becomes oblivious of the target mode.
the mode is set up in spec_post.prf according to the spec.
$$QMAKE_TARGET contains the feature suffixes to search, and is also
contained in $$CONFIG.
the target_mode variable itself becomes private to the Makefile class.
Change-Id: I3c06d9dab536b753343cec6c5c491d3203e50bd8
Reviewed-by: Mark Brand <mabrand@mabrand.nl>
Diffstat (limited to 'qmake/option.cpp')
| -rw-r--r-- | qmake/option.cpp | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/qmake/option.cpp b/qmake/option.cpp index 4d97d4d1dd..aaf9b55363 100644 --- a/qmake/option.cpp +++ b/qmake/option.cpp @@ -93,7 +93,6 @@ QString Option::user_template; QString Option::user_template_prefix; QStringList Option::shellPath; Option::HOST_MODE Option::host_mode = Option::HOST_UNKNOWN_MODE; -Option::TARG_MODE Option::target_mode = Option::TARG_UNKNOWN_MODE; //QMAKE_*_PROPERTY stuff QStringList Option::prop::properties; @@ -557,14 +556,6 @@ Option::init(int argc, char **argv) } #endif } - } else if (Option::qmake_mode == Option::QMAKE_GENERATE_PROJECT) { -#if defined(Q_OS_MAC) - Option::target_mode = Option::TARG_MACX_MODE; -#elif defined(Q_OS_UNIX) - Option::target_mode = Option::TARG_UNIX_MODE; -#else - Option::target_mode = Option::TARG_WIN_MODE; -#endif } //defaults for globals |