Merge lp://qastaging/~mardy/unity-chromium-extension/qt-host-impl into lp://qastaging/~webapps/unity-chromium-extension/staging
Proposed by
Alberto Mardegan
| Status: | Merged |
|---|---|
| Merged at revision: | 252 |
| Proposed branch: | lp://qastaging/~mardy/unity-chromium-extension/qt-host-impl |
| Merge into: | lp://qastaging/~webapps/unity-chromium-extension/staging |
| Diff against target: |
839 lines (+696/-16) 16 files modified
.bzrignore (+2/-0) messaging-host/connection.h (+2/-0) messaging-host/inactivity-timer.cpp (+65/-0) messaging-host/inactivity-timer.h (+56/-0) messaging-host/main.cpp (+23/-0) messaging-host/messaging-host.pro (+6/-2) messaging-host/service.cpp (+120/-0) messaging-host/service.h (+56/-0) tests/unit/messaging-host/messaging-host.pri (+9/-0) tests/unit/messaging-host/messaging-host.pro (+3/-1) tests/unit/messaging-host/tst_connection.pro (+1/-4) tests/unit/messaging-host/tst_connection_host.pro (+3/-9) tests/unit/messaging-host/tst_inactivity_timer.cpp (+125/-0) tests/unit/messaging-host/tst_inactivity_timer.pro (+18/-0) tests/unit/messaging-host/tst_service.cpp (+189/-0) tests/unit/messaging-host/tst_service.pro (+18/-0) |
| To merge this branch: | bzr merge lp://qastaging/~mardy/unity-chromium-extension/qt-host-impl |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Justin McPherson | Approve | ||
|
Review via email:
|
|||
Commit message
Add Service and InactivityTimer classes
Description of the change
Add Service and InactivityTimer classes
To post a comment you must log in.
Revision history for this message
| Justin McPherson (justinmcp) | # |
review:
Approve
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
