Merge remote-tracking branch 'origin/master'

19 files changed, 619 insertions, 93 deletions

diff --git a/qmake/Makefile.unix b/qmake/Makefile.unix
index a24076e..fd502e0 100644
--- a/qmake/Makefile.unix
+++ b/qmake/Makefile.unix
@@ -11,7 +11,7 @@ OBJS=project.o property.o main.o makefile.o unixmake2.o unixmake.o  \
      meta.o makefiledeps.o metamakefile.o xmloutput.o pbuilder_pbx.o \
      borland_bmake.o msvc_vcproj.o msvc_vcxproj.o msvc_nmake.o msvc_objectmodel.o msbuild_objectmodel.o \
      symmake.o initprojectdeploy_symbian.o symmake_abld.o symmake_sbsv2.o \
-     symbiancommon.o registry.o epocroot.o
+     symbiancommon.o registry.o epocroot.o gbuild.o
 
 #qt code
 QOBJS=qtextcodec.o qutfcodec.o qstring.o qtextstream.o qiodevice.o qmalloc.o qglobal.o \
@@ -38,6 +38,7 @@ DEPEND_SRC=project.cpp property.cpp meta.cpp main.cpp generators/makefile.cpp ge
 	   $(SOURCE_PATH)/tools/shared/symbian/epocroot.cpp \
 	   generators/symbian/symmake_abld.cpp generators/symbian/symmake_sbsv2.cpp \
            generaters/symbian/symbiancommon.cpp \
+	   generators/integrity/gbuild.cpp \
 	   $(SOURCE_PATH)/src/corelib/codecs/qtextcodec.cpp $(SOURCE_PATH)/src/corelib/codecs/qutfcodec.cpp \
 	   $(SOURCE_PATH)/src/corelib/tools/qstring.cpp $(SOURCE_PATH)/src/corelib/io/qfile.cpp \
 	   $(SOURCE_PATH)/src/corelib/io/qtextstream.cpp $(SOURCE_PATH)/src/corelib/io/qiodevice.cpp \
@@ -68,7 +69,8 @@ DEPEND_SRC=project.cpp property.cpp meta.cpp main.cpp generators/makefile.cpp ge
 	   $(SOURCE_PATH)/src/corelib/kernel/qsystemerror.cpp \
 	   $(QTSRCS)
 
-CPPFLAGS = -I. -Igenerators -Igenerators/unix -Igenerators/win32 -Igenerators/mac -Igenerators/symbian \
+CPPFLAGS = -g -I. -Igenerators -Igenerators/unix -Igenerators/win32 \
+           -Igenerators/mac -Igenerators/symbian -Igenerators/integrity \
 	   -I$(BUILD_PATH)/include -I$(BUILD_PATH)/include/QtCore \
 	   -I$(BUILD_PATH)/src/corelib/global -I$(BUILD_PATH)/src/corelib/xml \
 	   -I$(SOURCE_PATH)/tools/shared \
