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

* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  don't crash when destroying the shortcuts
  Disable activeqt on win32-g++ (it doesn't build).
  fix warning
  remove unused functions
  Make the DBus timeout configurable in QDBusAbstractInterface.
  Fix a typo in qt-conf docs.
  Revert "Fix build with the Clang compiler"
  Added missing no_include_pwd check
  Replace 'i < len-1 && func(i+1)' by 'i+1 < len && func(i+1)'
  Fix build with the Clang compiler
  Change spacing of title in offline style.
  Add support for rawFonts loaded from data in FaceId
  examples: fix compilation with namespaced Qt.
  Russian translation update
  Update Japanese translations for Qt 4.8.
  directfb: Include directfbgl.h directly
  tests: fix QNetworkProxyFactory test
  don't detach until the list is going to be modified
  optimize QList::removeAll()

2 files changed, 10 insertions, 4 deletions

diff --git a/doc/src/deployment/qt-conf.qdoc b/doc/src/deployment/qt-conf.qdoc
index 2f68f3d..5204cc6 100644
--- a/doc/src/deployment/qt-conf.qdoc
+++ b/doc/src/deployment/qt-conf.qdoc
@@ -48,7 +48,7 @@
 
     \o \c :/qt/etc/qt.conf using the resource system
 
-    \o on Mac OS X, in the Resource directory inside the appliction
+    \o on Mac OS X, in the Resource directory inside the application
     bundle, for example \c assistant.app/Contents/Resources/qt.conf
 
     \o in the directory containing the application executable, i.e.
diff --git a/doc/src/template/style/offline.css b/doc/src/template/style/offline.css
index 44abb3c..d33d8e7 100644
--- a/doc/src/template/style/offline.css
+++ b/doc/src/template/style/offline.css
@@ -74,8 +74,7 @@
 
     body
     {
-        margin-left: 0.5em;
-        margin-right: 0.5em;
+        margin: 0px;
         font-family: sans-serif;
         line-height: normal
     }
@@ -238,7 +237,9 @@
 
     .header .content
     {
-        margin-bottom: 0.5em
+        margin-left: 5px; 
+        margin-top: 5px;
+        margin-bottom: 0.5em;
     }
 
     .header .breadcrumb
@@ -413,6 +414,11 @@
     .flowList dd a{
     }
 
+    .mainContent
+    {
+        padding-left:5px;
+    }
+
     .content .flowList p{
         padding:0px;
     }