qtubuntu

Merge lp://qastaging/~albaguirre/qtubuntu/more-new-mir-apis into lp://qastaging/qtubuntu

  1. more-new-mir-apis
  2. Merge into trunk
Proposed by Alberto Aguirre
Status: Merged
Approved by: Gerry Boland
Approved revision: 381
Merged at revision: 389
Proposed branch: lp://qastaging/~albaguirre/qtubuntu/more-new-mir-apis
Merge into: lp://qastaging/qtubuntu
Prerequisite: lp://qastaging/~artmello/qtubuntu/qtubuntu-new_mir_api
Diff against target: 164 lines (+41/-40)
4 files modified
src/ubuntumirclient/qmirclientcursor.cpp (+27/-12)
src/ubuntumirclient/qmirclientdebugextension.cpp (+10/-21)
src/ubuntumirclient/qmirclientdebugextension.h (+3/-6)
src/ubuntumirclient/qmirclientintegration.cpp (+1/-1)
To merge this branch: bzr merge lp://qastaging/~albaguirre/qtubuntu/more-new-mir-apis
Reviewer Review Type Date Requested Status
Gerry Boland (community) Approve
Daniel d'Andrada (community) Approve
Unity8 CI Bot continuous-integration Approve
Review via email: mp+316646@code.qastaging.launchpad.net

Commit message

Remove more uses of deprecated mir apis.

- Use proper extension for translating window coordinates
- Use a window spec to apply a cursor name to a window.

To post a comment you must log in.
Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote :

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

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

review: Approve (continuous-integration)
Revision history for this message
Daniel d'Andrada (dandrader) wrote :

Code makes sense, but it breaks the cursor. Ie, it no longer changes shape. Maybe it needs changes also on the qtmir side to match?

To test:
$ bzr branch lp:~dandrader/+junk/animatedDemos
$ cd animatedDemos/CustomCursor
$ qmake && make
$ cd ..
$ qmlscene CursorShapes.qml -I . -- --desktop_file_hint=/usr/share/applications/gedit.desktop

Currently there's a problem somewhere (didn't investigate yet) that several of the named cursors are not working anymore. But still, the following ones still work:
UpArrow, Cross, WhatsThis, DragCopy, Busy, DragMove, DragLink.
The big boat an football ball custom cursors should also be set and unset as expected

With this patch, no named cursor work anymore. Also once you hover over the big football ball, it never goes back to the arrow cursor.

review: Needs Fixing
Revision history for this message
Daniel d'Andrada (dandrader) wrote :

For reference, it's bug 1662827

Revision history for this message
Alberto Aguirre (albaguirre) wrote :

@Daniel, yeah probably a new codepath needed in qtmir.

Cursor name changes work (with this branch) when I connect directly to a mir_demo_server instance.

Revision history for this message
Daniel d'Andrada (dandrader) wrote :

> @Daniel, yeah probably a new codepath needed in qtmir.

Will check the qtmir part.

Revision history for this message
Daniel d'Andrada (dandrader) wrote :

> > @Daniel, yeah probably a new codepath needed in qtmir.
>
> Will check the qtmir part.

alan_g said this actually might be a bug in mir: https://bugs.launchpad.net/mir/+bug/1663197

Revision history for this message
Daniel d'Andrada (dandrader) wrote :
Download full text (3.3 KiB)

We should be able to merge it now that the fix for bug 1663197 has been released. Unfortunately this branch now conflicts with latest trunk.

"""
$ bzr merge lp:~albaguirre/qtubuntu/more-new-mir-apis
Not attempting to fix packaging branch ancestry, missing pristine tar data for version 0.63+17.04.20170119.2.
 M src/ubuntumirclient/qmirclientcursor.cpp
 M src/ubuntumirclient/qmirclientdebugextension.cpp
 M src/ubuntumirclient/qmirclientdebugextension.h
 M src/ubuntumirclient/qmirclientintegration.cpp
 M src/ubuntumirclient/qmirclientwindow.cpp
Text conflict in src/ubuntumirclient/qmirclientcursor.cpp
Text conflict in src/ubuntumirclient/qmirclientdebugextension.cpp
Text conflict in src/ubuntumirclient/qmirclientdebugextension.h
Text conflict in src/ubuntumirclient/qmirclientwindow.cpp ...

Read more...

review: Needs Fixing
Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote :

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

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

review: Approve (continuous-integration)
Revision history for this message
Daniel d'Andrada (dandrader) wrote :

Thanks!

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

https://bugs.launchpad.net/miral/+bug/1670876
The new cursor api has a bug which this exposes. I think we need to hold off accepting this until that bug is fixed.

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

Mir 0.26.2 released with fix for this aforementioned bug, this should be good to go now

review: Approve

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