@@ -318,6 +320,9 @@ registry.o: $(SOURCE_PATH)/tools/shared/windows/registry.cpp
 epocroot.o: $(SOURCE_PATH)/tools/shared/symbian/epocroot.cpp
 	$(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/tools/shared/symbian/epocroot.cpp
 
+gbuild.o: generators/integrity/gbuild.cpp
+	$(CXX) -c -o $@ $(CXXFLAGS) generators/integrity/gbuild.cpp
+
 projectgenerator.o: generators/projectgenerator.cpp
 	$(CXX) -c -o $@ $(CXXFLAGS) generators/projectgenerator.cpp
 
diff --git a/qmake/Makefile.win32 b/qmake/Makefile.win32
index 4d29537..0ab2932 100644
--- a/qmake/Makefile.win32
+++ b/qmake/Makefile.win32
@@ -31,7 +31,7 @@ CFLAGS_EXTRA      = /MP
 CFLAGS_BARE = -c -Fo./ \
               -W3 -nologo -O2 \
               $(CFLAGS_EXTRA) \
-              -I. -Igenerators -Igenerators\unix -Igenerators\win32 -Igenerators\mac -Igenerators\symbian \
+              -I. -Igenerators -Igenerators\unix -Igenerators\win32 -Igenerators\mac -Igenerators\symbian -Igenerators\integrity \
               -I$(BUILD_PATH)\include -I$(BUILD_PATH)\include\QtCore \
               -I$(SOURCE_PATH)\include -I$(SOURCE_PATH)\include\QtCore \
               -I$(BUILD_PATH)\src\corelib\global \
@@ -62,7 +62,8 @@ OBJS        = project.obj main.obj makefile.obj unixmake.obj unixmake2.obj mingw
               makefiledeps.obj metamakefile.obj xmloutput.obj pbuilder_pbx.obj \
               borland_bmake.obj msvc_nmake.obj msvc_vcproj.obj msvc_vcxproj.obj \
               msvc_objectmodel.obj msbuild_objectmodel.obj symmake.obj initprojectdeploy_symbian.obj \
-              symmake_abld.obj symmake_sbsv2.obj symbiancommon.obj registry.obj epocroot.obj
+              symmake_abld.obj symmake_sbsv2.obj symbiancommon.obj registry.obj epocroot.obj \
+              gbuild.obj
 
 !IFDEF QMAKE_OPENSOURCE_EDITION
 CFLAGS      = $(CFLAGS) -DQMAKE_OPENSOURCE_EDITION
@@ -169,6 +170,9 @@ qmake_pch.obj:
 {$(SOURCE_PATH)\qmake\generators\symbian}.cpp{}.obj::
 	$(CXX) $(CXXFLAGS) $<
 
+{$(SOURCE_PATH)\qmake\generators\integrity}.cpp{}.obj::
+	$(CXX) $(CXXFLAGS) $<
+
 {$(SOURCE_PATH)\qmake\generators\unix}.cpp{}.obj::
 	$(CXX) $(CXXFLAGS) $<
 
diff --git a/qmake/Makefile.win32-g++ b/qmake/Makefile.win32-g++
index 59ac8c2..0707a3a 100644
--- a/qmake/Makefile.win32-g++
+++ b/qmake/Makefile.win32-g++
@@ -15,7 +15,7 @@ CXX	    =	g++
 CFLAGS	    =	-c -o$@ -O \
 		-I. -Igenerators -Igenerators/unix \
 		-Igenerators/win32 -Igenerators/mac \
-		-Igenerators/symbian \
+		-Igenerators/symbian -Igenerators/integrity \
 		-I$(BUILD_PATH)/include -I$(BUILD_PATH)/include/QtCore \
 		-I$(SOURCE_PATH)/include -I$(SOURCE_PATH)/include/QtCore \
 		-I$(BUILD_PATH)/src/corelib/global \
@@ -39,7 +39,7 @@ OBJS        = project.o main.o makefile.o unixmake.o unixmake2.o mingw_make.o \
               makefiledeps.o metamakefile.o xmloutput.o pbuilder_pbx.o \
               borland_bmake.o msvc_nmake.o msvc_vcproj.o msvc_vcxproj.o \
               msvc_objectmodel.o msbuild_objectmodel.o symmake.o initprojectdeploy_symbian.o \
-              symmake_abld.o symmake_sbsv2.o symbiancommon.o registry.o epocroot.o
+              symmake_abld.o symmake_sbsv2.o symbiancommon.o registry.o epocroot.o gbuild.o
 
 ifdef QMAKE_OPENSOURCE_EDITION
 CFLAGS      += -DQMAKE_OPENSOURCE_EDITION
@@ -311,6 +311,9 @@ registry.o: $(SOURCE_PATH)/tools/shared/windows/registry.cpp
 epocroot.o: $(SOURCE_PATH)/tools/shared/symbian/epocroot.cpp
 	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)/tools/shared/symbian/epocroot.cpp
 
+gbuild.o: $(SOURCE_PATH)/qmake/generators/integrity/gbuild.cpp
+	$(CXX) $(CXXFLAGS) generators/integrity/gbuild.cpp
+
 project.o: $(SOURCE_PATH)/qmake/project.cpp $(SOURCE_PATH)/qmake/project.h $(SOURCE_PATH)/qmake/option.h
 	$(CXX) $(CXXFLAGS) project.cpp
 
