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:
  Assistant: Add missing license header.
  Compile fixes.
  S60 style: Compile fix.
  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.

3 files changed, 3 insertions, 3 deletions

diff --git a/src/corelib/io/qfilesystemwatcher_inotify.cpp b/src/corelib/io/qfilesystemwatcher_inotify.cpp
index a7dc8fa..4740a89 100644
--- a/src/corelib/io/qfilesystemwatcher_inotify.cpp
+++ b/src/corelib/io/qfilesystemwatcher_inotify.cpp
@@ -235,7 +235,7 @@ QInotifyFileSystemWatcherEngine::QInotifyFileSystemWatcherEngine(int fd)
 
 QInotifyFileSystemWatcherEngine::~QInotifyFileSystemWatcherEngine()
 {
-    foreach (int id, pathToID.values())
+    foreach (int id, pathToID)
         inotify_rm_watch(inotifyFd, id < 0 ? -id : id);
 
     ::close(inotifyFd);
diff --git a/src/corelib/io/qfilesystemwatcher_kqueue.cpp b/src/corelib/io/qfilesystemwatcher_kqueue.cpp
index f088ded..8396481 100644
--- a/src/corelib/io/qfilesystemwatcher_kqueue.cpp
+++ b/src/corelib/io/qfilesystemwatcher_kqueue.cpp
@@ -109,7 +109,7 @@ QKqueueFileSystemWatcherEngine::~QKqueueFileSystemWatcherEngine()
     close(kqpipe[0]);
     close(kqpipe[1]);
 
-    foreach (int id, pathToID.values())
+    foreach (int id, pathToID)
         ::close(id < 0 ? -id : id);
 }
 
diff --git a/src/corelib/kernel/qabstractitemmodel.cpp b/src/corelib/kernel/qabstractitemmodel.cpp
index dbf422e..8b9cec8 100644
--- a/src/corelib/kernel/qabstractitemmodel.cpp
+++ b/src/corelib/kernel/qabstractitemmodel.cpp
@@ -1245,7 +1245,7 @@ void QAbstractItemModelPrivate::columnsRemoved(const QModelIndex &parent,
 /*!
     \fn QModelIndex QAbstractItemModel::parent(const QModelIndex &index) const = 0
 
-    Returns the parent of the model item with the given \a index. If the model
+    Returns the parent of the model item with the given \a index. If the item
     has no parent, an invalid QModelIndex is returned.
 
     A common convention used in models that expose tree data structures is that