QtMir

Merge lp:~dandrader/qtmir/miral-qt-integration into lp:~unity-team/qtmir/miral-qt-integration

  1. miral-qt-integration
  2. Merge into miral-qt-integration
Proposed by Daniel d'Andrada
Status: Merged
Approved by: Gerry Boland
Approved revision: 589
Merged at revision: 589
Proposed branch: lp:~dandrader/qtmir/miral-qt-integration
Merge into: lp:~unity-team/qtmir/miral-qt-integration
Diff against target: 230 lines (+43/-41)
11 files modified
CMakeLists.txt (+2/-2)
debian/changelog (+6/-0)
debian/control (+5/-5)
src/platforms/mirserver/miropenglcontext.cpp (+3/-12)
src/platforms/mirserver/mirserverstatuslistener.cpp (+8/-0)
src/platforms/mirserver/mirserverstatuslistener.h (+2/-5)
tests/framework/fake_displayconfigurationoutput.h (+3/-10)
tests/framework/fake_surface.h (+6/-3)
tests/framework/mock_mir_session.cpp (+2/-0)
tests/framework/mock_mir_session.h (+3/-0)
tests/framework/mock_surface.h (+3/-4)
To merge this branch: bzr merge lp:~dandrader/qtmir/miral-qt-integration
Reviewer Review Type Date Requested Status
Gerry Boland (community) Approve
Review via email: mp+313145@code.launchpad.net

Commit message

Mir 0.25 compat (merging upcoming trunk)

To post a comment you must log in.
Revision history for this message
Gerry Boland (gerboland) wrote :

=== modified file 'debian/control'
can you bump the deps for mir-renderer-gl-dev & mirtest-dev please, just in case.

review: Needs Fixing
lp:~dandrader/qtmir/miral-qt-integration updated
589. By Daniel d'Andrada

Bump dependency version of other mir packages

Revision history for this message
Gerry Boland (gerboland) wrote :

