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

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (34 commits)
  Add declarative changelog entries for 4.7.1
  connman backend
  My changelog entries for 4.7.1
  updated changes-4.7.1
  Update frameGeometry when the unified toolbar visiblity is toggled
  Update changelog
  my contributions to dist/changes-4.7.1
  My 4.7.1 changes.
  added my and Jan-Arve's change to changelog for 4.7.1
  Changes done for 4.7.1
  Updated changes-4.7.1
  My changes.
  Fix for bug QTMOBILITY-448 to list the default network configuration in Bearermonitor example
  Initialise pointer variables.
  An aborted QNetworkSession on Maemo must emit SessionAbortedError.
  Autotest: also enable testing of QtDeclarative
  Add Qt 4.7.0 baseline symbols to the 4.7 branch
  Call createpackage without the explicit .bat suffix
  Improve Qt/Symbian compatibility with unix shells
  Ukrainian translation updated
  ...

1 files changed, 1 insertions, 0 deletions

diff --git a/qmake/generators/symbian/symmake_abld.cpp b/qmake/generators/symbian/symmake_abld.cpp
index 85dcab4..7416cbe 100644
--- a/qmake/generators/symbian/symmake_abld.cpp
+++ b/qmake/generators/symbian/symmake_abld.cpp
@@ -323,6 +323,7 @@ void SymbianAbldMakefileGenerator::writeWrapperMakefile(QFile& wrapperFile, bool
                     QString fixedValue(QDir::toNativeSeparators(values.at(i)));
                     dirsToClean << fixedValue;
                     t << "\t-@ " << dirExists << " \""  << fixedValue << "\" "
+                      << (isWindowsShell() ? "" : "|| ")
                       << mkdir << " \"" << fixedValue << "\"" << endl;
                 }
             }