Merge lp://staging/~mardy/signon-ui/qt5 into lp://staging/signon-ui

Proposed by Alberto Mardegan
Status: Merged
Approved by: David King
Approved revision: 71
Merged at revision: 69
Proposed branch: lp://staging/~mardy/signon-ui/qt5
Merge into: lp://staging/signon-ui
Diff against target: 205 lines (+31/-6)
7 files modified
src/browser-request.cpp (+1/-0)
src/cookie-jar-manager.cpp (+3/-0)
src/dialog-request.cpp (+2/-0)
src/request.cpp (+13/-1)
src/signonui_dbus_adaptor.pri (+1/-1)
src/src.pro (+5/-2)
tests/unit/unit.pro (+6/-2)
To merge this branch: bzr merge lp://staging/~mardy/signon-ui/qt5
Reviewer Review Type Date Requested Status
David King (community) Approve
PS Jenkins bot (community) continuous-integration Needs Fixing
Review via email: mp+134060@code.staging.launchpad.net

This proposal supersedes a proposal from 2012-11-07.

Description of the change

Allow building with Qt5

To post a comment you must log in.
Revision history for this message
Alberto Mardegan (mardy) wrote : Posted in a previous version of this proposal
Revision history for this message
David King (amigadave) wrote : Posted in a previous version of this proposal

Looks good, but I guess that it should be merged into the 13.04 branch, not 12.10. You might need to change things around to set the development focus in Launchpad, as that is where merge proposals are targetted by default.

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote : Posted in a previous version of this proposal
review: Needs Fixing (continuous-integration)
Revision history for this message
Víctor R. Ruiz (vrruiz) wrote : Posted in a previous version of this proposal

reauthenticator.cpp: In member function ‘void SignOnUi::ReauthenticatorPrivate::onResponse(const SignOn::SessionData&)’:
reauthenticator.cpp:134:44: error: ‘const class SignOn::SessionData’ has no member named ‘toMap’

Revision history for this message
Víctor R. Ruiz (vrruiz) wrote : Posted in a previous version of this proposal

I suppose this is related to Alberto's comment.

Revision history for this message
Alberto Mardegan (mardy) wrote : Posted in a previous version of this proposal

> reauthenticator.cpp: In member function ‘void
> SignOnUi::ReauthenticatorPrivate::onResponse(const SignOn::SessionData&)’:
> reauthenticator.cpp:134:44: error: ‘const class SignOn::SessionData’ has no
> member named ‘toMap’

This is because this branch depends on the latest signond code, which is not yet released. I've pushed the commits to launchpad, but I haven't seen a build coming out of them yet:

https://code.launchpad.net/~online-accounts/online-accounts-signond/trunk

Revision history for this message
Alberto Mardegan (mardy) wrote :

Resubmitting for trunk, after merging the reauthenticator stuff. Now the diff is much smalled and hopefully easier to review. :-)

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
David King (amigadave) wrote :

Works fine here.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: