diff options
Diffstat (limited to 'recipes-qt/maliit/maliit-framework-qt5/qt5.3-fix.patch')
-rw-r--r-- | recipes-qt/maliit/maliit-framework-qt5/qt5.3-fix.patch | 43 |
1 files changed, 43 insertions, 0 deletions
diff --git a/recipes-qt/maliit/maliit-framework-qt5/qt5.3-fix.patch b/recipes-qt/maliit/maliit-framework-qt5/qt5.3-fix.patch new file mode 100644 index 00000000..4f8890f3 --- /dev/null +++ b/recipes-qt/maliit/maliit-framework-qt5/qt5.3-fix.patch | |||
@@ -0,0 +1,43 @@ | |||
1 | Fix compatibility with qt-5.3 | ||
2 | |||
3 | https://bugs.launchpad.net/ubuntu/+source/maliit-framework/+bug/1323962 | ||
4 | |||
5 | Upstream-Status: Pending | ||
6 | |||
7 | diff --git a/src/maliit/plugins/updateevent.cpp b/src/maliit/plugins/updateevent.cpp | ||
8 | index 06a5228..85b7166 100644 | ||
9 | --- a/src/maliit/plugins/updateevent.cpp | ||
10 | +++ b/src/maliit/plugins/updateevent.cpp | ||
11 | @@ -38,7 +38,7 @@ bool MImUpdateEventPrivate::isFlagSet(Qt::InputMethodHint hint, | ||
12 | bool result = false; | ||
13 | |||
14 | if (update.contains(Maliit::Internal::inputMethodHints)) { | ||
15 | - const Qt::InputMethodHints hints(static_cast<Qt::InputMethodHints>( | ||
16 | + const Qt::InputMethodHints hints(static_cast<int>( | ||
17 | update.value(Maliit::Internal::inputMethodHints).toLongLong())); | ||
18 | |||
19 | result = (hints & hint); | ||
20 | @@ -89,8 +89,8 @@ QStringList MImUpdateEvent::propertiesChanged() const | ||
21 | Qt::InputMethodHints MImUpdateEvent::hints(bool *changed) const | ||
22 | { | ||
23 | Q_D(const MImUpdateEvent); | ||
24 | - return static_cast<Qt::InputMethodHints>( | ||
25 | - d->extractProperty(Maliit::Internal::inputMethodHints, changed).toLongLong()); | ||
26 | + return Qt::InputMethodHints(static_cast<int>( | ||
27 | + d->extractProperty(Maliit::Internal::inputMethodHints, changed).toLongLong())); | ||
28 | } | ||
29 | |||
30 | bool MImUpdateEvent::westernNumericInputEnforced(bool *changed) const | ||
31 | diff --git a/src/mimpluginmanager.cpp b/src/mimpluginmanager.cpp | ||
32 | index 02788a4..3c5c99a 100644 | ||
33 | --- a/src/mimpluginmanager.cpp | ||
34 | +++ b/src/mimpluginmanager.cpp | ||
35 | @@ -1493,7 +1493,7 @@ void MIMPluginManager::handleWidgetStateChanged(unsigned int clientId, | ||
36 | } | ||
37 | } | ||
38 | |||
39 | - const Qt::InputMethodHints lastHints = static_cast<Qt::InputMethodHints>(newState.value(Maliit::Internal::inputMethodHints).toLongLong()); | ||
40 | + const Qt::InputMethodHints lastHints(static_cast<int>(newState.value(Maliit::Internal::inputMethodHints).toLongLong())); | ||
41 | MImUpdateEvent ev(newState, changedProperties, lastHints); | ||
42 | |||
43 | // general notification last | ||