Merge lp:~michael-sheldon/ubuntu-keyboard/fix-build-against-new-libplatform into lp:ubuntu-keyboard

[Michael Sheldon]

Allow the keyboard to build with new version of platform-api

Allow the keyboard to build with new version of platform-api

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:391
http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-ci/619/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3446
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-amd64-ci/120
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-armhf-ci/120
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-armhf-ci/120/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-i386-ci/120
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2870
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3443
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3443/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/21941

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

review: Needs Fixing (continuous-integration)

[Michael Sheldon (michael-sheldon)]

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

 * No

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?

 * No change

Note: CI will fail due to autopilot adding a fake keyboard which unity then detects causing it to suppress the OSK.

=== modified file 'src/plugin/ubuntuapplicationapiwrapper.cpp'
--- src/plugin/ubuntuapplicationapiwrapper.cpp	2014-04-16 13:12:34 +0000
+++ src/plugin/ubuntuapplicationapiwrapper.cpp	2015-07-17 10:22:35 +0000
@@ -19,12 +19,6 @@
 // FIXME: this is hacky way of deciding if running on Touch platform or not
 #include <QtCore/qconfig.h>
 
-#ifdef QT_OPENGL_ES_2
-#include <ubuntu/ui/ubuntu_ui_session_service.h>
-#include <ubuntu/application/ui/window_properties.h>
-  #define HAVE_UBUNTU_PLATFORM_API
-#endif
-
 #include <QByteArray>
 #include <QDir>
 #include <QFile>
@@ -95,11 +89,7 @@
 
 int UbuntuApplicationApiWrapper::oskWindowRole() const
 {
-#ifdef HAVE_UBUNTU_PLATFORM_API
-    return static_cast<int>(U_ON_SCREEN_KEYBOARD_ROLE);
-#else
     return 7;
-#endif
 }
 
 void UbuntuApplicationApiWrapper::sendInfoToClientConnection()