Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (26 commits)
  fix autotest on windows (again)
  fix autotest on windows
  Ammend last INTEGRITY fix
  Fix qmake build on Windows
  fix test for QtLighthouse
  add test for suppressing warnings in moc
  Ammend INTEGRITY fixes
  Store property editor's column positions in settings
  add gsm to connectable bearer for networkmanager.
  Fix license headers
  add missing include
  Silence GHS compiler
  Run on INTEGRITY
  Fix compilation on INTEGRITY
  Do not link with libm on INTEGRITY
  Add a "-nn" option to moc
  Add Documentation about INTEGRITY RTOS
  List the INTEGRITY drivers as well
  Use TCP_LOCALSOCKET on INTEGRITY
  Compile for systems without mmap
  ...

3 files changed, 533 insertions, 11 deletions

diff --git a/qmake/generators/integrity/gbuild.cpp b/qmake/generators/integrity/gbuild.cpp
new file mode 100644
index 0000000..17bd8f0
--- /dev/null
+++ b/qmake/generators/integrity/gbuild.cpp
@@ -0,0 +1,442 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtGui module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "gbuild.h"
+#include "option.h"
+#include "meta.h"
+#include <qdir.h>
+#include <qregexp.h>
+#include <qcryptographichash.h>
+#include <qdebug.h>
+#include <stdlib.h>
+#include <time.h>
+#ifdef Q_OS_UNIX
+#  include <sys/types.h>
+#  include <sys/stat.h>
+#endif
+
+QT_BEGIN_NAMESPACE
+
+unsigned int dllbase = 0x01000000;
+#define DLLOFFSET 0x600000
+
+GBuildMakefileGenerator::GBuildMakefileGenerator() : MakefileGenerator()
+{
+    nativebins << "moc" << "rcc" << "uic" << "bootstrap";
+}
+
+bool
+GBuildMakefileGenerator::write()
+{
+    QStringList tmp;
+    QString filename(Option::output.fileName());
+    QString pathtoremove(qmake_getpwd());
+    QString relpath(pathtoremove);
+    QString strtarget(project->first("TARGET"));
+    bool isnativebin = nativebins.contains(strtarget);
+    relpath.replace(Option::output_dir, "");
+
+    /* correct output for non-prl, non-recursive case */
+    QString outname(qmake_getpwd());
+    outname += QDir::separator();
+    outname += fileInfo(Option::output.fileName()).baseName();
+    outname += projectSuffix();
+    Option::output.close();
+    Option::output.setFileName(outname);
+    MakefileGenerator::openOutput(Option::output, QString());
+
+    if (strtarget != fileInfo(project->projectFile()).baseName()) {
+        QString gpjname(strtarget);
+        QString outputName(qmake_getpwd());
+        outputName += QDir::separator();
+        outputName += fileInfo(project->projectFile()).baseName();
+        outputName += projectSuffix();
+        QFile f(outputName);
+        f.open(QIODevice::WriteOnly | QIODevice::Text | QIODevice::Truncate);
+        QTextStream t(&f);
+        t << "#!gbuild\n";
+        t << "[Project]\n";
+        t << gpjname << projectSuffix() << "\n";
+        if ((project->first("TEMPLATE") == "lib")
+                && project->isActiveConfig("shared"))
+            t << gpjname << "_shared" << projectSuffix() << "\n";
+        t.flush();
+        gpjname += projectSuffix();
+        Option::output.close();
+        Option::output.setFileName(gpjname);
+        MakefileGenerator::openOutput(Option::output, QString());
+    }
+
+    if ((project->first("TEMPLATE") == "app")
+            && (!isnativebin)) {
+        QTextStream t(&Option::output);
+        QString intname(strtarget);
+        intname += ".int";
+        /* this is for bulding an INTEGRITY application.
+         * generate the .int integrate file and the .gpj INTEGRITY Application
+         * project file, then go on with regular files */
+        t << "#!gbuild" << "\n";
+        t << "[INTEGRITY Application]" << "\n";
+        t << "\t:binDirRelative=.\n";
+        t << "\t-o " << strtarget << "\n";
+        t << intname << "\n";
+        t << strtarget << "_app" << projectSuffix() << "\n";
+        t.flush();
+
+        /* generate integrate file */
+        QFile f(intname);
+        f.open(QIODevice::WriteOnly | QIODevice::Text | QIODevice::Truncate);
+        QTextStream ti(&f);
+        ti << "# This is a file automatically generated by qmake" << "\n";
+        ti << "# Modifications will be lost next time you run qmake" << "\n";
+        ti << "Kernel" << "\n";
+        ti << "\tFilename\tDynamicDownload" << "\n";
+        ti << "EndKernel" << "\n" << "\n";
+        ti << "AddressSpace" << "\n";
+        ti << "\tName\t" << strtarget << "\n";
+        ti << "\tFilename\t" << strtarget << "_app" << "\n";
+        ti << "\tMemoryPoolSize\t0x100000" << "\n";
+        ti << "\tLanguage\tC++" << "\n";
+        /* FIXME : heap size is huge to be big enough for every example
+         * it should probably be tailored for each example, btu there is no
+         * good way to guess that */
+        ti << "\tHeapSize\t0x00D00000" << "\n";
+        ti << "\tTask\tInitial" << "\n";
+        ti << "\t\tStackSize\t0x30000" << "\n";
+        ti << "\tEndTask" << "\n";
+        ti << "EndAddressSpace" << "\n";
+        ti.flush();
+
+        /* change current project file to <projectname>_app.gpj and continue
+         * generation */
+        filename.insert(filename.lastIndexOf("."), "_app");
+        Option::output.close();
+        Option::output.setFileName(filename);
+        MakefileGenerator::openOutput(Option::output, QString());
+    } else if ((project->first("TEMPLATE") == "lib")
+            && project->isActiveConfig("shared")) {
+        QString gpjname(strtarget);
+        gpjname += "_shared";
+        gpjname += projectSuffix();
+        QFile f(gpjname);
+        f.open(QIODevice::WriteOnly | QIODevice::Text | QIODevice::Truncate);
+        QTextStream t(&f);
+        t << "#!gbuild\n"
+            "[Program]\n"
+            "\t-A libINTEGRITY.so\n"
+            "\t-A libc.so\n"
+            "\t-A libscxx.so\n"
+            "\t-A libQtCore.so\n"
+            "\t-e __ghsbegin_text\n"
+            "\t-startfile=-\n"
+            "\t:syslibraries=-\n"
+            "\t-Onolink\n";
+        t << "\t-o lib" << strtarget << ".so\n";
+        t << "\t-l" << strtarget << "\n";
+        t << "\t-extractall=-l" << strtarget << "\n";
+        t << "\t:outputDir=work/" << filename.section(QDir::separator(), 0, -1).remove(".gpj") << "\n";
+        t << strtarget << "_shared.ld\n";
+        t << "$(__OS_DIR)/intlib/sharedobjbssinit.c\n";
+        t.flush();
+
+        QFile fl(strtarget + "_shared.ld");
+        fl.open(QIODevice::WriteOnly | QIODevice::Text | QIODevice::Truncate);
+        QTextStream tl(&fl);
+        tl << "CONSTANTS {\n"
+             "    __INTEGRITY_MinPageAlign          = 16K\n"
+             "    __INTEGRITY_MaxPageAlign          = 16K\n"
+             "    __INTEGRITY_LibCBaseAddress       = \n";
+        tl << dllbase << "\n";
+        tl << "}\n"
+             "-sec\n"
+             "{\n"
+             "  .picbase __INTEGRITY_LibCBaseAddress :\n"
+             "        .text :\n"
+             "  .syscall :\n"
+             "        .intercall :\n"
+             "        .interfunc :\n"
+             "  .secinfo :\n"
+             "  .rodata align(16) :\n"
+             "  .fixaddr :\n"
+             "  .fixtype :\n"
+             "        .rombeg :\n"
+             "        .textchecksum :\n"
+             "        // The above sections may be large. Leave a bigger gap for large pages.\n"
+             "  .pidbase align(__INTEGRITY_MaxPageAlign) :\n"
+             "        .sdabase :\n"
+             "        .data :\n"
+             "        .toc :\n"
+             "        .opd :\n"
+             "        .datachecksum :\n"
+             "  .bss align(__INTEGRITY_MinPageAlign) :\n"
+             "        .heap :\n"
+             "}\n";
+        tl.flush();
+        dllbase += DLLOFFSET;
+    }
+
+    warn_msg(WarnParser, Option::output.fileName().toAscii());
+    QTextStream t(&Option::output);
+    QString primaryTarget(project->values("QMAKE_CXX").at(0));
+
+    pathtoremove += QDir::separator();
+    filename.remove(qmake_getpwd());
+
+    //HEADER
+    t << "#!gbuild" << "\n";
+
+    /* find the architecture out of the compiler name */
+    if (filename.endsWith("projects.gpj")) {
+        primaryTarget.remove(0, 5);
+        t << "macro QT_BUILD_DIR=%expand_path(.)\n";
+        t << "macro __OS_DIR=" << project->values("INTEGRITY_DIR").first() << "\n";
+        t << "primaryTarget=" << primaryTarget << "_integrity.tgt" << "\n";
+        t << "customization=util/integrity/qt.bod\n";
+    }
+    /* project type */
+    if (project->first("TEMPLATE") == "app") {
+        t << "[Program]" << "\n";
+        if (isnativebin) {
+            t << "\t:binDir=bin\n";
+            t << "\t-o " << strtarget << "\n";
+        } else {
+            t << "\t:binDirRelative=.\n";
+            t << "\t-o " << strtarget << "_app\n";
+        }
+    } else if (project->first("TEMPLATE") == "lib") {
+        t << "[Library]" << "\n";
+        t << "\t:binDir=lib" << "\n";
+        t << "\t-o lib" << strtarget << ".a" << "\n";
+    } else if (project->first("TEMPLATE") == "subdirs")
+        t << "[Project]" << "\n";
+    else
+        t << project->first("TEMPLATE") << "\n";
+
+    /* compilations options */
+    t << "\t:sourceDir=." << "\n";
+
+    t << "\t:outputDir=work" << relpath << "\n";
+    if (filename.endsWith("projects.gpj")) {
+        t << "\t:sourceDir=work\n";
+        t << "\t-Iwork\n";
+        t << "\t-Llib\n";
+        t << "\t";
+        QStringList &l = project->values("QMAKE_CXXFLAGS");
+        for (QStringList::Iterator it = l.begin(); it != l.end(); ++it) {
+            if ((*it).startsWith("-"))
+                t << "\n" << "\t" << (*it);
+            else
+                t << " " << (*it);
+        }
+        t << "\n";
+    }
+    t << "\n";
+
+    t << varGlue("DEFINES", "\t-D", "\n\t-D", "\n");
+
+    t << "\t-I.\n\t-I" << specdir() << "\n";
+    t << varGlue("INCLUDEPATH", "\t-I", "\n\t-I", "\n");
+    t << "\t--cxx_include_directory .\n\t--cxx_include_directory " << specdir() << "\n";
+    t << varGlue("INCLUDEPATH", "\t--cxx_include_directory ", "\n\t--cxx_include_directory ", "\n");
+
+    if (project->first("TEMPLATE") == "app") {
+        /* include linker flags if it's an application */
+        QString src[] = { "QMAKE_LFLAGS", "QMAKE_FRAMEWORKPATH_FLAGS", "QMAKE_LIBDIR_FLAGS", "QMAKE_LIBS", "LIBS", QString() };
+        for (int i = 0; !src[i].isNull(); i++) {
+            /* skip target libraries for native tools */
+            if (isnativebin && (i == 0))
+                continue;
+            t << "\t";
+            QStringList &l = project->values(src[i]);
+            for (QStringList::Iterator it = l.begin(); it != l.end(); ++it) {
+                if ((*it).startsWith("-"))
+                    t << "\n" << "\t" << (*it);
+                else
+                    t << " " << (*it);
+            }
+            t << "\n";
+        }
+    }
+
+    /* first subdirectories/subprojects */
+    {
+        QStringList &l = project->values("SUBDIRS");
+        for (QStringList::Iterator it = l.begin(); it != l.end(); ++it) {
+            QString gpjname((*it));
+            /* avoid native tools */
+            if (nativebins.contains(gpjname.section("_", -1)))
+                continue;
+            if (!project->first((*it) + ".subdir").isEmpty())
+                gpjname = project->first((*it) + ".subdir");
+            else
+                gpjname.replace("_", QDir::separator());
+            gpjname += QDir::separator() + gpjname.section(QDir::separator(), -1);
+            gpjname += projectSuffix();
+            /* make relative */
+            if (!project->values("QT_SOURCE_TREE").isEmpty()) {
+                gpjname.replace(project->values("QT_SOURCE_TREE").first() + QDir::separator(), "");
+            }
+            t << gpjname << "\n";
+        }
+    }
+
+    {
+        QStringList &l = project->values("RESOURCES");
+        for (QStringList::Iterator it = l.begin(); it != l.end(); ++it) {
+            QString tmpstr((*it).replace(pathtoremove, ""));
+            t << tmpstr << "\t[Qt Resource]\n";
+            tmpstr = tmpstr.section(".", -2, -1).section(QDir::separator(), -1);
+            tmpstr.remove(".qrc");
+            t << "\t-name " << tmpstr << "\n";
+            tmpstr.insert(tmpstr.lastIndexOf(QDir::separator()) + 1, "qrc_");
+            tmpstr.append(".cpp");
+            t << "\t-o work/" << tmpstr << "\n";
+        }
+    }
+    {
+        QStringList &l = project->values("FORMS");
+        for (QStringList::Iterator it = l.begin(); it != l.end(); ++it) {
+            QString tmpstr((*it).replace(pathtoremove, ""));
+            t << tmpstr << "\t[Qt Dialog]\n";
+            tmpstr = tmpstr.section(".", 0, 0).section(QDir::separator(), -1);
+            tmpstr.insert(tmpstr.lastIndexOf(QDir::separator()) + 1, "ui_");
+            tmpstr.remove(".ui");
+            tmpstr.append(".h");
+            t << "\t-o work/" << tmpstr << "\n";
+        }
+    }
+
+    /* source files for this project */
+    QString src[] = { "HEADERS", "SOURCES", QString() };
+    for (int i = 0; !src[i].isNull(); i++) {
+        QStringList &l = project->values(src[i]);
+        for (QStringList::Iterator it = l.begin(); it != l.end(); ++it) {
+            if ((*it).isEmpty())
+                continue;
+            /* native tools aren't preprocessed */
+            if (!isnativebin)
+                t << writeOne((*it), pathtoremove);
+            else
+                t << (*it).remove(pathtoremove) << "\n";
+        }
+    }
+    t << "\n";
+
+    {
+        QStringList &l = project->values("GENERATED_SOURCES");
+        for (QStringList::Iterator it = l.begin(); it != l.end(); ++it) {
+            t << "work/" << (*it).section(QDir::separator(), -1) << "\n";
+        }
+    }
+
+    return true;
+}
+
+QString GBuildMakefileGenerator::writeOne(QString filename, QString pathtoremove)
+{
+    QString s("");
+    s += filename.remove(pathtoremove);
+    if (filename.endsWith(Option::h_ext.first())) {
+        QString corename(filename.section(QDir::separator(), -1));
+        corename.remove(Option::h_ext.first());
+        corename.append(Option::cpp_ext.first());
+        corename.prepend(Option::h_moc_mod);
+        s += "\t[MOC/Qt Header]\n";
+        s += "\t-o ";
+        s += "work/";
+        s += corename;
+        s += "\n";
+    } else if (filename.section(QDir::separator(), -1).startsWith("qrc_")) {
+        QString tmpstr(filename.section("/", -1).section(".", 0, -1).remove("qrc_").remove(".cpp"));
+        s += "\n\t:depends=";
+        s += tmpstr;
+        s += ".qrc";
+        s += "\n";
+    } else if (filename.endsWith(Option::cpp_ext.first())) {
+        QString tmpstr(filename.section("/", -1));
+//        QString moctool(project->values("QMAKE_MOC").first());
+        QString filepath(pathtoremove);
+        if (!project->values("QT_SOURCE_TREE").isEmpty()) {
+            filepath.remove(project->values("QT_SOURCE_TREE").first());
+            filepath.remove(0, 1);
+        }
+//        if (!project->values("QT_BUILD_TREE").isEmpty()) {
+//            moctool.remove(project->values("QT_BUILD_TREE").first());
+//            moctool.remove(0, 1);
+//        }
+        s += "\n\t:preexecShellSafe='${QT_BUILD_DIR}/bin/moc ";
+//        s += moctool;
+//        s += " ";
+        s += varGlue("DEFINES", "-D", " -D", " ");
+        s += varGlue("INCLUDEPATH", "-I", " -I", " ");
+        s += filepath;
+        s += filename;
+        s += " -o ";
+        tmpstr.replace(Option::cpp_ext.first(), Option::cpp_moc_ext);
+        s += "work/";
+        s += tmpstr;
+        s += "\n";
+    } else
+        s += "\n";
+    return s;
+}
+
+bool
+GBuildMakefileGenerator::openOutput(QFile &file, const QString &build) const
+{
+    debug_msg(1, "file is %s", file.fileName().toLatin1().constData());
+    QFileInfo fi(file);
+    if (fi.filePath().isEmpty())
+        file.setFileName(qmake_getpwd() + QDir::separator() + file.fileName());
+    if (!file.fileName().endsWith(projectSuffix())) {
+        QString outputName(file.fileName());
+        outputName += QDir::separator();
+        outputName += fileInfo(project->projectFile()).baseName();
+        outputName += projectSuffix();
+        warn_msg(WarnParser, outputName.toAscii());
+        file.setFileName(outputName);
+    }
+    debug_msg(1, "file is %s", file.fileName().toLatin1().constData());
+    bool ret = MakefileGenerator::openOutput(file, QString());
+    return ret;
+}
+
+QT_END_NAMESPACE
diff --git a/qmake/generators/integrity/gbuild.h b/qmake/generators/integrity/gbuild.h
new file mode 100644
index 0000000..6b5b1a0
--- /dev/null
+++ b/qmake/generators/integrity/gbuild.h
@@ -0,0 +1,74 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtGui module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef GBUILD_H
+#define GBUILD_H
+
+#include "makefile.h"
+
+QT_BEGIN_NAMESPACE
+
+class GBuildMakefileGenerator : public MakefileGenerator
+{
+    virtual bool write();
+
+    QString projectSuffix() const { return QString(".gpj"); };
+    QString writeOne(QString filename, QString pathtoremove = "");
+
+public:
+    GBuildMakefileGenerator();
+    ~GBuildMakefileGenerator();
+
+    virtual bool supportsMetaBuild() { return false; }
+    virtual bool openOutput(QFile &, const QString &) const;
+protected:
+    bool doPrecompiledHeaders() const { return false; }
+    virtual bool doDepends() const { return true; }
+    QStringList nativebins;
+
+};
+
+inline GBuildMakefileGenerator::~GBuildMakefileGenerator()
+{ }
+
+QT_END_NAMESPACE
+
+#endif // GBUILD_H
diff --git a/qmake/generators/metamakefile.cpp b/qmake/generators/metamakefile.cpp
index ae48ddd..a3fba6a 100644
--- a/qmake/generators/metamakefile.cpp
+++ b/qmake/generators/metamakefile.cpp
@@ -138,12 +138,12 @@ BuildsMetaMakefileGenerator::init()
         Build *build = new Build;
         build->name = name;
         build->makefile = createMakefileGenerator(project, false);
