Merge lp://qastaging/~renatofilho/qtorganizer5-eds/implemented-ocurrence-fetch into lp://qastaging/qtorganizer5-eds
Status: | Merged |
---|---|
Merged at revision: | 38 |
Proposed branch: | lp://qastaging/~renatofilho/qtorganizer5-eds/implemented-ocurrence-fetch |
Merge into: | lp://qastaging/qtorganizer5-eds |
Prerequisite: | lp://qastaging/~renatofilho/qtorganizer5-eds/qt5.0.2 |
Diff against target: |
528 lines (+329/-16) 8 files modified
qorganizer/CMakeLists.txt (+2/-0) qorganizer/qorganizer-eds-engine.cpp (+135/-10) qorganizer/qorganizer-eds-engine.h (+9/-0) qorganizer/qorganizer-eds-fetchocurrencedata.cpp (+85/-0) qorganizer/qorganizer-eds-fetchocurrencedata.h (+42/-0) qorganizer/qorganizer-eds-fetchrequestdata.cpp (+8/-1) qorganizer/qorganizer-eds-fetchrequestdata.h (+1/-0) tests/unittest/recurrence-test.cpp (+47/-5) |
To merge this branch: | bzr merge lp://qastaging/~renatofilho/qtorganizer5-eds/implemented-ocurrence-fetch |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
PS Jenkins bot | continuous-integration | Approve | |
Michael Sheldon (community) | Approve | ||
Ubuntu Phablet Team | Pending | ||
Review via email:
|
Commit message
Implemented support for QOrganizerItemO
Description of the change
Are there any related MPs required for this MP to build/function as expected? YES
lp:~renatofilho/qtorganizer5-eds/qt5.0.2
Is your branch in sync with latest trunk (e.g. bzr pull lp:trunk -> no changes): YES
Did you perform an exploratory manual test run of your code change and any related functionality on device or emulator? YES
Did you successfully run all tests found in your component's Test Plan (https:/
If you changed the UI, was the change specified/approved by design? NO UI CHANGE
If you changed the packaging (debian), did you subscribe a core-dev to this MP? NO PACKAGE CHANGE
FAILED: Continuous integration, rev:36 jenkins. qa.ubuntu. com/job/ qtorganizer5- eds-ci/ 95/ jenkins. qa.ubuntu. com/job/ qtorganizer5- eds-trusty- amd64-ci/ 82/console jenkins. qa.ubuntu. com/job/ qtorganizer5- eds-trusty- armhf-ci/ 82/console jenkins. qa.ubuntu. com/job/ qtorganizer5- eds-trusty- i386-ci/ 82/console
http://
Executed test runs:
FAILURE: http://
FAILURE: http://
FAILURE: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/qtorganizer 5-eds-ci/ 95/rebuild
http://