diff --git a/qmake/Makefile.win32-g++-sh b/qmake/Makefile.win32-g++-sh
index a84b3f6..c3537e3 100644
--- a/qmake/Makefile.win32-g++-sh
+++ b/qmake/Makefile.win32-g++-sh
@@ -15,7 +15,7 @@ CXX	    =	g++
 CFLAGS	    =	-c -o$@ -O \
 		-I. -Igenerators -Igenerators/unix \
 		-Igenerators/win32 -Igenerators/mac \
-		-Igenerators/symbian \
+		-Igenerators/symbian -Igenerators/integrity \
 		-I$(BUILD_PATH)/include -I$(BUILD_PATH)/include/QtCore \
 		-I$(SOURCE_PATH)/include -I$(SOURCE_PATH)/include/QtCore \
 		-I$(BUILD_PATH)/src/corelib/global \
@@ -39,7 +39,7 @@ OBJS        = project.o main.o makefile.o unixmake.o unixmake2.o mingw_make.o \
               makefiledeps.o metamakefile.o xmloutput.o pbuilder_pbx.o \
               borland_bmake.o msvc_nmake.o msvc_vcproj.o msvc_vcxproj.o \
               msvc_objectmodel.o msbuild_objectmodel.o symmake.o initprojectdeploy_symbian.o \
-              symmake_abld.o symmake_sbsv2.o symbiancommon.o registry.o epocroot.o
+              symmake_abld.o symmake_sbsv2.o symbiancommon.o registry.o epocroot.o gbuild.o
 
 ifdef QMAKE_OPENSOURCE_EDITION
 CFLAGS      += -DQMAKE_OPENSOURCE_EDITION
@@ -310,6 +310,10 @@ registry.o: $(SOURCE_PATH)/tools/shared/windows/registry.cpp
 epocroot.o: $(SOURCE_PATH)/tools/shared/symbian/epocroot.cpp
 	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)/tools/shared/symbian/epocroot.cpp
 
+gbuild.o: $(SOURCE_PATH)/qmake/generators/integrity/gbuild.cpp
+	$(CXX) $(CXXFLAGS) generators/integrity/gbuild.cpp
+
+
 project.o: $(SOURCE_PATH)/qmake/project.cpp $(SOURCE_PATH)/qmake/project.h $(SOURCE_PATH)/qmake/option.h
 	$(CXX) $(CXXFLAGS) project.cpp
 
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/mac/pbuilder_pbx.cpp b/qmake/generators/mac/pbuilder_pbx.cpp
index 0ec946e..19667cd 100644
--- a/qmake/generators/mac/pbuilder_pbx.cpp
+++ b/qmake/generators/mac/pbuilder_pbx.cpp
@@ -1272,6 +1272,8 @@ ProjectBuilderMakefileGenerator::writeMakeParts(QTextStream &t)
                     plist_in_text = plist_in_text.replace("@EXECUTABLE@", project->first("QMAKE_ORIG_TARGET"));
                 } else {
                     plist_in_text = plist_in_text.replace("@LIBRARY@", project->first("QMAKE_ORIG_TARGET"));
+                }
+                if (!project->values("VERSION").isEmpty()) {
                     plist_in_text = plist_in_text.replace("@SHORT_VERSION@", project->first("VER_MAJ") + "." +
                                                           project->first("VER_MIN"));
                 }
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;
diff --git a/qmake/generators/symbian/symmake_sbsv2.cpp b/qmake/generators/symbian/symmake_sbsv2.cpp
index f94a63f..0fdef86 100644
--- a/qmake/generators/symbian/symmake_sbsv2.cpp
+++ b/qmake/generators/symbian/symmake_sbsv2.cpp
@@ -727,7 +727,10 @@ void SymbianSbsv2MakefileGenerator::writeBldInfExtensionRulesPart(QTextStream& t
         QStringList absoluteCleanFiles;
         foreach (QString cleanFile, cleanFiles) {
             QFileInfo fi(cleanFile);
-            absoluteCleanFiles << fi.absoluteFilePath();
+            QString fileName = QLatin1String("\"");
+            fileName.append(fi.absoluteFilePath());
+            fileName.append(QLatin1String("\""));
+            absoluteCleanFiles << fileName;   	
         }
         t << "START EXTENSION qt/qmake_clean" << endl;
         t << "OPTION CLEAN_FILES " << absoluteCleanFiles.join(" ") << endl;
diff --git a/qmake/generators/unix/unixmake2.cpp b/qmake/generators/unix/unixmake2.cpp
index d7145b4..212f8bd 100644
--- a/qmake/generators/unix/unixmake2.cpp
+++ b/qmake/generators/unix/unixmake2.cpp
@@ -536,7 +536,7 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t)
                 t << "\n\t"
                   << "-$(MOVE) $(TARGET) " << destdir;
             if(!project->isEmpty("QMAKE_POST_LINK"))
