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

* 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging:
  Fixed spelling.
  Various small fixes for the QScroller examples
  Use qreal everywhere to avoid double/float errors on embedded platforms.
  Fixed overshooting with a very low start velocity.
  Fix Xrandr DPI calculation for NVidia TwinView.
  Review and improve scroller documentation
  Improve overshooting behaviour

1 files changed, 4 insertions, 5 deletions

diff --git a/examples/scroller/plot/main.cpp b/examples/scroller/plot/main.cpp
index acf83ee..6166505 100644
--- a/examples/scroller/plot/main.cpp
+++ b/examples/scroller/plot/main.cpp
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QtGui module of the Qt Toolkit.
+** This file is part of the examples of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
@@ -208,15 +208,14 @@ int main(int argc, char **argv)
     if (a.arguments().contains(QLatin1String("--touch")))
         touch = true;
 
-    MainWindow *mw = new MainWindow(smallscreen, touch);
+    MainWindow mw(smallscreen, touch);
     if (smallscreen)
-        mw->showMaximized();
+        mw.showMaximized();
     else
-        mw->show();
+        mw.show();
 #if defined(Q_WS_MAC)
     mw->raise();
 #endif
-
     return a.exec();
 }