Merge lp:~abreu-alexandre/qtcreator-plugin-ubuntu/qtcreator-template-webview-policy into lp:qtcreator-plugin-ubuntu

[Alexandre Abreu]

Add webview to basic template policy

Add webview to basic template policy

[lp:~abreu-alexandre/qtcreator-plugin-ubuntu/qtcreator-template-webview-policy]

311. By Alexandre Abreu on 2014-12-10

Add oxide flag to new html5 apps

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Zoltan Balogh (bzoltan)]

OK

review: Approve

[lp:~abreu-alexandre/qtcreator-plugin-ubuntu/qtcreator-template-webview-policy]

312. By Alexandre Abreu on 2014-12-17

remove unecessary oxide flag

=== modified file 'share/qtcreator/templates/wizards/ubuntu/share/displayName.apparmor'
--- share/qtcreator/templates/wizards/ubuntu/share/displayName.apparmor	2014-11-17 14:24:59 +0000
+++ share/qtcreator/templates/wizards/ubuntu/share/displayName.apparmor	2014-12-17 16:42:42 +0000
@@ -1,6 +1,7 @@
 {
     "policy_groups": [
-        "networking"
+        "networking",
+        "webview"
     ],
     "policy_version": %ClickAAPolicyVersion%
 }