diff -Nru maliit-framework-0.99.0+git20130923+17fdf86/debian/changelog maliit-framework-0.99.0+git20130923+17fdf86/debian/changelog --- maliit-framework-0.99.0+git20130923+17fdf86/debian/changelog 2015-07-15 15:39:10.000000000 +0000 +++ maliit-framework-0.99.0+git20130923+17fdf86/debian/changelog 2015-10-06 08:02:55.000000000 +0000 @@ -1,3 +1,11 @@ +maliit-framework (0.99.0+git20130923+17fdf86-0ubuntu12) wily; urgency=medium + + * Add 0015-fix-plugin-iid.patch to fix keyboard functionality with Qt 5.5, + #ifdef to build also on Qt 5.4. + (LP: #1474690) + + -- Timo Jyrinki Mon, 05 Oct 2015 12:41:54 +0000 + maliit-framework (0.99.0+git20130923+17fdf86-0ubuntu11~gcc5.1) wily; urgency=medium * No-change test rebuild for g++5 ABI transition diff -Nru maliit-framework-0.99.0+git20130923+17fdf86/debian/patches/0015-fix-plugin-iid.patch maliit-framework-0.99.0+git20130923+17fdf86/debian/patches/0015-fix-plugin-iid.patch --- maliit-framework-0.99.0+git20130923+17fdf86/debian/patches/0015-fix-plugin-iid.patch 1970-01-01 00:00:00.000000000 +0000 +++ maliit-framework-0.99.0+git20130923+17fdf86/debian/patches/0015-fix-plugin-iid.patch 2015-10-06 08:01:53.000000000 +0000 @@ -0,0 +1,22 @@ +Description: Replace hard coded plugin IID string + Replace hard coded string with QPlatformInputContextFactoryInterface_iid, + this fixes compatibility with Qt 5.5 where this string has changed. +Author: Michael Sheldon +Bug: https://github.com/maliit/framework/issues/13 +Bug-Ubuntu: https://launchpad.net/bugs/1474690 +Forwarded: https://github.com/maliit/framework/pull/14 + +--- maliit-framework-0.99.0+git20130923+17fdf86.orig/input-context/main.cpp ++++ maliit-framework-0.99.0+git20130923+17fdf86/input-context/main.cpp +@@ -22,7 +22,11 @@ + class MaliitPlatformInputContextPlugin: public QPlatformInputContextPlugin + { + Q_OBJECT ++#if QT_VERSION < QT_VERSION_CHECK(5, 5, 0) + Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QPlatformInputContextFactoryInterface" FILE "maliit.json") ++#else ++ Q_PLUGIN_METADATA(IID QPlatformInputContextFactoryInterface_iid FILE "maliit.json") ++#endif + + public: + QPlatformInputContext *create(const QString&, const QStringList&); diff -Nru maliit-framework-0.99.0+git20130923+17fdf86/debian/patches/series maliit-framework-0.99.0+git20130923+17fdf86/debian/patches/series --- maliit-framework-0.99.0+git20130923+17fdf86/debian/patches/series 2015-06-04 11:09:41.000000000 +0000 +++ maliit-framework-0.99.0+git20130923+17fdf86/debian/patches/series 2015-08-03 11:57:01.000000000 +0000 @@ -11,3 +11,4 @@ 0012-fix-focus-changes.patch 0013-check-testability-environment-variable.patch 0014-fix-building-with-qt5.5.patch +0015-fix-plugin-iid.patch