summaryrefslogtreecommitdiffstats
path: root/qmake/generators/unix
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/unix
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/unix')
-rw-r--r--qmake/generators/unix/unixmake.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/qmake/generators/unix/unixmake.h b/qmake/generators/unix/unixmake.h
index 77bdd01..0ea3350 100644
--- a/qmake/generators/unix/unixmake.h
+++ b/qmake/generators/unix/unixmake.h
@@ -49,7 +49,6 @@ QT_BEGIN_NAMESPACE
class UnixMakefileGenerator : public MakefileGenerator
{
bool init_flag, include_deps;
- bool writeMakefile(QTextStream &);
QString libtoolFileName(bool fixify=true);
void writeLibtoolFile(); // for libtool
QString pkgConfigPrefix() const;
@@ -75,6 +74,7 @@ protected:
virtual void init();
void writeMakeParts(QTextStream &);
+ bool writeMakefile(QTextStream &);
private:
void init2();