Merge lp:~thomas-moenicke/phablet-extras/maliit-framework-autopilot into lp:phablet-extras/maliit-framework

[Thomas Moenicke]

added patch that loads the autopilot driver

added patch that loads the autopilot driver

[lp:~thomas-moenicke/phablet-extras/maliit-framework-autopilot]

1563. By Thomas Moenicke on 2013-07-19

bumped changelog version

1564. By Thomas Moenicke on 2013-07-19

word_engine should not be set to true with this commit

[Thomas Moenicke (thomas-moenicke)]

tested on the device:

>>> from autopilot import introspection
>>> maliit = introspection.get_proxy_object_for_existing_process(1433)
>>> print maliit
<autopilot.introspection.dbus.maliit-server object at 0x189c8f0>
>>> maliit.get_children()
No handlers could be found for logger "autopilot.introspection.dbus"
[<autopilot.introspection.dbus.QQuickView object at 0x189ca50>]

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1562
http://jenkins.qa.ubuntu.com/job/phablet-extras-maliit-framework-ci/33/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-extras-maliit-framework-saucy-armhf-ci/20
        deb: http://jenkins.qa.ubuntu.com/job/phablet-extras-maliit-framework-saucy-armhf-ci/20/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-extras-maliit-framework-saucy-i386-ci/20

Click here to trigger a rebuild:
http://s-jenkins:8080/job/phablet-extras-maliit-framework-ci/33/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1564
http://jenkins.qa.ubuntu.com/job/phablet-extras-maliit-framework-ci/34/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-extras-maliit-framework-saucy-armhf-ci/21
        deb: http://jenkins.qa.ubuntu.com/job/phablet-extras-maliit-framework-saucy-armhf-ci/21/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-extras-maliit-framework-saucy-i386-ci/21

Click here to trigger a rebuild:
http://s-jenkins:8080/job/phablet-extras-maliit-framework-ci/34/rebuild

review: Approve (continuous-integration)

Unmerged revisions

1564. By Thomas Moenicke on 2013-07-19

word_engine should not be set to true with this commit

1563. By Thomas Moenicke on 2013-07-19

bumped changelog version

1562. By Thomas Moenicke on 2013-07-19

added patch that loads the autopilot driver

1561. By Thomas Moenicke on 2013-07-19

enabled word-engine by default in settings file

=== modified file 'debian/changelog'
--- debian/changelog	2013-07-12 11:38:03 +0000
+++ debian/changelog	2013-07-19 15:55:34 +0000
@@ -1,3 +1,9 @@
+maliit-framework (0.99.trunk.phablet3) saucy; urgency=low
+
+  * added patch that loads the autopilot driver
+
+ -- Thomas Moenicke <thomas@pachamama>  Fri, 19 Jul 2013 16:29:19 +0200
+
 maliit-framework (0.99.trunk.phablet2) saucy; urgency=low
 
   * fix activationLostEvent: keyboard state should be updated and hidden

=== modified file 'passthroughserver/main.cpp'
--- passthroughserver/main.cpp	2013-07-01 11:14:32 +0000
+++ passthroughserver/main.cpp	2013-07-19 15:55:34 +0000
@@ -138,6 +138,23 @@
 
     QGuiApplication app(argc, argv);
 
+    // The testability driver is only loaded by QApplication but not by QGuiApplication.
+    // However, QApplication depends on QWidget which would add some unneeded overhead => Let's load the testability driver on our own.
+    if (app.arguments().contains(QLatin1String("-testability"))) {
+      QLibrary testLib(QLatin1String("qttestability"));
+      if (testLib.load()) {
+       typedef void (*TasInitialize)(void);
+       TasInitialize initFunction = (TasInitialize)testLib.resolve("qt_testability_init");
+       if (initFunction) {
+         initFunction();
+       } else {
+         qCritical("Library qttestability resolve failed!");
+       }
+      } else {
+       qCritical("Library qttestability load failed!");
+      }
+    }
+
     // Input Context Connection
     QSharedPointer<MInputContextConnection> icConnection(createConnection(connectionOptions));