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: (83 commits)
  Crash while runnig tst_QMdiSubWindow::emittingOfSignals test on Cocoa
  fix qconfig.h aliased header creation
  fix warning directive on gnuc
  qdoc: Removed navigation arrow that was causing display problems.
  Silence warning when building with MSVC 2005
  Fix an Assert in QTextTable
  Revert "Fix an Assert in QTextTable"
  Attempt to fix build failure with msvc200{5,8} on Windows XP.
  fix macx not having UNICODE in DEFINES any more
  doc: Fixed several qdoc warnings.
  Fix an Assert in QTextTable
  doc: Fixed several qdoc warnings.
  QSslSocket: Improve error handling
  qdoc: Fixed several <div> elements that had the "/>" ending.
  QSslSocket: fix documentation for QSslSocket::setPeerVerifyMode()
  qdoc: Fixed breadcrumbs for QML examples.
  remove redundand translations project files
  make projects lupdate-friendly
  Timing fix for slow devices.
  QNAM: Add future enum attribute for Zerocopy QNAM
  ...

3 files changed, 50 insertions, 2 deletions

diff --git a/examples/declarative/tutorials/samegame/samegame1/samegame.qml b/examples/declarative/tutorials/samegame/samegame1/samegame.qml
index 68f8712..80567ef 100644
--- a/examples/declarative/tutorials/samegame/samegame1/samegame.qml
+++ b/examples/declarative/tutorials/samegame/samegame1/samegame.qml
@@ -55,7 +55,7 @@ Rectangle {
         Image {
             id: background
             anchors.fill: parent
-            source: "../shared/pics/background.jpg"
+            source: "../shared/pics/background.png"
             fillMode: Image.PreserveAspectCrop
         }
     }
diff --git a/examples/network/bearermonitor/sessionwidget.h b/examples/network/bearermonitor/sessionwidget.h
index 5b5827b..c92db44 100644
--- a/examples/network/bearermonitor/sessionwidget.h
+++ b/examples/network/bearermonitor/sessionwidget.h
@@ -41,12 +41,12 @@
 #ifndef SESSIONWIDGET_H
 #define SESSIONWIDGET_H
 
+#include <qnetworksession.h>
 #if defined(Q_WS_MAEMO_5) || defined(Q_WS_MAEMO_6)
 #include "ui_sessionwidget_maemo.h"
 #else
 #include "ui_sessionwidget.h"
 #endif
-#include <qnetworksession.h>
 
 QT_USE_NAMESPACE
 
diff --git a/examples/network/bearermonitor/sessionwidget_maemo.ui b/examples/network/bearermonitor/sessionwidget_maemo.ui
index ca68246..8867509 100644
--- a/examples/network/bearermonitor/sessionwidget_maemo.ui
+++ b/examples/network/bearermonitor/sessionwidget_maemo.ui
@@ -214,6 +214,54 @@
        </item>
       </layout>
      </item>
+     <item>
+      <layout class="QHBoxLayout" name="errorStringLayout_2">
+       <item>
+        <widget class="QLabel" name="rxData">
+         <property name="text">
+          <string>0</string>
+         </property>
+         <property name="alignment">
+          <set>Qt::AlignCenter</set>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QLabel" name="txData">
+         <property name="text">
+          <string>0</string>
+         </property>
+         <property name="alignment">
+          <set>Qt::AlignCenter</set>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </item>
+     <item>
+      <layout class="QHBoxLayout" name="errorStringLayout_3">
+       <item>
+        <widget class="QLabel" name="errorStringLabel_2">
+         <property name="text">
+          <string>Active Time:</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QLabel" name="activeTime">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="text">
+          <string>0 seconds</string>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </item>
     </layout>
    </item>
    <item>