-                t << "\n\t" << var("QMAKE_POST_LINK") << "\n\t";
+                t << "\n\t" << var("QMAKE_POST_LINK");
             t << endl << endl;
         } else if(!project->isEmpty("QMAKE_BUNDLE")) {
             t << "\n\t"
@@ -712,11 +712,18 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t)
         t << info_plist_out << ": " << "\n\t";
         if(!destdir.isEmpty())
             t << mkdir_p_asstring(destdir) << "\n\t";
+        QStringList commonSedArgs;
+        if (!project->values("VERSION").isEmpty())
+            commonSedArgs << "-e \"s,@SHORT_VERSION@," << project->first("VER_MAJ") << "." << project->first("VER_MIN") << ",g\" ";
+        commonSedArgs << "-e \"s,@TYPEINFO@,"<< (project->isEmpty("QMAKE_PKGINFO_TYPEINFO") ?
+                   QString::fromLatin1("????") : project->first("QMAKE_PKGINFO_TYPEINFO").left(4)) << ",g\" ";
         if(project->first("TEMPLATE") == "app") {
             QString icon = fileFixify(var("ICON"));
             t << "@$(DEL_FILE) " << info_plist_out << "\n\t"
-              << "@sed "
-              << "-e \"s,@ICON@," << icon.section(Option::dir_sep, -1) << ",g\" "
+              << "@sed ";
+            foreach (const QString &arg, commonSedArgs)
+                t << arg;
+            t << "-e \"s,@ICON@," << icon.section(Option::dir_sep, -1) << ",g\" "
               << "-e \"s,@EXECUTABLE@," << var("QMAKE_ORIG_TARGET") << ",g\" "
               << "-e \"s,@TYPEINFO@,"<< (project->isEmpty("QMAKE_PKGINFO_TYPEINFO") ?
                          QString::fromLatin1("????") : project->first("QMAKE_PKGINFO_TYPEINFO").left(4)) << ",g\" "
@@ -732,9 +739,10 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t)
             }
         } else {
             t << "@$(DEL_FILE) " << info_plist_out << "\n\t"
-              << "@sed "
-              << "-e \"s,@LIBRARY@," << var("QMAKE_ORIG_TARGET") << ",g\" "
-              << "-e \"s,@SHORT_VERSION@," << project->first("VER_MAJ") << "." << project->first("VER_MIN") << ",g\" "
+              << "@sed ";
+            foreach (const QString &arg, commonSedArgs)
+                t << arg;
+            t << "-e \"s,@LIBRARY@," << var("QMAKE_ORIG_TARGET") << ",g\" "
               << "-e \"s,@TYPEINFO@,"
               << (project->isEmpty("QMAKE_PKGINFO_TYPEINFO") ?
                   QString::fromLatin1("????") : project->first("QMAKE_PKGINFO_TYPEINFO").left(4)) << ",g\" "
diff --git a/qmake/generators/win32/mingw_make.cpp b/qmake/generators/win32/mingw_make.cpp
index 2639332..462920e 100644
--- a/qmake/generators/win32/mingw_make.cpp
+++ b/qmake/generators/win32/mingw_make.cpp
@@ -302,8 +302,10 @@ void MingwMakefileGenerator::init()
 	project->values("QMAKE_LFLAGS").append(QString("-Wl,--out-implib,") + project->first("MINGW_IMPORT_LIB"));
     }
 
