~attente/maliit/maliit-glib

« back to all changes in this revision

Viewing changes to debian/patches/0008-qt5.3-fix.patch

  • Committer: William Hua
  • Date: 2015-11-18 20:37:29 UTC
  • Revision ID: william.hua@canonical.com-20151118203729-ndhsl6tq9pqip529
* debian/patches/series:
* debian/patches/0008-qt5.3-fix.patch:
  - Removed, fixed upstream

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
diff --git a/src/maliit/plugins/updateevent.cpp b/src/maliit/plugins/updateevent.cpp
2
 
index 06a5228..85b7166 100644
3
 
--- a/src/maliit/plugins/updateevent.cpp
4
 
+++ b/src/maliit/plugins/updateevent.cpp
5
 
@@ -38,7 +38,7 @@ bool MImUpdateEventPrivate::isFlagSet(Qt::InputMethodHint hint,
6
 
     bool result = false;
7
 
 
8
 
     if (update.contains(Maliit::Internal::inputMethodHints)) {
9
 
-        const Qt::InputMethodHints hints(static_cast<Qt::InputMethodHints>(
10
 
+        const Qt::InputMethodHints hints(static_cast<int>(
11
 
                                              update.value(Maliit::Internal::inputMethodHints).toLongLong()));
12
 
 
13
 
         result = (hints & hint);
14
 
@@ -89,8 +89,8 @@ QStringList MImUpdateEvent::propertiesChanged() const
15
 
 Qt::InputMethodHints MImUpdateEvent::hints(bool *changed) const
16
 
 {
17
 
     Q_D(const MImUpdateEvent);
18
 
-    return static_cast<Qt::InputMethodHints>(
19
 
-        d->extractProperty(Maliit::Internal::inputMethodHints, changed).toLongLong());
20
 
+    return Qt::InputMethodHints(static_cast<int>(
21
 
+        d->extractProperty(Maliit::Internal::inputMethodHints, changed).toLongLong()));
22
 
 }
23
 
 
24
 
 bool MImUpdateEvent::westernNumericInputEnforced(bool *changed) const
25
 
diff --git a/src/mimpluginmanager.cpp b/src/mimpluginmanager.cpp
26
 
index 02788a4..3c5c99a 100644
27
 
--- a/src/mimpluginmanager.cpp
28
 
+++ b/src/mimpluginmanager.cpp
29
 
@@ -1493,7 +1493,7 @@ void MIMPluginManager::handleWidgetStateChanged(unsigned int clientId,
30
 
         }
31
 
     }
32
 
 
33
 
-    const Qt::InputMethodHints lastHints = static_cast<Qt::InputMethodHints>(newState.value(Maliit::Internal::inputMethodHints).toLongLong());
34
 
+    const Qt::InputMethodHints lastHints(static_cast<int>(newState.value(Maliit::Internal::inputMethodHints).toLongLong()));
35
 
     MImUpdateEvent ev(newState, changedProperties, lastHints);
36
 
 
37
 
     // general notification last