Merge lp:~marcustomlinson/qtcreator-plugin-ubuntu/lp-1538419 into lp:qtcreator-plugin-ubuntu

Proposed by Marcus Tomlinson on 2016-01-27
Status: Merged
Approved by: Benjamin Zeller on 2016-01-27
Approved revision: 418
Merged at revision: 444
Proposed branch: lp:~marcustomlinson/qtcreator-plugin-ubuntu/lp-1538419
Merge into: lp:qtcreator-plugin-ubuntu
Diff against target: 38 lines (+2/-2)
2 files modified
share/qtcreator/templates/wizards/ubuntu/scope-14.10/CMakeLists.txt (+1/-1)
share/qtcreator/templates/wizards/ubuntu/scope/CMakeLists.txt (+1/-1)
To merge this branch: bzr merge lp:~marcustomlinson/qtcreator-plugin-ubuntu/lp-1538419
Reviewer Review Type Date Requested Status
Benjamin Zeller (community) 2016-01-27 Approve on 2016-01-27
PS Jenkins bot continuous-integration Approve on 2016-01-27
Review via email: mp+284065@code.launchpad.net

Commit message

Don't expect .pot file to exist, this breaks CMake when no translations are present

To post a comment you must log in.
Benjamin Zeller (zeller-benjamin) wrote :

OK

review: Approve

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/scope-14.10/CMakeLists.txt'
2--- share/qtcreator/templates/wizards/ubuntu/scope-14.10/CMakeLists.txt 2015-06-11 10:03:53 +0000
3+++ share/qtcreator/templates/wizards/ubuntu/scope-14.10/CMakeLists.txt 2016-01-27 07:43:11 +0000
4@@ -90,6 +90,7 @@
5 file(GLOB_RECURSE
6 _PO_FILES
7 "po/*.po"
8+ "po/*.pot"
9 )
10 add_custom_target(hidden_files
11 ALL
12@@ -98,7 +99,6 @@
13 %ClickHookName:l%.apparmor
14 data/${SCOPE_NAME}.ini.in
15 po/POTFILES.in
16- po/${GETTEXT_PACKAGE}.pot
17 ${_PO_FILES}
18 )
19
20
21=== modified file 'share/qtcreator/templates/wizards/ubuntu/scope/CMakeLists.txt'
22--- share/qtcreator/templates/wizards/ubuntu/scope/CMakeLists.txt 2015-05-19 10:37:38 +0000
23+++ share/qtcreator/templates/wizards/ubuntu/scope/CMakeLists.txt 2016-01-27 07:43:11 +0000
24@@ -81,6 +81,7 @@
25 file(GLOB_RECURSE
26 _PO_FILES
27 "po/*.po"
28+ "po/*.pot"
29 )
30 add_custom_target(hidden_files
31 ALL
32@@ -90,7 +91,6 @@
33 src/data/%ClickHookName:l%.ini.in
34 src/data/%ClickHookName:l%-settings.ini.in
35 po/POTFILES.in
36- po/${GETTEXT_PACKAGE}.pot
37 ${_PO_FILES}
38 )
39

Subscribers

People subscribed via source and target branches