Merge lp:~michael-sheldon/ubuntu-keyboard/custom-plugin-paths into lp:ubuntu-keyboard

[Michael Sheldon]

Allow the keyboard to load plugins from additional paths specified via gsettings.

Allow the keyboard to load plugins from additional paths specified via gsettings.

[Michael Sheldon (michael-sheldon)]

This depends on https://code.launchpad.net/~michael-sheldon/ubuntu-system-settings/support-additional-keyboard-plugin-paths/+merge/256286 which makes it possible to select custom plugins through system settings.

It can be tested by installing the ubuntu-keyboard-tests package and adding "/usr/share/maliit/tests/ubuntu-keyboard/" to the plugin paths by running:

gsettings set com.canonical.keyboard.maliit plugin-paths "['/custom/share/maliit/plugins/com/ubuntu/lib', '/usr/share/maliit/tests/ubuntu-keyboard/']"

A layout called "Testlayout" should then be displayed in the settings panel.

[lp:~michael-sheldon/ubuntu-keyboard/custom-plugin-paths]

350. By Michael Sheldon on 2015-04-15

Merge from trunk

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:349
http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-ci/579/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2238
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-amd64-ci/80
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-armhf-ci/80
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-armhf-ci/80/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-i386-ci/80
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1964
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2236
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2236/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/19640

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-keyboard-ci/579/rebuild

review: Needs Fixing (continuous-integration)

[lp:~michael-sheldon/ubuntu-keyboard/custom-plugin-paths]

351. By Michael Sheldon on 2015-04-15

Install missing qmldir for new keys module

352. By Michael Sheldon on 2015-04-15

Handle plugin path changes without requiring a restart of maliit-server

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:351
http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-ci/580/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2247
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-amd64-ci/81
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-armhf-ci/81
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-armhf-ci/81/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-i386-ci/81
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1973
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2245
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2245/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/19652

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-keyboard-ci/580/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:352
http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-ci/581/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2260
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-amd64-ci/82
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-armhf-ci/82
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-armhf-ci/82/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-i386-ci/82
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1985
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2258
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2258/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/19668

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-keyboard-ci/581/rebuild

review: Needs Fixing (continuous-integration)

[lp:~michael-sheldon/ubuntu-keyboard/custom-plugin-paths]

353. By Michael Sheldon on 2015-04-17

Add language key to testlayout for easier testing

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:353
http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-ci/584/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2315
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-amd64-ci/85
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-armhf-ci/85
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-armhf-ci/85/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-i386-ci/85
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2031
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2313
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2313/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/19754

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-keyboard-ci/584/rebuild

review: Approve (continuous-integration)

[Michael Sheldon (michael-sheldon)]

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

 * Yes, this system setting MR is required for plugins in custom locations to be activated: https://code.launchpad.net/~michael-sheldon/ubuntu-system-settings/support-additional-keyboard-plugin-paths/+merge/256286

