diff options
| author | Joerg Bornemann <joerg.bornemann@nokia.com> | 2011-11-04 13:51:20 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-11-07 13:26:41 +0100 |
| commit | 981dd3b3147df213608981d347c998dcf0230fe1 (patch) | |
| tree | 1b9ea8de5a01d641444c99b9ef0212341cc1de60 /qmake/generators/makefile.h | |
| parent | e0dfa4547ec89b69acf20af91587a12cef96cfe4 (diff) | |
qmake: remove symbian support
Change-Id: I1db834500921681676a6f46e7750bdd81bf0093d
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Diffstat (limited to 'qmake/generators/makefile.h')
| -rw-r--r-- | qmake/generators/makefile.h | 34 |
1 files changed, 0 insertions, 34 deletions
diff --git a/qmake/generators/makefile.h b/qmake/generators/makefile.h index 245d95e1cd..df718f9cb4 100644 --- a/qmake/generators/makefile.h +++ b/qmake/generators/makefile.h @@ -255,40 +255,6 @@ public: virtual bool mergeBuildProject(MakefileGenerator * /*other*/) { return false; } virtual bool openOutput(QFile &, const QString &build) const; virtual bool isWindowsShell() const { return Option::host_mode == Option::HOST_WIN_MODE; } - virtual bool isForSymbianSbsv2() const { return false; } // FIXME: killme - i'm ugly! - - /* The next one is to avoid having SymbianCommonGenerator as a virtually - inherited class of this class. Instead it is without a base class - (avoiding the virtual inheritance problem), and is allowed to use - functions defined in here. - - To illustrate: - +-------------------+ - | MakefileGenerator | - +-------------------+ - ^ ^ - | | - | X <-- Avoid this inheritance - | | - +------------------------+ +------------------------+ - | UnixMakefileGenerator | | SymbianCommonGenerator | - | or | | | - | NmakeMakefileGenerator | | | - +------------------------+ +------------------------+ - ^ ^ - | | - | | - | | - +-----------------------------+ - | SymbianMakefileTemplate<> | - +-----------------------------+ - - We want to avoid the famous diamond problem, because if we have that, we need - virtual inheritance, which not all compilers like. Therefore, we break the - link as illustrated. Instead, we have a pointer to MakefileGenerator inside - SymbianCommonGenerator, and allows full access by making it a friend here. - */ - friend class SymbianCommonGenerator; }; inline void MakefileGenerator::setNoIO(bool o) |