Merge lp:~gerboland/qtubuntu/fix-autopilot into lp:qtubuntu

[Gerry Boland]

Use debug extension only if mir-debug loaded

Fix logic error where enabling testability would cause debug extension to be used, even if it didn't load mir-debug extension.

[Unity8 CI Bot (unity8-ci-bot)]

PASSED: Continuous integration, rev:359
https://unity8-jenkins.ubuntu.com/job/lp-qtubuntu-ci/161/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/3453
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/3481
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3328
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3328/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3328
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3328/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3328
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3328/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/3328
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/3328/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3328
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3328/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3328
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3328/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-qtubuntu-ci/161/rebuild

review: Approve (continuous-integration)

[Daniel d'Andrada (dandrader)]

Not sure if isEnabled() is the most appropriate name for this method but it will do.

review: Approve

[Daniel d'Andrada (dandrader)]

something like loadedSuccessfully() would make code in src/ubuntumirclient/integration.cpp easier to understand.

=== modified file 'src/ubuntumirclient/debugextension.cpp'
--- src/ubuntumirclient/debugextension.cpp	2016-09-22 19:45:48 +0000
+++ src/ubuntumirclient/debugextension.cpp	2016-12-01 22:31:07 +0000
@@ -39,6 +39,11 @@
     }
 }
 
+bool UbuntuDebugExtension::isEnabled() const
+{
+    return m_mirclientDebug.isLoaded() && m_mapper;
+}
+
 QPoint UbuntuDebugExtension::mapSurfacePointToScreen(MirSurface *surface, const QPoint &point)
 {
     if (!m_mapper) {

=== modified file 'src/ubuntumirclient/debugextension.h'
--- src/ubuntumirclient/debugextension.h	2016-06-24 12:36:24 +0000
+++ src/ubuntumirclient/debugextension.h	2016-12-01 22:31:07 +0000
@@ -29,6 +29,8 @@
 public:
     UbuntuDebugExtension();
 
+    bool isEnabled() const;
+
     QPoint mapSurfacePointToScreen(MirSurface *, const QPoint &point);
 
 private:

=== modified file 'src/ubuntumirclient/integration.cpp'
--- src/ubuntumirclient/integration.cpp	2016-11-23 12:10:57 +0000
+++ src/ubuntumirclient/integration.cpp	2016-12-01 22:31:07 +0000
@@ -113,6 +113,9 @@
     }
     if (testability) {
         mDebugExtension.reset(new UbuntuDebugExtension);
+        if (!mDebugExtension->isEnabled()) {
+            mDebugExtension.reset();
+        }
     }
 }