lp://qastaging/~stolowski/unity/phablet-new-libunity

Branch merges

Propose for merging

No branches dependent on this one.

Superseded for merging into lp://qastaging/unity/phablet

Unity Team: Pending requested 2013-06-06

Diff: 1966 lines (+308/-1072)

15 files modified

Dash/Dash.qml (+1/-1)
Dash/DashContent.qml (+2/-2)
Dash/GenericLensView.qml (+27/-2)
build_unity (+9/-7)
plugins/Unity/CMakeLists.txt (+2/-3)
plugins/Unity/categories.cpp (+20/-13)
plugins/Unity/categories.h (+8/-8)
plugins/Unity/peoplepreviewdata.cpp (+0/-438)
plugins/Unity/peoplepreviewdata.h (+0/-251)
plugins/Unity/plugin.cpp (+5/-9)
plugins/Unity/scope.cpp (+135/-186)
plugins/Unity/scope.h (+18/-32)
plugins/Unity/scopes.cpp (+60/-100)
plugins/Unity/scopes.h (+19/-18)
tests/qmltests/plugins/Unity/fake_lens.cpp (+2/-2)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

689. By Paweł Stołowski on 2013-06-06

Merged trunk.

688. By Paweł Stołowski on 2013-06-05

Removed mock-setup C++ code. All this is now set up by demo-assets gsettings schema override.

687. By Paweł Stołowski on 2013-06-05

Minor fixes.

686. By Paweł Stołowski on 2013-06-03

Renamed lens/lenses files to scope/scopes.

685. By Paweł Stołowski on 2013-06-03

Renamed Lens/Lenses to Scope/Scopes.

684. By Paweł Stołowski on 2013-06-03

Some cleanups.

683. By Paweł Stołowski on 2013-06-03

Merged main branch.

682. By Paweł Stołowski on 2013-06-03

Removed some commented code.

681. By Paweł Stołowski on 2013-06-03

Implemented a quick hack to get some gicons working, and fallback to base icons for annotated ones. Proper global solution needs to be implemented.

680. By Paweł Stołowski on 2013-05-23

First cut at port to new UnityCore and libunity 7.0.