Merge lp://qastaging/~timo-jyrinki/qtvideo-node/port_to_qt55 into lp://qastaging/qtvideo-node
Proposed by
Timo Jyrinki
| Status: | Merged | ||||
|---|---|---|---|---|---|
| Approved by: | Jim Hodapp | ||||
| Approved revision: | 66 | ||||
| Merged at revision: | 66 | ||||
| Proposed branch: | lp://qastaging/~timo-jyrinki/qtvideo-node/port_to_qt55 | ||||
| Merge into: | lp://qastaging/qtvideo-node | ||||
| Diff against target: |
313 lines (+70/-78) 7 files modified
src/private/qtmultimediaquickdefs_p.h (+14/-22) src/qsgvideonode_p.cpp (+15/-23) src/qsgvideonode_p.h (+23/-25) src/shadervideonode.cpp (+10/-1) src/shadervideonode.h (+3/-2) src/shadervideonodeplugin.h (+1/-1) unittests/shadervideonode/tst_shadervideonode.cpp (+4/-4) |
||||
| To merge this branch: | bzr merge lp://qastaging/~timo-jyrinki/qtvideo-node/port_to_qt55 | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Jim Hodapp (community) | code | Approve | |
| PS Jenkins bot | continuous-integration | Needs Fixing | |
|
Review via email:
|
|||
Commit message
Port to Qt 5.5 to fix video playback (LP: #1474695)
To post a comment you must log in.
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote | # |
review:
Needs Fixing
(continuous-integration)
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
FAILED: Continuous integration, rev:66
http://
Executed test runs:
FAILURE: http://
FAILURE: http://
FAILURE: http://
Click here to trigger a rebuild:
http://