maliit-framework-qt5: bump to latest commit for getting Qt 5.5 compatibility

Signed-off-by: Christophe Chapuis <chris.chapuis@gmail.com>

2 files changed, 1 insertions, 45 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
deleted file mode 100644
index 4f8890f3..00000000
--- a/recipes-qt/maliit/maliit-framework-qt5/qt5.3-fix.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-Fix compatibility with qt-5.3
-
-https://bugs.launchpad.net/ubuntu/+source/maliit-framework/+bug/1323962
-
-Upstream-Status: Pending
-
-diff --git a/src/maliit/plugins/updateevent.cpp b/src/maliit/plugins/updateevent.cpp
-index 06a5228..85b7166 100644
---- a/src/maliit/plugins/updateevent.cpp
-+++ b/src/maliit/plugins/updateevent.cpp
-@@ -38,7 +38,7 @@ bool MImUpdateEventPrivate::isFlagSet(Qt::InputMethodHint hint,
-     bool result = false;
- 
-     if (update.contains(Maliit::Internal::inputMethodHints)) {
--        const Qt::InputMethodHints hints(static_cast<Qt::InputMethodHints>(
-+        const Qt::InputMethodHints hints(static_cast<int>(
-                                              update.value(Maliit::Internal::inputMethodHints).toLongLong()));
- 
-         result = (hints & hint);
-@@ -89,8 +89,8 @@ QStringList MImUpdateEvent::propertiesChanged() const
- Qt::InputMethodHints MImUpdateEvent::hints(bool *changed) const
- {
-     Q_D(const MImUpdateEvent);
--    return static_cast<Qt::InputMethodHints>(
--        d->extractProperty(Maliit::Internal::inputMethodHints, changed).toLongLong());
-+    return Qt::InputMethodHints(static_cast<int>(
-+        d->extractProperty(Maliit::Internal::inputMethodHints, changed).toLongLong()));
- }
- 
- bool MImUpdateEvent::westernNumericInputEnforced(bool *changed) const
-diff --git a/src/mimpluginmanager.cpp b/src/mimpluginmanager.cpp
-index 02788a4..3c5c99a 100644
---- a/src/mimpluginmanager.cpp
-+++ b/src/mimpluginmanager.cpp
-@@ -1493,7 +1493,7 @@ void MIMPluginManager::handleWidgetStateChanged(unsigned int clientId,
-         }
-     }
- 
--    const Qt::InputMethodHints lastHints = static_cast<Qt::InputMethodHints>(newState.value(Maliit::Internal::inputMethodHints).toLongLong());
-+    const Qt::InputMethodHints lastHints(static_cast<int>(newState.value(Maliit::Internal::inputMethodHints).toLongLong()));
-     MImUpdateEvent ev(newState, changedProperties, lastHints);
- 
-     // general notification last
diff --git a/recipes-qt/maliit/maliit-framework-qt5_git.bb b/recipes-qt/maliit/maliit-framework-qt5_git.bb
index 83da8cad..975892d6 100644
--- a/recipes-qt/maliit/maliit-framework-qt5_git.bb
+++ b/recipes-qt/maliit/maliit-framework-qt5_git.bb
@@ -9,10 +9,9 @@ inherit qmake5
 SRC_URI = "git://github.com/maliit/framework.git;branch=master \
     file://0001-Fix-MALIIT_INSTALL_PRF-to-allow-the-build-with-opene.patch \
     file://maliit-server.desktop \
-    file://qt5.3-fix.patch \
 "
 
-SRCREV = "17fdf8699c53ddfb2c15df8e11d46804e782fec5"
+SRCREV = "60b1b10de14f932420313c547ab801daf522d539"
 PV = "0.99.0+git${SRCPV}"