Merge lp://qastaging/~jonas-drange/ubuntu-settings-components/cups-notifications into lp://qastaging/~phablet-team/ubuntu-settings-components/printer-components
Proposed by
Jonas G. Drange
| Status: | Merged |
|---|---|
| Approved by: | Andrew Hayzen |
| Approved revision: | 227 |
| Merged at revision: | 225 |
| Proposed branch: | lp://qastaging/~jonas-drange/ubuntu-settings-components/cups-notifications |
| Merge into: | lp://qastaging/~phablet-team/ubuntu-settings-components/printer-components |
| Diff against target: |
880 lines (+417/-79) 17 files modified
plugins/Ubuntu/Settings/Printers/CMakeLists.txt (+9/-1) plugins/Ubuntu/Settings/Printers/backend/backend.h (+25/-5) plugins/Ubuntu/Settings/Printers/backend/backend_cups.cpp (+46/-9) plugins/Ubuntu/Settings/Printers/backend/backend_cups.h (+8/-0) plugins/Ubuntu/Settings/Printers/cups/cupsfacade.cpp (+10/-0) plugins/Ubuntu/Settings/Printers/cups/cupsfacade.h (+2/-0) plugins/Ubuntu/Settings/Printers/cups/cupspkhelper.cpp (+61/-0) plugins/Ubuntu/Settings/Printers/cups/cupspkhelper.h (+2/-0) plugins/Ubuntu/Settings/Printers/models/printermodel.cpp (+21/-11) plugins/Ubuntu/Settings/Printers/models/printermodel.h (+5/-5) plugins/Ubuntu/Settings/Printers/org.cups.cupsd.Notifier.xml (+146/-0) plugins/Ubuntu/Settings/Printers/printers/printers.cpp (+7/-5) plugins/Ubuntu/Settings/Printers/printers/printers.h (+2/-4) tests/unittests/Printers/mockbackend.h (+35/-20) tests/unittests/Printers/tst_printerfilter.cpp (+8/-6) tests/unittests/Printers/tst_printermodel.cpp (+28/-11) tests/unittests/Printers/tst_printers.cpp (+2/-2) |
| To merge this branch: | bzr merge lp://qastaging/~jonas-drange/ubuntu-settings-components/cups-notifications |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Andrew Hayzen (community) | Approve | ||
|
Review via email:
|
|||
Commit message
* Deprecate QTimer based update()
* Replace with cups subscription based update()
* Fixes tests.
To post a comment you must log in.
Revision history for this message
| Jonas G. Drange (jonas-drange) wrote | # |
Revision history for this message
| Andrew Hayzen (ahayzen) wrote | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
http://