Merge lp://qastaging/ubuntu-ui-extras/staging into lp://qastaging/ubuntu-ui-extras
Proposed by
Jonas G. Drange
Status: | Merged |
---|---|
Approved by: | Andrew Hayzen |
Approved revision: | no longer in the source branch. |
Merged at revision: | 131 |
Proposed branch: | lp://qastaging/ubuntu-ui-extras/staging |
Merge into: | lp://qastaging/ubuntu-ui-extras |
Diff against target: |
6506 lines (+3970/-590) 46 files modified
debian/changelog (+67/-0) modules/Ubuntu/Components/Extras/Example/PrinterQueue.qml (+0/-117) modules/Ubuntu/Components/Extras/Example/Printers.qml (+232/-75) modules/Ubuntu/Components/Extras/Printers/CMakeLists.txt (+4/-1) modules/Ubuntu/Components/Extras/Printers/backend/backend.cpp (+48/-0) modules/Ubuntu/Components/Extras/Printers/backend/backend.h (+13/-0) modules/Ubuntu/Components/Extras/Printers/backend/backend_cups.cpp (+225/-44) modules/Ubuntu/Components/Extras/Printers/backend/backend_cups.h (+25/-1) modules/Ubuntu/Components/Extras/Printers/backend/backend_pdf.cpp (+10/-0) modules/Ubuntu/Components/Extras/Printers/cups/devicesearcher.cpp (+70/-0) modules/Ubuntu/Components/Extras/Printers/cups/devicesearcher.h (+57/-0) modules/Ubuntu/Components/Extras/Printers/cups/ippclient.cpp (+163/-9) modules/Ubuntu/Components/Extras/Printers/cups/ippclient.h (+13/-1) modules/Ubuntu/Components/Extras/Printers/cups/jobloader.cpp (+50/-0) modules/Ubuntu/Components/Extras/Printers/cups/jobloader.h (+47/-0) modules/Ubuntu/Components/Extras/Printers/cups/printerloader.cpp (+3/-0) modules/Ubuntu/Components/Extras/Printers/enums.h (+23/-0) modules/Ubuntu/Components/Extras/Printers/models/devicemodel.cpp (+149/-0) modules/Ubuntu/Components/Extras/Printers/models/devicemodel.h (+78/-0) modules/Ubuntu/Components/Extras/Printers/models/jobmodel.cpp (+267/-126) modules/Ubuntu/Components/Extras/Printers/models/jobmodel.h (+53/-11) modules/Ubuntu/Components/Extras/Printers/models/printermodel.cpp (+70/-30) modules/Ubuntu/Components/Extras/Printers/models/printermodel.h (+13/-4) modules/Ubuntu/Components/Extras/Printers/plugin.cpp (+2/-0) modules/Ubuntu/Components/Extras/Printers/printer/printer.cpp (+150/-24) modules/Ubuntu/Components/Extras/Printers/printer/printer.h (+29/-3) modules/Ubuntu/Components/Extras/Printers/printer/printerjob.cpp (+108/-60) modules/Ubuntu/Components/Extras/Printers/printer/printerjob.h (+14/-11) modules/Ubuntu/Components/Extras/Printers/printer/signalratelimiter.cpp (+28/-6) modules/Ubuntu/Components/Extras/Printers/printer/signalratelimiter.h (+8/-6) modules/Ubuntu/Components/Extras/Printers/printers/printers.cpp (+152/-7) modules/Ubuntu/Components/Extras/Printers/printers/printers.h (+20/-0) modules/Ubuntu/Components/Extras/Printers/structs.h (+84/-0) po/ubuntu-ui-extras.pot (+26/-2) tests/unittests/Printers/CMakeLists.txt (+13/-3) tests/unittests/Printers/mockbackend.h (+127/-4) tests/unittests/Printers/tst_jobfilter.cpp (+4/-2) tests/unittests/Printers/tst_jobmodel.cpp (+446/-29) tests/unittests/Printers/tst_printer.cpp (+96/-0) tests/unittests/Printers/tst_printerdevice.cpp (+131/-0) tests/unittests/Printers/tst_printerdevicemodel.cpp (+162/-0) tests/unittests/Printers/tst_printerfilter.cpp (+30/-0) tests/unittests/Printers/tst_printerjob.cpp (+53/-0) tests/unittests/Printers/tst_printermodel.cpp (+489/-1) tests/unittests/Printers/tst_printers.cpp (+92/-7) tests/unittests/Printers/tst_signalratelimiter.cpp (+26/-6) |
To merge this branch: | bzr merge lp://qastaging/ubuntu-ui-extras/staging |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Andrew Hayzen (community) | Approve | ||
Jonas G. Drange (community) | Approve | ||
Review via email: mp+320797@code.qastaging.launchpad.net |
Description of the change
Please see the changelog entry for details.
Testing:
1. Build it
2. qmlscene -I <path/to/
3. Add a printer
4. Explore configured printers
5. Change configured printers
To post a comment you must log in.
I approve all the changes made by Andrew, which is this whole branch minus my own changes.