Merge lp://qastaging/~renatofilho/qtorganizer5-eds/qt5.0.2 into lp://qastaging/qtorganizer5-eds

Proposed by Renato Araujo Oliveira Filho
Status: Merged
Approved by: Gustavo Pichorim Boiko
Approved revision: 36
Merged at revision: 35
Proposed branch: lp://qastaging/~renatofilho/qtorganizer5-eds/qt5.0.2
Merge into: lp://qastaging/qtorganizer5-eds
Diff against target: 116 lines (+17/-1)
9 files modified
qorganizer/qorganizer-eds-collection-engineid.cpp (+2/-0)
qorganizer/qorganizer-eds-engineid.cpp (+3/-0)
qorganizer/qorganizer-eds-engineid.h (+1/-0)
qorganizer/qorganizer-eds-factory.cpp (+2/-0)
qorganizer/qorganizer-eds-fetchrequestdata.cpp (+3/-0)
qorganizer/qorganizer-eds-savecollectionrequestdata.cpp (+2/-0)
qorganizer/qorganizer-eds-source-registry.cpp (+2/-0)
qorganizer/qorganizer-eds-viewwatcher.cpp (+1/-0)
tests/unittest/CMakeLists.txt (+1/-1)
To merge this branch: bzr merge lp://qastaging/~renatofilho/qtorganizer5-eds/qt5.0.2
Reviewer Review Type Date Requested Status
Gustavo Pichorim Boiko (community) Approve
PS Jenkins bot continuous-integration Approve
Review via email: mp+208188@code.qastaging.launchpad.net

Commit message

Fixed compilation with Qt5.2

To post a comment you must log in.
Revision history for this message
Renato Araujo Oliveira Filho (renatofilho) wrote :

Are there any related MPs required for this MP to build/function as expected? NO
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://wiki.ubuntu.com/Process/Merges/TestPlan/qtorganizer5-eds) on device or emulator? YES
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

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
36. By Renato Araujo Oliveira Filho

Does not wait for EDS to finish during the tests.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
Gustavo Pichorim Boiko (boiko) wrote :

Did you perform an exploratory manual test run of the code change and any related functionality on device or emulator?
No real code changes, just missing include files.

Did CI run pass? If not, please explain why.
Yes

Have you checked that submitter has accurately filled out the submitter checklist and has taken no shortcut?
Yes

Code looks good.

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