Ok, thank you

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'CMakeLists.txt'
2--- CMakeLists.txt 2016-11-09 14:27:51 +0000
3+++ CMakeLists.txt 2016-12-13 15:52:03 +0000
4@@ -71,8 +71,8 @@
5
6 find_package(Threads REQUIRED)
7
8-pkg_check_modules(MIRSERVER mirserver>=0.24 REQUIRED)
9-pkg_check_modules(MIRCLIENT mirclient>=0.24 REQUIRED)
10+pkg_check_modules(MIRSERVER mirserver>=0.25 REQUIRED)
11+pkg_check_modules(MIRCLIENT mirclient>=0.25 REQUIRED)
12 pkg_check_modules(MIRRENDERERGLDEV mir-renderer-gl-dev>=0.24 REQUIRED)
13 pkg_check_modules(MIRAL miral>=0.4 REQUIRED)
14
15
16=== modified file 'debian/changelog'
17--- debian/changelog 2016-12-01 19:30:03 +0000
18+++ debian/changelog 2016-12-13 15:52:03 +0000
19@@ -4,6 +4,12 @@
20
21 -- Gerry Boland <gerry.boland@canonical.com> Fri, 14 Oct 2016 16:51:26 +0100
22
23+qtmir (0.5.0+17.04.20161203-0ubuntu1) zesty; urgency=medium
24+
25+ * Mir 0.25 compat
26+
27+ -- Brandon Schaefer <brandon.schaefer@canonical.com> Sat, 03 Dec 2016 12:38:04 +0000
28+
29 qtmir (0.5.0+17.04.20161123.3-0ubuntu1) zesty; urgency=medium
30
31 [ Albert Astals Cid ]
32
33=== modified file 'debian/control'
34--- debian/control 2016-11-03 20:38:57 +0000
35+++ debian/control 2016-12-13 15:52:03 +0000
36@@ -14,9 +14,9 @@
37 libgsettings-qt-dev,
38 liblttng-ust-dev,
39 libmiral-dev (>= 0.4),
40- libmirclient-dev (>= 0.24.0),
41- libmircommon-dev (>= 0.24.0),
42- libmirserver-dev (>= 0.24.0),
43+ libmirclient-dev (>= 0.25.0),
44+ libmircommon-dev (>= 0.25.0),
45+ libmirserver-dev (>= 0.25.0),
46 libmtdev-dev,
47 libprocess-cpp-dev,
48 libqt5sensors5-dev,
49@@ -29,8 +29,8 @@
50 liburl-dispatcher1-dev,
51 libxkbcommon-dev,
52 libxrender-dev,
53- mir-renderer-gl-dev (>= 0.24.0),
54- mirtest-dev (>= 0.24.0),
55+ mir-renderer-gl-dev (>= 0.25.0),
56+ mirtest-dev (>= 0.25.0),
57 pkg-config,
58 # lttng-gen-ts needs python3, but doesn't depend on it itself: bug 1359147
59 python3:any,
60
61=== modified file 'src/platforms/mirserver/miropenglcontext.cpp'
62--- src/platforms/mirserver/miropenglcontext.cpp 2016-12-01 11:45:31 +0000
63+++ src/platforms/mirserver/miropenglcontext.cpp 2016-12-13 15:52:03 +0000
64@@ -29,14 +29,8 @@
65
66 // Mir
67 #include <mir/graphics/display.h>
68-#include <mir/version.h>
69-#if MIR_SERVER_VERSION >= MIR_VERSION_NUMBER(0, 25, 0)
70+#include <mir/renderer/gl/context.h>
71 #include <mir/renderer/gl/context_source.h>
72-#include <mir/renderer/gl/context.h>
73-#else
74-#include <mir/graphics/gl_context.h>
75-#endif
76-
77
78 // Qt supports one GL context per screen, but also shared contexts.
79 // The Mir "Display" generates a shared GL context for all DisplayBuffers
80@@ -52,11 +46,8 @@
81 #endif
82 {
83 // create a temporary GL context to fetch the EGL display and config, so Qt can determine the surface format
84-#if MIR_SERVER_VERSION < MIR_VERSION_NUMBER(0, 25, 0)
85- std::unique_ptr<mir::graphics::GLContext> mirContext = display.create_gl_context();
86-#else
87- auto const mirContext = dynamic_cast<mir::renderer::gl::ContextSource&>(display).create_gl_context();
88-#endif
89+ std::unique_ptr<mir::renderer::gl::Context> mirContext = dynamic_cast<mir::renderer::gl::ContextSource*>(
90+ display.native_display())->create_gl_context();
91 mirContext->make_current();
92
93 EGLDisplay eglDisplay = eglGetCurrentDisplay();
94
95=== modified file 'src/platforms/mirserver/mirserverstatuslistener.cpp'
96--- src/platforms/mirserver/mirserverstatuslistener.cpp 2015-08-11 12:08:32 +0000
97+++ src/platforms/mirserver/mirserverstatuslistener.cpp 2016-12-13 15:52:03 +0000
98@@ -35,3 +35,11 @@
99 void MirServerStatusListener::started()
100 {
101 }
102+
103+void MirServerStatusListener::ready_for_user_input()
104+{
105+}
106+
107+void MirServerStatusListener::stop_receiving_input()
108+{
109+}
110
111=== modified file 'src/platforms/mirserver/mirserverstatuslistener.h'
112--- src/platforms/mirserver/mirserverstatuslistener.h 2016-11-03 20:17:46 +0000
113+++ src/platforms/mirserver/mirserverstatuslistener.h 2016-12-13 15:52:03 +0000
114@@ -26,11 +26,8 @@
115 void paused() override;
116 void resumed() override;
117 void started() override;
118-
119-#if MIR_SERVER_VERSION >= MIR_VERSION_NUMBER(0, 25, 0)
120- void ready_for_user_input() override {}
121- void stop_receiving_input() override {}
122-#endif
123+ void ready_for_user_input() override;
124+ void stop_receiving_input() override;
125 };
126
127 #endif // MIRSERVERSTATUSLISTENER_H
128
129=== modified file 'tests/framework/fake_displayconfigurationoutput.h'
130--- tests/framework/fake_displayconfigurationoutput.h 2016-11-03 20:17:46 +0000
131+++ tests/framework/fake_displayconfigurationoutput.h 2016-12-13 15:52:03 +0000
132@@ -46,15 +46,11 @@
133 mir_power_mode_on,
134 mir_orientation_normal,
135 1.0f,
136- mir_form_factor_unknown
137-
138-#if MIR_SERVER_VERSION >= MIR_VERSION_NUMBER(0, 25, 0)
139- ,
140+ mir_form_factor_unknown,
141 mir_subpixel_arrangement_unknown,
142 {},
143 mir_output_gamma_unsupported
144-#endif
145- };
146+};
147
148 const mg::DisplayConfigurationOutput fakeOutput2
149 {
150@@ -79,13 +75,10 @@
151 mir_power_mode_on,
152 mir_orientation_left,
153 1.0f,
154- mir_form_factor_unknown
155-#if MIR_SERVER_VERSION >= MIR_VERSION_NUMBER(0, 25, 0)
156- ,
157+ mir_form_factor_unknown,
158 mir_subpixel_arrangement_unknown,
159 {},
160 mir_output_gamma_unsupported
161-#endif
162 };
163
164 #endif // FAKE_DISPLAYCONFIGURATIONOUTPUT_H
165
166=== modified file 'tests/framework/fake_surface.h'
167--- tests/framework/fake_surface.h 2016-11-03 20:17:46 +0000
168+++ tests/framework/fake_surface.h 2016-12-13 15:52:03 +0000
169@@ -102,10 +102,13 @@
170 void rename(std::string const&) override {}
171 std::shared_ptr<frontend::BufferStream> primary_buffer_stream() const override { return nullptr; }
172
173-#if MIR_SERVER_VERSION >= MIR_VERSION_NUMBER(0, 24, 0)
174 void set_confine_pointer_state(MirPointerConfinementState) {}
175- MirPointerConfinementState confine_pointer_state() const { return {}; }
176-#endif
177+ MirPointerConfinementState confine_pointer_state() const
178+ {
179+ return mir_pointer_unconfined;
180+ }
181+
182+ void placed_relative(mir::geometry::Rectangle const&) {}
183 };
184
185 } // namespace scene
186
187=== modified file 'tests/framework/mock_mir_session.cpp'
188--- tests/framework/mock_mir_session.cpp 2016-05-27 07:58:10 +0000
189+++ tests/framework/mock_mir_session.cpp 2016-12-13 15:52:03 +0000
190@@ -59,6 +59,8 @@
191 }
192
193 void MockSession::configure_streams(scene::Surface &, const std::vector<mir::shell::StreamSpecification> &) {}
194+void MockSession::send_error(mir::ClientVisibleError const&) {}
195+
196
197 } // namespace scene
198 } // namespace mir
199
200=== modified file 'tests/framework/mock_mir_session.h'
201--- tests/framework/mock_mir_session.h 2016-11-03 20:17:46 +0000
202+++ tests/framework/mock_mir_session.h 2016-12-13 15:52:03 +0000
203@@ -72,6 +72,9 @@
204 //void send_input_device_change(std::vector<std::shared_ptr<input::Device>> const& devices) = 0;
205
206
207+ void send_error(ClientVisibleError const&) override;
208+
209+
210 private:
211
212 #if MIR_SERVER_VERSION >= MIR_VERSION_NUMBER(0, 24, 0)
213
214=== modified file 'tests/framework/mock_surface.h'
215--- tests/framework/mock_surface.h 2016-11-03 20:17:46 +0000
216+++ tests/framework/mock_surface.h 2016-12-13 15:52:03 +0000
217@@ -89,10 +89,9 @@
218
219 MOCK_METHOD2(set_cursor_stream, void(std::shared_ptr<frontend::BufferStream> const&, geometry::Displacement const&));
220
221-#if MIR_SERVER_VERSION >= MIR_VERSION_NUMBER(0, 24, 0)
222- void set_confine_pointer_state(MirPointerConfinementState) {}
223- MirPointerConfinementState confine_pointer_state() const { return {}; }
224-#endif
225+ MOCK_METHOD1(set_confine_pointer_state, void(MirPointerConfinementState));
226+ MOCK_CONST_METHOD0(confine_pointer_state, MirPointerConfinementState());
227+ MOCK_METHOD1(placed_relative, void(mir::geometry::Rectangle const& placement));
228 };
229
230 } // namespace scene

Subscribers

People subscribed via source and target branches

to all changes: