QtMir

Merge lp://staging/~alan-griffiths/qtmir/untangle-libmirserver-from-QOBJECTs into lp://staging/qtmir

untangle-libmirserver-from-QOBJECTs
Merge into trunk

Proposed by Alan Griffiths on 2017-03-31

Status:	Approved
Approved by:	Gerry Boland on 2017-04-05
Approved revision:	641
Proposed branch:	lp://staging/~alan-griffiths/qtmir/untangle-libmirserver-from-QOBJECTs
Merge into:	lp://staging/qtmir
Diff against target:	448 lines (+132/-118) 10 files modified src/platforms/mirserver/CMakeLists.txt (+54/-57) src/platforms/mirserver/inputdeviceobserver.cpp (+0/-23) src/platforms/mirserver/inputdeviceobserver.h (+5/-10) src/platforms/mirserver/mirserverhooks.cpp (+34/-1) src/platforms/mirserver/qtcompositor.cpp (+0/-18) src/platforms/mirserver/qtcompositor.h (+1/-6) src/platforms/mirserver/screenscontroller.cpp (+1/-0) src/platforms/mirserver/screensmodel.cpp (+1/-0) src/platforms/mirserver/screensmodel.h (+10/-2) src/platforms/mirserver/setqtcompositor.cpp (+26/-1)
To merge this branch:	bzr merge lp://staging/~alan-griffiths/qtmir/untangle-libmirserver-from-QOBJECTs
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Gerry Boland (community)		2017-03-31	Approve on 2017-04-05
Unity8 CI Bot (community)	continuous-integration		Approve on 2017-04-05
Review via email: mp+321568@code.staging.launchpad.net

Commit message

Another pass at separating out the libmirserver dependencies

Revision history for this message

Unity8 CI Bot (unity8-ci-bot) wrote on 2017-03-31:

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

review: Approve (continuous-integration)

lp://staging/~alan-griffiths/qtmir/untangle-libmirserver-from-QOBJECTs updated on 2017-04-03

640. By Alan Griffiths on 2017-04-03: windowmanagementpolicy.cpp doesn't use libmirserver

Revision history for this message

Unity8 CI Bot (unity8-ci-bot) wrote on 2017-04-03:

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

review: Approve (continuous-integration)

Revision history for this message

Gerry Boland (gerboland) wrote on 2017-04-04:

May I propose this patch to neaten up the CMakeLists.txt file considerably:
http://pastebin.ubuntu.com/24312831/

=== modified file 'src/platforms/mirserver/screensmodel.h'
+ namespace graphics {
+ namespace detail { struct GraphicsConfCardIdTag; struct GraphicsConfOutputIdTag; }
+ typedef IntWrapper <detail::GraphicsConfCardIdTag> DisplayConfigurationCardId;
+ typedef IntWrapper <detail::GraphicsConfOutputIdTag> DisplayConfigurationOutputId;
+ class Display;
+ class DisplayConfigurationOutput;
+ }
I'm not keen on duplicating Mir code like this, looks very fragile. Is this temporary? I do intend to update the poorly named ScreensModel to use miral::ActiveDisplayObserver stuff.

Rest is good, glad to see we're going in the same direction.

review: Needs Fixing

lp://staging/~alan-griffiths/qtmir/untangle-libmirserver-from-QOBJECTs updated on 2017-04-05

641. By Alan Griffiths on 2017-04-05: Apply Gerry's patch to CMakeLists.txt

Revision history for this message

Alan Griffiths (alan-griffiths) wrote on 2017-04-05:

> May I propose this patch to neaten up the CMakeLists.txt file considerably:
> http://pastebin.ubuntu.com/24312831/

Patch applied.

> === modified file 'src/platforms/mirserver/screensmodel.h'
> + namespace graphics {
> + namespace detail { struct GraphicsConfCardIdTag; struct
> GraphicsConfOutputIdTag; }
> + typedef IntWrapper <detail::GraphicsConfCardIdTag>
> DisplayConfigurationCardId;
> + typedef IntWrapper <detail::GraphicsConfOutputIdTag>
> DisplayConfigurationOutputId;
> + class Display;
> + class DisplayConfigurationOutput;
> + }
> I'm not keen on duplicating Mir code like this, looks very fragile. Is this
> temporary? I do intend to update the poorly named ScreensModel to use
> miral::ActiveDisplayObserver stuff.

I agree. It is temporary and IMO a low risk, I simply didn't want to complicate the MP by addressing that now.

> Rest is good, glad to see we're going in the same direction.

Great. Let's get there soon!

Revision history for this message

Unity8 CI Bot (unity8-ci-bot) wrote on 2017-04-05:

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

review: Approve (continuous-integration)

Revision history for this message

Unity8 CI Bot (unity8-ci-bot) wrote on 2017-04-05:

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

review: Approve (continuous-integration)

Revision history for this message

Gerry Boland (gerboland) on 2017-04-05:

review: Approve

Unmerged revisions

641. By Alan Griffiths on 2017-04-05: Apply Gerry's patch to CMakeLists.txt
640. By Alan Griffiths on 2017-04-03: windowmanagementpolicy.cpp doesn't use libmirserver
639. By Alan Griffiths on 2017-03-31: cleanup the mirserver platform compile flags
638. By Alan Griffiths on 2017-03-31: Avoid dependency on libmirserver-dev in qtcompositor.h
637. By Alan Griffiths on 2017-03-31: Avoid dependency on libmirserver-dev in inputdeviceobserver.h
636. By Alan Griffiths on 2017-03-31: Avoid dependency on libmirserver-dev in screensmodel.h

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes:

Alan Griffiths

Daniel d'Andrada

Mir development team

QtMir

Merge lp://staging/~alan-griffiths/qtmir/untangle-libmirserver-from-QOBJECTs into lp://staging/qtmir

Commit message

Description of the change

Unmerged revisions

Preview Diff

Subscribers