« back to all changes in this revision
Viewing changes to ubuntu-system-settings-online-accounts.pro
- Committer: CI bot
- Date: 2014-10-09 20:20:41 UTC
- mfrom: (193.2.6 master)
- Revision ID: ps-jenkins@lists.canonical.com-20141009202041-tn2i5f3couen6zlw
Merge from master:
- Create the Ubuntu.OnlineAccounts.Plugin module
Approved by: David Barth
- Create the Ubuntu.OnlineAccounts.Plugin module
Approved by: David Barth
- files added:
- debian/libonline-accounts-plugin-dev.install
- plugins/OnlineAccountsPlugin
- tests/plugin
- files removed:
- online-accounts-ui/online-accounts-ui.pro
- files renamed:
- debian/qtdeclarative5-online-accounts-client-doc.install => debian/qml-module-ubuntu-onlineaccounts-client-doc.install
- debian/qtdeclarative5-online-accounts-client0.1.install => debian/qml-module-ubuntu-onlineaccounts-client.install
- online-accounts-ui/online-accounts-ui-helper.pro => online-accounts-ui/online-accounts-ui.pro
- online-accounts-ui/module/OnlineAccountsPlugin.pc.in => plugins/OnlineAccountsPlugin/OnlineAccountsPlugin.pc.in
- online-accounts-ui/account-manager.cpp => plugins/OnlineAccountsPlugin/account-manager.cpp
- online-accounts-ui/account-manager.h => plugins/OnlineAccountsPlugin/account-manager.h
- online-accounts-ui/application-manager.cpp => plugins/OnlineAccountsPlugin/application-manager.cpp
- online-accounts-ui/application-manager.h => plugins/OnlineAccountsPlugin/application-manager.h
- online-accounts-ui/request-handler.cpp => plugins/OnlineAccountsPlugin/request-handler.cpp
- online-accounts-ui/request-handler.h => plugins/OnlineAccountsPlugin/request-handler.h
- online-accounts-ui/module/ => plugins/module/
- tests/online-accounts-ui/tst_application_manager.cpp => tests/plugin/tst_application_manager.cpp
- tests/online-accounts-ui/tst_application_manager.pro => tests/plugin/tst_application_manager.pro
- files modified:
- .bzrignore
added
removed
ubuntu-system-settings-online-accounts.pro
