Merge lp://staging/~lukas-kde/unity-api/launcheritem-description into lp://staging/unity-api
Proposed by
Lukáš Tinkl
Status: | Approved |
---|---|
Approved by: | Albert Astals Cid |
Approved revision: | 286 |
Proposed branch: | lp://staging/~lukas-kde/unity-api/launcheritem-description |
Merge into: | lp://staging/unity-api |
Prerequisite: | lp://staging/~mzanetti/unity-api/launcheritems-popularity |
Diff against target: |
124 lines (+29/-1) 6 files modified
debian/changelog (+2/-1) include/unity/shell/launcher/AppDrawerModelInterface.h (+2/-0) include/unity/shell/launcher/LauncherItemInterface.h (+7/-0) test/qmltest/mocks/plugins/Unity/Launcher/Mocks/MockLauncherItem.cpp (+13/-0) test/qmltest/mocks/plugins/Unity/Launcher/Mocks/MockLauncherItem.h (+4/-0) test/qmltest/unity/shell/launcher/tst_Launcher.qml (+1/-0) |
To merge this branch: | bzr merge lp://staging/~lukas-kde/unity-api/launcheritem-description |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Albert Astals Cid (community) | Approve | ||
Unity8 CI Bot | continuous-integration | Approve | |
Review via email: mp+321992@code.staging.launchpad.net |
This proposal supersedes a proposal from 2017-04-04.
Commit message
Add LauncherItemInt
Description of the change
Add LauncherItemInt
To post a comment you must log in.
Unmerged revisions
- 286. By Lukáš Tinkl
-
resolve conflict
- 285. By Lukáš Tinkl
-
add a property test
- 284. By Lukáš Tinkl
-
merge changelog
- 283. By Lukáš Tinkl
-
rebase on top of lp:~mzanetti/unity-api/launcheritems-popularity
- 282. By Lukáš Tinkl
-
validate changelog
- 281. By Lukáš Tinkl
-
Add LauncherItemInt
erface: :description
FAILED: Continuous integration, rev:281 /unity8- jenkins. ubuntu. com/job/ lp-unity- api-ci/ 174/ /unity8- jenkins. ubuntu. com/job/ build/4880/ console /unity8- jenkins. ubuntu. com/job/ build-0- fetch/4908/ console
https:/
Executed test runs:
FAILURE: https:/
FAILURE: https:/
Click here to trigger a rebuild: /unity8- jenkins. ubuntu. com/job/ lp-unity- api-ci/ 174/rebuild
https:/