Merge lp://qastaging/~aacid/u1db-qt/qt54 into lp://qastaging/u1db-qt
Proposed by
Albert Astals Cid
| Status: | Merged | ||||
|---|---|---|---|---|---|
| Approved by: | Cris Dywan | ||||
| Approved revision: | 122 | ||||
| Merged at revision: | 122 | ||||
| Proposed branch: | lp://qastaging/~aacid/u1db-qt/qt54 | ||||
| Merge into: | lp://qastaging/u1db-qt | ||||
| Diff against target: |
36 lines (+9/-0) 2 files modified
src/database.cpp (+3/-0) src/document.cpp (+6/-0) |
||||
| To merge this branch: | bzr merge lp://qastaging/~aacid/u1db-qt/qt54 | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| PS Jenkins bot | continuous-integration | Approve | |
| Cris Dywan | Approve | ||
|
Review via email:
|
|||
Commit message
Make tests pass with Qt 5.4
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
For the record, the lack of an "else" slightly bugged me, but the fact is that an empty string can be passed to putDoc and thereby contents to delete an existing document, thus I feel it's not something to tackle here as part of the fix.
Thanks a lot!