-    if(!project->values("DEF_FILE").isEmpty() && project->values("QMAKE_SYMBIAN_SHLIB").isEmpty())
-        project->values("QMAKE_LFLAGS").append(QString("-Wl,") + project->first("DEF_FILE"));
+    if(!project->values("DEF_FILE").isEmpty() && project->values("QMAKE_SYMBIAN_SHLIB").isEmpty()) {
+        QString defFileName = fileFixify(project->values("DEF_FILE")).first();
+        project->values("QMAKE_LFLAGS").append(QString("-Wl,") + escapeFilePath(defFileName));
+    }
 
     MakefileGenerator::init();
 
diff --git a/qmake/generators/win32/msvc_nmake.cpp b/qmake/generators/win32/msvc_nmake.cpp
index 1b2cd18..c55806d 100644
--- a/qmake/generators/win32/msvc_nmake.cpp
+++ b/qmake/generators/win32/msvc_nmake.cpp
@@ -218,8 +218,10 @@ void NmakeMakefileGenerator::init()
         project->values("QMAKE_LIBS") += escapeFilePaths(project->values("RES_FILE"));
     }
 
-    if(!project->values("DEF_FILE").isEmpty())
-        project->values("QMAKE_LFLAGS").append(QString("/DEF:") + escapeFilePath(project->first("DEF_FILE")));
+    if (!project->values("DEF_FILE").isEmpty()) {
+        QString defFileName = fileFixify(project->values("DEF_FILE")).first();
+        project->values("QMAKE_LFLAGS").append(QString("/DEF:") + escapeFilePath(defFileName));
+    }
 
     if(!project->values("VERSION").isEmpty()) {
         QString version = project->values("VERSION")[0];
diff --git a/qmake/generators/win32/msvc_objectmodel.cpp b/qmake/generators/win32/msvc_objectmodel.cpp
index 69cfc0d..815a476 100644
--- a/qmake/generators/win32/msvc_objectmodel.cpp
+++ b/qmake/generators/win32/msvc_objectmodel.cpp
@@ -355,7 +355,7 @@ VCCLCompilerTool::VCCLCompilerTool()
         TreatWChar_tAsBuiltInType(unset),
         TurnOffAssemblyGeneration(unset),
         UndefineAllPreprocessorDefinitions(unset),
-        UsePrecompiledHeader(pchNone),
+        UsePrecompiledHeader(pchUnset),
         UseUnicodeForAssemblerListing(unset),
         WarnAsError(unset),
         WarningLevel(warningLevel_0),
@@ -389,7 +389,7 @@ inline XmlOutput::xml_output xformUsePrecompiledHeaderForNET2005(pchOption whatP
         if (whatPch ==  pchGenerateAuto) whatPch = (pchOption)0;
         if (whatPch ==  pchUseUsingSpecific) whatPch = (pchOption)2;
     }
-    return attrE(_UsePrecompiledHeader, whatPch);
+    return attrE(_UsePrecompiledHeader, whatPch, /*ifNot*/ pchUnset);
 }
 
 inline XmlOutput::xml_output xformExceptionHandlingNET2005(exceptionHandling eh, DotNET compilerVersion)
@@ -857,11 +857,11 @@ bool VCCLCompilerTool::parseOption(const char* option)
             break;
         case 'X':
             UsePrecompiledHeader = pchGenerateAuto;
-            PrecompiledHeaderFile = option+3;
+            PrecompiledHeaderThrough = option+3;
             break;
         case 'c':
             UsePrecompiledHeader = pchCreateUsingSpecific;
-            PrecompiledHeaderFile = option+3;
+            PrecompiledHeaderThrough = option+3;
             break;
         case 'd':
         case 'l':
@@ -869,7 +869,7 @@ bool VCCLCompilerTool::parseOption(const char* option)
             break;
         case 'u':
             UsePrecompiledHeader = pchUseUsingSpecific;
-            PrecompiledHeaderFile = option+3;
+            PrecompiledHeaderThrough = option+3;
             break;
         default:
             found = false; break;
