diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-07-05 08:54:21 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2017-07-05 08:54:21 +0000 |
| commit | 207253384b69e49db22e9b1cfe472ad0d99a9051 (patch) | |
| tree | d31d1f136509cc1942f308c8bb479f7479131e6e /src/plugins/platforminputcontexts | |
| parent | 4f7507c52390cd19d76e0f36744f21fbc3e14674 (diff) | |
| parent | c2b224a758ce7e6dcf3748444fa8e29ab81904be (diff) | |
Merge "Merge remote-tracking branch 'origin/5.9' into dev" into refs/staging/dev
Diffstat (limited to 'src/plugins/platforminputcontexts')
| -rw-r--r-- | src/plugins/platforminputcontexts/ibus/qibusplatforminputcontext.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/platforminputcontexts/ibus/qibusplatforminputcontext.cpp b/src/plugins/platforminputcontexts/ibus/qibusplatforminputcontext.cpp index 1ee81fa9c9..eb9e9c8b8d 100644 --- a/src/plugins/platforminputcontexts/ibus/qibusplatforminputcontext.cpp +++ b/src/plugins/platforminputcontexts/ibus/qibusplatforminputcontext.cpp @@ -395,8 +395,8 @@ void QIBusPlatformInputContext::filterEventFinished(QDBusPendingCallWatcher *cal Qt::KeyboardModifiers modifiers = watcher->modifiers(); QVariantList args = watcher->arguments(); - const ulong time = static_cast<const ulong>(args.at(0).toUInt()); - const QEvent::Type type = static_cast<const QEvent::Type>(args.at(1).toUInt()); + const ulong time = static_cast<ulong>(args.at(0).toUInt()); + const QEvent::Type type = static_cast<QEvent::Type>(args.at(1).toUInt()); const int qtcode = args.at(2).toInt(); const quint32 code = args.at(3).toUInt(); const quint32 sym = args.at(4).toUInt(); |