diff options
author | Ian <ian@mediator-software.com> | 2011-06-20 13:26:26 (GMT) |
---|---|---|
committer | con <qtc-committer@nokia.com> | 2011-06-27 13:48:26 (GMT) |
commit | 6f9cd3170d917c8ab3b526d3e4cc33c714e26648 (patch) | |
tree | 651e0392d9d29474aa0626cbc439a72b0020701a /src/plugins/platforms/uikit/quikiteventloop.mm | |
parent | cad13a0bbe738a71b9716cb6676c4f11521f0030 (diff) | |
download | Qt-6f9cd3170d917c8ab3b526d3e4cc33c714e26648.zip Qt-6f9cd3170d917c8ab3b526d3e4cc33c714e26648.tar.gz Qt-6f9cd3170d917c8ab3b526d3e4cc33c714e26648.tar.bz2 |
Use nicer fonts and a few little patches to uikit platform.
Merge-request: 1275
Reviewed-by: con
Diffstat (limited to 'src/plugins/platforms/uikit/quikiteventloop.mm')
-rw-r--r-- | src/plugins/platforms/uikit/quikiteventloop.mm | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/plugins/platforms/uikit/quikiteventloop.mm b/src/plugins/platforms/uikit/quikiteventloop.mm index 8884f63..c049563 100644 --- a/src/plugins/platforms/uikit/quikiteventloop.mm +++ b/src/plugins/platforms/uikit/quikiteventloop.mm @@ -72,7 +72,8 @@ Q_UNUSED(application) foreach (QWidget *widget, qApp->topLevelWidgets()) { QUIKitWindow *platformWindow = static_cast<QUIKitWindow *>(widget->platformWindow()); - platformWindow->ensureNativeWindow(); + if (platformWindow) platformWindow->ensureNativeWindow(); + else qDebug() << "Failed to get platform window: " << widget; } return YES; } @@ -156,15 +157,15 @@ bool QUIKitSoftwareInputHandler::eventFilter(QObject *obj, QEvent *event) if (event->type() == QEvent::RequestSoftwareInputPanel) { QWidget *widget = qobject_cast<QWidget *>(obj); if (widget) { - QUIKitWindow *platformWindow = static_cast<QUIKitWindow *>(widget->platformWindow()); - [platformWindow->nativeView() becomeFirstResponder]; + QUIKitWindow *platformWindow = static_cast<QUIKitWindow *>(widget->window()->platformWindow()); + if (platformWindow) [platformWindow->nativeView() becomeFirstResponder]; return true; } } else if (event->type() == QEvent::CloseSoftwareInputPanel) { QWidget *widget = qobject_cast<QWidget *>(obj); if (widget) { - QUIKitWindow *platformWindow = static_cast<QUIKitWindow *>(widget->platformWindow()); - [platformWindow->nativeView() resignFirstResponder]; + QUIKitWindow *platformWindow = static_cast<QUIKitWindow *>(widget->window()->platformWindow()); + if (platformWindow) [platformWindow->nativeView() resignFirstResponder]; return true; } } |