summaryrefslogtreecommitdiffstats
path: root/qmake/generators/makefile.h
diff options
context:
space:
mode:
authoraxis <qt-info@nokia.com>2010-02-02 11:55:12 (GMT)
committeraxis <qt-info@nokia.com>2010-02-04 14:40:28 (GMT)
commit0de1cf57c6ad80776dc4d57a394ea5e0982686a6 (patch)
treea229956ef8ed62820832d5eb0a94f739bf13e51b /qmake/generators/makefile.h
parentfdd83d54b88fbe82937878d4ac73257120ec480e (diff)
downloadQt-0de1cf57c6ad80776dc4d57a394ea5e0982686a6.zip
Qt-0de1cf57c6ad80776dc4d57a394ea5e0982686a6.tar.gz
Qt-0de1cf57c6ad80776dc4d57a394ea5e0982686a6.tar.bz2
Implemented pkg generator for the symbian/linux-armcc mkspec.
It reuses almost everything from the original pkg generator, but the code had to be restructured to accomodate for the new makefile generator. In addition a few new codepaths and profile changes had to be introduced to cope with the fact that this mkspec puts files in different places than Symbian does (inside $QTDIR/lib instead of $EPOCROOT/...). This enables the pkg generator to generate correct pkg files for Qt itself, but applications will not work yet because they also require generated rss files.
Diffstat (limited to 'qmake/generators/makefile.h')
-rw-r--r--qmake/generators/makefile.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/qmake/generators/makefile.h b/qmake/generators/makefile.h
index d89c3b1..0b3bdfa 100644
--- a/qmake/generators/makefile.h
+++ b/qmake/generators/makefile.h
@@ -248,6 +248,11 @@ public:
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; }
+
+ // This 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.
+ friend class SymbianCommonGenerator;
};
inline void MakefileGenerator::setNoIO(bool o)