diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2010-02-22 17:59:00 (GMT) |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2010-02-26 13:31:02 (GMT) |
| commit | f5b19c173109c53bf3d8167573f7276cf39262d2 (patch) | |
| tree | c88224e2e4ac7afeaa00093d8a8dc0f636e1ef2f /qmake/generators/makefile.h | |
| parent | 7e9cf4a4b3e04e4268e6920aef263a85b5b3de70 (diff) | |
| download | Qt-f5b19c173109c53bf3d8167573f7276cf39262d2.zip Qt-f5b19c173109c53bf3d8167573f7276cf39262d2.tar.gz Qt-f5b19c173109c53bf3d8167573f7276cf39262d2.tar.bz2 | |
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/generators/makefile.h')
| -rw-r--r-- | qmake/generators/makefile.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/qmake/generators/makefile.h b/qmake/generators/makefile.h index d89c3b1..1f70e64 100644 --- a/qmake/generators/makefile.h +++ b/qmake/generators/makefile.h @@ -247,7 +247,7 @@ public: virtual bool supportsMergedBuilds() { return false; } virtual bool mergeBuildProject(MakefileGenerator * /*other*/) { return false; } virtual bool openOutput(QFile &, const QString &build) const; - virtual bool isWindowsShell() const { return Option::target_mode == Option::TARG_WIN_MODE; } + virtual bool isWindowsShell() const { return Option::host_mode == Option::HOST_WIN_MODE; } }; inline void MakefileGenerator::setNoIO(bool o) |