Merge lp://staging/~bregma/qtmir/use-ual-info into lp://staging/qtmir
Proposed by
Stephen M. Webb
| Status: | Work in progress |
|---|---|
| Proposed branch: | lp://staging/~bregma/qtmir/use-ual-info |
| Merge into: | lp://staging/qtmir |
| Diff against target: |
3126 lines (+493/-1554) 30 files modified
debian/control (+1/-1) src/modules/Unity/Application/CMakeLists.txt (+2/-1) src/modules/Unity/Application/application.cpp (+22/-67) src/modules/Unity/Application/application.h (+3/-9) src/modules/Unity/Application/application_manager.cpp (+29/-42) src/modules/Unity/Application/application_manager.h (+0/-3) src/modules/Unity/Application/applicationinfo.h (+59/-0) src/modules/Unity/Application/dbuswindowstack.cpp (+1/-1) src/modules/Unity/Application/desktopfilereader.cpp (+0/-320) src/modules/Unity/Application/desktopfilereader.h (+0/-78) src/modules/Unity/Application/taskcontroller.h (+3/-3) src/modules/Unity/Application/upstart/applicationinfo.cpp (+109/-0) src/modules/Unity/Application/upstart/applicationinfo.h (+57/-0) src/modules/Unity/Application/upstart/taskcontroller.cpp (+75/-93) src/modules/Unity/Application/upstart/taskcontroller.h (+1/-2) tests/framework/CMakeLists.txt (+3/-3) tests/framework/fake_application_info.cpp (+31/-41) tests/framework/fake_application_info.h (+12/-17) tests/framework/mock_application_info.cpp (+23/-94) tests/framework/mock_application_info.h (+17/-35) tests/framework/mock_task_controller.cpp (+5/-17) tests/framework/mock_task_controller.h (+2/-5) tests/framework/qtmir_test.cpp (+0/-10) tests/framework/qtmir_test.h (+0/-2) tests/modules/Application/application_test.cpp (+15/-14) tests/modules/ApplicationManager/application_manager_test.cpp (+23/-246) tests/modules/CMakeLists.txt (+0/-1) tests/modules/DesktopFileReader/CMakeLists.txt (+0/-22) tests/modules/DesktopFileReader/calculator.desktop (+0/-227) tests/modules/DesktopFileReader/desktopfilereader_test.cpp (+0/-200) |
| To merge this branch: | bzr merge lp://staging/~bregma/qtmir/use-ual-info |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Mir development team | Pending | ||
|
Review via email:
|
|||
Commit message
add required param to mock app object ctor to fix ftbfs
Description of the change
fix params to mock object ctor
To post a comment you must log in.
Unmerged revisions
- 448. By Stephen M. Webb
-
synch with trunk
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
