← Back to branch summary

~zsombi/ubuntu-ui-toolkit/platform_menu

« back to all changes in this revision

Viewing changes to src/Ubuntu/Components/1.2/MainView.qml

  • Committer: Christian Dywan
  • Date: 2015-12-18 15:28:33 UTC
  • mfrom: (1783 staging)
  • mto: This revision was merged to the branch mainline in revision 1787.
  • Revision ID: christian.dywan@canonical.com-20151218152833-qk8et50txa2cdhv3
Merge lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/staging

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/Ubuntu/Components/1.2/MainView.qml
99
99
 
100
100
        Component {
101
101
            id: toolbarComponent
102
 
            DeprecatedToolbar {
 
102
            Toolbar {
103
103
                parent: canvas
104
104
                onPressedChanged: {
105
105
                    if (!pressed) return;
264
264
          \deprecated
265
265
          The toolbar that will be propagated to the children in the page tree node.
266
266
         */
267
 
        property DeprecatedToolbar toolbar: toolbarLoader.item
 
267
        property Toolbar toolbar: toolbarLoader.item
268
268
 
269
269
        /*!
270
270
          \internal