@@ -2104,7 +2104,7 @@ void VCFilter::modifyPCHstage(QString str)
             break;
         }
     }
-    bool isHFile = str.endsWith(".h") && (str == Project->precompH);
+    bool isHFile = Option::hasFileExtension(str, Option::h_ext) && (str == Project->precompH);
     bool isCPPFile = pchThroughSourceFile && (str == Project->precompCPP);
 
     if(!isCFile && !isHFile && !isCPPFile)
@@ -2146,7 +2146,7 @@ void VCFilter::modifyPCHstage(QString str)
     useCompilerTool = true;
     // Setup PCH options
     CompilerTool.UsePrecompiledHeader     = (isCFile ? pchNone : pchCreateUsingSpecific);
-    CompilerTool.PrecompiledHeaderThrough = (isCPPFile ? QString("$(INHERIT)") : QString("$(NOINHERIT)"));
+    CompilerTool.PrecompiledHeaderThrough = (isCPPFile ? Project->precompHFilename : QString("$(NOINHERIT)"));
     CompilerTool.ForcedIncludeFiles       = QStringList("$(NOINHERIT)");
 }
 
@@ -2514,7 +2514,7 @@ void VCProjectWriter::write(XmlOutput &xml, const VCCLCompilerTool &tool)
         << attrT(_TurnOffAssemblyGeneration, tool.TurnOffAssemblyGeneration)
         << attrT(_UndefineAllPreprocessorDefinitions, tool.UndefineAllPreprocessorDefinitions)
         << attrX(_UndefinePreprocessorDefinitions, tool.UndefinePreprocessorDefinitions)
-        << (!tool.PrecompiledHeaderFile.isEmpty() || !tool.PrecompiledHeaderThrough.isEmpty() ? xformUsePrecompiledHeaderForNET2005(tool.UsePrecompiledHeader, tool.config->CompilerVersion) : noxml())
+        << xformUsePrecompiledHeaderForNET2005(tool.UsePrecompiledHeader, tool.config->CompilerVersion)
         << attrT(_WarnAsError, tool.WarnAsError)
         << attrE(_WarningLevel, tool.WarningLevel, /*ifNot*/ warningLevelUnknown)
         << attrT(_WholeProgramOptimization, tool.WholeProgramOptimization)
diff --git a/qmake/generators/win32/msvc_objectmodel.h b/qmake/generators/win32/msvc_objectmodel.h
index 5431ce0..3e62fb4 100644
--- a/qmake/generators/win32/msvc_objectmodel.h
+++ b/qmake/generators/win32/msvc_objectmodel.h
@@ -366,6 +366,7 @@ enum optLinkTimeCodeGenType {
     optLTCGUpdate
 };
 enum pchOption {
+    pchUnset = -1,
     pchNone,
     pchCreateUsingSpecific,
     pchGenerateAuto,
diff --git a/qmake/generators/win32/msvc_vcproj.cpp b/qmake/generators/win32/msvc_vcproj.cpp
index 8455189..80f5bde 100644
--- a/qmake/generators/win32/msvc_vcproj.cpp
+++ b/qmake/generators/win32/msvc_vcproj.cpp
@@ -878,22 +878,16 @@ void VcprojGenerator::initConfiguration()
         break;
     }
 
+    conf.OutputDirectory = project->first("DESTDIR");
+    if (conf.OutputDirectory.isEmpty())
+        conf.OutputDirectory = ".\\";
+    if (!conf.OutputDirectory.endsWith("\\"))
+        conf.OutputDirectory += '\\';
     if (conf.CompilerVersion >= NET2010) {
-        conf.OutputDirectory = project->first("DESTDIR");
-
-        if(conf.OutputDirectory.isEmpty())
-            conf.OutputDirectory = ".\\";
-
-        if(!conf.OutputDirectory.endsWith("\\"))
-            conf.OutputDirectory += '\\';
-
         // The target name could have been changed.
         conf.PrimaryOutput = project->first("TARGET");
         if ( !conf.PrimaryOutput.isEmpty() && !project->first("TARGET_VERSION_EXT").isEmpty() && project->isActiveConfig("shared"))
             conf.PrimaryOutput.append(project->first("TARGET_VERSION_EXT"));
-    } else {
-        conf.PrimaryOutput = project->first("PrimaryOutput");
-        conf.OutputDirectory = ".";
     }
 
     conf.Name = project->values("BUILD_NAME").join(" ");
