Merge lp://qastaging/~mardy/ubuntu-system-settings-online-accounts/autopilot into lp://qastaging/ubuntu-system-settings-online-accounts
Proposed by
Alberto Mardegan
Status: | Superseded |
---|---|
Proposed branch: | lp://qastaging/~mardy/ubuntu-system-settings-online-accounts/autopilot |
Merge into: | lp://qastaging/ubuntu-system-settings-online-accounts |
Diff against target: |
1261 lines (+287/-437) 25 files modified
client/OnlineAccountsClient/OnlineAccountsClient.pro (+1/-1) client/OnlineAccountsClient/setup.cpp (+37/-1) client/OnlineAccountsClient/setup.h (+6/-0) common-vars.pri (+1/-1) debian/changelog (+6/-0) debian/control (+3/-2) debian/tests/autopilot (+6/-0) debian/tests/control (+2/-0) debian/ubuntu-system-settings-online-accounts.install (+2/-1) src/globals.h (+5/-2) src/main.cpp (+22/-0) src/module/OAuth.qml (+0/-7) src/online-accounts-ui.pro (+16/-3) src/panel-request.cpp (+9/-4) src/qml/AccountCreationPage.qml (+9/-3) src/qml/AccountEditPage.qml (+8/-1) src/request.cpp (+17/-6) src/ui.qrc (+2/-0) tests/autopilot/online_accounts_ui/tests/test_online_accounts_ui.py (+94/-398) tests/client/tst_client.cpp (+20/-1) tests/client/tst_qml_client.cpp (+1/-1) tests/online-accounts-ui/online-accounts-ui.pro (+1/-0) tests/online-accounts-ui/qml/tst_AccountCreationPage.qml (+11/-1) tests/online-accounts-ui/tst_service.cpp (+3/-3) ubuntu-system-settings-online-accounts.pro (+5/-1) |
To merge this branch: | bzr merge lp://qastaging/~mardy/ubuntu-system-settings-online-accounts/autopilot |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Online Accounts | Pending | ||
Review via email:
|
This proposal has been superseded by a proposal from 2014-05-08.
Commit message
Depend on python-autopilot
Description of the change
To post a comment you must log in.
Unmerged revisions
- 111. By Alberto Mardegan
-
Depend on autopilot-desktop