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:
  don't crash in QProcessEnvironment::systemEnvironment()
  qmake: Introduce new template type
  no environment on WinCE
  fix Widestring vs. Ansi mixup
  fix potential crash in QProcessEnvironment::systemEnvironment() on windows
  Fix compilation with QT_NO_*
  fix build on symbian
  skip widget when its focusPolicy is Qt::ClickFocus in TabOrderEditor
  fix build on mac
  make QProcessEnvironment on Unix cache converted values
  make QProcessEnvironment::systemEnvironment() encoding-safe
  make QProcessEnvironment on Unix cache converted variable names
  move key/value converters to the private class
  make QProcessEnvironment on Windows preserve variable name case
  split QProcessEnvironmentPrivate::Unit into Key and Value
  remove unused functions
  minor optimization: use QList::reserve()
  use the Hash typedef
  Changelog: Qt Designer 4.8

1 files changed, 5 insertions, 1 deletions

diff --git a/qmake/generators/unix/unixmake2.cpp b/qmake/generators/unix/unixmake2.cpp
index 9f14492..82f2366 100644
--- a/qmake/generators/unix/unixmake2.cpp
+++ b/qmake/generators/unix/unixmake2.cpp
@@ -96,7 +96,8 @@ UnixMakefileGenerator::writeMakefile(QTextStream &t)
     }
 
     if (project->values("TEMPLATE").first() == "app" ||
-        project->values("TEMPLATE").first() == "lib") {
+        project->values("TEMPLATE").first() == "lib" ||
+        project->values("TEMPLATE").first() == "aux") {
         if(Option::mkfile::do_stub_makefile && MakefileGenerator::writeStubMakefile(t))
             return true;
         writeMakeParts(t);
@@ -1017,6 +1018,9 @@ void UnixMakefileGenerator::init2()
     if(project->isEmpty("QMAKE_FRAMEWORK_VERSION"))
         project->values("QMAKE_FRAMEWORK_VERSION").append(project->values("VER_MAJ").first());
 
+    if (project->values("TEMPLATE").first() == "aux")
+        return;
+
     if (!project->values("QMAKE_APP_FLAG").isEmpty()) {
         if(!project->isEmpty("QMAKE_BUNDLE")) {
             QString bundle_loc = project->first("QMAKE_BUNDLE_LOCATION");