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

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (33 commits)
  make shadow builds not write into the source dir
  Fix failing tst_qmdisubwindow test after 71a3b1a0d3
  Doc: update the documentation of QUrl about HTML Form encoding
  search translator comments
  Install translators earlier in assistant
  Fix compilation on ARM: don't include kernel headers
  Fix compilation of qmake with MSVC
  Doc: Updating known-issues page.
  Recognize @, #, $ and ` as word separators
  rebuild configure.exe
  Fix dependencies so JOM will handle parallellization properly
  Symbian: Disable IPv6 for now
  Doc: Fixed namespaced Qt build breakage in the model/view tutorial.
  Doc: Fixing links on index page and corecting HTML in the template.
  Accept empty authority segments in QUrl as different from not-present
  Doc: Adds line about non-support for Webkit on Solaris
  protect nil dictionary from release.
  Fix potential KERN-EXEC 0 on Symbian.
  Ukrainian translation updated
  Fix remote crash in delivering D-Bus calls with too few arguments
  ...

1 files changed, 1 insertions, 1 deletions

diff --git a/demos/browser/settings.cpp b/demos/browser/settings.cpp
index 5ceca67..fba781b 100644
--- a/demos/browser/settings.cpp
+++ b/demos/browser/settings.cpp
@@ -89,7 +89,7 @@ void SettingsDialog::loadFromSettings()
 {
     QSettings settings;
     settings.beginGroup(QLatin1String("MainWindow"));
-    QString defaultHome = QLatin1String("http://qt.nokia.com");
+    QString defaultHome = QLatin1String("http://doc.qt.nokia.com");
     homeLineEdit->setText(settings.value(QLatin1String("home"), defaultHome).toString());
     settings.endGroup();