Merge lp:~zeller-benjamin/qtcreator-plugin-ubuntu/fw1504 into lp:qtcreator-plugin-ubuntu

[Benjamin Zeller]

- Support framework 15.04
- Fix small issue in the templates

- Support framework 15.04
- Fix small issue in the templates

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

=== modified file 'share/qtcreator/templates/wizards/ubuntu/backend-app-qmake/appName/appName.apparmor'
--- share/qtcreator/templates/wizards/ubuntu/backend-app-qmake/appName/appName.apparmor	2015-01-16 10:50:52 +0000
+++ share/qtcreator/templates/wizards/ubuntu/backend-app-qmake/appName/appName.apparmor	2015-04-15 14:59:20 +0000
@@ -2,7 +2,7 @@
     "policy_groups": [
         "networking"
     ],
-    "policy_version": 1.2
+    "policy_version": %ClickAAPolicyVersion%
 }
 
 

=== modified file 'share/qtcreator/templates/wizards/ubuntu/qtquick-app-qmake/appName/appName.apparmor'
--- share/qtcreator/templates/wizards/ubuntu/qtquick-app-qmake/appName/appName.apparmor	2014-11-13 15:45:24 +0000
+++ share/qtcreator/templates/wizards/ubuntu/qtquick-app-qmake/appName/appName.apparmor	2015-04-15 14:59:20 +0000
@@ -2,7 +2,7 @@
     "policy_groups": [
         "networking"
     ],
-    "policy_version": 1.2
+    "policy_version": %ClickAAPolicyVersion%
 }
 
 

=== modified file 'share/qtcreator/templates/wizards/ubuntu/simple-app-qmake/appName/appName.apparmor'
--- share/qtcreator/templates/wizards/ubuntu/simple-app-qmake/appName/appName.apparmor	2015-01-15 12:51:26 +0000
+++ share/qtcreator/templates/wizards/ubuntu/simple-app-qmake/appName/appName.apparmor	2015-04-15 14:59:20 +0000
@@ -2,7 +2,7 @@
     "policy_groups": [
         "networking"
     ],
-    "policy_version": 1.2
+    "policy_version": %ClickAAPolicyVersion%
 }
 
 

=== modified file 'src/ubuntu/ubuntuclicktool.cpp'
--- src/ubuntu/ubuntuclicktool.cpp	2015-04-01 15:07:51 +0000
+++ src/ubuntu/ubuntuclicktool.cpp	2015-04-15 14:59:20 +0000
@@ -576,7 +576,8 @@
       m_policyCache {
         {QStringLiteral("ubuntu-sdk-13.10"),QStringLiteral("1.0")},
         {QStringLiteral("ubuntu-sdk-14.04"),QStringLiteral("1.1")},
-        {QStringLiteral("ubuntu-sdk-14.10"),QStringLiteral("1.2")}
+        {QStringLiteral("ubuntu-sdk-14.10"),QStringLiteral("1.2")},
+        {QStringLiteral("ubuntu-sdk-15.04"),QStringLiteral("1.3")}
       },
       m_manager(nullptr),
       m_currentRequest(nullptr),

=== modified file 'src/ubuntu/wizards/ubuntuprojectapplicationwizard.cpp'
--- src/ubuntu/wizards/ubuntuprojectapplicationwizard.cpp	2015-01-07 10:50:28 +0000
+++ src/ubuntu/wizards/ubuntuprojectapplicationwizard.cpp	2015-04-15 14:59:20 +0000
@@ -133,7 +133,7 @@
 {
     QString requiredPolicy = UbuntuClickFrameworkProvider::instance()->frameworkPolicy(w->field(QStringLiteral("ClickFrameworkVersion")).toString());
     if(requiredPolicy.isEmpty())
-        requiredPolicy = QStringLiteral("1.2"); //some sane default value
+        requiredPolicy = QStringLiteral("1.3"); //some sane default value
 
     context()->baseReplacements.insert(QStringLiteral("ClickAAPolicyVersion"),requiredPolicy);
     return ProjectExplorer::CustomProjectWizard::generateFiles(w,errorMessage);

=== modified file 'src/ubuntu/wizards/ubuntuprojectmigrationwizard.cpp'
--- src/ubuntu/wizards/ubuntuprojectmigrationwizard.cpp	2015-01-07 10:50:28 +0000
+++ src/ubuntu/wizards/ubuntuprojectmigrationwizard.cpp	2015-04-15 14:59:20 +0000
@@ -146,7 +146,7 @@
         QString framework = wiz.framework();
         QString aaPolicy  = UbuntuClickFrameworkProvider::instance()->frameworkPolicy(framework);
         base_replacements.insert(QStringLiteral("ClickFrameworkVersion"),framework);
-        base_replacements.insert(QStringLiteral("ClickAAPolicyVersion"),aaPolicy.isEmpty() ? QStringLiteral("1.2") : aaPolicy);
+        base_replacements.insert(QStringLiteral("ClickAAPolicyVersion"),aaPolicy.isEmpty() ? QStringLiteral("1.3") : aaPolicy);
 
         QStringList hookTargets = wiz.selectedTargets();