qtcreator-plugin-ubuntu

Merge lp:~bzoltan/qtcreator-plugin-ubuntu/change_title_of_template_apps into lp:qtcreator-plugin-ubuntu

  1. change_title_of_template_apps
  2. Merge into trunk
Proposed by Zoltan Balogh
Status: Merged
Approved by: Zoltan Balogh
Approved revision: 383
Merged at revision: 386
Proposed branch: lp:~bzoltan/qtcreator-plugin-ubuntu/change_title_of_template_apps
Merge into: lp:qtcreator-plugin-ubuntu
Diff against target: 90 lines (+7/-7)
7 files modified
share/qtcreator/templates/wizards/ubuntu/backend-app-cmake/app/displayName.qml (+1/-1)
share/qtcreator/templates/wizards/ubuntu/backend-app-qmake/appName/Main.qml (+1/-1)
share/qtcreator/templates/wizards/ubuntu/goproject/share/displayName/Main.qml (+1/-1)
share/qtcreator/templates/wizards/ubuntu/qtquick-app-qmake/appName/Main.qml (+1/-1)
share/qtcreator/templates/wizards/ubuntu/simple-app-qmake/appName/Main.qml (+1/-1)
share/qtcreator/templates/wizards/ubuntu/simple-app-qmlproject/Main.qml (+1/-1)
share/qtcreator/templates/wizards/ubuntu/simple-i18n-cmake/app/displayName.qml (+1/-1)
To merge this branch: bzr merge lp:~bzoltan/qtcreator-plugin-ubuntu/change_title_of_template_apps
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Benjamin Zeller Approve
Review via email: mp+258369@code.launchpad.net

Commit message

Set the title of the tamplate apps to the app name. Fixes LP: #1365309

Description of the change

Set the title of the tamplate apps to the app name. Fixes LP: #1365309

To post a comment you must log in.
Revision history for this message
Benjamin Zeller (zeller-benjamin) wrote :

Ok

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:383
http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-ci/538/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-vivid-amd64-ci/72
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-vivid-armhf-ci/72

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtcreator-plugin-ubuntu-ci/538/rebuild

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'share/qtcreator/templates/wizards/ubuntu/backend-app-cmake/app/displayName.qml'
2--- share/qtcreator/templates/wizards/ubuntu/backend-app-cmake/app/displayName.qml 2015-03-31 16:18:58 +0000
3+++ share/qtcreator/templates/wizards/ubuntu/backend-app-cmake/app/displayName.qml 2015-05-06 11:43:15 +0000
4@@ -28,7 +28,7 @@
5 height: units.gu(76)
6
7 Page {
8- title: i18n.tr("App with backend")
9+ title: i18n.tr("%ClickHookName%")
10
11 MyType {
12 id: myType
13
14=== modified file 'share/qtcreator/templates/wizards/ubuntu/backend-app-qmake/appName/Main.qml'
15--- share/qtcreator/templates/wizards/ubuntu/backend-app-qmake/appName/Main.qml 2015-02-09 11:22:14 +0000
16+++ share/qtcreator/templates/wizards/ubuntu/backend-app-qmake/appName/Main.qml 2015-05-06 11:43:15 +0000
17@@ -25,7 +25,7 @@
18 height: units.gu(75)
19
20 Page {
21- title: i18n.tr("App with backend")
22+ title: i18n.tr("%ClickHookName%")
23
24 MyType {
25 id: myType
26
27=== modified file 'share/qtcreator/templates/wizards/ubuntu/goproject/share/displayName/Main.qml'
28--- share/qtcreator/templates/wizards/ubuntu/goproject/share/displayName/Main.qml 2015-01-17 04:53:32 +0000
29+++ share/qtcreator/templates/wizards/ubuntu/goproject/share/displayName/Main.qml 2015-05-06 11:43:15 +0000
30@@ -25,7 +25,7 @@
31 height: units.gu(75)
32
33 Page {
34- title: i18n.tr("Simple")
35+ title: i18n.tr("%ClickHookName%")
36
37 Column {
38 spacing: units.gu(1)
39
40=== modified file 'share/qtcreator/templates/wizards/ubuntu/qtquick-app-qmake/appName/Main.qml'
41--- share/qtcreator/templates/wizards/ubuntu/qtquick-app-qmake/appName/Main.qml 2015-01-17 04:53:32 +0000
42+++ share/qtcreator/templates/wizards/ubuntu/qtquick-app-qmake/appName/Main.qml 2015-05-06 11:43:15 +0000
43@@ -25,7 +25,7 @@
44 height: units.gu(75)
45
46 Page {
47- title: i18n.tr("Simple")
48+ title: i18n.tr("%ClickHookName%")
49
50 Column {
51 spacing: units.gu(1)
52
53=== modified file 'share/qtcreator/templates/wizards/ubuntu/simple-app-qmake/appName/Main.qml'
54--- share/qtcreator/templates/wizards/ubuntu/simple-app-qmake/appName/Main.qml 2015-01-17 04:53:32 +0000
55+++ share/qtcreator/templates/wizards/ubuntu/simple-app-qmake/appName/Main.qml 2015-05-06 11:43:15 +0000
56@@ -25,7 +25,7 @@
57 height: units.gu(75)
58
59 Page {
60- title: i18n.tr("Simple")
61+ title: i18n.tr("%ClickHookName%")
62
63 Column {
64 spacing: units.gu(1)
65
66=== modified file 'share/qtcreator/templates/wizards/ubuntu/simple-app-qmlproject/Main.qml'
67--- share/qtcreator/templates/wizards/ubuntu/simple-app-qmlproject/Main.qml 2015-02-04 17:42:14 +0000
68+++ share/qtcreator/templates/wizards/ubuntu/simple-app-qmlproject/Main.qml 2015-05-06 11:43:15 +0000
69@@ -25,7 +25,7 @@
70 height: units.gu(75)
71
72 Page {
73- title: i18n.tr("Simple")
74+ title: i18n.tr("%ClickHookName%")
75
76 Column {
77 spacing: units.gu(1)
78
79=== modified file 'share/qtcreator/templates/wizards/ubuntu/simple-i18n-cmake/app/displayName.qml'
80--- share/qtcreator/templates/wizards/ubuntu/simple-i18n-cmake/app/displayName.qml 2015-01-16 11:11:30 +0000
81+++ share/qtcreator/templates/wizards/ubuntu/simple-i18n-cmake/app/displayName.qml 2015-05-06 11:43:15 +0000
82@@ -27,7 +27,7 @@
83 height: units.gu(75)
84
85 Page {
86- title: i18n.tr("Simple")
87+ title: i18n.tr("%ClickHookName%")
88
89 Column {
90 spacing: units.gu(1)

Subscribers

People subscribed via source and target branches

to all changes: