qtvideo-node

Merge lp://staging/~timo-jyrinki/qtvideo-node/port_to_qt56 into lp://staging/qtvideo-node

  1. port_to_qt56
  2. Merge into trunk
Proposed by Timo Jyrinki
Status: Merged
Approved by: Jim Hodapp
Approved revision: 68
Merged at revision: 70
Proposed branch: lp://staging/~timo-jyrinki/qtvideo-node/port_to_qt56
Merge into: lp://staging/qtvideo-node
Diff against target: 71 lines (+23/-0)
4 files modified
src/qsgvideonode_p.cpp (+4/-0)
src/qsgvideonode_p.h (+13/-0)
src/shadervideonodeplugin.cpp (+5/-0)
src/shadervideonodeplugin.h (+1/-0)
To merge this branch: bzr merge lp://staging/~timo-jyrinki/qtvideo-node/port_to_qt56
Reviewer Review Type Date Requested Status
Jim Hodapp (community) code Approve
PS Jenkins bot continuous-integration Needs Fixing
Ubuntu Phablet Team Pending
Review via email: mp+292369@code.staging.launchpad.net

Commit message

Port to Qt 5.6.

To post a comment you must log in.
Revision history for this message
Timo Jyrinki (timo-jyrinki) wrote :

Seems to fix the issue for me.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:68
http://jenkins.qa.ubuntu.com/job/qtvideo-node-ci/70/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtvideo-node-vivid-amd64-ci/12/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtvideo-node-vivid-armhf-ci/12/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtvideo-node-vivid-i386-ci/12/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtvideo-node-ci/70/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Jim Hodapp (jhodapp) wrote :

LGTM

review: Approve (code)

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