diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-12-24 00:56:59 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-12-24 00:56:59 +0100 |
| commit | f0fbff4c905fd3e21d7aefedd45d98cc9dd54018 (patch) | |
| tree | c61f47f858a9ac6183676bd7aee378a6a2b84a19 /src/plugins/platforms/ios/qiosinputcontext.mm | |
| parent | d776937df91e46536f404c6868d64016b6038d7b (diff) | |
| parent | 0e1ce36ae67de940b2d499ec7f23e520dce0f112 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: I2defae1904154283446b069d151c3ef57302ec7b
Diffstat (limited to 'src/plugins/platforms/ios/qiosinputcontext.mm')
| -rw-r--r-- | src/plugins/platforms/ios/qiosinputcontext.mm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/platforms/ios/qiosinputcontext.mm b/src/plugins/platforms/ios/qiosinputcontext.mm index ea6a0bd4a6..39a22f367e 100644 --- a/src/plugins/platforms/ios/qiosinputcontext.mm +++ b/src/plugins/platforms/ios/qiosinputcontext.mm @@ -150,7 +150,7 @@ m_keyboardEndRect = [self getKeyboardRect:notification]; if (!m_duration) { m_duration = [notification.userInfo[UIKeyboardAnimationDurationUserInfoKey] doubleValue]; - m_curve = [notification.userInfo[UIKeyboardAnimationCurveUserInfoKey] integerValue] << 16; + m_curve = UIViewAnimationCurve([notification.userInfo[UIKeyboardAnimationCurveUserInfoKey] integerValue] << 16); } m_context->scrollRootView(); } |