diff options
author | Ian Dean <ian@mediator-software.com> | 2012-07-18 20:58:04 (GMT) |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-07-25 07:08:46 (GMT) |
commit | 89c8b1908ccaf13e6722bb7f2344f46fe6ba7e15 (patch) | |
tree | 952ed79cac60b765430612bf3f641149182dcdb1 /src/plugins/platforms | |
parent | d91b88ba9f00d3321eedc19a6b49120a9b99dec9 (diff) | |
download | Qt-89c8b1908ccaf13e6722bb7f2344f46fe6ba7e15.zip Qt-89c8b1908ccaf13e6722bb7f2344f46fe6ba7e15.tar.gz Qt-89c8b1908ccaf13e6722bb7f2344f46fe6ba7e15.tar.bz2 |
Remove QtDeclarative dependency from UIKit plugin.
Change-Id: I8425b98ecb908b1b912385c3ed2acb9df4b47f2d
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Diffstat (limited to 'src/plugins/platforms')
-rw-r--r-- | src/plugins/platforms/uikit/quikiteventloop.mm | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/plugins/platforms/uikit/quikiteventloop.mm b/src/plugins/platforms/uikit/quikiteventloop.mm index ab7e241..404ac84 100644 --- a/src/plugins/platforms/uikit/quikiteventloop.mm +++ b/src/plugins/platforms/uikit/quikiteventloop.mm @@ -49,8 +49,9 @@ #include <QtGui/QApplication> #include <QtGui/QWidget> -#include <QtDeclarative/QDeclarativeView> -#include <QtDeclarative/QDeclarativeItem> +#include <QtGui/QGraphicsView> +#include <QtGui/QGraphicsScene> +#include <QtGui/QGraphicsItem> #include <QtDebug> @interface QUIKitAppDelegate : NSObject <UIApplicationDelegate> { @@ -218,13 +219,13 @@ bool QUIKitSoftwareInputHandler::eventFilter(QObject *obj, QEvent *event) { if (event->type() == QEvent::RequestSoftwareInputPanel) { UIReturnKeyType returnKeyType = UIReturnKeyDone; - if (QDeclarativeView *declarativeView = qobject_cast<QDeclarativeView *>(obj)) { + if (QGraphicsView *declarativeView = qobject_cast<QGraphicsView *>(obj)) { // register on loosing the focus, so we can auto-remove the input panel again QGraphicsScene *scene = declarativeView->scene(); if (scene) { if (mCurrentFocusObject) disconnect(mCurrentFocusObject, 0, this, SLOT(activeFocusChanged(bool))); - QDeclarativeItem *focus = static_cast<QDeclarativeItem *>(scene->focusItem()); + QObject *focus = dynamic_cast<QObject *>(scene->focusItem()); mCurrentFocusObject = focus; if (focus) { connect(mCurrentFocusObject, SIGNAL(activeFocusChanged(bool)), this, SLOT(activeFocusChanged(bool))); |