Merge lp:~jhodapp/mediaplayer-app/multithreaded-rendering into lp:mediaplayer-app

Proposed by Jim Hodapp
Status: Merged
Approved by: Günter Schwann
Approved revision: 59
Merged at revision: 59
Proposed branch: lp:~jhodapp/mediaplayer-app/multithreaded-rendering
Merge into: lp:mediaplayer-app
Diff against target: 13 lines (+0/-2)
1 file modified
src/main.cpp (+0/-2)
To merge this branch: bzr merge lp:~jhodapp/mediaplayer-app/multithreaded-rendering
Reviewer Review Type Date Requested Status
Günter Schwann (community) Approve
PS Jenkins bot continuous-integration Approve
Review via email: mp+152953@code.launchpad.net

Commit message

Re-enable Qt multithreaded rendering.

Description of the change

Re-enable Qt multithreaded rendering.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
Günter Schwann (schwann) wrote :

I'm not yet top approving - as the MW support should land first

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/main.cpp'
2--- src/main.cpp 2013-02-12 14:30:57 +0000
3+++ src/main.cpp 2013-03-12 16:16:26 +0000
4@@ -23,9 +23,7 @@
5
6 int main(int argc, char** argv)
7 {
8- unsetenv("QML_FORCE_THREADED_RENDERER");
9 unsetenv("QML_FIXED_ANIMATION_STEP");
10- setenv("QML_BAD_GUI_RENDER_LOOP", "1", 1);
11
12 QGuiApplication::setApplicationName("Media Player");
13 MediaPlayer application(argc, argv);

Subscribers

People subscribed via source and target branches