Merge lp:~abreu-alexandre/qtcreator-plugin-ubuntu/add-doc-for-html5-cordova-import into lp:qtcreator-plugin-ubuntu

[Alexandre Abreu]

Add a bit of documentation in the html5 template index to guide the developer to the "import cordova runtime options"

Add a bit of documentation in the html5 template index to guide the developer to the "import cordova runtime options"

[Adnane Belmadiaf (daker)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:212
http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-ci/353/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-utopic-amd64-ci/121
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-utopic-armhf-ci/121

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

review: Approve (continuous-integration)

[Zoltan Balogh (bzoltan)]

OK

review: Approve

=== modified file 'share/qtcreator/templates/wizards/ubuntu/html5-simple/www/index.html'
--- share/qtcreator/templates/wizards/ubuntu/html5-simple/www/index.html	2014-07-04 12:58:32 +0000
+++ share/qtcreator/templates/wizards/ubuntu/html5-simple/www/index.html	2014-07-18 13:59:53 +0000
@@ -19,7 +19,12 @@
     <script src="/usr/share/ubuntu-html5-ui-toolkit/0.1/ambiance/js/tab.js"></script>
     <script src="/usr/share/ubuntu-html5-ui-toolkit/0.1/ambiance/js/tabs.js"></script>
 
-    <!-- Cordova platform API access - Uncomment this to have access to the Javascript APIs -->
+    <!-- Cordova platform API access - Uncomment this to have access to the Cordova Javascript APIs -->
+    <!-- NOTE:
+         Make sure that you have imported the Cordova native runtime and JS libraries into your project first.
+	 In order to do that, in QtCreator, select the "Add Cordova runtime to HTML5 project" menu item
+         in Tools > Ubuntu.
+      -->
     <!-- <script src="cordova/cordova.js"></script> -->
 
     <!-- Application script -->