Merge lp:~juhapekka-piiroinen/ubuntu-qtcreator-plugins/fix-1166950-simple-app-template into lp:ubuntu-qtcreator-plugins

Proposed by Juhapekka Piiroinen
Status: Merged
Approved by: Tim Peeters
Approved revision: 140
Merged at revision: 140
Proposed branch: lp:~juhapekka-piiroinen/ubuntu-qtcreator-plugins/fix-1166950-simple-app-template
Merge into: lp:ubuntu-qtcreator-plugins
Diff against target: 54 lines (+25/-19)
1 file modified
qtcreator/share/qtcreator/templates/wizards/ubuntu/simple/main.qml (+25/-19)
To merge this branch: bzr merge lp:~juhapekka-piiroinen/ubuntu-qtcreator-plugins/fix-1166950-simple-app-template
Reviewer Review Type Date Requested Status
Michael Hall Pending
Tim Peeters Pending
Review via email: mp+157945@code.launchpad.net

Commit message

Fixed Simple application template.

Description of the change

Fixed Simple application template.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'qtcreator/share/qtcreator/templates/wizards/ubuntu/simple/main.qml'
--- qtcreator/share/qtcreator/templates/wizards/ubuntu/simple/main.qml 2013-02-19 13:53:05 +0000
+++ qtcreator/share/qtcreator/templates/wizards/ubuntu/simple/main.qml 2013-04-09 20:03:20 +0000
@@ -13,25 +13,31 @@
13 width: units.gu(100)13 width: units.gu(100)
14 height: units.gu(75)14 height: units.gu(75)
1515
16 Column {16 Page {
17 anchors.centerIn: parent17 title: "Simple"
18 width: units.gu(40)18
19 spacing: units.gu(2)19 Column {
2020 spacing: units.gu(1)
21 Label {21 anchors {
22 id: label22 margins: units.gu(2)
23 objectName: "label"23 fill: parent
2424 }
25 text: "Hello.."25
26 }26 Label {
27 Button {27 id: label
28 objectName: "button"28 objectName: "label"
29 width: parent.width29
3030 text: "Hello.."
31 text: "Tap me!"31 }
3232 Button {
33 onClicked: {33 objectName: "button"
34 label.text = "..world!"34 width: parent.width
35
36 text: "Tap me!"
37
38 onClicked: {
39 label.text = "..world!"
40 }
35 }41 }
36 }42 }
37 }43 }

Subscribers

People subscribed via source and target branches