@@ -982,13 +976,7 @@ void VcprojGenerator::initCompilerTool()
 void VcprojGenerator::initLibrarianTool()
 {
     VCConfiguration &conf = vcProject.Configuration;
-    conf.librarian.OutputFile = project->first("DESTDIR");
-    if(conf.librarian.OutputFile.isEmpty())
-        conf.librarian.OutputFile = ".\\";
-
-    if(!conf.librarian.OutputFile.endsWith("\\"))
-        conf.librarian.OutputFile += '\\';
-
+    conf.librarian.OutputFile = "$(OutDir)\\";
     conf.librarian.OutputFile += project->first("MSVCPROJ_TARGET");
     conf.librarian.AdditionalOptions += project->values("QMAKE_LIBFLAGS");
 }
@@ -1018,24 +1006,7 @@ void VcprojGenerator::initLinkerTool()
         }
     }
 
-    switch (projectTarget) {
-    case Application:
-        conf.linker.OutputFile = project->first("DESTDIR");
-        break;
-    case SharedLib:
-        conf.linker.parseOptions(project->values("MSVCPROJ_LIBOPTIONS"));
-        conf.linker.OutputFile = project->first("DESTDIR");
-        break;
-    case StaticLib: //unhandled - added to remove warnings..
-        break;
-    }
-
-    if(conf.linker.OutputFile.isEmpty())
-        conf.linker.OutputFile = ".\\";
-
-    if(!conf.linker.OutputFile.endsWith("\\"))
-        conf.linker.OutputFile += '\\';
-
+    conf.linker.OutputFile = "$(OutDir)\\";
     conf.linker.OutputFile += project->first("MSVCPROJ_TARGET");
 
     if(project->isActiveConfig("dll")){
@@ -1054,7 +1025,7 @@ void VcprojGenerator::initResourceTool()
     if(project->isActiveConfig("debug"))
         conf.resource.PreprocessorDefinitions += "_DEBUG";
     if(project->isActiveConfig("staticlib"))
-        conf.resource.ResourceOutputFileName = project->first("DESTDIR") + "/$(InputName).res";
+        conf.resource.ResourceOutputFileName = "$(OutDir)\\$(InputName).res";
 }
 
 void VcprojGenerator::initIDLTool()
@@ -1582,19 +1553,6 @@ QString VcprojGenerator::findTemplate(QString file)
     return ret;
 }
 
-void VcprojGenerator::processPrlVariable(const QString &var, const QStringList &l)
-{
-    if(var == "QMAKE_PRL_DEFINES") {
-        QStringList &out = project->values("MSVCPROJ_DEFINES");
-        for(QStringList::ConstIterator it = l.begin(); it != l.end(); ++it) {
-            if(out.indexOf((*it)) == -1)
-                out.append((" /D " + *it));
-        }
-    } else {
-        MakefileGenerator::processPrlVariable(var, l);
-    }
-}
-
 void VcprojGenerator::outputVariables()
 {
 #if 0
diff --git a/qmake/generators/win32/msvc_vcproj.h b/qmake/generators/win32/msvc_vcproj.h
index 656afa9..fdcd73f 100644
--- a/qmake/generators/win32/msvc_vcproj.h
+++ b/qmake/generators/win32/msvc_vcproj.h
@@ -92,7 +92,6 @@ protected:
     virtual bool mergeBuildProject(MakefileGenerator *other);
 
     virtual bool openOutput(QFile &file, const QString &build) const;
-    virtual void processPrlVariable(const QString &, const QStringList &);
     virtual bool findLibraries();
     virtual void outputVariables();
     QString fixFilename(QString ofile) const;
diff --git a/qmake/generators/win32/winmakefile.cpp b/qmake/generators/win32/winmakefile.cpp
index 603ffb5..ef234ec 100644
--- a/qmake/generators/win32/winmakefile.cpp
+++ b/qmake/generators/win32/winmakefile.cpp
@@ -456,6 +456,10 @@ void Win32MakefileGenerator::processRcFileVar()
         ts << "\t\t\t\tVALUE \"ProductName\", \"" << productName << "\\0\"" << endl;
         ts << "\t\t\tEND" << endl;
         ts << "\t\tEND" << endl;
+        ts << "\t\tBLOCK \"VarFileInfo\"" << endl;
+        ts << "\t\tBEGIN" << endl;
+        ts << "\t\t\tVALUE \"Translation\", 0x409, 1200" << endl;
+        ts << "\t\tEND" << endl;
         ts << "\tEND" << endl;
         ts << "/* End of Version info */" << endl;
         ts << endl;
@@ -701,10 +705,10 @@ void Win32MakefileGenerator::writeStandardParts(QTextStream &t)
     if(project->isActiveConfig("shared") && !project->values("DLLDESTDIR").isEmpty()) {
         QStringList dlldirs = project->values("DLLDESTDIR");
         for (QStringList::Iterator dlldir = dlldirs.begin(); dlldir != dlldirs.end(); ++dlldir) {
-            t << "\n\t" << "-$(COPY_FILE) \"$(DESTDIR_TARGET)\" " << Option::fixPathToTargetOS(*dlldir, false);
+            t << "\t" << "-$(COPY_FILE) \"$(DESTDIR_TARGET)\" " << Option::fixPathToTargetOS(*dlldir, false) << endl;
         }
     }
-    t << endl << endl;
+    t << endl;
 
     writeRcFilePart(t);
 
diff --git a/qmake/option.cpp b/qmake/option.cpp
index 7bee659..cbf8d29 100644
--- a/qmake/option.cpp
+++ b/qmake/option.cpp
@@ -260,6 +260,8 @@ Option::parseCommandLine(int argc, char **argv, int skip)
                 Option::host_mode = HOST_WIN_MODE;
                 Option::target_mode = TARG_WIN_MODE;
                 Option::target_mode_overridden = true;
+            } else if(opt == "integrity") {
+                Option::target_mode = TARG_INTEGRITY_MODE;
             } else if(opt == "d") {
                 Option::debug_level++;
             } else if(opt == "version" || opt == "v" || opt == "-version") {
diff --git a/qmake/option.h b/qmake/option.h
index 23be12f..bc87343 100644
--- a/qmake/option.h
+++ b/qmake/option.h
@@ -139,6 +139,14 @@ struct Option
         return fixString(in, flags);
     }
 
+    inline static bool hasFileExtension(const QString &str, const QStringList &extensions)
+    {
+        foreach (const QString &ext, extensions)
+            if (str.endsWith(ext))
+                return true;
+        return false;
+    }
+
     //global qmake mode, can only be in one mode per invocation!
     enum QMAKE_MODE { QMAKE_GENERATE_NOTHING, QMAKE_GENERATE_PROJECT, QMAKE_GENERATE_MAKEFILE,
                       QMAKE_GENERATE_PRL, QMAKE_SET_PROPERTY, QMAKE_QUERY_PROPERTY };
@@ -156,7 +164,7 @@ struct Option
     enum HOST_MODE { HOST_UNKNOWN_MODE, HOST_UNIX_MODE, HOST_WIN_MODE, HOST_MACX_MODE };
     static HOST_MODE host_mode;
     enum TARG_MODE { TARG_UNKNOWN_MODE, TARG_UNIX_MODE, TARG_WIN_MODE, TARG_MACX_MODE,
-                     TARG_SYMBIAN_MODE };
+                     TARG_SYMBIAN_MODE, TARG_INTEGRITY_MODE };
     static TARG_MODE target_mode;
     static bool target_mode_overridden;
     static QString user_template, user_template_prefix;
@@ -195,7 +203,6 @@ private:
 inline QString fixEnvVariables(const QString &x) { return Option::fixString(x, Option::FixEnvVars); }
 inline QStringList splitPathList(const QString &paths) { return paths.split(Option::dirlist_sep); }
 
-
 // this is a stripped down version of the one found in QtCore
 class QLibraryInfo
 {