Merge lp://staging/~andreas-pokorny/qtmir/controlMirCursor-and-more into lp://staging/qtmir
Proposed by
Andreas Pokorny
| Status: | Work in progress |
|---|---|
| Proposed branch: | lp://staging/~andreas-pokorny/qtmir/controlMirCursor-and-more |
| Merge into: | lp://staging/qtmir |
| Diff against target: |
520 lines (+101/-48) 17 files modified
debian/changelog (+6/-0) src/platforms/mirserver/cursor.cpp (+20/-2) src/platforms/mirserver/cursor.h (+4/-1) src/platforms/mirserver/miropenglcontext.cpp (+14/-2) src/platforms/mirserver/mirserver.cpp (+17/-26) src/platforms/mirserver/mirserverstatuslistener.cpp (+8/-0) src/platforms/mirserver/mirserverstatuslistener.h (+2/-0) src/platforms/mirserver/offscreensurface.cpp (+0/-1) src/platforms/mirserver/screen.cpp (+2/-1) src/platforms/mirserver/screen.h (+2/-1) src/platforms/mirserver/screensmodel.cpp (+4/-2) src/platforms/mirserver/screensmodel.h (+4/-2) tests/framework/fake_displayconfigurationoutput.h (+8/-2) tests/framework/mock_display.h (+4/-2) tests/mirserver/Screen/screen_test.cpp (+4/-4) tests/mirserver/ScreensModel/stub_screen.h (+1/-1) tests/mirserver/ScreensModel/testable_screensmodel.h (+1/-1) |
| To merge this branch: | bzr merge lp://staging/~andreas-pokorny/qtmir/controlMirCursor-and-more |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Mir development team | Pending | ||
|
Review via email:
|
|||
Commit message
WIP
Description of the change
mp needed for integration silo
To post a comment you must log in.
Unmerged revisions
- 555. By Andreas Pokorny
-
Feed cursor position directly into WindowSystemInt
erface - 554. By Andreas Pokorny
-
forward qtmir cursor position to the nested cursor
- 553. By Andreas Pokorny
-
changelog update
- 552. By Andreas Pokorny
-
update of qtmir
- 551. By Andreas Pokorny
-
update to upcoming lp:mir interfaces
- 550. By Daniel d'Andrada
-
WIP
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