-	if (build->makefile){
+        if (build->makefile){
             makefiles += build;
-	}else {
-	    delete build;
-	    return false;
-	}
+        }else {
+            delete build;
+            return false;
+        }
     }
     return true;
 }
@@ -179,7 +179,7 @@ BuildsMetaMakefileGenerator::write(const QString &oldpwd)
                     using_stdout = true;
                 } else {
                     if(Option::output.fileName().isEmpty() &&
-		       Option::qmake_mode == Option::QMAKE_GENERATE_MAKEFILE)
+                       Option::qmake_mode == Option::QMAKE_GENERATE_MAKEFILE)
                         Option::output.setFileName(project->first("QMAKE_MAKEFILE"));
                     Option::output_dir = oldpwd;
                     QString build_name = build->name;
@@ -306,7 +306,7 @@ SubdirsMetaMakefileGenerator::init()
                        && project->isRecursive());
     if(recurse) {
         QString old_output_dir = Option::output_dir;
-	QString old_output = Option::output.fileName();
+        QString old_output = Option::output.fileName();
         QString oldpwd = qmake_getpwd();
         QString thispwd = oldpwd;
         if(!thispwd.endsWith('/'))
@@ -387,7 +387,7 @@ SubdirsMetaMakefileGenerator::init()
     self->input_dir = qmake_getpwd();
     self->output_dir = Option::output_dir;
     if(!recurse || (!Option::output.fileName().endsWith(Option::dir_sep) && !QFileInfo(Option::output).isDir()))
-	self->output_file = Option::output.fileName();
+        self->output_file = Option::output.fileName();
     self->makefile = new BuildsMetaMakefileGenerator(project, name, false);
     self->makefile->init();
     subs.append(self);
@@ -420,10 +420,10 @@ SubdirsMetaMakefileGenerator::write(const QString &oldpwd)
             writepwd = oldpwd;
         if(!(ret = subs.at(i)->makefile->write(writepwd)))
             break;
-	//restore because I'm paranoid
+        //restore because I'm paranoid
         qmake_setpwd(pwd);
-	Option::output.setFileName(output_name);
-	Option::output_dir = output_dir;
+        Option::output.setFileName(output_name);
+        Option::output_dir = output_dir;
     }
     return ret;
 }
