Merge lp:~bzoltan/ubuntu-ui-toolkit/add_default_tools into lp:ubuntu-ui-toolkit

Proposed by Zoltan Balogh on 2013-10-01
Status: Merged
Approved by: Zsombor Egri on 2013-10-02
Approved revision: 775
Merged at revision: 774
Proposed branch: lp:~bzoltan/ubuntu-ui-toolkit/add_default_tools
Merge into: lp:ubuntu-ui-toolkit
Diff against target: 14 lines (+2/-2)
1 file modified
examples/ubuntu-ui-toolkit-gallery/ubuntu-ui-toolkit-gallery.qml (+2/-2)
To merge this branch: bzr merge lp:~bzoltan/ubuntu-ui-toolkit/add_default_tools
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve on 2013-10-02
Zsombor Egri 2013-10-01 Approve on 2013-10-01
Review via email: mp+188615@code.launchpad.net

Commit message

Add default tools (LP: #1233709)

Description of the change

Add default tools (LP: #1233709)

To post a comment you must log in.
Zsombor Egri (zsombi) wrote :

Thanks for the fix, dude :)

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'examples/ubuntu-ui-toolkit-gallery/ubuntu-ui-toolkit-gallery.qml'
2--- examples/ubuntu-ui-toolkit-gallery/ubuntu-ui-toolkit-gallery.qml 2013-09-24 08:05:04 +0000
3+++ examples/ubuntu-ui-toolkit-gallery/ubuntu-ui-toolkit-gallery.qml 2013-10-01 14:43:15 +0000
4@@ -106,8 +106,8 @@
5 visible: false
6 property alias source: contentLoader.source
7 onActiveChanged: if (!active) source = ""
8-
9- tools: contentLoader.item && contentLoader.item.tools ? contentLoader.item.tools : null
10+ ToolbarItems{ id: defTools}
11+ tools: contentLoader.item && contentLoader.item.tools ? contentLoader.item.tools : defTools
12 flickable: contentLoader.item && !wideAspect ? contentLoader.item.flickable : null
13
14 Loader {

Subscribers

People subscribed via source and target branches

to status/vote changes: