diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-01-24 22:49:35 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-01-24 22:49:35 (GMT) |
commit | ac798c5d77c59ea8dfe29c9d1896fb6604e3a628 (patch) | |
tree | db0d1885e30b86edd944a426f5af92bf0ebb0095 /examples/scroller/plot/settingswidget.h | |
parent | 7913d2f438c498237d5e587513bc2a018ba56ec9 (diff) | |
parent | b668857b3749b39c3a61e0a25e750740b74df552 (diff) | |
download | Qt-ac798c5d77c59ea8dfe29c9d1896fb6604e3a628.zip Qt-ac798c5d77c59ea8dfe29c9d1896fb6604e3a628.tar.gz Qt-ac798c5d77c59ea8dfe29c9d1896fb6604e3a628.tar.bz2 |
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
Diffstat (limited to 'examples/scroller/plot/settingswidget.h')
-rw-r--r-- | examples/scroller/plot/settingswidget.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/examples/scroller/plot/settingswidget.h b/examples/scroller/plot/settingswidget.h index 0ea201d..13edbf4 100644 --- a/examples/scroller/plot/settingswidget.h +++ b/examples/scroller/plot/settingswidget.h @@ -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 |