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

[Cris Dywan]

Make it clear that ToolbarItems is deprecated

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'modules/Ubuntu/Components/ToolbarItems.qml'
--- modules/Ubuntu/Components/ToolbarItems.qml	2014-10-02 13:03:22 +0000
+++ modules/Ubuntu/Components/ToolbarItems.qml	2014-11-13 15:38:46 +0000
@@ -20,8 +20,11 @@
     \qmltype ToolbarItems
     \inqmlmodule Ubuntu.Components 1.1
     \ingroup ubuntu
+    \deprecated
     \brief Row of Items to be placed in a toolbar.
 
+    \b DEPRECATED: DO NOT USE THIS. USE \b head.actions IN \l Page INSTEAD.
+
     Each \l Page has a tools property that can be set to change the tools of toolbar supplied
     by \l MainView when the \l Page is active. Each ToolbarItems consists of a set of
     Items and several properties that specify the behavior of the toolbar when the \l Page