Merge lp://qastaging/~renatofilho/qtorganizer5-eds/fix-query-with-detached-events into lp://qastaging/qtorganizer5-eds
Proposed by
Renato Araujo Oliveira Filho
Status: | Merged |
---|---|
Approved by: | Bill Filler |
Approved revision: | 90 |
Merged at revision: | 93 |
Proposed branch: | lp://qastaging/~renatofilho/qtorganizer5-eds/fix-query-with-detached-events |
Merge into: | lp://qastaging/qtorganizer5-eds |
Prerequisite: | lp://qastaging/~renatofilho/qtorganizer5-eds/optimize-query |
Diff against target: |
421 lines (+221/-50) 5 files modified
organizer/qorganizer-eds-engine.cpp (+77/-20) organizer/qorganizer-eds-engine.h (+3/-1) organizer/qorganizer-eds-fetchrequestdata.cpp (+63/-29) organizer/qorganizer-eds-fetchrequestdata.h (+5/-0) tests/unittest/recurrence-test.cpp (+73/-0) |
To merge this branch: | bzr merge lp://qastaging/~renatofilho/qtorganizer5-eds/fix-query-with-detached-events |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
PS Jenkins bot | continuous-integration | Approve | |
Ubuntu Phablet Team | Pending | ||
Review via email:
|
Commit message
Populate event list with detached events.
Make sure that detached events appear on the list while fetching events.
To post a comment you must log in.
PASSED: Continuous integration, rev:87 jenkins. qa.ubuntu. com/job/ qtorganizer5- eds-ci/ 243/ jenkins. qa.ubuntu. com/job/ qtorganizer5- eds-vivid- amd64-ci/ 50 jenkins. qa.ubuntu. com/job/ qtorganizer5- eds-vivid- armhf-ci/ 50 jenkins. qa.ubuntu. com/job/ qtorganizer5- eds-vivid- armhf-ci/ 50/artifact/ work/output/ *zip*/output. zip jenkins. qa.ubuntu. com/job/ qtorganizer5- eds-vivid- i386-ci/ 50
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/qtorganizer 5-eds-ci/ 243/rebuild
http://