Merge lp://staging/~online-accounts/signon/packaging into lp://staging/signon
Proposed by
Alberto Mardegan
| Status: | Merged |
|---|---|
| Approved by: | David Barth |
| Approved revision: | 636 |
| Merged at revision: | 632 |
| Proposed branch: | lp://staging/~online-accounts/signon/packaging |
| Merge into: | lp://staging/signon |
| Diff against target: |
5206 lines (+1716/-958) 180 files modified
.gitlab-ci.yml (+51/-0) .qmake.conf (+2/-0) README.md (+7/-0) common-project-config.pri (+8/-18) common-vars.pri (+1/-1) debian/changelog (+24/-0) debian/control (+0/-25) debian/libsignon-qt-dev.install (+0/-4) debian/libsignon-qt1.install (+0/-1) debian/rules (+6/-26) doc/doc.pri (+0/-1) lib/SignOn/SignOnQt5ConfigVersion.cmake.in (+5/-5) lib/SignOn/SignOnQtConfig.cmake.in (+0/-7) lib/SignOn/SignOnQtConfigVersion.cmake.in (+0/-10) lib/SignOn/async-dbus-proxy.cpp (+1/-1) lib/SignOn/async-dbus-proxy.h (+1/-2) lib/SignOn/authservice.cpp (+1/-1) lib/SignOn/authservice.h (+1/-1) lib/SignOn/authserviceimpl.cpp (+1/-1) lib/SignOn/authserviceimpl.h (+1/-2) lib/SignOn/authsession.cpp (+1/-1) lib/SignOn/authsession.h (+1/-2) lib/SignOn/authsessionimpl.cpp (+1/-1) lib/SignOn/authsessionimpl.h (+1/-2) lib/SignOn/connection-manager.cpp (+1/-7) lib/SignOn/connection-manager.h (+1/-1) lib/SignOn/dbusinterface.cpp (+1/-1) lib/SignOn/dbusinterface.h (+1/-0) lib/SignOn/debug.cpp (+1/-1) lib/SignOn/debug.h (+1/-1) lib/SignOn/identity.cpp (+1/-1) lib/SignOn/identity.h (+1/-1) lib/SignOn/identityimpl.cpp (+1/-1) lib/SignOn/identityimpl.h (+1/-2) lib/SignOn/identityinfo.cpp (+1/-1) lib/SignOn/identityinfo.h (+1/-1) lib/SignOn/identityinfoimpl.cpp (+1/-1) lib/SignOn/identityinfoimpl.h (+1/-1) lib/SignOn/libsignon-qt.pri (+1/-5) lib/SignOn/libsignoncommon.h (+1/-1) lib/SignOn/sessiondata.h (+1/-0) lib/SignOn/signon.h (+1/-0) lib/SignOn/signonerror.h (+1/-1) lib/plugins/SignOn/authpluginif.h (+1/-0) lib/plugins/SignOn/signonplugincommon.h (+1/-0) lib/plugins/SignOn/uisessiondata.h (+1/-0) lib/plugins/SignOn/uisessiondata_priv.h (+10/-0) lib/plugins/signon-plugins-common/SignOn/blobiohandler.cpp (+4/-4) lib/plugins/signon-plugins-common/SignOn/blobiohandler.h (+3/-1) lib/plugins/signon-plugins-common/SignOn/ipc.h (+1/-0) lib/plugins/signon-plugins-common/signon-plugins-common.pc.in (+1/-1) lib/plugins/signon-plugins.pc.in (+1/-1) lib/signond/SignOn/SignOnExtension.pc.in (+1/-1) lib/signond/SignOn/abstract-access-control-manager.cpp (+1/-1) lib/signond/SignOn/abstract-access-control-manager.h (+1/-1) lib/signond/SignOn/abstract-crypto-manager.cpp (+1/-1) lib/signond/SignOn/abstract-crypto-manager.h (+1/-1) lib/signond/SignOn/abstract-key-authorizer.cpp (+1/-0) lib/signond/SignOn/abstract-key-authorizer.h (+1/-0) lib/signond/SignOn/abstract-key-manager.cpp (+1/-0) lib/signond/SignOn/abstract-key-manager.h (+1/-0) lib/signond/SignOn/abstract-secrets-storage.cpp (+1/-0) lib/signond/SignOn/abstract-secrets-storage.h (+1/-0) lib/signond/SignOn/debug.cpp (+1/-0) lib/signond/SignOn/debug.h (+1/-0) lib/signond/SignOn/export.h (+1/-0) lib/signond/SignOn/extension-interface.cpp (+1/-1) lib/signond/SignOn/extension-interface.h (+1/-1) lib/signond/SignOn/key-handler.cpp (+1/-0) lib/signond/SignOn/key-handler.h (+1/-0) lib/signond/SignOn/misc.cpp (+1/-0) lib/signond/SignOn/misc.h (+1/-0) lib/signond/signoncommon.h (+2/-2) signon.pro (+0/-3) src/extensions/cryptsetup/cryptsetup-plugin.cpp (+0/-4) src/extensions/cryptsetup/cryptsetup-plugin.h (+0/-2) src/plugins/example/exampledata.h (+1/-0) src/plugins/example/exampleplugin.cpp (+1/-0) src/plugins/example/exampleplugin.h (+1/-0) src/plugins/password/passwordplugin.cpp (+1/-0) src/plugins/password/passwordplugin.h (+1/-0) src/plugins/test/ssotest2data.h (+1/-0) src/plugins/test/ssotest2plugin.cpp (+1/-0) src/plugins/test/ssotest2plugin.h (+1/-0) src/plugins/test/ssotestplugin.cpp (+26/-34) src/plugins/test/ssotestplugin.h (+6/-2) src/remotepluginprocess/debug.cpp (+1/-0) src/remotepluginprocess/debug.h (+1/-0) src/remotepluginprocess/main.cpp (+7/-5) src/remotepluginprocess/my-network-proxy-factory.h (+1/-1) src/remotepluginprocess/remotepluginprocess.cpp (+18/-146) src/remotepluginprocess/remotepluginprocess.h (+1/-25) src/remotepluginprocess/remotepluginprocess.pro (+1/-1) src/signond/accesscontrolmanagerhelper.cpp (+1/-2) src/signond/accesscontrolmanagerhelper.h (+1/-2) src/signond/backup.cpp (+343/-0) src/signond/backup.h (+63/-0) src/signond/credentialsaccessmanager.cpp (+1/-1) src/signond/credentialsaccessmanager.h (+1/-1) src/signond/credentialsdb.cpp (+1/-2) src/signond/credentialsdb.h (+1/-2) src/signond/credentialsdb_p.h (+1/-1) src/signond/default-crypto-manager.cpp (+1/-1) src/signond/default-crypto-manager.h (+1/-1) src/signond/default-key-authorizer.cpp (+1/-0) src/signond/default-key-authorizer.h (+1/-0) src/signond/default-secrets-storage.cpp (+1/-1) src/signond/default-secrets-storage.h (+1/-1) src/signond/main.cpp (+1/-0) src/signond/pluginproxy.cpp (+1/-0) src/signond/pluginproxy.h (+1/-0) src/signond/signonauthsession.cpp (+10/-16) src/signond/signonauthsession.h (+2/-2) src/signond/signonauthsessionadaptor.cpp (+1/-1) src/signond/signonauthsessionadaptor.h (+1/-1) src/signond/signond-common.h (+1/-0) src/signond/signond.pro (+10/-8) src/signond/signondaemon.cpp (+11/-328) src/signond/signondaemon.h (+1/-15) src/signond/signondaemonadaptor.cpp (+1/-2) src/signond/signondaemonadaptor.h (+1/-2) src/signond/signondisposable.cpp (+1/-0) src/signond/signondisposable.h (+1/-0) src/signond/signonidentity.cpp (+1/-2) src/signond/signonidentity.h (+1/-2) src/signond/signonidentityadaptor.cpp (+1/-2) src/signond/signonidentityadaptor.h (+1/-2) src/signond/signonidentityinfo.cpp (+1/-1) src/signond/signonidentityinfo.h (+1/-1) src/signond/signonsessioncore.cpp (+15/-21) src/signond/signonsessioncore.h (+1/-1) src/signond/signonsessioncoretools.cpp (+1/-1) src/signond/signonsessioncoretools.h (+1/-1) src/signond/signontrace.h (+7/-4) src/signond/signonui_interface.cpp (+1/-1) src/signond/signonui_interface.h (+1/-1) tests/extensions/tst_access_control_manager.cpp (+1/-1) tests/libsignon-qt-tests/libsignon-qt-tests.pro (+1/-5) tests/libsignon-qt-tests/signon-ui.cpp (+1/-1) tests/libsignon-qt-tests/signon-ui.h (+1/-1) tests/libsignon-qt-tests/ssotestclient.cpp (+1/-0) tests/libsignon-qt-tests/ssotestclient.h (+1/-0) tests/libsignon-qt-tests/testauthserviceresult.cpp (+1/-0) tests/libsignon-qt-tests/testauthserviceresult.h (+1/-0) tests/libsignon-qt-tests/testauthsession.cpp (+1/-106) tests/libsignon-qt-tests/testauthsession.h (+1/-3) tests/libsignon-qt-tests/testidentityresult.cpp (+1/-0) tests/libsignon-qt-tests/testidentityresult.h (+1/-0) tests/libsignon-qt-tests/testsinglesignon.cpp (+1/-0) tests/libsignon-qt-tests/testsinglesignon.h (+1/-0) tests/libsignon-qt-tests/testthread.cpp (+1/-1) tests/libsignon-qt-tests/testthread.h (+1/-1) tests/passwordplugintest/passwordplugintest.cpp (+1/-1) tests/passwordplugintest/passwordplugintest.h (+1/-0) tests/run-with-signond.sh (+1/-1) tests/signond-tests/.gitignore (+1/-0) tests/signond-tests/backuptest.cpp (+1/-0) tests/signond-tests/backuptest.h (+1/-0) tests/signond-tests/databasetest.cpp (+1/-0) tests/signond-tests/databasetest.h (+1/-0) tests/signond-tests/fake_signonui.h (+53/-0) tests/signond-tests/identity-tool.cpp (+1/-1) tests/signond-tests/identity-tool.pro (+1/-5) tests/signond-tests/include.cpp (+1/-0) tests/signond-tests/mock-ac-plugin/identity-ac-helper.pro (+1/-5) tests/signond-tests/mock-ac-plugin/plugin.cpp (+1/-5) tests/signond-tests/mock-ac-plugin/plugin.h (+1/-3) tests/signond-tests/session_tool.cpp (+125/-0) tests/signond-tests/session_tool.pro (+13/-0) tests/signond-tests/signond-tests.pri (+3/-6) tests/signond-tests/signond-tests.pro (+7/-0) tests/signond-tests/signonui.py (+55/-0) tests/signond-tests/testpluginproxy.cpp (+1/-0) tests/signond-tests/testpluginproxy.h (+1/-0) tests/signond-tests/timeouts.cpp (+1/-1) tests/signond-tests/timeouts.h (+1/-1) tests/signond-tests/tst_access_control.cpp (+1/-1) tests/signond-tests/tst_access_control_manager_helper.cpp (+1/-1) tests/signond-tests/tst_signond.cpp (+648/-0) tests/signond-tests/tst_signond.pro (+32/-0) |
| To merge this branch: | bzr merge lp://staging/~online-accounts/signon/packaging |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Jenkins for Webapps Team - CI Bot | continuous-integration | Pending | |
| PS Jenkins bot | continuous-integration | Pending | |
| Online Accounts | Pending | ||
|
Review via email:
|
|||
Description of the change
New upstream release:
- Remove Qt4 support
- Lib: add more defines for SignOnUi password dialog
- signond: inform SignOnUI when a session finishes
- signond: add configure option to enable backup
- signond: minor code simplifications and cleanups
- plugins: don't use custom proxy implementation on Qt 5.5 and later
- RemotePluginPro
- Build: use qmake's DBUS_ADAPTORS to build the backup adaptor
- Build: support implicit out-of-tree builds
- Build: enable CI in gitlab
- Tests: add tst_signond using QtDBusMock
- Doc: don't build signond documentation
- Escape quotation marks in ConfigVersion.
Merge from upstream
- Tests: fix AuthSession's "invocation of process() from another process"
test (bug 1608822)
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
