Merge lp:~tpeeters/ubuntu-ui-toolkit/removeToolbarExample into lp:ubuntu-ui-toolkit/staging

[Tim Peeters]

Remove the deprecated toolbar example from the gallery.

Remove the deprecated toolbar example from the gallery.

[Christian Dywan (kalikiana)]

Nice! Thanks!

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1457
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1587/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1925
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/314
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/317
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/317/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/314
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1697
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1923
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1923/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/19081

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1587/rebuild

review: Needs Fixing (continuous-integration)

=== removed file 'examples/ubuntu-ui-toolkit-gallery/Toolbar.qml'
--- examples/ubuntu-ui-toolkit-gallery/Toolbar.qml	2015-03-11 17:10:20 +0000
+++ examples/ubuntu-ui-toolkit-gallery/Toolbar.qml	1970-01-01 00:00:00 +0000
@@ -1,49 +0,0 @@
-/*
- * Copyright 2014 Canonical Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-import QtQuick 2.0
-import Ubuntu.Components 0.1
-import Ubuntu.Components.Popups 0.1
-
-Template {
-    objectName: "popoversTemplate"
-
-    tools: ToolbarItems {
-        ToolbarButton {
-            text: "Call"
-            iconName: "call-start"
-        }
-        ToolbarButton {
-            text: i18n.tr("Share")
-            iconName: "share"
-        }
-        ToolbarButton {
-            iconName: "settings"
-        }
-        ToolbarButton {
-            iconName: "speaker"
-        }
-    }
-
-    TemplateSection {
-        className: "Toolbar"
-        documentation: "qml-ubuntu-components-toolbaritems.html".arg(className.toLowerCase())
-
-        TemplateRow {
-            title: i18n.tr("See below")
-        }
-    }
-}

=== modified file 'examples/ubuntu-ui-toolkit-gallery/WidgetsModel.qml'
--- examples/ubuntu-ui-toolkit-gallery/WidgetsModel.qml	2015-03-03 13:20:06 +0000
+++ examples/ubuntu-ui-toolkit-gallery/WidgetsModel.qml	2015-03-23 16:36:24 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 Canonical Ltd.
+ * Copyright 2013-2015 Canonical Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -39,11 +39,6 @@
         source: "Toggles.qml"
     }
     ListElement {
-        objectName: "toolbarElement"
-        label: "Toolbar"
-        source: "Toolbar.qml"
-    }
-    ListElement {
         objectName: "buttonsElement"
         label: "Buttons"
         source: "Buttons.qml"