diff options
| author | axis <qt-info@nokia.com> | 2010-02-09 09:50:15 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2010-02-09 09:50:15 (GMT) |
| commit | 325689d72c77c280f3c5a63a2e4fd2db03f5b304 (patch) | |
| tree | a582a205e8f6b120591a561f3dbb69b091a0699a /qmake/generators/metamakefile.cpp | |
| parent | 31cd89e8139f178e57ebb9a1b81b289b5df5fc69 (diff) | |
| parent | 18c9ecc6a381d77128ef1caf7ab9c2990c7e49f7 (diff) | |
| download | Qt-325689d72c77c280f3c5a63a2e4fd2db03f5b304.zip Qt-325689d72c77c280f3c5a63a2e4fd2db03f5b304.tar.gz Qt-325689d72c77c280f3c5a63a2e4fd2db03f5b304.tar.bz2 | |
Merge branch 'pkgGeneratorForLinux'
Conflicts:
mkspecs/symbian/linux-armcc/features/symbian_building.prf
Diffstat (limited to 'qmake/generators/metamakefile.cpp')
| -rw-r--r-- | qmake/generators/metamakefile.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/qmake/generators/metamakefile.cpp b/qmake/generators/metamakefile.cpp index 4151193..54df7bc 100644 --- a/qmake/generators/metamakefile.cpp +++ b/qmake/generators/metamakefile.cpp @@ -436,6 +436,7 @@ QT_BEGIN_INCLUDE_NAMESPACE #include "msvc_vcproj.h" #include "symmake_abld.h" #include "symmake_sbsv2.h" +#include "symbian_makefile.h" QT_END_INCLUDE_NAMESPACE MakefileGenerator * @@ -476,6 +477,8 @@ MetaMakefileGenerator::createMakefileGenerator(QMakeProject *proj, bool noIO) mkfile = new SymbianAbldMakefileGenerator; } else if(gen == "SYMBIAN_SBSV2") { mkfile = new SymbianSbsv2MakefileGenerator; + } else if(gen == "UNIX_SYMBIAN") { + mkfile = new SymbianMakefileTemplate<UnixMakefileGenerator>; } else { fprintf(stderr, "Unknown generator specified: %s\n", gen.toLatin1().constData()); } |