Merge lp:~fboucault/unity-2d/opengl_switch into lp:unity-2d/3.0
Proposed by
Florian Boucault
Status: | Merged |
---|---|
Approved by: | Ricardo Salveti |
Approved revision: | 553 |
Merged at revision: | 553 |
Proposed branch: | lp:~fboucault/unity-2d/opengl_switch |
Merge into: | lp:unity-2d/3.0 |
Diff against target: |
245 lines (+85/-6) 13 files modified
CMakeLists.txt (+1/-0) launcher/app/launcher.cpp (+2/-0) launcher/app/launcherview.cpp (+1/-1) launcher/app/launcherview.h (+3/-1) libunity-2d-private/src/CMakeLists.txt (+2/-0) libunity-2d-private/src/unity2ddeclarativeview.cpp (+37/-0) libunity-2d-private/src/unity2ddeclarativeview.h (+27/-0) places/app/dashdeclarativeview.cpp (+1/-1) places/app/dashdeclarativeview.h (+2/-1) places/app/places.cpp (+3/-0) spread/app/spread.cpp (+2/-0) spread/app/spreadview.cpp (+1/-1) spread/app/spreadview.h (+3/-1) |
To merge this branch: | bzr merge lp:~fboucault/unity-2d/opengl_switch |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Ricardo Salveti (community) | Approve | ||
Olivier Tilloy | Pending | ||
Review via email: mp+59530@code.launchpad.net |
Description of the change
[dash, launcher, spread] Added a new command line switch (-opengl) that triggers the use of a QGLWidget for the QML viewport.
To post a comment you must log in.
Code seems fine, and was able to test and confirm the opengl usage when using with -opengl.
The initial broken window for places is also gone, as we're also using the raster engine.
Just remember that an additional change is needed at the package side, to add libqt4-opengl-dev as build-depends.