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

* 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1:
  A few trivial optimizations
  Rewrote bookmark handling, the previous code was just plain awful.
  Small style cleanup.
  Fix some warnings.
  Designer: Emit QDesignerPropertyEditorInterface::propertyChanged().
  Designer: Support the 'windowOpacity'-property for forms.
  Expanded tst_QFileSystemModel::rootPath() to check directories ending in "." or ".."
  Assistant: Treat "unfiltered" filter in a apecial way.
  Assistant: Give meaningful context to translations.
  Fixed handling of paths containing ".." in QFileSystemModel on Windows.
  QAbstractItemModel docs: Fix typo.
  Assistant: Eliminate private tr contexts.

1 files changed, 6 insertions, 6 deletions

diff --git a/src/gui/styles/qs60style_simulated.cpp b/src/gui/styles/qs60style_simulated.cpp
index f87cf28..2df55b7 100644
--- a/src/gui/styles/qs60style_simulated.cpp
+++ b/src/gui/styles/qs60style_simulated.cpp
@@ -94,12 +94,12 @@ bool saveThemeToBlob(const QString &themeBlob,
         dataOut << color;
     }
 
-    const int picturesCount = partPictures.count();
-    dataOut << picturesCount;
-    foreach (const QString &key, partPictures.keys()) {
-        const QPicture picture = partPictures.value(key);
-        dataOut << key;
-        dataOut << picture;
+    dataOut << partPictures.count();
+    QHashIterator i(partPictures);
+    while (i.hasNext()) {
+        i.next();
+        dataOut << i.key();
+        dataOut << i.value(); // the QPicture
     }
 
     QDataStream blobOut(&blob);