Merge lp:~albaguirre/qtmir/mir-0.20-compatibility into lp:qtmir

[Alberto Aguirre]

DO NOT MERGE: silo testing

DO NOT MERGE: silo testing

[lp:~albaguirre/qtmir/mir-0.20-compatibility]

440. By Alberto Aguirre on 2016-02-03

Increment version

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

FAILED: Continuous integration, rev:439
https://unity8-jenkins.ubuntu.com/job/lp-qtmir-1-ci/60/
Executed test runs:

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-qtmir-1-ci/60/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:440
http://jenkins.qa.ubuntu.com/job/qtmir-ci/682/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-amd64-ci/376/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-armhf-ci/378/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-i386-ci/258/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-wily-amd64-ci/413/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-wily-armhf-ci/415/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-wily-i386-ci/258/console

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:440
https://unity8-jenkins.ubuntu.com/job/lp-qtmir-1-ci/61/
Executed test runs:

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-qtmir-1-ci/61/rebuild

review: Needs Fixing (continuous-integration)

[Gerry Boland (gerboland)]

This landed. Cleaning up

Unmerged revisions

440. By Alberto Aguirre on 2016-02-03

Increment version

439. By Alberto Aguirre on 2016-02-03

Mir 0.20 compatibility

=== modified file 'debian/changelog'
--- debian/changelog	2016-01-27 21:42:31 +0000
+++ debian/changelog	2016-02-03 23:54:36 +0000
@@ -1,3 +1,9 @@
+qtmir (0.4.7+16.04.20160127.1-0ubuntu2) UNRELEASED; urgency=medium
+
+  * Changes for mir 0.20 
+
+ -- Alberto Aguirre <[e-mail]>  Wed, 03 Feb 2016 17:53:47 -0600
+
 qtmir (0.4.7+16.04.20160127.1-0ubuntu1) xenial; urgency=medium
 
   * Changes for mir 0.19.

=== modified file 'tests/common/mock_display.h'
--- tests/common/mock_display.h	2015-08-20 10:16:54 +0000
+++ tests/common/mock_display.h	2016-02-03 23:54:36 +0000
@@ -19,6 +19,7 @@
 
 #include <mir/graphics/display.h>
 #include <mir/graphics/gl_context.h>
+#include <mir/graphics/virtual_output.h>
 
 #include <gmock/gmock.h>
 #include "gmock_fixes.h"
@@ -46,6 +47,7 @@
     MOCK_METHOD0(resume, void());
     MOCK_METHOD1(create_hardware_cursor, std::shared_ptr<mir::graphics::Cursor>(std::shared_ptr<mir::graphics::CursorImage> const&));
     MOCK_METHOD0(create_gl_context, std::unique_ptr<mir::graphics::GLContext>());
+    MOCK_METHOD2(create_virtual_output, std::unique_ptr<mir::graphics::VirtualOutput>(int, int));
 };