Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into master-integration

* 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: (354 commits)
  Clean up rasterfallback mechanism in DirectFB
  QNAM HTTP: Fix crash related to aborted uploads
  Destroy the old runtime system only when existing pixmaps were migrated.
  Fixed autotest failure in tst_qgl::clipTest.
  Properly emit geometryChanged() when the position change.
  Make bld.inf target in Symbian mkspecs to depend on .pro file
  Fixed build failure
  Added way to destroy the share widget in the GL graphics system.
  QCoreApplication::library path, ensure mutex lock ordering
  Fix memory leak.
  QAudioOutput(ALSA); Fix check for available devices.
  qdoc: All references to -assistant and -base were removed.
  Only modify pixmap cache reply when protected by a mutex
  Fix broken example code
  Fix some #ifdefs to compile for a specific combination of featuress that was previously unsupported
  update Russian translations for Qt and tools
  Updated Slovenian translations for Qt 4.7
  doc: The QML Qt element was missing from the documentation.
  Added documentation for Spectrum Analyzer demo
  Do not include Spectrum Analyzer demo in static builds
  ...

1 files changed, 1 insertions, 1 deletions

diff --git a/demos/browser/browsermainwindow.cpp b/demos/browser/browsermainwindow.cpp
index 8c2ed89..50c2cf8 100644
--- a/demos/browser/browsermainwindow.cpp
+++ b/demos/browser/browsermainwindow.cpp
@@ -670,7 +670,7 @@ void BrowserMainWindow::slotPrivateBrowsing()
             " items are automatically removed from the Downloads window," \
             " new cookies are not stored, current cookies can't be accessed," \
             " site icons wont be stored, session wont be saved, " \
-            " and searches are not addded to the pop-up menu in the Google search box." \
+            " and searches are not added to the pop-up menu in the Google search box." \
             "  Until you close the window, you can still click the Back and Forward buttons" \
             " to return to the webpages you have opened.").arg(title);