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

[Marcus Tomlinson]

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

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:418
http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-ci/583/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-wily-amd64-ci/44
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-wily-armhf-ci/44

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

review: Approve (continuous-integration)

[Benjamin Zeller (zeller-benjamin)]

OK

review: Approve

=== modified file 'share/qtcreator/templates/wizards/ubuntu/scope-14.10/CMakeLists.txt'
--- share/qtcreator/templates/wizards/ubuntu/scope-14.10/CMakeLists.txt	2015-06-11 10:03:53 +0000
+++ share/qtcreator/templates/wizards/ubuntu/scope-14.10/CMakeLists.txt	2016-01-27 07:43:11 +0000
@@ -90,6 +90,7 @@
 file(GLOB_RECURSE
   _PO_FILES
   "po/*.po" 
+  "po/*.pot" 
 )
 add_custom_target(hidden_files
   ALL
@@ -98,7 +99,6 @@
     %ClickHookName:l%.apparmor
     data/${SCOPE_NAME}.ini.in
     po/POTFILES.in
-    po/${GETTEXT_PACKAGE}.pot
     ${_PO_FILES}
 )
 
 
=== modified file 'share/qtcreator/templates/wizards/ubuntu/scope/CMakeLists.txt'
--- share/qtcreator/templates/wizards/ubuntu/scope/CMakeLists.txt	2015-05-19 10:37:38 +0000
+++ share/qtcreator/templates/wizards/ubuntu/scope/CMakeLists.txt	2016-01-27 07:43:11 +0000
@@ -81,6 +81,7 @@
 file(GLOB_RECURSE
   _PO_FILES
   "po/*.po"
+  "po/*.pot"
 )
 add_custom_target(hidden_files
   ALL
@@ -90,7 +91,6 @@
     src/data/%ClickHookName:l%.ini.in
     src/data/%ClickHookName:l%-settings.ini.in
     po/POTFILES.in
-    po/${GETTEXT_PACKAGE}.pot
     ${_PO_FILES}
 )