Merge lp://staging/~dobey/ubuntu-sso-client/fix-setproxy into lp://staging/ubuntu-sso-client
Proposed by
dobey
| Status: | Merged | ||||
|---|---|---|---|---|---|
| Merged at revision: | 1013 | ||||
| Proposed branch: | lp://staging/~dobey/ubuntu-sso-client/fix-setproxy | ||||
| Merge into: | lp://staging/ubuntu-sso-client | ||||
| Diff against target: |
266 lines (+19/-124) 3 files modified
ubuntu_sso/utils/webclient/qtnetwork.py (+2/-8) ubuntu_sso/utils/webclient/tests/test_qtnetwork.py (+10/-94) ubuntu_sso/utils/webclient/tests/test_webclient.py (+7/-22) |
||||
| To merge this branch: | bzr merge lp://staging/~dobey/ubuntu-sso-client/fix-setproxy | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Ubuntu One hackers | Pending | ||
|
Review via email:
|
|||
Commit message
Use setUseSystemCon
figure out a list of proxies from systemProxyForQ
Stop trying to fake and patch abstract classes and methods from Qt.
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
