diff options
| author | Robert Griebl <robert.griebl@nokia.com> | 2011-05-12 13:54:11 (GMT) |
|---|---|---|
| committer | Robert Griebl <robert.griebl@nokia.com> | 2011-05-16 13:57:38 (GMT) |
| commit | 4f7af4c544c3b793ba8cccb28e5c856f3d754e4a (patch) | |
| tree | df28438d523460f8897e4242df20f47672efef63 /tools/qml | |
| parent | cb5b6799333794496269aa7e6515f96c2ac96d37 (diff) | |
| download | Qt-4f7af4c544c3b793ba8cccb28e5c856f3d754e4a.zip Qt-4f7af4c544c3b793ba8cccb28e5c856f3d754e4a.tar.gz Qt-4f7af4c544c3b793ba8cccb28e5c856f3d754e4a.tar.bz2 | |
Revert all QScroller and QFlickGesture related code.
This reverts commits
0274e68767cce6440515a68d6af868725d5577a4
2770b1277744bb676e96e4ae8c89acd645ec895d
02e1f4e83dc8e3c4ab957095167b3d34c51ba3c1
fdf3be5b6b5db75833e0a7e9a90445ddd794fe4d
d1f9a534da288884f443a975f428b0cfe0a7b29b
205d607c3387d074fb87f8deb77a8f515ae2e189
32d200da9cc7a4dfb3f302f22ef5718a286845c9
3e0df49f978933b1e4e6b48c695bf813ec9a2828
82bbc1c1611bde33680d22a1a3c6449e51d7b0b9
b78ffe51f9a4c4ac705e435d45fffe39864c032d
fe438d7d828021d7f86301af36fe8dff2768532a
df30d58de183d13c649ef7e0fbb8e2b3658e0862
fa845566b3733bc06454b71e33b1ff405ba32280
4f9a318d639c4e7e09e56751d31608fb39d472af
4810b587a65d81f8f90646efd09cadeb1276a756
7bad867382ad6c84155ffcfbb361709a8e8184ab
64ec011c6132496eb9555c1d09e7fd4ddf472837
81492e56aba5b5761500543665012a85d6835513
b668857b3749b39c3a61e0a25e750740b74df552
78a7a02b3b85435bc28eb23e9210522467171e42
Reviewed-By: Ralf Engels
Diffstat (limited to 'tools/qml')
| -rw-r--r-- | tools/qml/texteditautoresizer_maemo5.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tools/qml/texteditautoresizer_maemo5.h b/tools/qml/texteditautoresizer_maemo5.h index 71dbce0..e82d006 100644 --- a/tools/qml/texteditautoresizer_maemo5.h +++ b/tools/qml/texteditautoresizer_maemo5.h @@ -41,7 +41,7 @@ #include <QtGui/qplaintextedit.h> #include <QtGui/qtextedit.h> -#include <QtGui/qscroller.h> +#include <QtGui/qabstractkineticscroller.h> #include <QtGui/qscrollarea.h> #include <QtDebug> @@ -102,11 +102,11 @@ void TextEditAutoResizer::textEditChanged() QPoint scrollto = area->widget()->mapFrom(edit, cursor.center()); QPoint margin(10 + cursor.width(), 2 * cursor.height()); -#ifdef Q_WS_MAEMO_5 - QScroller::scroller(area)->ensureVisible(scrollto, margin.x(), margin.y()); -#else - area->ensureVisible(scrollto.x(), scrollto.y(), margin.x(), margin.y()); -#endif + if (QAbstractKineticScroller *scroller = area->property("kineticScroller").value<QAbstractKineticScroller *>()) { + scroller->ensureVisible(scrollto, margin.x(), margin.y()); + } else { + area->ensureVisible(scrollto.x(), scrollto.y(), margin.x(), margin.y()); + } } } |