Merge lp:~abreu-alexandre/qtcreator-plugin-ubuntu/update-webapp-template into lp:qtcreator-plugin-ubuntu

[Alexandre Abreu]

Update webapp template to account for the latest & most up to date changes

Update webapp template to account for the latest & most up to date changes

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:134
http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-ci/232/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-trusty-amd64-ci/163
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-trusty-armhf-ci/163

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

review: Approve (continuous-integration)

[Zoltan Balogh (bzoltan)]

OK

review: Approve

=== modified file 'share/qtcreator/templates/wizards/ubuntu/webapp/app.desktop'
--- share/qtcreator/templates/wizards/ubuntu/webapp/app.desktop	2014-01-31 11:27:43 +0000
+++ share/qtcreator/templates/wizards/ubuntu/webapp/app.desktop	2014-04-28 21:29:22 +0000
@@ -2,6 +2,6 @@
 Name=%DISPLAYNAME%
 Type=Application
 Icon=app.png
-Exec=webbrowser-app --webapp --enable-back-forward --webappUrlPatterns=https?://m.%DISPLAYNAME%.com/* http://m.%DISPLAYNAME%.com
+Exec=webapp-container --enable-back-forward --store-session cookies --webappUrlPatterns=https?://m.%DISPLAYNAME%.com/* http://m.%DISPLAYNAME%.com
 Terminal=false
 X-Ubuntu-Touch=true

=== modified file 'share/qtcreator/templates/wizards/ubuntu/webapp/app.json'
--- share/qtcreator/templates/wizards/ubuntu/webapp/app.json	2013-11-14 17:45:06 +0000
+++ share/qtcreator/templates/wizards/ubuntu/webapp/app.json	2014-04-28 21:29:22 +0000
@@ -1,7 +1,11 @@
 {
-"template": "ubuntu-webapp",
-"policy_groups": [
-"networking"
-],
-"policy_version": 1.0
+  "template": "ubuntu-webapp",
+  "policy_groups": [
+    "networking",
+    "audio",
+    "content_exchange",
+    "video",
+    "webview",
+  ],
+  "policy_version": 1.1
 }

=== modified file 'src/ubuntu/ubuntuconstants.h'
--- src/ubuntu/ubuntuconstants.h	2014-04-10 15:59:28 +0000
+++ src/ubuntu/ubuntuconstants.h	2014-04-28 21:29:22 +0000
@@ -509,7 +509,7 @@
 //Frameworks
 const char UBUNTU_FRAMEWORK_14_04_BASENAME[] = "ubuntu-sdk-14.04";
 const char UBUNTU_FRAMEWORK_13_10_BASENAME[] = "ubuntu-sdk-13.10";
-const char UBUNTU_DEFAULT_QML_FRAMEWORK[]    = "ubuntu-sdk-14.04-qml";
+const char UBUNTU_DEFAULT_QML_FRAMEWORK[]    = "ubuntu-sdk-14.04-qml-dev1";
 const char UBUNTU_DEFAULT_HTML_FRAMEWORK[]   = "ubuntu-sdk-14.04-html";
 const char UBUNTU_UNKNOWN_FRAMEWORK_NAME[]   = "Unknown framework";
 const int  UBUNTU_UNKNOWN_FRAMEWORK_DATA     = 0xdeadbeef;