Merge lp:~gerboland/qtubuntu/fix-debug-mode-56 into lp:qtubuntu

[Gerry Boland]

Fix for Qt5.6 mapToGlobal: QPlatformWindow::geometry() expected to be in absolute screens coordinates

Needed for Autopilot

Handy test application:
lp:~gerboland/+junk/absolute-position-test
It will print where you tap in absolute coordinates.

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

PASSED: Continuous integration, rev:352
https://unity8-jenkins.ubuntu.com/job/lp-qtubuntu-ci/160/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/3298
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/3326
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/3178
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/3178/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3178
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3178/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3178
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3178/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/3178
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/3178/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3178
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3178/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/3178
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/3178/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/3178
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/3178/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3178
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3178/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3178
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3178/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Daniel d'Andrada (dandrader)]

Looks good to me

review: Approve

=== modified file 'src/ubuntumirclient/window.cpp'
--- src/ubuntumirclient/window.cpp	2016-10-24 11:32:31 +0000
+++ src/ubuntumirclient/window.cpp	2016-11-16 16:58:48 +0000
@@ -755,6 +755,17 @@
     }
 }
 
+QRect UbuntuWindow::geometry() const
+{
+    if (mDebugExtention) {
+        auto geom = QPlatformWindow::geometry();
+        geom.moveTopLeft(mDebugExtention->mapSurfacePointToScreen(mSurface->mirSurface(), QPoint(0,0)));
+        return geom;
+    } else {
+        return QPlatformWindow::geometry();
+    }
+}
+
 void UbuntuWindow::setGeometry(const QRect &rect)
 {
     QMutexLocker lock(&mMutex);

=== modified file 'src/ubuntumirclient/window.h'
--- src/ubuntumirclient/window.h	2016-10-04 16:04:53 +0000
+++ src/ubuntumirclient/window.h	2016-11-16 16:58:48 +0000
@@ -45,6 +45,7 @@
 
     // QPlatformWindow methods.
     WId winId() const override;
+    QRect geometry() const override;
     void setGeometry(const QRect&) override;
     void setWindowState(Qt::WindowState state) override;
     void setWindowFlags(Qt::WindowFlags flags) override;