Merge lp:~renatofilho/ubuntu-keyboard/fix-qml-inputMethod-extensions into lp:ubuntu-keyboard

Proposed by Renato Araujo Oliveira Filho
Status: Merged
Approved by: Michael Sheldon
Approved revision: 274
Merged at revision: 276
Proposed branch: lp:~renatofilho/ubuntu-keyboard/fix-qml-inputMethod-extensions
Merge into: lp:ubuntu-keyboard
Diff against target: 30 lines (+3/-1)
2 files modified
src/imports/Ubuntu/Keyboard/Keyboard.pro (+1/-1)
src/imports/Ubuntu/Keyboard/inputmethodextensions.cpp (+2/-0)
To merge this branch: bzr merge lp:~renatofilho/ubuntu-keyboard/fix-qml-inputMethod-extensions
Reviewer Review Type Date Requested Status
Michael Sheldon (community) Approve
PS Jenkins bot continuous-integration Approve
Review via email: mp+245775@code.launchpad.net

Commit message

Make sure that changes on "InputMethod.extensions" property get propagated to maliit.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
Renato Araujo Oliveira Filho (renatofilho) wrote :

Are there any related MPs required for this MP to build/function as expected? NO

Is your branch in sync with latest trunk? YES

Did you perform an exploratory manual test run of your code change and any related functionality on device or emulator? YES

Did you successfully run all tests found in your component's Test Plan on device or emulator? YES

If you changed the UI, was the change specified/approved by design? NO UI CHANGE

If you changed UI labels, did you update the pot file? NO LABEL CHANGE

If you changed the packaging (debian), did you add a core-dev as a reviewer to this MP? NO PACAKGE CHANGE

Revision history for this message
Michael Sheldon (michael-sheldon) wrote :

Did you perform an exploratory manual test run of the code change and any related functionality on device or emulator?

 * Yes

Did CI run pass? If not, please explain why.

 * Yes

Have you checked that submitter has accurately filled out the submitter checklist and has taken no shortcut?

 * Yes

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/imports/Ubuntu/Keyboard/Keyboard.pro'
2--- src/imports/Ubuntu/Keyboard/Keyboard.pro 2014-04-30 15:34:45 +0000
3+++ src/imports/Ubuntu/Keyboard/Keyboard.pro 2015-01-07 18:20:29 +0000
4@@ -1,5 +1,5 @@
5 TEMPLATE = lib
6-QT += qml quick
7+QT += qml quick gui
8 CONFIG += qt plugin no_keywords
9 TARGET = ubuntu-keyboard-qml
10
11
12=== modified file 'src/imports/Ubuntu/Keyboard/inputmethodextensions.cpp'
13--- src/imports/Ubuntu/Keyboard/inputmethodextensions.cpp 2014-04-30 15:34:45 +0000
14+++ src/imports/Ubuntu/Keyboard/inputmethodextensions.cpp 2015-01-07 18:20:29 +0000
15@@ -30,6 +30,7 @@
16 #include "inputmethodextensions.h"
17
18 #include <QtCore>
19+#include <QtGui>
20
21 namespace Ubuntu {
22 namespace Keyboard {
23@@ -83,6 +84,7 @@
24 m_extensions = map;
25 if (m_inputText) {
26 m_inputText->setProperty("__inputMethodExtensions", m_extensions);
27+ qApp->inputMethod()->update(Qt::ImPlatformData);
28 }
29 Q_EMIT inputMethodExtensionsChanged();
30 }

Subscribers

People subscribed via source and target branches