Is your branch in sync with latest trunk (e.g. bzr pull lp:trunk -> no changes)

 * 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 (https://wiki.ubuntu.com/Process/Merges/TestPlan/ubuntu-keyboard) on device or emulator?

 * Yes

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

 * No change

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

 * No change

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

 * Yes

[Ken VanDine (ken-vandine)]

You should probably make the autopilot package depend on the same version of the ubuntu-keyboard-tests package

review: Needs Fixing (packaging)

[lp:~michael-sheldon/ubuntu-keyboard/custom-plugin-paths]

354. By Michael Sheldon on 2015-04-20

Update autopilot test dependencies to depend on specific version of keyboard tests package

[Ken VanDine (ken-vandine)]

Packaging looks good now

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:354
http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-ci/585/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2349
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-amd64-ci/86
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-armhf-ci/86
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-armhf-ci/86/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-i386-ci/86
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2058
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2347
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2347/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/19796

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-keyboard-ci/585/rebuild

review: Needs Fixing (continuous-integration)

=== modified file 'data/schemas/com.canonical.keyboard.maliit.gschema.xml'
--- data/schemas/com.canonical.keyboard.maliit.gschema.xml	2015-02-09 21:14:44 +0000
+++ data/schemas/com.canonical.keyboard.maliit.gschema.xml	2015-04-20 15:33:53 +0000
@@ -66,5 +66,10 @@
       <description>Never show the keyboard (e.g. because a hardware keyboard has been connected.)</description>
       <default>false</default>
     </key>
+    <key name="plugin-paths" type="as">
+      <summary>Plugin paths</summary>
+      <description>A list of locations to search for keyboard layout plugins in addition to the keyboard data directory.</description>
+      <default>['/custom/share/maliit/plugins/com/ubuntu/lib/']</default>
+    </key>
   </schema>
 </schemalist>

=== modified file 'debian/control'
--- debian/control	2015-01-19 14:06:48 +0000
+++ debian/control	2015-04-20 15:33:53 +0000
@@ -83,6 +83,7 @@
          ubuntu-keyboard-english (>= ${source:Version}),
          ubuntu-keyboard-german (>= ${source:Version}),
          ubuntu-keyboard-spanish (>= ${source:Version}),
+         ubuntu-keyboard-tests (>= ${source:Version}),
          ubuntu-ui-toolkit-autopilot
 Description: Tests and emulators package for ubuntu-keyboard
  Autopilot tests for the ubuntu-keyboard package

=== modified file 'plugins/ar/qml/Keyboard_ar.qml'
--- plugins/ar/qml/Keyboard_ar.qml	2015-03-13 12:07:08 +0000
+++ plugins/ar/qml/Keyboard_ar.qml	2015-04-20 15:33:53 +0000
@@ -15,8 +15,7 @@
  */
 
 import QtQuick 2.0
-import "../../keys"
-import "../../keys/key_constants.js" as UI
+import keys 1.0
 
 KeyPad {
     anchors.fill: parent

=== modified file 'plugins/ar/qml/Keyboard_ar_email.qml'
--- plugins/ar/qml/Keyboard_ar_email.qml	2015-03-13 12:07:08 +0000
+++ plugins/ar/qml/Keyboard_ar_email.qml	2015-04-20 15:33:53 +0000
@@ -15,8 +15,7 @@
  */
 
 import QtQuick 2.0
-import "../../keys"
-import "../../keys/key_constants.js" as UI
+import keys 1.0
 
 KeyPad {
     anchors.fill: parent

=== modified file 'plugins/ar/qml/Keyboard_ar_url.qml'
--- plugins/ar/qml/Keyboard_ar_url.qml	2015-03-13 12:07:08 +0000
+++ plugins/ar/qml/Keyboard_ar_url.qml	2015-04-20 15:33:53 +0000
@@ -15,8 +15,7 @@
  */
 
 import QtQuick 2.0
-import "../../keys"
-import "../../keys/key_constants.js" as UI
+import keys 1.0
 
 KeyPad {
     anchors.fill: parent

=== modified file 'plugins/ar/qml/Keyboard_ar_url_search.qml'
--- plugins/ar/qml/Keyboard_ar_url_search.qml	2015-03-13 12:07:08 +0000
+++ plugins/ar/qml/Keyboard_ar_url_search.qml	2015-04-20 15:33:53 +0000
@@ -15,8 +15,7 @@
  */
 
 import QtQuick 2.0
-import "../../keys"
-import "../../keys/key_constants.js" as UI
+import keys 1.0
 
 KeyPad {
     anchors.fill: parent

=== modified file 'plugins/ar/src/src.pro'
--- plugins/ar/src/src.pro	2014-05-20 09:53:45 +0000
+++ plugins/ar/src/src.pro	2015-04-20 15:33:53 +0000
@@ -15,7 +15,7 @@
 HEADERS         = \
     arabicplugin.h
 
-TARGET          = $$qtLibraryTarget(arabicplugin)
+TARGET          = $$qtLibraryTarget(arplugin)
 
 EXAMPLE_FILES = arabicplugin.json
 

=== modified file 'plugins/az/qml/Keyboard_az.qml'
--- plugins/az/qml/Keyboard_az.qml	2015-03-13 12:07:08 +0000
+++ plugins/az/qml/Keyboard_az.qml	2015-04-20 15:33:53 +0000
@@ -15,8 +15,7 @@
  */
 
 import QtQuick 2.0
-import "../../keys"
-import "../../keys/key_constants.js" as UI
+import keys 1.0
 
 KeyPad {
     anchors.fill: parent

=== modified file 'plugins/az/qml/Keyboard_az_email.qml'
--- plugins/az/qml/Keyboard_az_email.qml	2015-03-13 12:07:08 +0000
+++ plugins/az/qml/Keyboard_az_email.qml	2015-04-20 15:33:53 +0000
@@ -15,8 +15,7 @@
  */
 
 import QtQuick 2.0
-import "../../keys"
-import "../../keys/key_constants.js" as UI
+import keys 1.0
 
 KeyPad {
     anchors.fill: parent

=== modified file 'plugins/az/qml/Keyboard_az_url.qml'
--- plugins/az/qml/Keyboard_az_url.qml	2015-03-13 12:07:08 +0000
+++ plugins/az/qml/Keyboard_az_url.qml	2015-04-20 15:33:53 +0000
@@ -15,8 +15,7 @@
  */
 
 import QtQuick 2.0
-import "../../keys"
-import "../../keys/key_constants.js" as UI
+import keys 1.0
 
 KeyPad {
     anchors.fill: parent

=== modified file 'plugins/az/qml/Keyboard_az_url_search.qml'
--- plugins/az/qml/Keyboard_az_url_search.qml	2015-03-13 12:07:08 +0000
+++ plugins/az/qml/Keyboard_az_url_search.qml	2015-04-20 15:33:53 +0000
@@ -15,8 +15,7 @@
  */
 
 import QtQuick 2.0
-import "../../keys"
-import "../../keys/key_constants.js" as UI
+import keys 1.0
 
 KeyPad {
     anchors.fill: parent

=== modified file 'plugins/az/src/src.pro'
--- plugins/az/src/src.pro	2014-11-12 15:21:10 +0000
+++ plugins/az/src/src.pro	2015-04-20 15:33:53 +0000
@@ -15,7 +15,7 @@
 HEADERS         = \
     azerbaijaniplugin.h
 
-TARGET          = $$qtLibraryTarget(azerbaijaniplugin)
+TARGET          = $$qtLibraryTarget(azplugin)
 
 EXAMPLE_FILES = azerbaijaniplugin.json
 

=== modified file 'plugins/bs/qml/Keyboard_bs.qml'
--- plugins/bs/qml/Keyboard_bs.qml	2015-03-13 12:07:08 +0000
+++ plugins/bs/qml/Keyboard_bs.qml	2015-04-20 15:33:53 +0000
@@ -15,8 +15,7 @@
  */
 
 import QtQuick 2.0
-import "../../keys"
-import "../../keys/key_constants.js" as UI
+import keys 1.0
 
 KeyPad {
     anchors.fill: parent

=== modified file 'plugins/bs/qml/Keyboard_bs_email.qml'
--- plugins/bs/qml/Keyboard_bs_email.qml	2015-03-13 12:07:08 +0000
+++ plugins/bs/qml/Keyboard_bs_email.qml	2015-04-20 15:33:53 +0000
@@ -15,8 +15,7 @@
  */
 
 import QtQuick 2.0
-import "../../keys"
-import "../../keys/key_constants.js" as UI
+import keys 1.0
 
 KeyPad {
     anchors.fill: parent

=== modified file 'plugins/bs/qml/Keyboard_bs_url.qml'
--- plugins/bs/qml/Keyboard_bs_url.qml	2015-03-13 12:07:08 +0000
+++ plugins/bs/qml/Keyboard_bs_url.qml	2015-04-20 15:33:53 +0000
@@ -15,8 +15,7 @@
  */
 
 import QtQuick 2.0
-import "../../keys"
-import "../../keys/key_constants.js" as UI
+import keys 1.0
 
 KeyPad {
     anchors.fill: parent

=== modified file 'plugins/bs/qml/Keyboard_bs_url_search.qml'
--- plugins/bs/qml/Keyboard_bs_url_search.qml	2015-03-13 12:07:08 +0000
+++ plugins/bs/qml/Keyboard_bs_url_search.qml	2015-04-20 15:33:53 +0000
@@ -15,8 +15,7 @@
  */
 
 import QtQuick 2.0
-import "../../keys"
-import "../../keys/key_constants.js" as UI
+import keys 1.0
 
 KeyPad {
     anchors.fill: parent

=== modified file 'plugins/bs/src/src.pro'
--- plugins/bs/src/src.pro	2014-10-30 21:51:14 +0000
+++ plugins/bs/src/src.pro	2015-04-20 15:33:53 +0000
@@ -15,7 +15,7 @@
 HEADERS         = \
     bosnianplugin.h
 
-TARGET          = $$qtLibraryTarget(bosnianplugin)
+TARGET          = $$qtLibraryTarget(bsplugin)
 
 EXAMPLE_FILES = bosnianplugin.json
 

=== modified file 'plugins/ca/qml/Keyboard_ca.qml'
--- plugins/ca/qml/Keyboard_ca.qml	2015-03-16 13:06:37 +0000
+++ plugins/ca/qml/Keyboard_ca.qml	2015-04-20 15:33:53 +0000
@@ -15,8 +15,7 @@
  */
 
 import QtQuick 2.0
-import "../../keys"
-import "../../keys/key_constants.js" as UI
+import keys 1.0
 
 KeyPad {
     anchors.fill: parent

=== modified file 'plugins/ca/qml/Keyboard_ca_email.qml'
--- plugins/ca/qml/Keyboard_ca_email.qml	2015-03-16 13:06:37 +0000
+++ plugins/ca/qml/Keyboard_ca_email.qml	2015-04-20 15:33:53 +0000
@@ -15,8 +15,7 @@
  */
 
 import QtQuick 2.0
-import "../../keys"
-import "../../keys/key_constants.js" as UI
+import keys 1.0
 
 KeyPad {
     anchors.fill: parent

=== modified file 'plugins/ca/qml/Keyboard_ca_url.qml'
--- plugins/ca/qml/Keyboard_ca_url.qml	2015-03-16 13:06:37 +0000
+++ plugins/ca/qml/Keyboard_ca_url.qml	2015-04-20 15:33:53 +0000
@@ -15,8 +15,7 @@
  */
 
 import QtQuick 2.0
-import "../../keys"
-import "../../keys/key_constants.js" as UI
+import keys 1.0
 
 KeyPad {
     anchors.fill: parent

=== modified file 'plugins/ca/qml/Keyboard_ca_url_search.qml'
--- plugins/ca/qml/Keyboard_ca_url_search.qml	2015-03-16 13:06:37 +0000
+++ plugins/ca/qml/Keyboard_ca_url_search.qml	2015-04-20 15:33:53 +0000
@@ -15,8 +15,7 @@
  */
 
 import QtQuick 2.0
-import "../../keys"
-import "../../keys/key_constants.js" as UI
+import keys 1.0
 
 KeyPad {
     anchors.fill: parent

=== modified file 'plugins/ca/src/src.pro'
--- plugins/ca/src/src.pro	2015-02-02 15:09:28 +0000
+++ plugins/ca/src/src.pro	2015-04-20 15:33:53 +0000
@@ -15,7 +15,7 @@
 HEADERS         = \
     catalanplugin.h
 
-TARGET          = $$qtLibraryTarget(catalanplugin)
+TARGET          = $$qtLibraryTarget(caplugin)
 
 EXAMPLE_FILES = catalanplugin.json
 

=== modified file 'plugins/cs/qml/Keyboard_cs.qml'
--- plugins/cs/qml/Keyboard_cs.qml	2015-03-13 12:07:08 +0000
+++ plugins/cs/qml/Keyboard_cs.qml	2015-04-20 15:33:53 +0000
@@ -15,8 +15,7 @@
  */
 
 import QtQuick 2.0
-import "../../keys"
-import "../../keys/key_constants.js" as UI
+import keys 1.0
 
 KeyPad {
     anchors.fill: parent

=== modified file 'plugins/cs/qml/Keyboard_cs_email.qml'
--- plugins/cs/qml/Keyboard_cs_email.qml	2015-03-13 12:07:08 +0000
+++ plugins/cs/qml/Keyboard_cs_email.qml	2015-04-20 15:33:53 +0000
@@ -15,8 +15,7 @@
  */
 
 import QtQuick 2.0
-import "../../keys"
-import "../../keys/key_constants.js" as UI
+import keys 1.0
 
 KeyPad {
     anchors.fill: parent

=== modified file 'plugins/cs/qml/Keyboard_cs_url.qml'
--- plugins/cs/qml/Keyboard_cs_url.qml	2015-03-13 12:07:08 +0000
+++ plugins/cs/qml/Keyboard_cs_url.qml	2015-04-20 15:33:53 +0000
@@ -15,8 +15,7 @@
  */
 
 import QtQuick 2.0
-import "../../keys"
-import "../../keys/key_constants.js" as UI
+import keys 1.0
 
 KeyPad {
     anchors.fill: parent

=== modified file 'plugins/cs/qml/Keyboard_cs_url_search.qml'
--- plugins/cs/qml/Keyboard_cs_url_search.qml	2015-03-13 12:07:08 +0000
+++ plugins/cs/qml/Keyboard_cs_url_search.qml	2015-04-20 15:33:53 +0000
@@ -15,8 +15,7 @@
  */
 
 import QtQuick 2.0
-import "../../keys"
-import "../../keys/key_constants.js" as UI
+import keys 1.0
 
 KeyPad {
     anchors.fill: parent

=== modified file 'plugins/cs/src/src.pro'
--- plugins/cs/src/src.pro	2014-05-20 09:53:45 +0000
+++ plugins/cs/src/src.pro	2015-04-20 15:33:53 +0000
@@ -15,7 +15,7 @@
 HEADERS         = \
     czechplugin.h
 
-TARGET          = $$qtLibraryTarget(czechplugin)
+TARGET          = $$qtLibraryTarget(csplugin)
 
 EXAMPLE_FILES = czechplugin.json
 

=== modified file 'plugins/da/qml/Keyboard_da.qml'
--- plugins/da/qml/Keyboard_da.qml	2015-03-13 12:07:08 +0000
+++ plugins/da/qml/Keyboard_da.qml	2015-04-20 15:33:53 +0000
@@ -15,8 +15,7 @@
  */
 
 import QtQuick 2.0
-import "../../keys"
-import "../../keys/key_constants.js" as UI
+import keys 1.0
 
 KeyPad {
     anchors.fill: parent

=== modified file 'plugins/da/qml/Keyboard_da_email.qml'
--- plugins/da/qml/Keyboard_da_email.qml	2015-03-13 12:07:08 +0000
+++ plugins/da/qml/Keyboard_da_email.qml	2015-04-20 15:33:53 +0000
@@ -15,8 +15,7 @@
  */
 
 import QtQuick 2.0
-import "../../keys"
-import "../../keys/key_constants.js" as UI
+import keys 1.0
 
 KeyPad {
     anchors.fill: parent

=== modified file 'plugins/da/qml/Keyboard_da_url.qml'
--- plugins/da/qml/Keyboard_da_url.qml	2015-03-13 12:07:08 +0000
+++ plugins/da/qml/Keyboard_da_url.qml	2015-04-20 15:33:53 +0000
@@ -15,8 +15,7 @@
  */
 
 import QtQuick 2.0
-import "../../keys"
-import "../../keys/key_constants.js" as UI
+import keys 1.0
 
 KeyPad {
     anchors.fill: parent

=== modified file 'plugins/da/qml/Keyboard_da_url_search.qml'
--- plugins/da/qml/Keyboard_da_url_search.qml	2015-03-13 12:07:08 +0000
+++ plugins/da/qml/Keyboard_da_url_search.qml	2015-04-20 15:33:53 +0000
@@ -15,8 +15,7 @@
  */
 
 import QtQuick 2.0
-import "../../keys"
-import "../../keys/key_constants.js" as UI
+import keys 1.0
 
 KeyPad {
     anchors.fill: parent

=== modified file 'plugins/da/src/src.pro'
--- plugins/da/src/src.pro	2015-02-02 15:09:28 +0000
+++ plugins/da/src/src.pro	2015-04-20 15:33:53 +0000
@@ -15,7 +15,7 @@
 HEADERS         = \
     danishplugin.h
 
-TARGET          = $$qtLibraryTarget(danishplugin)
+TARGET          = $$qtLibraryTarget(daplugin)
 
 EXAMPLE_FILES = danishplugin.json
 

=== modified file 'plugins/de/qml/Keyboard_de.qml'
--- plugins/de/qml/Keyboard_de.qml	2015-03-13 12:07:08 +0000
+++ plugins/de/qml/Keyboard_de.qml	2015-04-20 15:33:53 +0000
@@ -15,8 +15,7 @@
  */
 
 import QtQuick 2.0
-import "../../keys"
-import "../../keys/key_constants.js" as UI
+import keys 1.0
 
 KeyPad {
     anchors.fill: parent

=== modified file 'plugins/de/qml/Keyboard_de_email.qml'
--- plugins/de/qml/Keyboard_de_email.qml	2015-03-13 12:07:08 +0000
+++ plugins/de/qml/Keyboard_de_email.qml	2015-04-20 15:33:53 +0000
@@ -15,8 +15,7 @@
  */
 
 import QtQuick 2.0
-import "../../keys"
-import "../../keys/key_constants.js" as UI
+import keys 1.0
 
 KeyPad {
     anchors.fill: parent

=== modified file 'plugins/de/qml/Keyboard_de_url.qml'
--- plugins/de/qml/Keyboard_de_url.qml	2015-03-13 12:07:08 +0000
+++ plugins/de/qml/Keyboard_de_url.qml	2015-04-20 15:33:53 +0000
@@ -15,8 +15,7 @@
  */
 
 import QtQuick 2.0
-import "../../keys"
-import "../../keys/key_constants.js" as UI
+import keys 1.0
 
 KeyPad {
     anchors.fill: parent

=== modified file 'plugins/de/qml/Keyboard_de_url_search.qml'
--- plugins/de/qml/Keyboard_de_url_search.qml	2015-03-13 12:07:08 +0000
+++ plugins/de/qml/Keyboard_de_url_search.qml	2015-04-20 15:33:53 +0000
@@ -15,8 +15,7 @@
  */
 
 import QtQuick 2.0
-import "../../keys"
-import "../../keys/key_constants.js" as UI
+import keys 1.0
 
 KeyPad {
     anchors.fill: parent

=== modified file 'plugins/de/src/src.pro'
--- plugins/de/src/src.pro	2014-05-20 09:53:45 +0000
+++ plugins/de/src/src.pro	2015-04-20 15:33:53 +0000
@@ -15,7 +15,7 @@
 HEADERS         = \
     germanplugin.h
 
-TARGET          = $$qtLibraryTarget(germanplugin)
+TARGET          = $$qtLibraryTarget(deplugin)
 
 EXAMPLE_FILES = germanplugin.json
 

=== modified file 'plugins/emoji/qml/Keyboard_emoji.qml'
--- plugins/emoji/qml/Keyboard_emoji.qml	2015-01-12 17:59:04 +0000
+++ plugins/emoji/qml/Keyboard_emoji.qml	2015-04-20 15:33:53 +0000
@@ -15,8 +15,7 @@
  */
 
 import QtQuick 2.0
-import "../../keys"
-import "../../keys/key_constants.js" as UI
+import keys 1.0
 import "emoji.js" as Emoji
 
 KeyPad {

=== modified file 'plugins/en/qml/Keyboard_en.qml'
--- plugins/en/qml/Keyboard_en.qml	2015-03-13 12:07:08 +0000
+++ plugins/en/qml/Keyboard_en.qml	2015-04-20 15:33:53 +0000
@@ -15,8 +15,7 @@
  */
 
 import QtQuick 2.0
-import "../../keys"
-import "../../keys/key_constants.js" as UI
+import keys 1.0
 
 KeyPad {
     anchors.fill: parent

=== modified file 'plugins/en/qml/Keyboard_en_email.qml'
--- plugins/en/qml/Keyboard_en_email.qml	2015-03-13 12:07:08 +0000
+++ plugins/en/qml/Keyboard_en_email.qml	2015-04-20 15:33:53 +0000
@@ -15,8 +15,7 @@
  */
 
 import QtQuick 2.0
-import "../../keys"
-import "../../keys/key_constants.js" as UI
+import keys 1.0
 
 KeyPad {
     anchors.fill: parent

=== modified file 'plugins/en/qml/Keyboard_en_url.qml'
--- plugins/en/qml/Keyboard_en_url.qml	2015-03-13 12:07:08 +0000
+++ plugins/en/qml/Keyboard_en_url.qml	2015-04-20 15:33:53 +0000
@@ -15,8 +15,7 @@
  */
 
 import QtQuick 2.0
-import "../../keys"
-import "../../keys/key_constants.js" as UI
+import keys 1.0
 
 KeyPad {
     anchors.fill: parent

=== modified file 'plugins/en/qml/Keyboard_en_url_search.qml'
--- plugins/en/qml/Keyboard_en_url_search.qml	2015-03-13 12:07:08 +0000
+++ plugins/en/qml/Keyboard_en_url_search.qml	2015-04-20 15:33:53 +0000
@@ -15,8 +15,7 @@
  */
 
 import QtQuick 2.0
-import "../../keys"
-import "../../keys/key_constants.js" as UI
+import keys 1.0
 
 KeyPad {
     anchors.fill: parent

=== modified file 'plugins/en/src/src.pro'
--- plugins/en/src/src.pro	2015-02-02 15:09:28 +0000
+++ plugins/en/src/src.pro	2015-04-20 15:33:53 +0000
@@ -15,7 +15,7 @@
 HEADERS         = \
     englishplugin.h
 
-TARGET          = $$qtLibraryTarget(englishplugin)
+TARGET          = $$qtLibraryTarget(enplugin)
 
 EXAMPLE_FILES = englishplugin.json
 

=== modified file 'plugins/es/qml/Keyboard_es.qml'
--- plugins/es/qml/Keyboard_es.qml	2015-03-13 12:07:08 +0000
+++ plugins/es/qml/Keyboard_es.qml	2015-04-20 15:33:53 +0000
@@ -15,8 +15,7 @@
  */
 
 import QtQuick 2.0
-import "../../keys"
-import "../../keys/key_constants.js" as UI
+import keys 1.0
 
 KeyPad {
     anchors.fill: parent

=== modified file 'plugins/es/qml/Keyboard_es_email.qml'
--- plugins/es/qml/Keyboard_es_email.qml	2015-03-13 12:07:08 +0000
+++ plugins/es/qml/Keyboard_es_email.qml	2015-04-20 15:33:53 +0000
@@ -15,8 +15,7 @@
  */
 
 import QtQuick 2.0
-import "../../keys"
-import "../../keys/key_constants.js" as UI
+import keys 1.0
 
 KeyPad {
     anchors.fill: parent

=== modified file 'plugins/es/qml/Keyboard_es_url.qml'
--- plugins/es/qml/Keyboard_es_url.qml	2015-03-13 12:07:08 +0000
+++ plugins/es/qml/Keyboard_es_url.qml	2015-04-20 15:33:53 +0000
@@ -15,8 +15,7 @@
  */
 
 import QtQuick 2.0
-import "../../keys"
-import "../../keys/key_constants.js" as UI
+import keys 1.0
 
 KeyPad {
     anchors.fill: parent

=== modified file 'plugins/es/qml/Keyboard_es_url_search.qml'
--- plugins/es/qml/Keyboard_es_url_search.qml	2015-03-13 12:07:08 +0000
+++ plugins/es/qml/Keyboard_es_url_search.qml	2015-04-20 15:33:53 +0000
@@ -15,8 +15,7 @@
  */
 
 import QtQuick 2.0
-import "../../keys"
-import "../../keys/key_constants.js" as UI
+import keys 1.0
 
 KeyPad {
     anchors.fill: parent

=== modified file 'plugins/es/src/src.pro'
--- plugins/es/src/src.pro	2014-05-20 09:53:45 +0000
+++ plugins/es/src/src.pro	2015-04-20 15:33:53 +0000
@@ -15,7 +15,7 @@
 HEADERS         = \
     spanishplugin.h
 
-TARGET          = $$qtLibraryTarget(spanishplugin)
+TARGET          = $$qtLibraryTarget(esplugin)
 
 EXAMPLE_FILES = spanishplugin.json
 

=== modified file 'plugins/fi/qml/Keyboard_fi.qml'
--- plugins/fi/qml/Keyboard_fi.qml	2015-03-13 12:07:08 +0000
+++ plugins/fi/qml/Keyboard_fi.qml	2015-04-20 15:33:53 +0000
@@ -15,8 +15,7 @@
  */
 
 import QtQuick 2.0
-import "../../keys"
-import "../../keys/key_constants.js" as UI
+import keys 1.0
 
 KeyPad {
     anchors.fill: parent

=== modified file 'plugins/fi/qml/Keyboard_fi_email.qml'
--- plugins/fi/qml/Keyboard_fi_email.qml	2014-11-27 16:57:43 +0000
+++ plugins/fi/qml/Keyboard_fi_email.qml	2015-04-20 15:33:53 +0000
@@ -15,8 +15,7 @@
  */
 
 import QtQuick 2.0
-import "../../keys"
-import "../../keys/key_constants.js" as UI
+import keys 1.0
 
 KeyPad {
     anchors.fill: parent

=== modified file 'plugins/fi/qml/Keyboard_fi_url.qml'
--- plugins/fi/qml/Keyboard_fi_url.qml	2014-11-27 16:57:43 +0000
+++ plugins/fi/qml/Keyboard_fi_url.qml	2015-04-20 15:33:53 +0000
@@ -15,8 +15,7 @@
  */
 
 import QtQuick 2.0
-import "../../keys"
-import "../../keys/key_constants.js" as UI
+import keys 1.0
 
 KeyPad {
     anchors.fill: parent

=== modified file 'plugins/fi/qml/Keyboard_fi_url_search.qml'
--- plugins/fi/qml/Keyboard_fi_url_search.qml	2014-11-27 16:57:43 +0000
+++ plugins/fi/qml/Keyboard_fi_url_search.qml	2015-04-20 15:33:53 +0000
@@ -15,8 +15,7 @@
  */
 
 import QtQuick 2.0
-import "../../keys"
-import "../../keys/key_constants.js" as UI
+import keys 1.0
 
 KeyPad {
     anchors.fill: parent

=== modified file 'plugins/fi/src/src.pro'
--- plugins/fi/src/src.pro	2014-05-20 09:53:45 +0000
+++ plugins/fi/src/src.pro	2015-04-20 15:33:53 +0000
@@ -15,7 +15,7 @@
 HEADERS         = \
     finnishplugin.h
 
-TARGET          = $$qtLibraryTarget(finnishplugin)
+TARGET          = $$qtLibraryTarget(fiplugin)
 
 EXAMPLE_FILES = finnishplugin.json
 

=== modified file 'plugins/fr/qml/Keyboard_fr.qml'
--- plugins/fr/qml/Keyboard_fr.qml	2015-03-13 12:07:08 +0000
+++ plugins/fr/qml/Keyboard_fr.qml	2015-04-20 15:33:53 +0000
@@ -15,8 +15,7 @@
  */
 
 import QtQuick 2.0
-import "../../keys"
-import "../../keys/key_constants.js" as UI
+import keys 1.0
 
 KeyPad {
     anchors.fill: parent

=== modified file 'plugins/fr/qml/Keyboard_fr_email.qml'
--- plugins/fr/qml/Keyboard_fr_email.qml	2015-03-13 12:07:08 +0000
+++ plugins/fr/qml/Keyboard_fr_email.qml	2015-04-20 15:33:53 +0000
@@ -15,8 +15,7 @@
  */
 
 import QtQuick 2.0
-import "../../keys"
-import "../../keys/key_constants.js" as UI
+import keys 1.0
 
 KeyPad {
     anchors.fill: parent

=== modified file 'plugins/fr/qml/Keyboard_fr_url.qml'
--- plugins/fr/qml/Keyboard_fr_url.qml	2015-03-13 12:07:08 +0000
+++ plugins/fr/qml/Keyboard_fr_url.qml	2015-04-20 15:33:53 +0000
@@ -15,8 +15,7 @@
  */
 
 import QtQuick 2.0
-import "../../keys"
-import "../../keys/key_constants.js" as UI
+import keys 1.0
 
 KeyPad {
     anchors.fill: parent

=== modified file 'plugins/fr/qml/Keyboard_fr_url_search.qml'
--- plugins/fr/qml/Keyboard_fr_url_search.qml	2015-03-13 12:07:08 +0000
+++ plugins/fr/qml/Keyboard_fr_url_search.qml	2015-04-20 15:33:53 +0000
@@ -15,8 +15,7 @@
  */
 
 import QtQuick 2.0
-import "../../keys"
-import "../../keys/key_constants.js" as UI
+import keys 1.0
 
 KeyPad {
     anchors.fill: parent

=== modified file 'plugins/fr/src/src.pro'
--- plugins/fr/src/src.pro	2015-02-02 15:09:28 +0000
+++ plugins/fr/src/src.pro	2015-04-20 15:33:53 +0000
@@ -15,7 +15,7 @@
 HEADERS         = \
     frenchplugin.h
 
-TARGET          = $$qtLibraryTarget(frenchplugin)
+TARGET          = $$qtLibraryTarget(frplugin)
 
 EXAMPLE_FILES = frenchplugin.json
 

=== modified file 'plugins/he/qml/Keyboard_he.qml'
--- plugins/he/qml/Keyboard_he.qml	2015-03-13 15:58:30 +0000
+++ plugins/he/qml/Keyboard_he.qml	2015-04-20 15:33:53 +0000
@@ -15,8 +15,7 @@
  */
 
 import QtQuick 2.0
-import "../../keys"
-import "../../keys/key_constants.js" as UI
+import keys 1.0
 
 KeyPad {
     anchors.fill: parent

=== modified file 'plugins/he/qml/Keyboard_he_email.qml'
--- plugins/he/qml/Keyboard_he_email.qml	2015-03-13 15:58:30 +0000
+++ plugins/he/qml/Keyboard_he_email.qml	2015-04-20 15:33:53 +0000
@@ -15,8 +15,7 @@
  */
 
 import QtQuick 2.0
-import "../../keys"
-import "../../keys/key_constants.js" as UI
+import keys 1.0
 
 KeyPad {
     anchors.fill: parent

=== modified file 'plugins/he/qml/Keyboard_he_url.qml'
--- plugins/he/qml/Keyboard_he_url.qml	2015-03-13 15:58:30 +0000
+++ plugins/he/qml/Keyboard_he_url.qml	2015-04-20 15:33:53 +0000
@@ -15,8 +15,7 @@
  */
 
 import QtQuick 2.0
-import "../../keys"
-import "../../keys/key_constants.js" as UI
+import keys 1.0
 
 KeyPad {
     anchors.fill: parent

=== modified file 'plugins/he/qml/Keyboard_he_url_search.qml'
--- plugins/he/qml/Keyboard_he_url_search.qml	2015-03-13 15:58:30 +0000
+++ plugins/he/qml/Keyboard_he_url_search.qml	2015-04-20 15:33:53 +0000
@@ -15,8 +15,7 @@
  */
 
 import QtQuick 2.0
-import "../../keys"
-import "../../keys/key_constants.js" as UI
+import keys 1.0
 
 KeyPad {
     anchors.fill: parent

=== modified file 'plugins/he/src/src.pro'
--- plugins/he/src/src.pro	2015-02-02 15:09:28 +0000
+++ plugins/he/src/src.pro	2015-04-20 15:33:53 +0000
@@ -15,7 +15,7 @@
 HEADERS         = \
     hebrewplugin.h
 
-TARGET          = $$qtLibraryTarget(hebrewplugin)
+TARGET          = $$qtLibraryTarget(heplugin)
 
 EXAMPLE_FILES = hebrewplugin.json
 

=== modified file 'plugins/hr/qml/Keyboard_hr.qml'
--- plugins/hr/qml/Keyboard_hr.qml	2015-03-13 12:07:08 +0000
+++ plugins/hr/qml/Keyboard_hr.qml	2015-04-20 15:33:53 +0000
@@ -15,8 +15,7 @@
  */
 
 import QtQuick 2.0
-import "../../keys"
-import "../../keys/key_constants.js" as UI
+import keys 1.0
 
 KeyPad {
     anchors.fill: parent

=== modified file 'plugins/hr/qml/Keyboard_hr_email.qml'
--- plugins/hr/qml/Keyboard_hr_email.qml	2015-03-13 12:07:08 +0000
+++ plugins/hr/qml/Keyboard_hr_email.qml	2015-04-20 15:33:53 +0000
@@ -15,8 +15,7 @@
  */
 
 import QtQuick 2.0
-import "../../keys"
-import "../../keys/key_constants.js" as UI
+import keys 1.0
 
 KeyPad {
     anchors.fill: parent

=== modified file 'plugins/hr/qml/Keyboard_hr_url.qml'
--- plugins/hr/qml/Keyboard_hr_url.qml	2015-03-13 12:07:08 +0000
+++ plugins/hr/qml/Keyboard_hr_url.qml	2015-04-20 15:33:53 +0000
@@ -15,8 +15,7 @@
  */
 
 import QtQuick 2.0
-import "../../keys"
-import "../../keys/key_constants.js" as UI
+import keys 1.0
 
 KeyPad {
     anchors.fill: parent

=== modified file 'plugins/hr/qml/Keyboard_hr_url_search.qml'
--- plugins/hr/qml/Keyboard_hr_url_search.qml	2015-03-13 12:07:08 +0000
+++ plugins/hr/qml/Keyboard_hr_url_search.qml	2015-04-20 15:33:53 +0000
@@ -15,8 +15,7 @@
  */
 
 import QtQuick 2.0
-import "../../keys"
-import "../../keys/key_constants.js" as UI
+import keys 1.0
 
 KeyPad {
     anchors.fill: parent

=== modified file 'plugins/hr/src/src.pro'
--- plugins/hr/src/src.pro	2014-10-30 14:56:08 +0000
+++ plugins/hr/src/src.pro	2015-04-20 15:33:53 +0000
@@ -15,7 +15,7 @@
 HEADERS         = \
     croatianplugin.h
 
-TARGET          = $$qtLibraryTarget(croatianplugin)
+TARGET          = $$qtLibraryTarget(hrplugin)
 
 EXAMPLE_FILES = croatianplugin.json
 

=== modified file 'plugins/hu/qml/Keyboard_hu.qml'
--- plugins/hu/qml/Keyboard_hu.qml	2015-03-13 12:07:08 +0000
+++ plugins/hu/qml/Keyboard_hu.qml	2015-04-20 15:33:53 +0000
@@ -15,8 +15,7 @@
  */
 
 import QtQuick 2.0
-import "../../keys"
-import "../../keys/key_constants.js" as UI
+import keys 1.0
 
 KeyPad {
     anchors.fill: parent

=== modified file 'plugins/hu/qml/Keyboard_hu_email.qml'
--- plugins/hu/qml/Keyboard_hu_email.qml	2015-03-13 12:07:08 +0000
+++ plugins/hu/qml/Keyboard_hu_email.qml	2015-04-20 15:33:53 +0000
@@ -15,8 +15,7 @@
  */
 
 import QtQuick 2.0
-import "../../keys"
-import "../../keys/key_constants.js" as UI
+import keys 1.0
 
 KeyPad {
     anchors.fill: parent

=== modified file 'plugins/hu/qml/Keyboard_hu_url.qml'
--- plugins/hu/qml/Keyboard_hu_url.qml	2015-03-13 12:07:08 +0000
+++ plugins/hu/qml/Keyboard_hu_url.qml	2015-04-20 15:33:53 +0000
@@ -15,8 +15,7 @@
  */
 
 import QtQuick 2.0
-import "../../keys"
-import "../../keys/key_constants.js" as UI
+import keys 1.0
 
 KeyPad {
     anchors.fill: parent

=== modified file 'plugins/hu/qml/Keyboard_hu_url_search.qml'
--- plugins/hu/qml/Keyboard_hu_url_search.qml	2015-03-13 12:07:08 +0000
+++ plugins/hu/qml/Keyboard_hu_url_search.qml	2015-04-20 15:33:53 +0000
@@ -15,8 +15,7 @@
  */
 
 import QtQuick 2.0
-import "../../keys"
-import "../../keys/key_constants.js" as UI
+import keys 1.0
 
 KeyPad {
     anchors.fill: parent

=== modified file 'plugins/hu/src/src.pro'
--- plugins/hu/src/src.pro	2014-05-20 09:53:45 +0000
+++ plugins/hu/src/src.pro	2015-04-20 15:33:53 +0000
@@ -15,7 +15,7 @@
 HEADERS         = \
     hungarianplugin.h
 
-TARGET          = $$qtLibraryTarget(hungarianplugin)
+TARGET          = $$qtLibraryTarget(huplugin)
 
 EXAMPLE_FILES = hungarianplugin.json
 

=== modified file 'plugins/it/qml/Keyboard_it.qml'
--- plugins/it/qml/Keyboard_it.qml	2015-03-13 12:07:08 +0000
+++ plugins/it/qml/Keyboard_it.qml	2015-04-20 15:33:53 +0000
@@ -15,8 +15,7 @@
  */
 
 import QtQuick 2.0
-import "../../keys"
-import "../../keys/key_constants.js" as UI
+import keys 1.0
 
 KeyPad {
     anchors.fill: parent

=== modified file 'plugins/it/qml/Keyboard_it_email.qml'
--- plugins/it/qml/Keyboard_it_email.qml	2015-03-13 12:07:08 +0000
+++ plugins/it/qml/Keyboard_it_email.qml	2015-04-20 15:33:53 +0000
@@ -15,8 +15,7 @@
  */
 
 import QtQuick 2.0
-import "../../keys"
-import "../../keys/key_constants.js" as UI
+import keys 1.0
 
 KeyPad {
     anchors.fill: parent

=== modified file 'plugins/it/qml/Keyboard_it_url.qml'
--- plugins/it/qml/Keyboard_it_url.qml	2015-03-13 12:07:08 +0000
+++ plugins/it/qml/Keyboard_it_url.qml	2015-04-20 15:33:53 +0000
@@ -15,8 +15,7 @@
  */
 
 import QtQuick 2.0
-import "../../keys"
-import "../../keys/key_constants.js" as UI
+import keys 1.0
 
 KeyPad {
     anchors.fill: parent

=== modified file 'plugins/it/qml/Keyboard_it_url_search.qml'
--- plugins/it/qml/Keyboard_it_url_search.qml	2015-03-13 12:07:08 +0000
+++ plugins/it/qml/Keyboard_it_url_search.qml	2015-04-20 15:33:53 +0000
@@ -15,8 +15,7 @@
  */
 
 import QtQuick 2.0
-import "../../keys"
-import "../../keys/key_constants.js" as UI
+import keys 1.0
 
 KeyPad {
     anchors.fill: parent

=== modified file 'plugins/it/src/src.pro'
--- plugins/it/src/src.pro	2015-02-02 15:09:28 +0000
+++ plugins/it/src/src.pro	2015-04-20 15:33:53 +0000
@@ -15,7 +15,7 @@
 HEADERS         = \
     italianplugin.h
 
-TARGET          = $$qtLibraryTarget(italianplugin)
+TARGET          = $$qtLibraryTarget(itplugin)
 
 EXAMPLE_FILES = italianplugin.json
 

=== modified file 'plugins/nl/qml/Keyboard_nl.qml'
--- plugins/nl/qml/Keyboard_nl.qml	2015-03-13 12:07:08 +0000
+++ plugins/nl/qml/Keyboard_nl.qml	2015-04-20 15:33:53 +0000
@@ -15,8 +15,7 @@
  */
 
 import QtQuick 2.0
-import "../../keys"
-import "../../keys/key_constants.js" as UI
+import keys 1.0
 
 KeyPad {
     anchors.fill: parent

=== modified file 'plugins/nl/qml/Keyboard_nl_email.qml'
--- plugins/nl/qml/Keyboard_nl_email.qml	2015-03-13 12:07:08 +0000
+++ plugins/nl/qml/Keyboard_nl_email.qml	2015-04-20 15:33:53 +0000
@@ -15,8 +15,7 @@
  */
 
 import QtQuick 2.0
-import "../../keys"
-import "../../keys/key_constants.js" as UI
+import keys 1.0
 
 KeyPad {
     anchors.fill: parent

=== modified file 'plugins/nl/qml/Keyboard_nl_url.qml'
--- plugins/nl/qml/Keyboard_nl_url.qml	2015-03-13 12:07:08 +0000
+++ plugins/nl/qml/Keyboard_nl_url.qml	2015-04-20 15:33:53 +0000
@@ -15,8 +15,7 @@
  */
 
 import QtQuick 2.0
-import "../../keys"
-import "../../keys/key_constants.js" as UI
+import keys 1.0
 
 KeyPad {
     anchors.fill: parent

=== modified file 'plugins/nl/qml/Keyboard_nl_url_search.qml'
--- plugins/nl/qml/Keyboard_nl_url_search.qml	2015-03-13 12:07:08 +0000
+++ plugins/nl/qml/Keyboard_nl_url_search.qml	2015-04-20 15:33:53 +0000
@@ -15,8 +15,7 @@
  */
 
 import QtQuick 2.0
-import "../../keys"
-import "../../keys/key_constants.js" as UI
+import keys 1.0
 
 KeyPad {
     anchors.fill: parent

=== modified file 'plugins/nl/src/src.pro'
--- plugins/nl/src/src.pro	2015-02-02 15:09:28 +0000
+++ plugins/nl/src/src.pro	2015-04-20 15:33:53 +0000
@@ -15,7 +15,7 @@
 HEADERS         = \
     dutchplugin.h
 
-TARGET          = $$qtLibraryTarget(dutchplugin)
+TARGET          = $$qtLibraryTarget(nlplugin)
 
 EXAMPLE_FILES = dutchplugin.json
 

=== renamed file 'plugins/pinyin/qml/Keyboard_zh_cn_pinyin.qml' => 'plugins/pinyin/qml/Keyboard_zh.qml'
--- plugins/pinyin/qml/Keyboard_zh_cn_pinyin.qml	2014-09-26 13:22:23 +0000
+++ plugins/pinyin/qml/Keyboard_zh.qml	2015-04-20 15:33:53 +0000
@@ -15,8 +15,7 @@
  */
 
 import QtQuick 2.0
-import "../../keys"
-import "../../keys/key_constants.js" as UI
+import keys 1.0
 
 KeyPad {
     anchors.fill: parent

=== modified file 'plugins/pinyin/qml/Keyboard_zh_email.qml'
--- plugins/pinyin/qml/Keyboard_zh_email.qml	2014-11-27 16:57:43 +0000
+++ plugins/pinyin/qml/Keyboard_zh_email.qml	2015-04-20 15:33:53 +0000
@@ -15,8 +15,7 @@
  */
 
 import QtQuick 2.0
-import "../../keys"
-import "../../keys/key_constants.js" as UI
+import keys 1.0
 
 KeyPad {
     anchors.fill: parent

=== modified file 'plugins/pinyin/qml/Keyboard_zh_url.qml'
--- plugins/pinyin/qml/Keyboard_zh_url.qml	2014-11-27 16:57:43 +0000
+++ plugins/pinyin/qml/Keyboard_zh_url.qml	2015-04-20 15:33:53 +0000
@@ -15,8 +15,7 @@
  */
 
 import QtQuick 2.0
-import "../../keys"
-import "../../keys/key_constants.js" as UI
+import keys 1.0
 
 KeyPad {
     anchors.fill: parent

=== modified file 'plugins/pinyin/qml/Keyboard_zh_url_search.qml'
--- plugins/pinyin/qml/Keyboard_zh_url_search.qml	2014-11-27 16:57:43 +0000
+++ plugins/pinyin/qml/Keyboard_zh_url_search.qml	2015-04-20 15:33:53 +0000
@@ -15,8 +15,7 @@
  */
 
 import QtQuick 2.0
-import "../../keys"
-import "../../keys/key_constants.js" as UI
+import keys 1.0
 
 KeyPad {
     anchors.fill: parent

=== modified file 'plugins/pinyin/src/pinyinplugin.h'
--- plugins/pinyin/src/pinyinplugin.h	2015-02-17 18:15:29 +0000
+++ plugins/pinyin/src/pinyinplugin.h	2015-04-20 15:33:53 +0000
@@ -30,7 +30,7 @@
     //! spell checker
     virtual void spellCheckerSuggest(const QString& word, int limit) { Q_UNUSED(word); Q_UNUSED(limit); }
     virtual void addToSpellCheckerUserWordList(const QString& word) { Q_UNUSED(word); }
-    virtual bool setLanguage(const QString& languageId) { Q_UNUSED(languageId); return false; }
+    virtual bool setLanguage(const QString& languageId, const QString& pluginPath) { Q_UNUSED(languageId); Q_UNUSED(pluginPath); return false; }
 
 signals:
     void newPredictionSuggestions(QString word, QStringList suggestions);

=== modified file 'plugins/pinyin/src/src.pro'
--- plugins/pinyin/src/src.pro	2014-04-24 13:18:54 +0000
+++ plugins/pinyin/src/src.pro	2015-04-20 15:33:53 +0000
@@ -25,7 +25,7 @@
                   chineselanguagefeatures.cpp \
                   $${TOP_SRCDIR}/src/lib/logic/abstractlanguageplugin.cpp
 
-TARGET          = $$qtLibraryTarget(pinyinplugin)
+TARGET          = $$qtLibraryTarget(zhplugin)
 
 EXAMPLE_FILES = pinyinplugin.json
 

=== modified file 'plugins/pl/qml/Keyboard_pl.qml'
--- plugins/pl/qml/Keyboard_pl.qml	2015-03-13 12:07:08 +0000
+++ plugins/pl/qml/Keyboard_pl.qml	2015-04-20 15:33:53 +0000
@@ -15,8 +15,7 @@
  */
 
 import QtQuick 2.0
-import "../../keys"
-import "../../keys/key_constants.js" as UI
+import keys 1.0
 
 KeyPad {
     anchors.fill: parent

=== modified file 'plugins/pl/qml/Keyboard_pl_email.qml'
--- plugins/pl/qml/Keyboard_pl_email.qml	2015-03-13 12:07:08 +0000
+++ plugins/pl/qml/Keyboard_pl_email.qml	2015-04-20 15:33:53 +0000
@@ -15,8 +15,7 @@
  */
 
 import QtQuick 2.0
-import "../../keys"
-import "../../keys/key_constants.js" as UI
+import keys 1.0
 
 KeyPad {
     anchors.fill: parent

=== modified file 'plugins/pl/qml/Keyboard_pl_url.qml'
--- plugins/pl/qml/Keyboard_pl_url.qml	2015-03-13 12:07:08 +0000
+++ plugins/pl/qml/Keyboard_pl_url.qml	2015-04-20 15:33:53 +0000
@@ -15,8 +15,7 @@
  */
 
 import QtQuick 2.0
-import "../../keys"
-import "../../keys/key_constants.js" as UI
+import keys 1.0
 
 KeyPad {
     anchors.fill: parent

=== modified file 'plugins/pl/qml/Keyboard_pl_url_search.qml'
--- plugins/pl/qml/Keyboard_pl_url_search.qml	2015-03-13 12:07:08 +0000
+++ plugins/pl/qml/Keyboard_pl_url_search.qml	2015-04-20 15:33:53 +0000
@@ -15,8 +15,7 @@
  */
 
 import QtQuick 2.0
-import "../../keys"
-import "../../keys/key_constants.js" as UI
+import keys 1.0
 
 KeyPad {
     anchors.fill: parent

=== modified file 'plugins/pl/src/src.pro'
--- plugins/pl/src/src.pro	2014-05-20 09:53:45 +0000
+++ plugins/pl/src/src.pro	2015-04-20 15:33:53 +0000
@@ -15,7 +15,7 @@
 HEADERS         = \
     polishplugin.h
 
-TARGET          = $$qtLibraryTarget(polishplugin)
+TARGET          = $$qtLibraryTarget(plplugin)
 
 EXAMPLE_FILES = polishplugin.json
 

=== modified file 'plugins/pt/qml/Keyboard_pt.qml'
--- plugins/pt/qml/Keyboard_pt.qml	2015-03-13 12:07:08 +0000
+++ plugins/pt/qml/Keyboard_pt.qml	2015-04-20 15:33:53 +0000
@@ -15,8 +15,7 @@
  */
 
 import QtQuick 2.0
-import "../../keys"
-import "../../keys/key_constants.js" as UI
+import keys 1.0
 
 KeyPad {
     anchors.fill: parent

=== modified file 'plugins/pt/qml/Keyboard_pt_email.qml'
--- plugins/pt/qml/Keyboard_pt_email.qml	2015-03-13 12:07:08 +0000
+++ plugins/pt/qml/Keyboard_pt_email.qml	2015-04-20 15:33:53 +0000
@@ -15,8 +15,7 @@
  */
 
 import QtQuick 2.0
-import "../../keys"
-import "../../keys/key_constants.js" as UI
+import keys 1.0
 
 KeyPad {
     anchors.fill: parent

=== modified file 'plugins/pt/qml/Keyboard_pt_url.qml'
--- plugins/pt/qml/Keyboard_pt_url.qml	2015-03-13 12:07:08 +0000
+++ plugins/pt/qml/Keyboard_pt_url.qml	2015-04-20 15:33:53 +0000
@@ -15,8 +15,7 @@
  */
 
 import QtQuick 2.0
-import "../../keys"
-import "../../keys/key_constants.js" as UI
+import keys 1.0
 
 KeyPad {
     anchors.fill: parent

=== modified file 'plugins/pt/qml/Keyboard_pt_url_search.qml'
--- plugins/pt/qml/Keyboard_pt_url_search.qml	2015-03-13 12:07:08 +0000
+++ plugins/pt/qml/Keyboard_pt_url_search.qml	2015-04-20 15:33:53 +0000
@@ -15,8 +15,7 @@
  */
 
 import QtQuick 2.0
-import "../../keys"
-import "../../keys/key_constants.js" as UI
+import keys 1.0
 
 KeyPad {
     anchors.fill: parent

=== modified file 'plugins/pt/src/src.pro'
--- plugins/pt/src/src.pro	2015-02-02 15:09:28 +0000
+++ plugins/pt/src/src.pro	2015-04-20 15:33:53 +0000
@@ -15,7 +15,7 @@
 HEADERS         = \
     portugueseplugin.h
 
-TARGET          = $$qtLibraryTarget(portugueseplugin)
+TARGET          = $$qtLibraryTarget(ptplugin)
 
 EXAMPLE_FILES = portugueseplugin.json
 

=== modified file 'plugins/ru/qml/Keyboard_ru.qml'
--- plugins/ru/qml/Keyboard_ru.qml	2015-03-13 12:07:08 +0000
+++ plugins/ru/qml/Keyboard_ru.qml	2015-04-20 15:33:53 +0000
@@ -15,8 +15,7 @@
  */
 
 import QtQuick 2.0
-import "../../keys"
-import "../../keys/key_constants.js" as UI
+import keys 1.0
 
 KeyPad {
     anchors.fill: parent

=== modified file 'plugins/ru/qml/Keyboard_ru_email.qml'
--- plugins/ru/qml/Keyboard_ru_email.qml	2015-03-13 12:07:08 +0000
+++ plugins/ru/qml/Keyboard_ru_email.qml	2015-04-20 15:33:53 +0000
@@ -15,8 +15,7 @@
  */
 
 import QtQuick 2.0
-import "../../keys"
-import "../../keys/key_constants.js" as UI
+import keys 1.0
 
 KeyPad {
     anchors.fill: parent

=== modified file 'plugins/ru/qml/Keyboard_ru_url.qml'
--- plugins/ru/qml/Keyboard_ru_url.qml	2015-03-13 12:07:08 +0000
+++ plugins/ru/qml/Keyboard_ru_url.qml	2015-04-20 15:33:53 +0000
@@ -15,8 +15,7 @@
  */
 
 import QtQuick 2.0
-import "../../keys"
-import "../../keys/key_constants.js" as UI
+import keys 1.0
 
 KeyPad {
     anchors.fill: parent

=== modified file 'plugins/ru/qml/Keyboard_ru_url_search.qml'
--- plugins/ru/qml/Keyboard_ru_url_search.qml	2015-03-13 12:07:08 +0000
+++ plugins/ru/qml/Keyboard_ru_url_search.qml	2015-04-20 15:33:53 +0000
@@ -15,8 +15,7 @@
  */
 
 import QtQuick 2.0
-import "../../keys"
-import "../../keys/key_constants.js" as UI
+import keys 1.0
 
 KeyPad {
     anchors.fill: parent

=== modified file 'plugins/ru/src/src.pro'
--- plugins/ru/src/src.pro	2014-05-20 09:53:45 +0000
+++ plugins/ru/src/src.pro	2015-04-20 15:33:53 +0000
@@ -15,7 +15,7 @@
 HEADERS         = \
     russianplugin.h
 
-TARGET          = $$qtLibraryTarget(russianplugin)
+TARGET          = $$qtLibraryTarget(ruplugin)
 
 EXAMPLE_FILES = russianplugin.json
 

=== modified file 'plugins/sr/qml/Keyboard_sr.qml'
--- plugins/sr/qml/Keyboard_sr.qml	2015-03-13 12:07:08 +0000
+++ plugins/sr/qml/Keyboard_sr.qml	2015-04-20 15:33:53 +0000
@@ -15,8 +15,7 @@
  */
 
 import QtQuick 2.0
-import "../../keys"
-import "../../keys/key_constants.js" as UI
+import keys 1.0
 
 KeyPad {
     anchors.fill: parent

=== modified file 'plugins/sr/qml/Keyboard_sr_email.qml'
--- plugins/sr/qml/Keyboard_sr_email.qml	2015-03-13 12:07:08 +0000
+++ plugins/sr/qml/Keyboard_sr_email.qml	2015-04-20 15:33:53 +0000
@@ -15,8 +15,7 @@
  */
 
 import QtQuick 2.0
-import "../../keys"
-import "../../keys/key_constants.js" as UI
+import keys 1.0
 
 KeyPad {
     anchors.fill: parent

=== modified file 'plugins/sr/qml/Keyboard_sr_url.qml'
--- plugins/sr/qml/Keyboard_sr_url.qml	2015-03-13 12:07:08 +0000
+++ plugins/sr/qml/Keyboard_sr_url.qml	2015-04-20 15:33:53 +0000
@@ -15,8 +15,7 @@
  */
 
 import QtQuick 2.0
-import "../../keys"
-import "../../keys/key_constants.js" as UI
+import keys 1.0
 
 KeyPad {
     anchors.fill: parent

=== modified file 'plugins/sr/qml/Keyboard_sr_url_search.qml'
--- plugins/sr/qml/Keyboard_sr_url_search.qml	2015-03-13 12:07:08 +0000
+++ plugins/sr/qml/Keyboard_sr_url_search.qml	2015-04-20 15:33:53 +0000
@@ -15,8 +15,7 @@
  */
 
 import QtQuick 2.0
-import "../../keys"
-import "../../keys/key_constants.js" as UI
+import keys 1.0
 
 KeyPad {
     anchors.fill: parent

=== modified file 'plugins/sr/src/src.pro'
--- plugins/sr/src/src.pro	2014-09-22 13:23:28 +0000
+++ plugins/sr/src/src.pro	2015-04-20 15:33:53 +0000
@@ -15,7 +15,7 @@
 HEADERS         = \
     serbianplugin.h
 
-TARGET          = $$qtLibraryTarget(serbianplugin)
+TARGET          = $$qtLibraryTarget(srplugin)
 
 EXAMPLE_FILES = serbianplugin.json
 

=== modified file 'plugins/sv/qml/Keyboard_sv.qml'
--- plugins/sv/qml/Keyboard_sv.qml	2015-03-13 12:07:08 +0000
+++ plugins/sv/qml/Keyboard_sv.qml	2015-04-20 15:33:53 +0000
@@ -15,8 +15,7 @@
  */
 
 import QtQuick 2.0
-import "../../keys"
-import "../../keys/key_constants.js" as UI
+import keys 1.0
 
 KeyPad {
     anchors.fill: parent

=== modified file 'plugins/sv/qml/Keyboard_sv_email.qml'
--- plugins/sv/qml/Keyboard_sv_email.qml	2015-03-13 12:07:08 +0000
+++ plugins/sv/qml/Keyboard_sv_email.qml	2015-04-20 15:33:53 +0000
@@ -15,8 +15,7 @@
  */
 
 import QtQuick 2.0
-import "../../keys"
-import "../../keys/key_constants.js" as UI
+import keys 1.0
 
 KeyPad {
     anchors.fill: parent

=== modified file 'plugins/sv/qml/Keyboard_sv_url.qml'
--- plugins/sv/qml/Keyboard_sv_url.qml	2015-03-13 12:07:08 +0000
+++ plugins/sv/qml/Keyboard_sv_url.qml	2015-04-20 15:33:53 +0000
@@ -15,8 +15,7 @@
  */
 
 import QtQuick 2.0
-import "../../keys"
-import "../../keys/key_constants.js" as UI
+import keys 1.0
 
 KeyPad {
     anchors.fill: parent

=== modified file 'plugins/sv/qml/Keyboard_sv_url_search.qml'
--- plugins/sv/qml/Keyboard_sv_url_search.qml	2015-03-13 12:07:08 +0000
+++ plugins/sv/qml/Keyboard_sv_url_search.qml	2015-04-20 15:33:53 +0000
@@ -15,8 +15,7 @@
  */
 
 import QtQuick 2.0
-import "../../keys"
-import "../../keys/key_constants.js" as UI
+import keys 1.0
 
 KeyPad {
     anchors.fill: parent

=== modified file 'plugins/sv/src/src.pro'
--- plugins/sv/src/src.pro	2015-02-02 15:09:28 +0000
+++ plugins/sv/src/src.pro	2015-04-20 15:33:53 +0000
@@ -15,7 +15,7 @@
 HEADERS         = \
     swedishplugin.h
 
-TARGET          = $$qtLibraryTarget(swedishplugin)
+TARGET          = $$qtLibraryTarget(svplugin)
 
 EXAMPLE_FILES = swedishplugin.json
 

=== modified file 'plugins/westernsupport/spellpredictworker.cpp'
--- plugins/westernsupport/spellpredictworker.cpp	2015-02-02 15:09:28 +0000
+++ plugins/westernsupport/spellpredictworker.cpp	2015-04-20 15:33:53 +0000
@@ -86,11 +86,10 @@
     Q_EMIT newPredictionSuggestions(origPreedit, list);
 }
 
-void SpellPredictWorker::setLanguage(QString locale)
+void SpellPredictWorker::setLanguage(QString locale, QString pluginPath)
 {
     QString dbFileName = "database_"+locale+".db";
-    QString fullPath("/usr/share/maliit/plugins/com/ubuntu/lib/"+locale+"/");
-    fullPath.append(dbFileName);
+    QString fullPath(pluginPath + QDir::separator() + dbFileName);
     m_spellChecker.setLanguage(locale);
     m_spellChecker.setEnabled(true);
 

=== modified file 'plugins/westernsupport/spellpredictworker.h'
--- plugins/westernsupport/spellpredictworker.h	1970-01-01 00:50:37 +0000
+++ plugins/westernsupport/spellpredictworker.h	2015-04-20 15:33:53 +0000
@@ -49,7 +49,7 @@
 public slots:
     void parsePredictionText(const QString& surroundingLeft, const QString& preedit);
     void newSpellCheckWord(QString word);
-    void setLanguage(QString language);
+    void setLanguage(QString language, QString pluginPath);
     void setSpellCheckLimit(int limit);
     void addToUserWordList(const QString& word);
     void addOverride(const QString& orig, const QString& overriden);

=== modified file 'plugins/westernsupport/westernlanguagesplugin.cpp'
--- plugins/westernsupport/westernlanguagesplugin.cpp	2015-02-11 16:08:49 +0000
+++ plugins/westernsupport/westernlanguagesplugin.cpp	2015-04-20 15:33:53 +0000
@@ -16,7 +16,7 @@
     connect(m_spellPredictWorker, SIGNAL(newSpellingSuggestions(QString, QStringList)), this, SIGNAL(newSpellingSuggestions(QString, QStringList)));
     connect(m_spellPredictWorker, SIGNAL(newPredictionSuggestions(QString, QStringList)), this, SIGNAL(newPredictionSuggestions(QString, QStringList)));
     connect(this, SIGNAL(newSpellCheckWord(QString)), m_spellPredictWorker, SLOT(newSpellCheckWord(QString)));
-    connect(this, SIGNAL(setSpellPredictLanguage(QString)), m_spellPredictWorker, SLOT(setLanguage(QString)));
+    connect(this, SIGNAL(setSpellPredictLanguage(QString, QString)), m_spellPredictWorker, SLOT(setLanguage(QString, QString)));
     connect(this, SIGNAL(setSpellCheckLimit(int)), m_spellPredictWorker, SLOT(setSpellCheckLimit(int)));
     connect(this, SIGNAL(parsePredictionText(QString, QString)), m_spellPredictWorker, SLOT(parsePredictionText(QString, QString)));
     connect(this, SIGNAL(addToUserWordList(QString)), m_spellPredictWorker, SLOT(addToUserWordList(QString)));
@@ -57,10 +57,10 @@
     Q_EMIT addToUserWordList(word);
 }
 
-bool WesternLanguagesPlugin::setLanguage(const QString& languageId)
+bool WesternLanguagesPlugin::setLanguage(const QString& languageId, const QString& pluginPath)
 {
-    Q_EMIT setSpellPredictLanguage(languageId);
-    loadOverrides(languageId);
+    Q_EMIT setSpellPredictLanguage(languageId, pluginPath);
+    loadOverrides(pluginPath);
     return true;
 }
 
@@ -69,8 +69,8 @@
     Q_EMIT addOverride(orig, overriden);
 }
 
-void WesternLanguagesPlugin::loadOverrides(const QString& languageId) {
-    QFile overrideFile("/usr/share/maliit/plugins/com/ubuntu/lib/" + languageId + "/overrides.csv");
+void WesternLanguagesPlugin::loadOverrides(const QString& pluginPath) {
+    QFile overrideFile(pluginPath + QDir::separator() + "overrides.csv");
     if (overrideFile.open(QIODevice::ReadOnly | QIODevice::Text)) {
         QTextStream overrideStream(&overrideFile);
         while (!overrideStream.atEnd()) {

=== modified file 'plugins/westernsupport/westernlanguagesplugin.h'
--- plugins/westernsupport/westernlanguagesplugin.h	2015-02-11 16:08:49 +0000
+++ plugins/westernsupport/westernlanguagesplugin.h	2015-04-20 15:33:53 +0000
@@ -31,16 +31,16 @@
     //! spell checker
     virtual void spellCheckerSuggest(const QString& word, int limit);
     virtual void addToSpellCheckerUserWordList(const QString& word);
-    virtual bool setLanguage(const QString& languageId);
+    virtual bool setLanguage(const QString& languageId, const QString& pluginPath);
     virtual void addSpellingOverride(const QString& orig, const QString& overriden);
-    virtual void loadOverrides(const QString& languageId);
+    virtual void loadOverrides(const QString& pluginPath);
 
 signals:
     void newSpellingSuggestions(QString word, QStringList suggestions);
     void newPredictionSuggestions(QString word, QStringList suggestions);
     void newSpellCheckWord(QString word);
     void setSpellCheckLimit(int limit);
-    void setSpellPredictLanguage(QString language);
+    void setSpellPredictLanguage(QString language, QString pluginPath);
     void parsePredictionText(QString surroundingLeft, QString preedit);
     void setPredictionLanguage(QString language);
     void addToUserWordList(const QString& word);

=== modified file 'qml/KeyboardContainer.qml'
--- qml/KeyboardContainer.qml	2015-02-05 15:32:51 +0000
+++ qml/KeyboardContainer.qml	2015-04-20 15:33:53 +0000
@@ -115,139 +115,47 @@
             panel.state = "CHARACTERS";
         }
 
-        /// Returns if the given language is supported
-        /// FIXME the possible languages should be checked in C++
-        function languageIsSupported(locale)
-        {
-            var supportedLocales = [
-                "ar",
-                "az",
-                "bs",
-                "ca",
-                "cs",
-                "da",
-                "de",
-                "emoji",
-                "en",
-                "es",
-                "fi",
-                "fr",
-                "he",
-                "hr",
-                "hu",
-                "it",
-                "nl",
-                "pl",
-                "pt",
-                "ru",
-                "sr",
-                "sv",
-                "zh",
-            ];
-            return (supportedLocales.indexOf( locale ) > -1);
-        }
-
-        /// Returns the relative path to the keyboard QML file for a given language for free text
-        function freeTextLanguageKeyboard(language)
-        {
-            language = language.toLowerCase();
-            if (!languageIsSupported(language)) {
+        function loadLayout(contentType, activeLanguage)
+        {
+            var language = activeLanguage.toLowerCase();
+            if (!maliit_input_method.languageIsSupported(language)) {
                 // If we don't have a layout for this specific locale 
                 // check more generic locale
                 language = language.slice(0,2);
             }
 
-            if (!languageIsSupported(language)) {
-                console.log("Language '"+language+"' not supported - using 'en' instead");
+            if (!maliit_input_method.languageIsSupported(language)) {
+                console.log("Language '" + language + "' not supported - using 'en' instead");
                 language = "en";
             }
 
-            if (language === "ar")
-                return "lib/ar/Keyboard_ar.qml";
-            if (language === "az")
-                return "lib/az/Keyboard_az.qml";
-            if (language === "bs")
-                return "lib/bs/Keyboard_bs.qml";
-            if (language === "ca")
-                return "lib/ca/Keyboard_ca.qml";
-            if (language === "cs")
-                return "lib/cs/Keyboard_cs.qml";
-            if (language === "da")
-                return "lib/da/Keyboard_da.qml";
-            if (language === "de")
-                return "lib/de/Keyboard_de.qml";
-            if (language === "emoji")
-                return "lib/emoji/Keyboard_emoji.qml";
-            if (language === "en")
-                return "lib/en/Keyboard_en.qml";
-            if (language === "es")
-                return "lib/es/Keyboard_es.qml";
-            if (language === "fi")
-                return "lib/fi/Keyboard_fi.qml";
-            if (language === "fr")
-                return "lib/fr/Keyboard_fr.qml";
-            if (language === "he")
-                return "lib/he/Keyboard_he.qml";
-            if (language === "hr")
-                return "lib/hr/Keyboard_hr.qml";
-            if (language === "hu")
-                return "lib/hu/Keyboard_hu.qml";
-            if (language === "it")
-                return "lib/it/Keyboard_it.qml";
-            if (language === "nl")
-                return "lib/nl/Keyboard_nl.qml";
-            if (language === "pl")
-                return "lib/pl/Keyboard_pl.qml";
-            if (language === "pt")
-                return "lib/pt/Keyboard_pt.qml";
-            if (language === "ru")
-                return "lib/ru/Keyboard_ru.qml";
-            if (language === "sr")
-                return "lib/sr/Keyboard_sr.qml";
-            if (language === "sv")
-                return "lib/sv/Keyboard_sv.qml";
-            if (language === "zh")
-                return "lib/zh/Keyboard_zh_cn_pinyin.qml";
-        }
-
-        function loadLayout(contentType, activeLanguage)
-        {
-            //            if (contentType === InputMethod.NumberContentType) {
+            // NumberContentType
             if (contentType === 1) {
                 canvas.layoutId = "number";
                 return "languages/Keyboard_numbers.qml";
             }
 
-            //            if (contentType === InputMethod.PhoneNumberContentType) {
+            // PhoneNumberContentType
             if (contentType === 2) {
                 canvas.layoutId = "telephone";
                 return "languages/Keyboard_telephone.qml";
             }
 
-            var locale = activeLanguage.toLowerCase();
-            if (!languageIsSupported(locale)) {
-                locale = locale.slice(0,2);
-            }
-            if (!languageIsSupported(locale)) {
-                console.log("System language '"+locale+"' can't be used in OSK - using 'en' instead")
-                locale = "en"
-            }
-
-            //            if (contentType === InputMethod.EmailContentType) {
+            // EmailContentType
             if (contentType === 3) {
                 canvas.layoutId = "email";
-                return "lib/"+locale+"/Keyboard_"+locale+"_email.qml";
+                return maliit_input_method.currentPluginPath + "/Keyboard_" + language + "_email.qml";
             }
 
-            //            if (contentType === InputMethod.UrlContentType) {
+            // UrlContentType
             if (contentType === 4) {
                 canvas.layoutId = "url";
-                return "lib/"+locale+"/Keyboard_"+locale+"_url_search.qml";
+                return maliit_input_method.currentPluginPath + "/Keyboard_" + language + "_url_search.qml";
             }
 
             // FreeTextContentType used as fallback
             canvas.layoutId = "freetext";
-            return freeTextLanguageKeyboard(activeLanguage);
+            return maliit_input_method.currentPluginPath + "/Keyboard_" + language + ".qml";
         }
     }
 }

=== modified file 'qml/keys/LanguageMenu.qml'
--- qml/keys/LanguageMenu.qml	2015-02-09 13:51:15 +0000
+++ qml/keys/LanguageMenu.qml	2015-04-20 15:33:53 +0000
@@ -117,7 +117,7 @@
         if (languageId == "zh")         return i18n.tr("Chinese - Pinyin");
 
         // fallback
-        return i18n.tr("Language: ") + languageId;
+        return languageId.charAt(0).toUpperCase() + languageId.slice(1);
     }
 
 }

=== added file 'qml/keys/qmldir'
--- qml/keys/qmldir	1970-01-01 00:00:00 +0000
+++ qml/keys/qmldir	2015-04-20 15:33:53 +0000
@@ -0,0 +1,20 @@
+module keys
+ActionKey 1.0 ActionKey.qml
+DropShadow 1.0 DropShadow.qml
+KeyPopover 1.0 KeyPopover.qml
+Magnifier 1.0 Magnifier.qml
+ReturnKey 1.0 ReturnKey.qml
+Spacer 1.0 Spacer.qml
+BackspaceKey 1.0 BackspaceKey.qml
+ExtendedKeysSelector 1.0 ExtendedKeysSelector.qml
+LanguageKey 1.0 LanguageKey.qml
+OneTwoKey 1.0 OneTwoKey.qml
+ShiftKey 1.0 ShiftKey.qml
+SymbolShiftKey 1.0 SymbolShiftKey.qml
+CharKey 1.0 CharKey.qml
+KeyPad 1.0 KeyPad.qml
+LanguageMenu 1.0 LanguageMenu.qml
+PressArea 1.0 PressArea.qml
+SpaceKey 1.0 SpaceKey.qml
+UrlKey 1.0 UrlKey.qml
+UI 1.0 key_constants.js

=== modified file 'qml/qml.pro'
--- qml/qml.pro	2013-12-12 17:10:53 +0000
+++ qml/qml.pro	2015-04-20 15:33:53 +0000
@@ -7,7 +7,7 @@
 qml.files = *.qml *.js
 
 qml_keys.path = "$$UBUNTU_KEYBOARD_DATA_DIR/keys"
-qml_keys.files = keys/*.qml keys/*.js
+qml_keys.files = keys/*.qml keys/*.js keys/qmldir
 
 qml_languages.path = "$$UBUNTU_KEYBOARD_DATA_DIR/languages"
 qml_languages.files = languages/*.qml languages/*.js
@@ -45,6 +45,7 @@
     keys/Spacer.qml \
     keys/SymbolShiftKey.qml \
     keys/UrlKey.qml \
+    keys/qmldir \
     languages/Keyboard_numbers.qml \
     languages/Keyboard_symbols.qml \
     languages/Keyboard_telephone.qml \

=== modified file 'src/lib/logic/abstractlanguageplugin.cpp'
--- src/lib/logic/abstractlanguageplugin.cpp	2014-08-07 17:04:01 +0000
+++ src/lib/logic/abstractlanguageplugin.cpp	2015-04-20 15:33:53 +0000
@@ -61,9 +61,10 @@
     Q_UNUSED(word)
 }
 
-bool AbstractLanguagePlugin::setLanguage(const QString& languageId)
+bool AbstractLanguagePlugin::setLanguage(const QString& languageId, const QString& pluginPath)
 {
     Q_UNUSED(languageId)
+    Q_UNUSED(pluginPath)
     return false;
 }
 

=== modified file 'src/lib/logic/abstractlanguageplugin.h'
--- src/lib/logic/abstractlanguageplugin.h	2014-08-07 17:04:01 +0000
+++ src/lib/logic/abstractlanguageplugin.h	2015-04-20 15:33:53 +0000
@@ -48,7 +48,7 @@
     //! spell checker
     virtual void spellCheckerSuggest(const QString& word, int limit);
     virtual void addToSpellCheckerUserWordList(const QString& word);
-    virtual bool setLanguage(const QString& languageId);
+    virtual bool setLanguage(const QString& languageId, const QString& pluginPath);
 
 signals:
     void newSpellingSuggestions(QString word, QStringList suggestions);

=== modified file 'src/lib/logic/languageplugininterface.h'
--- src/lib/logic/languageplugininterface.h	2014-08-07 17:04:01 +0000
+++ src/lib/logic/languageplugininterface.h	2015-04-20 15:33:53 +0000
@@ -19,7 +19,7 @@
     //! spell checker
     virtual void spellCheckerSuggest(const QString& word, int limit) = 0;
     virtual void addToSpellCheckerUserWordList(const QString& word) = 0;
-    virtual bool setLanguage(const QString& languageId) = 0;
+    virtual bool setLanguage(const QString& languageId, const QString &pluginPath) = 0;
 };
 
 #define LanguagePluginInterface_iid "com.canonical.UbuntuKeyboard.LanguagePluginInterface"

=== modified file 'src/lib/logic/wordengine.cpp'
--- src/lib/logic/wordengine.cpp	2015-02-11 16:08:49 +0000
+++ src/lib/logic/wordengine.cpp	2015-04-20 15:33:53 +0000
@@ -35,7 +35,7 @@
 namespace MaliitKeyboard {
 namespace Logic {
 
-#define DEFAULT_PLUGIN "libenglishplugin.so"
+#define DEFAULT_PLUGIN "/usr/share/maliit/plugins/com/ubuntu/lib/en/libenplugin.so"
 
 //! \class WordEngine
 //! \brief Provides error correction (based on Hunspell) and word
@@ -71,9 +71,9 @@
     explicit WordEnginePrivate();
 
     QString currentPlugin;
-    void loadPlugin(QString pluginName, QString subfolder="en")
+    void loadPlugin(QString pluginPath)
     {
-        if (pluginName == currentPlugin)
+        if (pluginPath == currentPlugin)
             return;
 
         delete languagePlugin;
@@ -83,22 +83,20 @@
         QLocale::setDefault(QLocale::c());
         setlocale(LC_NUMERIC, "C");
 
-        QDir pluginsDir("/usr/share/maliit/plugins/com/ubuntu/lib/"+subfolder);
-
-        pluginLoader.setFileName(pluginsDir.absoluteFilePath(pluginName));
+        pluginLoader.setFileName(pluginPath);
         QObject *plugin = pluginLoader.instance();
 
         if (plugin) {
             languagePlugin = qobject_cast<LanguagePluginInterface *>(plugin);
             if (!languagePlugin) {
-                qCritical() << "wordengine.cpp - loading plugin failed: " + pluginName;
+                qCritical() << "wordengine.cpp - loading plugin failed: " + pluginPath;
 
                 // fallback
-                if (pluginName != DEFAULT_PLUGIN)
+                if (pluginPath != DEFAULT_PLUGIN)
                     loadPlugin(DEFAULT_PLUGIN);
             } else {
-                qDebug() << "wordengine.cpp plugin" << pluginName << "loaded";
-                currentPlugin = pluginName;
+                qDebug() << "wordengine.cpp plugin" << pluginPath << "loaded";
+                currentPlugin = pluginPath;
             }
         } else {
             qCritical() << __PRETTY_FUNCTION__ << " Loading plugin failed: " << pluginLoader.errorString();
@@ -392,60 +390,15 @@
     d->languagePlugin->addToSpellCheckerUserWordList(word);
 }
 
-void WordEngine::onLanguageChanged(const QString &languageId)
+void WordEngine::onLanguageChanged(const QString &pluginPath, const QString &languageId)
 {
     Q_D(WordEngine);
 
-    if (languageId == "ar")
-        d->loadPlugin("libarabicplugin.so", "ar");
-    else if (languageId == "az")
-        d->loadPlugin("libazerbaijaniplugin.so", "az");
-    else if (languageId == "bs")
-        d->loadPlugin("libbosnianplugin.so", "bs");
-    else if (languageId == "ca")
-        d->loadPlugin("libcatalanplugin.so", "ca");
-    else if (languageId == "cs")
-        d->loadPlugin("libczechplugin.so", "cs");
-    else if (languageId == "da")
-        d->loadPlugin("libdanishplugin.so", "da");
-    else if (languageId == "de")
-        d->loadPlugin("libgermanplugin.so", "de");
-    else if (languageId == "emoji")
-        d->loadPlugin("libemojiplugin.so", "emoji");
-    else if (languageId == "en")
-        d->loadPlugin("libenglishplugin.so", "en");
-    else if (languageId == "es")
-        d->loadPlugin("libspanishplugin.so", "es");
-    else if (languageId == "fi")
-        d->loadPlugin("libfinnishplugin.so", "fi");
-    else if (languageId == "fr")
-        d->loadPlugin("libfrenchplugin.so", "fr");
-    else if (languageId == "he")
-        d->loadPlugin("libhebrewplugin.so", "he");
-    else if (languageId == "hr")
-        d->loadPlugin("libcroatianplugin.so", "hr");
-    else if (languageId == "hu")
-        d->loadPlugin("libhungarianplugin.so", "hu");
-    else if (languageId == "it")
-        d->loadPlugin("libitalianplugin.so", "it");
-    else if (languageId == "nl")
-        d->loadPlugin("libdutchplugin.so", "nl");
-    else if (languageId == "pl")
-        d->loadPlugin("libpolishplugin.so", "pl");
-    else if (languageId == "pt")
-        d->loadPlugin("libportugueseplugin.so", "pt");
-    else if (languageId == "ru")
-        d->loadPlugin("librussianplugin.so", "ru");
-    else if (languageId == "sv")
-        d->loadPlugin("libswedishplugin.so", "sv");
-    else if (languageId == "zh")
-        d->loadPlugin("libpinyinplugin.so", "zh");
-    else
-        d->loadPlugin(DEFAULT_PLUGIN);
+    d->loadPlugin(pluginPath);
 
     setWordPredictionEnabled(d->requested_prediction_state);
 
-    d->languagePlugin->setLanguage(languageId);
+    d->languagePlugin->setLanguage(languageId, QFileInfo(pluginPath).absolutePath());
 
     Q_EMIT enabledChanged(isEnabled());
 

=== modified file 'src/lib/logic/wordengine.h'
--- src/lib/logic/wordengine.h	2015-01-29 05:44:05 +0000
+++ src/lib/logic/wordengine.h	2015-04-20 15:33:53 +0000
@@ -71,7 +71,7 @@
                                         const QString &candidate);
 
     Q_SLOT void onWordCandidateSelected(QString word);
-    Q_SLOT void onLanguageChanged(const QString& languageId);
+    Q_SLOT void onLanguageChanged(const QString& pluginPath, const QString& languageId);
     Q_SLOT void updateQmlCandidates(QStringList qmlCandidates);
     Q_SLOT void newSpellingSuggestions(QString word, QStringList suggestions);
     Q_SLOT void newPredictionSuggestions(QString word, QStringList suggestions);

=== modified file 'src/plugin/inputmethod.cpp'
--- src/plugin/inputmethod.cpp	2015-03-11 16:57:32 +0000
+++ src/plugin/inputmethod.cpp	2015-04-20 15:33:53 +0000
@@ -102,7 +102,8 @@
     connect(&d->editor,  SIGNAL(autoCapsDeactivated()), this, SIGNAL(deactivateAutocaps()));
 
     connect(this, SIGNAL(contentTypeChanged(TextContentType)), this, SLOT(setContentType(TextContentType)));
-    connect(this, SIGNAL(activeLanguageChanged(QString)), d->editor.wordEngine(), SLOT(onLanguageChanged(QString)));
+    connect(this, SIGNAL(activeLanguageChanged(QString)), this, SLOT(onLanguageChanged(QString)));
+    connect(this, SIGNAL(languagePluginChanged(QString, QString)), d->editor.wordEngine(), SLOT(onLanguageChanged(QString, QString)));
     connect(&d->event_handler, SIGNAL(qmlCandidateChanged(QStringList)), d->editor.wordEngine(), SLOT(updateQmlCandidates(QStringList)));
     connect(this, SIGNAL(hasSelectionChanged(bool)), &d->editor, SLOT(onHasSelectionChanged(bool)));
     connect(d->editor.wordEngine(), SIGNAL(pluginChanged()), this, SLOT(onWordEnginePluginChanged()));
@@ -119,6 +120,7 @@
     d->registerEnabledLanguages();
     d->registerDoubleSpaceFullStop();
     d->registerStayHidden();
+    d->registerPluginPaths();
 
     //fire signal so all listeners know what active language is
     Q_EMIT activeLanguageChanged(d->activeLanguage);
@@ -541,6 +543,14 @@
 
     qDebug() << "in inputMethod.cpp setActiveLanguage() activeLanguage is:" << newLanguage;
 
+    foreach(QString pluginPath, d->pluginPaths) {
+        QDir testDir(pluginPath + QDir::separator() + newLanguage);
+        if (testDir.exists()) {
+            d->currentPluginPath = testDir.absolutePath();
+            break;
+        }
+    }
+
     if (d->activeLanguage == newLanguage)
         return;
 
@@ -623,3 +633,40 @@
                 visibleRect.height()
                 );
 }
+
+const QString InputMethod::currentPluginPath() const
+{
+    Q_D(const InputMethod);
+    return d->currentPluginPath;
+}
+
+bool InputMethod::languageIsSupported(const QString plugin) {
+    Q_D(const InputMethod);
+    foreach(QString pluginPath, d->pluginPaths) {
+        QDir testDir(pluginPath + QDir::separator() + plugin);
+        if (testDir.exists()) {
+            return true;
+        }
+    }
+
+    return false;
+}
+
+void InputMethod::onLanguageChanged(const QString &language) {
+    Q_D(InputMethod);
+    foreach(QString pluginPath, d->pluginPaths) {
+        QFile testFile(pluginPath + QDir::separator() + language + QDir::separator() + "lib" + language + "plugin.so");
+        if (testFile.exists()) {
+            Q_EMIT languagePluginChanged(testFile.fileName(), language);
+            return;
+        }
+    }
+    qCritical() << "Couldn't find word engine plugin for " << language;
+}
+
+void InputMethod::onPluginPathsChanged(const QStringList& pluginPaths) {
+    Q_D(InputMethod);
+    Q_UNUSED(pluginPaths);
+
+    d->updatePluginPaths();
+}

=== modified file 'src/plugin/inputmethod.h'
--- src/plugin/inputmethod.h	2015-02-05 15:30:42 +0000
+++ src/plugin/inputmethod.h	2015-04-20 15:33:53 +0000
@@ -58,6 +58,7 @@
     Q_PROPERTY(bool useHapticFeedback READ useHapticFeedback NOTIFY useHapticFeedbackChanged)
     Q_PROPERTY(QString keyboardState READ keyboardState WRITE setKeyboardState NOTIFY keyboardStateChanged)
     Q_PROPERTY(bool hasSelection READ hasSelection NOTIFY hasSelectionChanged)
+    Q_PROPERTY(QString currentPluginPath READ currentPluginPath NOTIFY currentPluginPathChanged)
 
     Q_ENUMS(TextContentType)
 
@@ -123,10 +124,17 @@
 
     bool hasSelection() const;
 
+    const QString currentPluginPath() const;
+
     QObject* actionKeyOverride() const;
 
     Q_SLOT void close();
 
+    Q_INVOKABLE bool languageIsSupported(const QString plugin);
+    Q_SLOT void onLanguageChanged(const QString& language);
+
+    Q_SLOT void onPluginPathsChanged(const QStringList& pluginPaths);
+
 Q_SIGNALS:
     void contentTypeChanged(TextContentType contentType);
     void activateAutocaps();
@@ -144,6 +152,8 @@
     void keyboardStateChanged(QString state);
     void keyboardReset();
     void hasSelectionChanged(bool hasSelection);
+    void currentPluginPathChanged(QString currentPluginPath);
+    void languagePluginChanged(QString pluginPath, QString languageId);
 
 private:
     Q_SLOT void onAutoCorrectSettingChanged();

=== modified file 'src/plugin/inputmethod_p.h'
--- src/plugin/inputmethod_p.h	2015-02-05 15:32:51 +0000
+++ src/plugin/inputmethod_p.h	2015-04-20 15:33:53 +0000
@@ -69,6 +69,9 @@
 
     int previous_position;
 
+    QStringList pluginPaths;
+    QString currentPluginPath;
+
     explicit InputMethodPrivate(InputMethod * const _q,
                                 MAbstractInputMethodHost *host)
         : q(_q)
@@ -133,9 +136,12 @@
 
         view->setVisible(false);
 
+        updatePluginPaths();
+
         // TODO: Figure out whether two views can share one engine.
         QQmlEngine *const engine(view->engine());
         engine->addImportPath(UBUNTU_KEYBOARD_DATA_DIR);
+        engine->addImportPath(QString(UBUNTU_KEYBOARD_DATA_DIR) + QDir::separator() + "keys");
         setContextProperties(engine->rootContext());
 
         // following used to help shell identify the OSK surface
@@ -184,6 +190,12 @@
         qml_context->setContextProperty("greeter_status", m_greeterStatus);
     }
 
+    void updatePluginPaths()
+    {
+        pluginPaths.clear();
+        pluginPaths.append(QString(UBUNTU_KEYBOARD_DATA_DIR) + QDir::separator() + "lib");
+        pluginPaths.append(m_settings.pluginPaths());
+    }
 
     /*
      * register settings
@@ -272,6 +284,12 @@
                          q, SLOT(hide()));
     } 
 
+    void registerPluginPaths()
+    {
+        QObject::connect(&m_settings, SIGNAL(pluginPathsChanged(QStringList)),
+                        q, SLOT(onPluginPathsChanged(QStringList)));
+    }
+
     void closeOskWindow()
     {
         if (!view->isVisible())

=== modified file 'src/plugin/keyboardsettings.cpp'
--- src/plugin/keyboardsettings.cpp	2015-02-05 15:32:51 +0000
+++ src/plugin/keyboardsettings.cpp	2015-04-20 15:33:53 +0000
@@ -44,8 +44,9 @@
 const QLatin1String KEY_PRESS_AUDIO_FEEDBACK_KEY = QLatin1String("keyPressFeedback");
 const QLatin1String KEY_PRESS_AUDIO_FEEDBACK_SOUND_KEY = QLatin1String("keyPressFeedbackSound");
 const QLatin1String KEY_PRESS_HAPTIC_FEEDBACK_KEY = QLatin1String("keyPressHapticFeedback");
-const QLatin1String DOUBLE_SPACE_FULL_STOP = QLatin1String("doubleSpaceFullStop");
-const QLatin1String STAY_HIDDEN = QLatin1String("stayHidden");
+const QLatin1String DOUBLE_SPACE_FULL_STOP_KEY = QLatin1String("doubleSpaceFullStop");
+const QLatin1String STAY_HIDDEN_KEY = QLatin1String("stayHidden");
+const QLatin1String PLUGIN_PATHS_KEY = QLatin1String("pluginPaths");
 
 /*!
  * \brief KeyboardSettings::KeyboardSettings class to load the settings, and
@@ -177,7 +178,7 @@
  */
 bool KeyboardSettings::doubleSpaceFullStop() const
 {
-    return m_settings->get(DOUBLE_SPACE_FULL_STOP).toBool();
+    return m_settings->get(DOUBLE_SPACE_FULL_STOP_KEY).toBool();
 }
 
 /*!
@@ -186,7 +187,16 @@
  */
 bool KeyboardSettings::stayHidden() const
 {
-    return m_settings->get(STAY_HIDDEN).toBool();
+    return m_settings->get(STAY_HIDDEN_KEY).toBool();
+}
+
+/*!
+ * \brief KeyboardSettings::pluginPaths returns a list of paths containing
+ * ubuntu-keyboard layout plugins
+ */
+QStringList KeyboardSettings::pluginPaths() const
+{
+    return m_settings->get(PLUGIN_PATHS_KEY).toStringList();
 }
 
 /*!
@@ -226,11 +236,13 @@
     } else if (key == KEY_PRESS_AUDIO_FEEDBACK_SOUND_KEY) {
         Q_EMIT keyPressAudioFeedbackSoundChanged(keyPressAudioFeedbackSound());
         return;
-    } else if (key == DOUBLE_SPACE_FULL_STOP) {
+    } else if (key == DOUBLE_SPACE_FULL_STOP_KEY) {
         Q_EMIT doubleSpaceFullStopChanged(doubleSpaceFullStop());
         return;
-    } else if (key == STAY_HIDDEN) {
+    } else if (key == STAY_HIDDEN_KEY) {
         Q_EMIT stayHiddenChanged(stayHidden());
+    } else if (key == PLUGIN_PATHS_KEY) {
+        Q_EMIT pluginPathsChanged(pluginPaths());
     }
 
     qWarning() << Q_FUNC_INFO << "unknown settings key:" << key;

=== modified file 'src/plugin/keyboardsettings.h'
--- src/plugin/keyboardsettings.h	2015-02-05 15:32:51 +0000
+++ src/plugin/keyboardsettings.h	2015-04-20 15:33:53 +0000
@@ -57,6 +57,7 @@
     bool keyPressHapticFeedback() const;
     bool doubleSpaceFullStop() const;
     bool stayHidden() const;
+    QStringList pluginPaths() const;
 
 Q_SIGNALS:
     void activeLanguageChanged(QString);
@@ -71,6 +72,7 @@
     void keyPressHapticFeedbackChanged(bool);
     void doubleSpaceFullStopChanged(bool);
     void stayHiddenChanged(bool);
+    void pluginPathsChanged(QStringList);
 
 private:
     Q_SLOT void settingUpdated(const QString &key);

=== modified file 'tests/autopilot/ubuntu_keyboard/tests/test_keyboard.py'
--- tests/autopilot/ubuntu_keyboard/tests/test_keyboard.py	2015-03-26 16:09:48 +0000
+++ tests/autopilot/ubuntu_keyboard/tests/test_keyboard.py	2015-04-20 15:33:53 +0000
@@ -958,7 +958,40 @@
             text_area.text,
             Eventually(Equals(expected))
         )
+
         
+class UbuntuKeyboardPluginPaths(UbuntuKeyboardTests):
+
+    def set_test_settings(self):
+        gsettings = Gio.Settings.new("com.canonical.keyboard.maliit")
+        gsettings.set_strv("plugin-paths", ["/custom/share/maliit/plugins/com/ubuntu/lib", "/usr/share/maliit/tests/ubuntu-keyboard/"])
+        gsettings.set_strv("enabled-languages", ["en", "testlayout"])
+        gsettings.set_string("previous-language", "testlayout")
+        gsettings.set_string("active-language", "testlayout")
+        gsettings.set_boolean("auto-capitalization", True)
+        gsettings.set_boolean("auto-completion", True)
+        gsettings.set_boolean("predictive-text", True)
+        gsettings.set_boolean("spell-checking", True)
+        gsettings.set_boolean("double-space-full-stop", True)
+
+    def test_typing(self):
+        """Test that typing works using a plugin loaded from a custom location.
+
+        """
+        text_area = self.launch_test_input_area(input_hints=['Qt.ImhNoPredictiveText'])
+        self.ensure_focus_on_input(text_area)
+        keyboard = Keyboard()
+        self.addCleanup(keyboard.dismiss)
+
+        # The test layout has a single key that enters the word 'Test'
+        keyboard.press_key("Test")
+
+        expected = "Test"
+        self.assertThat(
+            text_area.text,
+            Eventually(Equals(expected))
+        )
+
 
 def maliit_cleanup():
     presagedir = os.path.expanduser("~/.presage")

=== added directory 'tests/testlayout'
=== added directory 'tests/testlayout/qml'
=== added file 'tests/testlayout/qml/Keyboard_testlayout.qml'
--- tests/testlayout/qml/Keyboard_testlayout.qml	1970-01-01 00:00:00 +0000
+++ tests/testlayout/qml/Keyboard_testlayout.qml	2015-04-20 15:33:53 +0000
@@ -0,0 +1,40 @@
+/*
+ * Copyright 2015 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.0
+import keys 1.0
+
+KeyPad {
+    anchors.fill: parent
+
+    content: c1
+    symbols: "languages/Keyboard_symbols.qml"
+
+    Column {
+        id: c1
+        anchors.fill: parent
+        spacing: 0
+
+        Row {
+            anchors.horizontalCenter: parent.horizontalCenter;
+            spacing: 0
+
+            CharKey { label: "Test"; shifted: "Test"; }
+            LanguageKey { }
+        }
+
+    } // column
+}

=== added symlink 'tests/testlayout/qml/Keyboard_testlayout_email.qml'
=== target is u'Keyboard_testlayout.qml'
=== added symlink 'tests/testlayout/qml/Keyboard_testlayout_url.qml'
=== target is u'Keyboard_testlayout.qml'
=== added symlink 'tests/testlayout/qml/Keyboard_testlayout_url_search.qml'
=== target is u'Keyboard_testlayout.qml'
=== added file 'tests/testlayout/qml/qml.pro'
--- tests/testlayout/qml/qml.pro	1970-01-01 00:00:00 +0000
+++ tests/testlayout/qml/qml.pro	2015-04-20 15:33:53 +0000
@@ -0,0 +1,20 @@
+TOP_BUILDDIR = $$OUT_PWD/../../..
+TOP_SRCDIR = $$PWD/../../..
+
+include($${TOP_SRCDIR}/config.pri)
+
+TARGET = dummy
+TEMPLATE = lib
+
+lang_testlayout.path = "$${UBUNTU_KEYBOARD_TEST_DIR}/testlayout/"
+lang_testlayout.files = *.qml *.js
+
+INSTALLS += lang_testlayout
+
+# for QtCreator
+OTHER_FILES += \
+    Keyboard_testlayout.qml \
+    Keyboard_testlayout_email.qml \
+    Keyboard_testlayout_url.qml \
+    Keyboard_testlayout_url_search.qml
+

=== added directory 'tests/testlayout/src'
=== added file 'tests/testlayout/src/database_testlayout.db'
Binary files tests/testlayout/src/database_testlayout.db	1970-01-01 00:00:00 +0000 and tests/testlayout/src/database_testlayout.db	2015-04-20 15:33:53 +0000 differ
=== added file 'tests/testlayout/src/empty.txt'
=== added file 'tests/testlayout/src/src.pro'
--- tests/testlayout/src/src.pro	1970-01-01 00:00:00 +0000
+++ tests/testlayout/src/src.pro	2015-04-20 15:33:53 +0000
@@ -0,0 +1,47 @@
+TOP_BUILDDIR = $$OUT_PWD/../../..
+TOP_SRCDIR = $$PWD/../../..
+
+include($${TOP_SRCDIR}/config.pri)
+
+TEMPLATE        = lib
+CONFIG         += plugin
+QT             += widgets
+INCLUDEPATH    += \
+    $${TOP_SRCDIR}/src/ \
+    $${TOP_SRCDIR}/src/lib/ \
+    $${TOP_SRCDIR}/src/lib/logic/
+    $${TOP_SRCDIR}/plugins/westernsupport
+
+HEADERS         = \
+    testlayoutplugin.h
+
+TARGET          = $$qtLibraryTarget(testlayoutplugin)
+
+EXAMPLE_FILES = testlayoutplugin.json
+
+# generate database for presage:
+PLUGIN_INSTALL_PATH = $${UBUNTU_KEYBOARD_TEST_DIR}/testlayout/
+
+lang_db_testlayout.commands += \
+  rm -f $$PWD/database_testlayout.db && \
+  text2ngram -n 1 -l -f sqlite -o $$PWD/database_testlayout.db $$PWD/empty.txt && \
+  text2ngram -n 2 -l -f sqlite -o $$PWD/database_testlayout.db $$PWD/empty.txt && \
+  text2ngram -n 3 -l -f sqlite -o $$PWD/database_testlayout.db $$PWD/empty.txt
+lang_db_testlayout.files += $$PWD/database_testlayout.db
+
+lang_db_testlayout_install.files += $$PWD/database_testlayout.db
+lang_db_testlayout_install.path = $$PLUGIN_INSTALL_PATH
+
+QMAKE_EXTRA_TARGETS += lang_db_testlayout lang_db_testlayout_install
+
+target.path = $$PLUGIN_INSTALL_PATH
+INSTALLS += target lang_db_testlayout_install
+
+OTHER_FILES += \
+    testlayoutplugin.json \
+    the_picture_of_dorian_gray.txt
+
+LIBS += $${TOP_BUILDDIR}/plugins/plugins/libwesternsupport.a -lpresage -lhunspell
+
+INCLUDEPATH += $${TOP_SRCDIR}/plugins/westernsupport
+DEPENDPATH += $${TOP_SRCDIR}/plugins/westernsupport

=== added file 'tests/testlayout/src/testlayoutplugin.h'
--- tests/testlayout/src/testlayoutplugin.h	1970-01-01 00:00:00 +0000
+++ tests/testlayout/src/testlayoutplugin.h	2015-04-20 15:33:53 +0000
@@ -0,0 +1,25 @@
+#ifndef TESTLAYOUTPLUGIN_H
+#define TESTLAYOUTPLUGIN_H
+
+#include <QObject>
+#include "languageplugininterface.h"
+#include "westernlanguagesplugin.h"
+
+class TestLayoutPlugin : public WesternLanguagesPlugin
+{
+    Q_OBJECT
+    Q_INTERFACES(LanguagePluginInterface)
+    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.Examples.TestLayoutPlugin" FILE "testlayoutplugin.json")
+
+public:
+    explicit TestLayoutPlugin(QObject* parent = 0)
+        : WesternLanguagesPlugin(parent)
+    {
+    }
+
+    virtual ~TestLayoutPlugin()
+    {
+    }
+};
+
+#endif // TESTLAYOUTPLUGIN_H

=== added file 'tests/testlayout/src/testlayoutplugin.json'
--- tests/testlayout/src/testlayoutplugin.json	1970-01-01 00:00:00 +0000
+++ tests/testlayout/src/testlayoutplugin.json	2015-04-20 15:33:53 +0000
@@ -0,0 +1,7 @@
+{
+    "IID": "org.qt-project.Qt.Examples.TestLayoutPlugin",
+    "MetaData": {
+    },
+    "className": "TestLayoutPlugin",
+    "debug": true
+}

=== added file 'tests/testlayout/testlayout.pro'
--- tests/testlayout/testlayout.pro	1970-01-01 00:00:00 +0000
+++ tests/testlayout/testlayout.pro	2015-04-20 15:33:53 +0000
@@ -0,0 +1,9 @@
+CONFIG += ordered
+TEMPLATE = subdirs
+SUBDIRS = \
+    src \
+    qml
+
+QMAKE_EXTRA_TARGETS += check
+check.target = check
+check.CONFIG = recursive

=== modified file 'tests/tests.pro'
--- tests/tests.pro	2013-10-24 10:17:12 +0000
+++ tests/tests.pro	2015-04-20 15:33:53 +0000
@@ -1,6 +1,7 @@
 TEMPLATE = subdirs
 SUBDIRS = \
     qmltests \
+    testlayout \
     unittests \
 
 CONFIG += ordered