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: (43 commits)
  Fix compilation on Windows: forgot to change one toTime_tHelper
  handle qt-format PO flags
  handle encoding of PO files
  make variable naming politically correct :-D
  add Plural-Forms header in PO writer
  simplify arabic plural rule
  don't mark untranslated messages as fuzzy in PO files
  support gettext POT files
  fix writing of length variant separators in the singular case
  make PO header handling less of a monster hack
  fix updating of X-Source-Language PO header
  interpret source language "en" as "POSIX" (more precisely: "none specified")
  Fix compilation with Sun CC: no semi-colon after Q_ENUM.
  Remove the "Insert unicode control character" menu entry on X11.
  adds a timeout option to QThreadPool::waitForDone();
  Remove leading whitespace from Qt header macros.
  Rename the xxxMsecsSinceEpoch functions to xxxMSecsSinceEpoch.
  Add QDateTime members that operate on 64-bit milliseconds.
  Fix compilation on WinCE and MinGW by memsetting the OVERLAPPED struct.
  qdoc: Added <div> elements to some html output for class references.
  ...

1 files changed, 3 insertions, 2 deletions

diff --git a/qmake/generators/symbian/symbian_makefile.h b/qmake/generators/symbian/symbian_makefile.h
index f9d3c24..289f9ae 100644
--- a/qmake/generators/symbian/symbian_makefile.h
+++ b/qmake/generators/symbian/symbian_makefile.h
@@ -71,8 +71,9 @@ public:
         if (targetType == TypeExe) {
             generatePkg = true;
         } else {
-            foreach(QString item, this->project->values("DEPLOYMENT")) {
-                if (!this->project->values(item + ".sources").isEmpty()) {
+            const QStringList deployments = this->project->values("DEPLOYMENT");
+            for (int i = 0; i < deployments.count(); ++i) {
+                if (!this->project->values(deployments.at(i) + ".sources").isEmpty()) {
                     generatePkg = true;
                     break;
                 }