Merge lp://staging/~timo-jyrinki/signon-ui/rebuild_against_qt521_and_sync_with_archive into lp://staging/signon-ui
Proposed by
Timo Jyrinki
| Status: | Merged |
|---|---|
| Approved by: | Alberto Mardegan |
| Approved revision: | 127 |
| Merged at revision: | 126 |
| Proposed branch: | lp://staging/~timo-jyrinki/signon-ui/rebuild_against_qt521_and_sync_with_archive |
| Merge into: | lp://staging/signon-ui |
| Diff against target: |
293 lines (+29/-95) 9 files modified
common-vars.pri (+1/-1) debian/changelog (+7/-0) debian/control (+1/-0) src/browser-process/ua-overrides.js (+20/-36) src/cookie-jar-manager.cpp (+0/-1) src/service.cpp (+0/-44) src/service.h (+0/-11) src/signon-ui.pro (+0/-1) tests/unit/test.cpp (+0/-1) |
| To merge this branch: | bzr merge lp://staging/~timo-jyrinki/signon-ui/rebuild_against_qt521_and_sync_with_archive |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| PS Jenkins bot (community) | continuous-integration | Approve | |
| Alberto Mardegan (community) | Approve | ||
|
Review via email:
|
|||
Commit message
Rebuild against Qt 5.2.1 and do the revert similar to what was done in the archive.
(merge) Build depend on libicu-dev to fix FTBFS (LP: #1287177)
To post a comment you must log in.
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote | # |
review:
Approve
(continuous-integration)
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Sadly. ;-)