Merge lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/deprecatedToolbarItems into lp:ubuntu-ui-toolkit/staging

Proposed by Cris Dywan
Status: Merged
Approved by: Tim Peeters
Approved revision: 1326
Merged at revision: 1326
Proposed branch: lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/deprecatedToolbarItems
Merge into: lp:ubuntu-ui-toolkit/staging
Diff against target: 15 lines (+3/-0)
1 file modified
modules/Ubuntu/Components/ToolbarItems.qml (+3/-0)
To merge this branch: bzr merge lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/deprecatedToolbarItems
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Ubuntu SDK team Pending
Review via email: mp+241700@code.launchpad.net

Commit message

Make it clear that ToolbarItems is deprecated

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'modules/Ubuntu/Components/ToolbarItems.qml'
2--- modules/Ubuntu/Components/ToolbarItems.qml 2014-10-02 13:03:22 +0000
3+++ modules/Ubuntu/Components/ToolbarItems.qml 2014-11-13 15:38:46 +0000
4@@ -20,8 +20,11 @@
5 \qmltype ToolbarItems
6 \inqmlmodule Ubuntu.Components 1.1
7 \ingroup ubuntu
8+ \deprecated
9 \brief Row of Items to be placed in a toolbar.
10
11+ \b DEPRECATED: DO NOT USE THIS. USE \b head.actions IN \l Page INSTEAD.
12+
13 Each \l Page has a tools property that can be set to change the tools of toolbar supplied
14 by \l MainView when the \l Page is active. Each ToolbarItems consists of a set of
15 Items and several properties that specify the behavior of the toolbar when the \l Page

Subscribers

People subscribed via source and target branches