Merge lp://staging/~mir-team/qtmir/port-to-msh-shell-and-mirevent2 into lp://staging/qtmir
Proposed by
kevin gunn
| Status: | Work in progress |
|---|---|
| Proposed branch: | lp://staging/~mir-team/qtmir/port-to-msh-shell-and-mirevent2 |
| Merge into: | lp://staging/qtmir |
| Diff against target: |
2466 lines (+813/-771) 38 files modified
CMakeLists.txt (+1/-0) debian/changelog (+6/-0) debian/control (+3/-3) src/common/debughelpers.cpp (+7/-23) src/modules/Unity/Application/application.cpp (+9/-7) src/modules/Unity/Application/application.h (+4/-15) src/modules/Unity/Application/application_manager.cpp (+3/-32) src/modules/Unity/Application/desktopfilereader.cpp (+96/-0) src/modules/Unity/Application/desktopfilereader.h (+5/-0) src/modules/Unity/Application/mirsurfaceitem.cpp (+140/-211) src/modules/Unity/Application/mirsurfaceitem.h (+25/-5) src/modules/Unity/Application/mirsurfacemanager.cpp (+5/-5) src/modules/Unity/Application/plugin.cpp (+1/-0) src/modules/Unity/Application/sessionmanager.cpp (+1/-1) src/platforms/mirserver/CMakeLists.txt (+1/-3) src/platforms/mirserver/focussetter.cpp (+0/-24) src/platforms/mirserver/focussetter.h (+0/-28) src/platforms/mirserver/mirplacementstrategy.cpp (+0/-59) src/platforms/mirserver/mirplacementstrategy.h (+0/-42) src/platforms/mirserver/mirserver.cpp (+13/-20) src/platforms/mirserver/mirserver.h (+4/-3) src/platforms/mirserver/mirshell.cpp (+75/-0) src/platforms/mirserver/mirshell.h (+56/-0) src/platforms/mirserver/nativeinterface.cpp (+2/-2) src/platforms/mirserver/qteventfeeder.cpp (+137/-113) src/platforms/mirserver/qteventfeeder.h (+6/-4) src/platforms/mirserver/surfaceconfigurator.cpp (+0/-34) src/platforms/mirserver/surfaceconfigurator.h (+0/-41) tests/mirserver/QtEventFeeder/mock_qtwindowsystem.h (+1/-0) tests/mirserver/QtEventFeeder/qteventfeeder_test.cpp (+2/-31) tests/modules/ApplicationManager/application_manager_test.cpp (+99/-0) tests/modules/DesktopFileReader/desktopfilereader_test.cpp (+70/-0) tests/modules/MirSurfaceItem/mirsurfaceitem_test.cpp (+38/-22) tests/modules/common/mock_focus_controller.h (+0/-40) tests/modules/common/mock_mir_session.h (+1/-0) tests/modules/common/mock_renderable.h (+0/-2) tests/modules/common/mock_surface.h (+2/-0) tests/modules/common/qtmir_test.h (+0/-1) |
| To merge this branch: | bzr merge lp://staging/~mir-team/qtmir/port-to-msh-shell-and-mirevent2 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Mir development team | Pending | ||
|
Review via email:
|
|||
Commit message
merge of qtmir port to shell and mirevent2
Description of the change
merge of qtmir port to shell and mirevent2
To post a comment you must log in.
Unmerged revisions
- 324. By kevin gunn
-
added mirsurfaceattribute to the qtmir application
- 323. By Andreas Pokorny
-
fix test cases
- 322. By Andreas Pokorny
-
duplicate mock entry oO
- 321. By kevin gunn
-
fix typo
- 320. By Andreas Pokorny
-
merged daniels branch into this one
- 319. By kevin gunn
-
merge port to shell and mir event
- 318. By Robert Carr
-
Finish touch-event-support
- 317. By Robert Carr
-
Implement touch mods
- 316. By Robert Carr
-
Typo
- 315. By Robert Carr
-
Update to use chrono
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
