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
1=== modified file 'qtcreator/share/qtcreator/templates/wizards/ubuntu/simple/main.qml'
2--- qtcreator/share/qtcreator/templates/wizards/ubuntu/simple/main.qml 2013-02-19 13:53:05 +0000
3+++ qtcreator/share/qtcreator/templates/wizards/ubuntu/simple/main.qml 2013-04-09 20:03:20 +0000
4@@ -13,25 +13,31 @@
5 width: units.gu(100)
6 height: units.gu(75)
7
8- Column {
9- anchors.centerIn: parent
10- width: units.gu(40)
11- spacing: units.gu(2)
12-
13- Label {
14- id: label
15- objectName: "label"
16-
17- text: "Hello.."
18- }
19- Button {
20- objectName: "button"
21- width: parent.width
22-
23- text: "Tap me!"
24-
25- onClicked: {
26- label.text = "..world!"
27+ Page {
28+ title: "Simple"
29+
30+ Column {
31+ spacing: units.gu(1)
32+ anchors {
33+ margins: units.gu(2)
34+ fill: parent
35+ }
36+
37+ Label {
38+ id: label
39+ objectName: "label"
40+
41+ text: "Hello.."
42+ }
43+ Button {
44+ objectName: "button"
45+ width: parent.width
46+
47+ text: "Tap me!"
48+
49+ onClicked: {
50+ label.text = "..world!"
51+ }
52 }
53 }
54 }

Subscribers

People subscribed via source and target branches