Merge lp:~michael-sheldon/ubuntu-keyboard/fix-qt55 into lp:ubuntu-keyboard

[Michael Sheldon]

Fix header ordering to build with Qt 5.5.

Fix header ordering to build with Qt 5.5 and add dependency on libqt5xcbqpa5 to support xvfb tests under Qt 5.5.

[Michael Sheldon (michael-sheldon)]

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

 * Yes, this requires Qt 5.5 to land first/at the same time. For testing on Qt 5.5 a patched version of maliit-framework is also required: https://bugs.launchpad.net/ubuntu/+source/maliit-framework/+bug/1474690

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?

 * Only changes header ordering and build-deps, no code changes.

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

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:402
http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-ci/627/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3560/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-amd64-ci/128/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-armhf-ci/128/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-i386-ci/128/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3557/console

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

review: Needs Fixing (continuous-integration)

[Timo Jyrinki (timo-jyrinki)]

qtbase is changed to recommend libqt5xcbqpa5 now (build ongoing), please publish this change without the debian/control change instead of waiting for Qt 5.5.

Thanks again for the fix!

review: Needs Fixing

[lp:~michael-sheldon/ubuntu-keyboard/fix-qt55]

403. By Michael Sheldon on 2015-09-03

Remove dependency on libqt5xcbqpa5 (now handled by qtbase)

[Timo Jyrinki (timo-jyrinki)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:403
http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-ci/632/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3998
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-amd64-ci/133
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-armhf-ci/133
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-armhf-ci/133/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-i386-ci/133
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3270
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3995
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3995/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/23035

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

review: Needs Fixing (continuous-integration)

=== modified file 'plugins/westernsupport/westernlanguagesplugin.h'
--- plugins/westernsupport/westernlanguagesplugin.h	2015-04-28 23:17:17 +0000
+++ plugins/westernsupport/westernlanguagesplugin.h	2015-09-03 13:40:25 +0000
@@ -1,6 +1,9 @@
 #ifndef WESTERNLANGUAGESPLUGIN_H
 #define WESTERNLANGUAGESPLUGIN_H
 
+#include <QObject>
+#include <presage.h>
+
 #include "languageplugininterface.h"
 #include "candidatescallback.h"
 #include "westernlanguagefeatures.h"
@@ -8,10 +11,6 @@
 #include "abstractlanguageplugin.h"
 #include "spellpredictworker.h"
 
-#include <presage.h>
-
-#include <QObject>
-
 class WesternLanguageFeatures;
 class CandidatesCallback;
 

=== modified file 'src/lib/logic/abstractlanguageplugin.h'
--- src/lib/logic/abstractlanguageplugin.h	2015-04-13 10:54:12 +0000
+++ src/lib/logic/abstractlanguageplugin.h	2015-09-03 13:40:25 +0000
@@ -28,10 +28,10 @@
 #ifndef ABSTRACTLANGUAGEPLUGIN_H
 #define ABSTRACTLANGUAGEPLUGIN_H
 
+#include <QObject>
+
 #include "languageplugininterface.h"
 
-#include <QObject>
-
 class AbstractLanguagePlugin : public QObject, public LanguagePluginInterface
 {
     Q_OBJECT