@@ -448,6 +448,7 @@ QT_BEGIN_INCLUDE_NAMESPACE
 #include "symmake_abld.h"
 #include "symmake_sbsv2.h"
 #include "symbian_makefile.h"
+#include "gbuild.h"
 QT_END_INCLUDE_NAMESPACE
 
 MakefileGenerator *
@@ -491,6 +492,8 @@ MetaMakefileGenerator::createMakefileGenerator(QMakeProject *proj, bool noIO)
         mkfile = new SymbianMakefileTemplate<UnixMakefileGenerator>;
     } else if(gen == "SYMBIAN_MINGW") {
         mkfile = new SymbianMakefileTemplate<MingwMakefileGenerator>;
+    } else if(gen == "GBUILD") {
+        mkfile = new GBuildMakefileGenerator;
     } else {
         fprintf(stderr, "Unknown generator specified: %s\n", gen.toLatin1().constData());
     }
@@ -556,6 +559,9 @@ MetaMakefileGenerator::modesForGenerator(const QString &gen,
         *host_mode = Option::HOST_WIN_MODE;
 #endif
         *target_mode = Option::TARG_SYMBIAN_MODE;
+    } else if (gen == "GBUILD") {
+        *host_mode = Option::HOST_UNIX_MODE;
+        *target_mode = Option::TARG_INTEGRITY_MODE;
     } else {
         fprintf(stderr, "Unknown generator specified: %s\n", gen.toLatin1().constData());
         return false;