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, 1 insertions, 1 deletions

diff --git a/tools/assistant/lib/qhelpenginecore.cpp b/tools/assistant/lib/qhelpenginecore.cpp
index a76fe69..71306af 100644
--- a/tools/assistant/lib/qhelpenginecore.cpp
+++ b/tools/assistant/lib/qhelpenginecore.cpp
@@ -119,7 +119,7 @@ bool QHelpEngineCorePrivate::setup()
         QHelpDBReader *reader = new QHelpDBReader(absFileName,
             QHelpGlobal::uniquifyConnectionName(info.fileName, this), this);
         if (!reader->init()) {
-            emit q->warning(tr("Cannot open documentation file %1: %2!")
+            emit q->warning(QHelpEngineCore::tr("Cannot open documentation file %1: %2!")
                 .arg(absFileName, reader->errorMessage()));
             continue;
         }