Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging

* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging: (21 commits)
  Fixed line endings.
  Update licenseheader text in source files for qtbase Qt module
  New configure.exe binary
  Add -qpa option on Windows
  Use qglobal.h's VERSION number instead of hardcoded current version
  More examples adjusted to Symbian and Maemo5. (cherry picked from commit a97b9620a584c9b1a2e006873183526b3d7e001e)
  Doc: Added some details to the accessibility events API documentation.
  Doc: Fixed qdoc warnings.
  Doc: Fixed qdoc warnings.
  Doc: Made an additional change for clarity.
  Doc: Noted that the example will not work as expected with a mouse.
  Doc: Fixed qdoc warnings.
  Doc: Applying a pending change from previous merges.
  Doc: Fixed qdoc warning.
  Doc: Fixed qdoc warnings.
  Doc: Applied pending fixes to API documentation.
  Doc: Various fixes to documentation, some based on changes in master.
  Doc: Added missing project and desktop files.
  Doc: Documented the value returned when no field can be found.
  Squashed commit of changes from the 4.8-temp branch.
  ...

1 files changed, 7 insertions, 4 deletions

diff --git a/examples/effects/fademessage/fademessage.cpp b/examples/effects/fademessage/fademessage.cpp
index 88f9f89f1b..158f0491bc 100644
--- a/examples/effects/fademessage/fademessage.cpp
+++ b/examples/effects/fademessage/fademessage.cpp
@@ -56,7 +56,6 @@ FadeMessage::FadeMessage(QWidget *parent): QGraphicsView(parent)
     m_animation->setStartValue(0);
     m_animation->setEndValue(1);
 
-
     setRenderHint(QPainter::Antialiasing, true);
     setFrameStyle(QFrame::NoFrame);
 }
@@ -75,7 +74,7 @@ void FadeMessage::togglePopup()
 
 void FadeMessage::setupScene()
 {
-    QGraphicsRectItem *parent = m_scene.addRect(0, 0, 400, 600);
+    QGraphicsRectItem *parent = m_scene.addRect(0, 0, 800, 600);
     parent->setPen(Qt::NoPen);
     parent->setZValue(0);
 
@@ -85,7 +84,7 @@ void FadeMessage::setupScene()
 
     for (int i = 1; i < 5; ++i)
         for (int j = 2; j < 5; ++j) {
-            QGraphicsRectItem *item = m_scene.addRect(i * 50, j * 50, 38, 38);
+            QGraphicsRectItem *item = m_scene.addRect(i * 50, (j - 1) * 50, 38, 38);
             item->setParentItem(parent);
             item->setZValue(1);
             int hue = 12 * (i * 5 + j);
@@ -124,6 +123,10 @@ void FadeMessage::setupScene()
     press->setText(tr("Press me"));
     connect(press, SIGNAL(clicked()), SLOT(togglePopup()));
     m_scene.addWidget(press);
+
+#if defined(Q_WS_S60) || defined(Q_WS_MAEMO_5)
+    press->move(200, 210);
+#else
     press->move(300, 500);
+#endif
 }
-