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.

2 files changed, 3 insertions, 2 deletions

diff --git a/tools/designer/src/components/formeditor/formwindow.cpp b/tools/designer/src/components/formeditor/formwindow.cpp
index 9fd084d..3a7cd83 100644
--- a/tools/designer/src/components/formeditor/formwindow.cpp
+++ b/tools/designer/src/components/formeditor/formwindow.cpp
@@ -484,6 +484,7 @@ void FormWindow::setMainContainer(QWidget *w)
         sheet->setVisible(sheet->indexOf(QLatin1String("windowTitle")), true);
         sheet->setVisible(sheet->indexOf(QLatin1String("windowIcon")), true);
         sheet->setVisible(sheet->indexOf(QLatin1String("windowModality")), true);
+        sheet->setVisible(sheet->indexOf(QLatin1String("windowOpacity")), true);
         sheet->setVisible(sheet->indexOf(QLatin1String("windowFilePath")), true);
         // ### generalize
     }
diff --git a/tools/designer/src/components/propertyeditor/propertyeditor.cpp b/tools/designer/src/components/propertyeditor/propertyeditor.cpp
index b171ddc..512cc82 100644
--- a/tools/designer/src/components/propertyeditor/propertyeditor.cpp
+++ b/tools/designer/src/components/propertyeditor/propertyeditor.cpp
@@ -1175,11 +1175,11 @@ void PropertyEditor::slotValueChanged(QtProperty *property, const QVariant &valu
         Q_ASSERT(ok);
         QVariant v;
         qVariantSetValue(v, e);
-        emit propertyValueChanged(property->propertyName(), v, true);
+        emitPropertyValueChanged(property->propertyName(), v, true);
         return;
     }
 
-    emit propertyValueChanged(property->propertyName(), value, enableSubPropertyHandling);
+    emitPropertyValueChanged(property->propertyName(), value, enableSubPropertyHandling);
 }
 
 bool PropertyEditor::isDynamicProperty(const QtBrowserItem* item) const