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

[Benjamin Zeller]

- Remove QtScript dependency from the manifest.json parser
- Fix Bug lp:1461026 "Kits creation for a project should match targeted framework"
- Fix Bug lp:1461014 "Match application name to click package name"
- Fix Bug lp:1461019 "Default in project creation dialog should be a qmake project"
- Fix Bug lp:1340061: "Some dialogs have unreadable (too small) text"

- Remove QtScript dependency from the manifest.json parser
- Fix Bug lp:1461026 "Kits creation for a project should match targeted framework"
- Fix Bug lp:1461014 "Match application name to click package name"
- Fix Bug lp:1461019 "Default in project creation dialog should be a qmake project"

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Zoltan Balogh (bzoltan)]

OK

review: Approve

[lp:~zeller-benjamin/qtcreator-plugin-ubuntu/bughunt-201506]

399. By Benjamin Zeller on 2015-06-17

Merge trunk

400. By Benjamin Zeller on 2015-06-17

Fix Bug lp:1340061 "Some dialogs have unreadable (too small) text

=== modified file 'share/qtcreator/templates/wizards/ubuntu/backend-app-cmake/wizard.xml'
--- share/qtcreator/templates/wizards/ubuntu/backend-app-cmake/wizard.xml	2015-05-26 09:46:32 +0000
+++ share/qtcreator/templates/wizards/ubuntu/backend-app-cmake/wizard.xml	2015-06-17 14:03:08 +0000
@@ -38,25 +38,25 @@
         <file source="app/Main.qml"                                       target="app/Main.qml"                                         openeditor="true"/>
         <file source="po/CMakeLists.txt"                                  target="po/CMakeLists.txt"                                    openeditor="false"/>
    </files>
-
-      <!-- Create a 2nd wizard page with click package parameters -->
-        <fieldpagetitle>Click package parameters</fieldpagetitle>
-        <fields>
-            <field mandatory="true" name="ClickDomain">
-              <fieldcontrol class="QLineEdit" validator='^[A-Za-z0-9-]+$'
-                            defaulttext="" placeholdertext="Nickname"/>
-              <fielddescription>Nickname:</fielddescription>
-            </field>
-            <field mandatory="true" name="ClickMaintainer">
-              <fieldcontrol class="QLineEdit" validator='^[^"]+$'
-                            defaulttext="" placeholdertext="Maintainer"/>
-              <fielddescription>Maintainer:</fielddescription>
-            </field>
-            <field mandatory="true" name="ClickHookName">
-              <fieldcontrol class="QLineEdit" validator='^[A-Za-z0-9.-]+$'
-                            defaulttext="myapp" placeholdertext="app hook name"/>
-              <fielddescription>App name:</fielddescription>
-            </field>
+   
+	  <!-- Create a 2nd wizard page with click package parameters -->
+		<fieldpagetitle>Click package parameters</fieldpagetitle>
+		<fields>
+			<field mandatory="true" name="ClickDomain">
+			  <fieldcontrol class="QLineEdit" validator='^[A-Za-z0-9-]+$'
+			                defaulttext="" placeholdertext="Nickname"/>
+			  <fielddescription>Nickname:</fielddescription>
+			</field>
+			<field mandatory="true" name="ClickMaintainer">
+			  <fieldcontrol class="QLineEdit" validator='^[^"]+$'
+			                defaulttext="" placeholdertext="Maintainer"/>
+			  <fielddescription>Maintainer:</fielddescription>
+			</field>
+			<field mandatory="true" name="ClickHookName">
+			  <fieldcontrol class="QLineEdit" validator='^[A-Za-z0-9.-]+$'
+			                defaulttext="%ProjectName%" placeholdertext="app hook name"/>
+			  <fielddescription>App name:</fielddescription>
+			</field>
       <field name="ClickFrameworkVersion">
           <fieldcontrol class="QComboBox" defaultindex="0">
               <comboentries>

=== modified file 'share/qtcreator/templates/wizards/ubuntu/backend-app-qmake/wizard.xml'
--- share/qtcreator/templates/wizards/ubuntu/backend-app-qmake/wizard.xml	2015-05-26 09:46:32 +0000
+++ share/qtcreator/templates/wizards/ubuntu/backend-app-qmake/wizard.xml	2015-06-17 14:03:08 +0000
@@ -40,36 +40,36 @@
       <file source="backend/tests/unit/tst_mytype.qml"   target="backend/tests/unit/tst_mytype.qml" openeditor="false"/>
    </files>
 
-      <!-- Create a 2nd wizard page with click package parameters -->
-        <fieldpagetitle>Click package parameters</fieldpagetitle>
-        <fields>
-            <field mandatory="true" name="ClickDomain">
-              <fieldcontrol class="QLineEdit" validator='^[A-Za-z0-9-]+$'
-                            defaulttext="" placeholdertext="Nickname"/>
-              <fielddescription>Nickname:</fielddescription>
-            </field>
-            <field mandatory="true" name="ClickMaintainer">
-              <fieldcontrol class="QLineEdit" validator='^[^"]+$'
-                            defaulttext="" placeholdertext="Maintainer"/>
-              <fielddescription>Maintainer:</fielddescription>
-            </field>
-            <field mandatory="true" name="ClickHookName">
-              <fieldcontrol class="QLineEdit" validator='^[A-Za-z0-9.-]+$'
-                            defaulttext="app" placeholdertext="app hook name"/>
-              <fielddescription>App name:</fielddescription>
-            </field>
-          <field name="ClickFrameworkVersion">
-              <fieldcontrol class="QComboBox" defaultindex="0">
-                  <comboentries>
-                                <!-- Do not add any other frameworks here, they are populated at runtime, this is just a dummy framework to make sure we can find the combobox -->
-                                <comboentry value="ubuntu-sdk-dummy-framework">
-                        <comboentrytext>Dummy Framework</comboentrytext>
-                    </comboentry>
-                  </comboentries>
-              </fieldcontrol>
-              <fielddescription>Framework:</fielddescription>
-          </field>
-        </fields>
+	  <!-- Create a 2nd wizard page with click package parameters -->
+		<fieldpagetitle>Click package parameters</fieldpagetitle>
+		<fields>
+			<field mandatory="true" name="ClickDomain">
+			  <fieldcontrol class="QLineEdit" validator='^[A-Za-z0-9-]+$'
+			                defaulttext="" placeholdertext="Nickname"/>
+			  <fielddescription>Nickname:</fielddescription>
+			</field>
+			<field mandatory="true" name="ClickMaintainer">
+			  <fieldcontrol class="QLineEdit" validator='^[^"]+$'
+			                defaulttext="" placeholdertext="Maintainer"/>
+			  <fielddescription>Maintainer:</fielddescription>
+			</field>
+			<field mandatory="true" name="ClickHookName">
+			  <fieldcontrol class="QLineEdit" validator='^[A-Za-z0-9.-]+$'
+			                defaulttext="%ProjectName%" placeholdertext="app hook name"/>
+			  <fielddescription>App name:</fielddescription>
+			</field>
+		  <field name="ClickFrameworkVersion">
+		      <fieldcontrol class="QComboBox" defaultindex="0">
+		          <comboentries>
+								<!-- Do not add any other frameworks here, they are populated at runtime, this is just a dummy framework to make sure we can find the combobox -->
+								<comboentry value="ubuntu-sdk-dummy-framework">
+		                <comboentrytext>Dummy Framework</comboentrytext>
+		            </comboentry>
+		          </comboentries>
+		      </fieldcontrol>
+		      <fielddescription>Framework:</fielddescription>
+		  </field>
+		</fields>
     <validationrules>
         <validationrule condition='/^(.*)\s+&lt;(.*@.*)&gt;$/.test("%ClickMaintainer%")'>
             <message>Invalid format for maintainer (should be like "Joe Bloggs &lt;[e-mail]&gt;")</message>

=== modified file 'share/qtcreator/templates/wizards/ubuntu/goproject/wizard.xml'
--- share/qtcreator/templates/wizards/ubuntu/goproject/wizard.xml	2015-01-20 19:19:41 +0000
+++ share/qtcreator/templates/wizards/ubuntu/goproject/wizard.xml	2015-06-17 14:03:08 +0000
@@ -33,7 +33,7 @@
 			</field>
 			<field mandatory="true" name="ClickHookName">
 			  <fieldcontrol class="QLineEdit" validator='^[A-Za-z0-9.-]+$'
-			                defaulttext="myapp" placeholdertext="app hook name"/>
+			                defaulttext="%ProjectName%" placeholdertext="app hook name"/>
 			  <fielddescription>App name:</fielddescription>
 			</field>
 		  <field name="ClickFrameworkVersion">

=== modified file 'share/qtcreator/templates/wizards/ubuntu/html5-simple/wizard.xml'
--- share/qtcreator/templates/wizards/ubuntu/html5-simple/wizard.xml	2015-04-14 18:32:00 +0000
+++ share/qtcreator/templates/wizards/ubuntu/html5-simple/wizard.xml	2015-06-17 14:03:08 +0000
@@ -58,7 +58,7 @@
 			</field>
 			<field mandatory="true" name="ClickHookName">
 			  <fieldcontrol class="QLineEdit" validator='^[^"]+$'
-			                defaulttext="app" placeholdertext="app hook name"/>
+			                defaulttext="%ProjectName%" placeholdertext="app hook name"/>
 			  <fielddescription>App name:</fielddescription>
 			</field>
 		  <field name="ClickFrameworkVersion">

=== modified file 'share/qtcreator/templates/wizards/ubuntu/qtquick-app-qmake/wizard.xml'
--- share/qtcreator/templates/wizards/ubuntu/qtquick-app-qmake/wizard.xml	2015-05-26 09:46:32 +0000
+++ share/qtcreator/templates/wizards/ubuntu/qtquick-app-qmake/wizard.xml	2015-06-17 14:03:08 +0000
@@ -32,37 +32,37 @@
             <file source="appName/tests/autopilot/displayName/tests/__init__.py"  target="%ClickHookName%/tests/autopilot/%ProjectName%/tests/__init__.py"  openeditor="false"/>
             <file source="appName/tests/unit/tst_main.qml"                        target="%ClickHookName%/tests/unit/tst_main.qml"                          openeditor="false"/>
    </files>
-
-      <!-- Create a 2nd wizard page with click package parameters -->
-        <fieldpagetitle>Click package parameters</fieldpagetitle>
-        <fields>
-            <field mandatory="true" name="ClickDomain">
-              <fieldcontrol class="QLineEdit" validator='^[A-Za-z0-9-]+$'
-                            defaulttext="" placeholdertext="Nickname"/>
-              <fielddescription>Nickname:</fielddescription>
-            </field>
-            <field mandatory="true" name="ClickMaintainer">
-              <fieldcontrol class="QLineEdit" validator='^[^"]+$'
-                            defaulttext="" placeholdertext="Maintainer"/>
-              <fielddescription>Maintainer:</fielddescription>
-            </field>
-            <field mandatory="true" name="ClickHookName">
-              <fieldcontrol class="QLineEdit" validator='^[A-Za-z0-9.-]+$'
-                            defaulttext="app" placeholdertext="app hook name"/>
-              <fielddescription>App name:</fielddescription>
-            </field>
-          <field name="ClickFrameworkVersion">
-              <fieldcontrol class="QComboBox" defaultindex="0">
-                  <comboentries>
-                                <!-- Do not add any other frameworks here, they are populated at runtime, this is just a dummy framework to make sure we can find the combobox -->
-                                <comboentry value="ubuntu-sdk-dummy-framework">
-                        <comboentrytext>Dummy Framework</comboentrytext>
-                    </comboentry>
-                  </comboentries>
-              </fieldcontrol>
-              <fielddescription>Framework:</fielddescription>
-          </field>
-        </fields>
+   
+	  <!-- Create a 2nd wizard page with click package parameters -->
+		<fieldpagetitle>Click package parameters</fieldpagetitle>
+		<fields>
+			<field mandatory="true" name="ClickDomain">
+			  <fieldcontrol class="QLineEdit" validator='^[A-Za-z0-9-]+$'
+			                defaulttext="" placeholdertext="Nickname"/>
+			  <fielddescription>Nickname:</fielddescription>
+			</field>
+			<field mandatory="true" name="ClickMaintainer">
+			  <fieldcontrol class="QLineEdit" validator='^[^"]+$'
+			                defaulttext="" placeholdertext="Maintainer"/>
+			  <fielddescription>Maintainer:</fielddescription>
+			</field>
+			<field mandatory="true" name="ClickHookName">
+			  <fieldcontrol class="QLineEdit" validator='^[A-Za-z0-9.-]+$'
+			                defaulttext="%ProjectName%" placeholdertext="app hook name"/>
+			  <fielddescription>App name:</fielddescription>
+			</field>
+		  <field name="ClickFrameworkVersion">
+		      <fieldcontrol class="QComboBox" defaultindex="0">
+		          <comboentries>
+								<!-- Do not add any other frameworks here, they are populated at runtime, this is just a dummy framework to make sure we can find the combobox -->
+								<comboentry value="ubuntu-sdk-dummy-framework">
+		                <comboentrytext>Dummy Framework</comboentrytext>
+		            </comboentry>
+		          </comboentries>
+		      </fieldcontrol>
+		      <fielddescription>Framework:</fielddescription>
+		  </field>
+		</fields>
     <validationrules>
         <validationrule condition='/^(.*)\s+&lt;(.*@.*)&gt;$/.test("%ClickMaintainer%")'>
             <message>Invalid format for maintainer (should be like "Joe Bloggs &lt;[e-mail]&gt;")</message>

=== modified file 'share/qtcreator/templates/wizards/ubuntu/scope/wizard.xml'
--- share/qtcreator/templates/wizards/ubuntu/scope/wizard.xml	2015-06-11 10:03:53 +0000
+++ share/qtcreator/templates/wizards/ubuntu/scope/wizard.xml	2015-06-17 14:03:08 +0000
@@ -64,7 +64,7 @@
         </field>
         <field mandatory="true" name="ClickHookName">
             <fieldcontrol class="QLineEdit" validator='^[A-Za-z0-9.-]+$'
-                            defaulttext="myscope" placeholdertext="scope hook name"/>
+                            defaulttext="%ProjectName%" placeholdertext="scope hook name"/>
             <fielddescription>Scope name:</fielddescription>
         </field>
 				<field name="ClickFrameworkVersion">

=== modified file 'share/qtcreator/templates/wizards/ubuntu/simple-app-qmake/wizard.xml'
--- share/qtcreator/templates/wizards/ubuntu/simple-app-qmake/wizard.xml	2015-05-26 09:46:32 +0000
+++ share/qtcreator/templates/wizards/ubuntu/simple-app-qmake/wizard.xml	2015-06-17 14:03:08 +0000
@@ -27,37 +27,37 @@
             <file source="appName/tests/autopilot/displayName/tests/__init__.py"  target="%ClickHookName%/tests/autopilot/%ProjectName%/tests/__init__.py"  openeditor="false"/>
             <file source="appName/tests/unit/tst_main.qml"                        target="%ClickHookName%/tests/unit/tst_main.qml"                           openeditor="false"/>
    </files>
-
-      <!-- Create a 2nd wizard page with click package parameters -->
-        <fieldpagetitle>Click package parameters</fieldpagetitle>
-        <fields>
-            <field mandatory="true" name="ClickDomain">
-              <fieldcontrol class="QLineEdit" validator='^[A-Za-z0-9-]+$'
-                            defaulttext="" placeholdertext="Nickname"/>
-              <fielddescription>Nickname:</fielddescription>
-            </field>
-            <field mandatory="true" name="ClickMaintainer">
-              <fieldcontrol class="QLineEdit" validator='^[^"]+$'
-                            defaulttext="" placeholdertext="Maintainer"/>
-              <fielddescription>Maintainer:</fielddescription>
-            </field>
-            <field mandatory="true" name="ClickHookName">
-              <fieldcontrol class="QLineEdit" validator='^[A-Za-z0-9.-]+$'
-                            defaulttext="app" placeholdertext="app hook name"/>
-              <fielddescription>App name:</fielddescription>
-            </field>
-          <field name="ClickFrameworkVersion">
-              <fieldcontrol class="QComboBox" defaultindex="0">
-                  <comboentries>
-                                <!-- Do not add any other frameworks here, they are populated at runtime, this is just a dummy framework to make sure we can find the combobox -->
-                                <comboentry value="ubuntu-sdk-dummy-framework">
-                        <comboentrytext>Dummy Framework</comboentrytext>
-                    </comboentry>
-                  </comboentries>
-              </fieldcontrol>
-              <fielddescription>Framework:</fielddescription>
-          </field>
-        </fields>
+   
+	  <!-- Create a 2nd wizard page with click package parameters -->
+		<fieldpagetitle>Click package parameters</fieldpagetitle>
+		<fields>
+			<field mandatory="true" name="ClickDomain">
+			  <fieldcontrol class="QLineEdit" validator='^[A-Za-z0-9-]+$'
+			                defaulttext="" placeholdertext="Nickname"/>
+			  <fielddescription>Nickname:</fielddescription>
+			</field>
+			<field mandatory="true" name="ClickMaintainer">
+			  <fieldcontrol class="QLineEdit" validator='^[^"]+$'
+			                defaulttext="" placeholdertext="Maintainer"/>
+			  <fielddescription>Maintainer:</fielddescription>
+			</field>
+			<field mandatory="true" name="ClickHookName">
+			  <fieldcontrol class="QLineEdit" validator='^[A-Za-z0-9.-]+$'
+			                defaulttext="%ProjectName%" placeholdertext="app hook name"/>
+			  <fielddescription>App name:</fielddescription>
+			</field>
+		  <field name="ClickFrameworkVersion">
+		      <fieldcontrol class="QComboBox" defaultindex="0">
+		          <comboentries>
+								<!-- Do not add any other frameworks here, they are populated at runtime, this is just a dummy framework to make sure we can find the combobox -->
+								<comboentry value="ubuntu-sdk-dummy-framework">
+		                <comboentrytext>Dummy Framework</comboentrytext>
+		            </comboentry>
+		          </comboentries>
+		      </fieldcontrol>
+		      <fielddescription>Framework:</fielddescription>
+		  </field>
+		</fields>
     <validationrules>
         <validationrule condition='/^(.*)\s+&lt;(.*@.*)&gt;$/.test("%ClickMaintainer%")'>
             <message>Invalid format for maintainer (should be like "Joe Bloggs &lt;[e-mail]&gt;")</message>

=== modified file 'share/qtcreator/templates/wizards/ubuntu/simple-app-qmlproject/wizard.xml'
--- share/qtcreator/templates/wizards/ubuntu/simple-app-qmlproject/wizard.xml	2015-05-15 16:57:22 +0000
+++ share/qtcreator/templates/wizards/ubuntu/simple-app-qmlproject/wizard.xml	2015-06-17 14:03:08 +0000
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<wizard version="1" kind="project" firstpage="10" id="A1_UbuntuAppSimple'" category="A.UbuntuProject"
-        platformIndependent="true"
+<wizard version="1" kind="project" firstpage="10" id="A3_UbuntuAppSimple'" category="A.UbuntuProject"
+        platformIndependent="true" 
         class="ubuntu-project-plain-qml"
                 featuresRequired=""
         >
@@ -25,36 +25,36 @@
             <file source="../share/.excludes"                     target=".excludes" openeditor="false"/>
    </files>
 
-      <!-- Create a 2nd wizard page with click package parameters -->
-        <fieldpagetitle>Click package parameters</fieldpagetitle>
-        <fields>
-            <field mandatory="true" name="ClickDomain">
-              <fieldcontrol class="QLineEdit" validator='^[A-Za-z0-9-]+$'
-                            defaulttext="" placeholdertext="Nickname"/>
-              <fielddescription>Nickname:</fielddescription>
-            </field>
-            <field mandatory="true" name="ClickMaintainer">
-              <fieldcontrol class="QLineEdit" validator='^[^"]+$'
-                            defaulttext="" placeholdertext="Maintainer"/>
-              <fielddescription>Maintainer:</fielddescription>
-            </field>
-            <field mandatory="true" name="ClickHookName">
-              <fieldcontrol class="QLineEdit" validator='^[A-Za-z0-9.-]+$'
-                            defaulttext="app" placeholdertext="app hook name"/>
-              <fielddescription>App name:</fielddescription>
-            </field>
-          <field name="ClickFrameworkVersion">
-              <fieldcontrol class="QComboBox" defaultindex="0">
-                  <comboentries>
-                                <!-- Do not add any other frameworks here, they are populated at runtime, this is just a dummy framework to make sure we can find the combobox -->
-                                <comboentry value="ubuntu-sdk-dummy-framework">
-                        <comboentrytext>Dummy Framework</comboentrytext>
-                    </comboentry>
-                  </comboentries>
-              </fieldcontrol>
-              <fielddescription>Framework:</fielddescription>
-          </field>
-        </fields>
+	  <!-- Create a 2nd wizard page with click package parameters -->
+		<fieldpagetitle>Click package parameters</fieldpagetitle>
+		<fields>
+			<field mandatory="true" name="ClickDomain">
+			  <fieldcontrol class="QLineEdit" validator='^[A-Za-z0-9-]+$'
+			                defaulttext="" placeholdertext="Nickname"/>
+			  <fielddescription>Nickname:</fielddescription>
+			</field>
+			<field mandatory="true" name="ClickMaintainer">
+			  <fieldcontrol class="QLineEdit" validator='^[^"]+$'
+			                defaulttext="" placeholdertext="Maintainer"/>
+			  <fielddescription>Maintainer:</fielddescription>
+			</field>
+			<field mandatory="true" name="ClickHookName">
+			  <fieldcontrol class="QLineEdit" validator='^[A-Za-z0-9.-]+$'
+			                defaulttext="%ProjectName%" placeholdertext="app hook name"/>
+			  <fielddescription>App name:</fielddescription>
+			</field>
+		  <field name="ClickFrameworkVersion">
+		      <fieldcontrol class="QComboBox" defaultindex="0">
+		          <comboentries>
+								<!-- Do not add any other frameworks here, they are populated at runtime, this is just a dummy framework to make sure we can find the combobox -->
+								<comboentry value="ubuntu-sdk-dummy-framework">
+		                <comboentrytext>Dummy Framework</comboentrytext>
+		            </comboentry>
+		          </comboentries>
+		      </fieldcontrol>
+		      <fielddescription>Framework:</fielddescription>
+		  </field>
+		</fields>
     <validationrules>
         <validationrule condition='/^(.*)\s+&lt;(.*@.*)&gt;$/.test("%ClickMaintainer%")'>
             <message>Invalid format for maintainer (should be like "Joe Bloggs &lt;[e-mail]&gt;")</message>

=== modified file 'share/qtcreator/templates/wizards/ubuntu/simple-i18n-cmake/wizard.xml'
--- share/qtcreator/templates/wizards/ubuntu/simple-i18n-cmake/wizard.xml	2015-05-26 09:46:32 +0000
+++ share/qtcreator/templates/wizards/ubuntu/simple-i18n-cmake/wizard.xml	2015-06-17 14:03:08 +0000
@@ -26,36 +26,36 @@
         <file source="po/CMakeLists.txt"                       target="po/CMakeLists.txt"     openeditor="false"/>
    </files>
 
-      <!-- Create a 2nd wizard page with click package parameters -->
-        <fieldpagetitle>Click package parameters</fieldpagetitle>
-        <fields>
-            <field mandatory="true" name="ClickDomain">
-              <fieldcontrol class="QLineEdit" validator='^[A-Za-z0-9-]+$'
-                            defaulttext="" placeholdertext="Nickname"/>
-              <fielddescription>Nickname:</fielddescription>
-            </field>
-            <field mandatory="true" name="ClickMaintainer">
-              <fieldcontrol class="QLineEdit" validator='^[^"]+$'
-                            defaulttext="" placeholdertext="Maintainer"/>
-              <fielddescription>Maintainer:</fielddescription>
-            </field>
-            <field mandatory="true" name="ClickHookName">
-              <fieldcontrol class="QLineEdit" validator='^[A-Za-z0-9.-]+$'
-                            defaulttext="myapp" placeholdertext="app hook name"/>
-              <fielddescription>App name:</fielddescription>
-            </field>
-          <field name="ClickFrameworkVersion">
-              <fieldcontrol class="QComboBox" defaultindex="0">
-                  <comboentries>
-                                <!-- Do not add any other frameworks here, they are populated at runtime, this is just a dummy framework to make sure we can find the combobox -->
-                                <comboentry value="ubuntu-sdk-dummy-framework">
-                        <comboentrytext>Dummy Framework</comboentrytext>
-                    </comboentry>
-                  </comboentries>
-              </fieldcontrol>
-              <fielddescription>Framework:</fielddescription>
-          </field>
-        </fields>
+	  <!-- Create a 2nd wizard page with click package parameters -->
+		<fieldpagetitle>Click package parameters</fieldpagetitle>
+		<fields>
+			<field mandatory="true" name="ClickDomain">
+			  <fieldcontrol class="QLineEdit" validator='^[A-Za-z0-9-]+$'
+			                defaulttext="" placeholdertext="Nickname"/>
+			  <fielddescription>Nickname:</fielddescription>
+			</field>
+			<field mandatory="true" name="ClickMaintainer">
+			  <fieldcontrol class="QLineEdit" validator='^[^"]+$'
+			                defaulttext="" placeholdertext="Maintainer"/>
+			  <fielddescription>Maintainer:</fielddescription>
+			</field>
+			<field mandatory="true" name="ClickHookName">
+			  <fieldcontrol class="QLineEdit" validator='^[A-Za-z0-9.-]+$'
+			                defaulttext="%ProjectName%" placeholdertext="app hook name"/>
+			  <fielddescription>App name:</fielddescription>
+			</field>
+		  <field name="ClickFrameworkVersion">
+		      <fieldcontrol class="QComboBox" defaultindex="0">
+		          <comboentries>
+								<!-- Do not add any other frameworks here, they are populated at runtime, this is just a dummy framework to make sure we can find the combobox -->
+								<comboentry value="ubuntu-sdk-dummy-framework">
+		                <comboentrytext>Dummy Framework</comboentrytext>
+		            </comboentry>
+		          </comboentries>
+		      </fieldcontrol>
+		      <fielddescription>Framework:</fielddescription>
+		  </field>
+		</fields>
     <validationrules>
         <validationrule condition='/^(.*)\s+&lt;(.*@.*)&gt;$/.test("%ClickMaintainer%")'>
             <message>Invalid format for maintainer (should be like "Joe Bloggs &lt;[e-mail]&gt;")</message>

=== modified file 'share/qtcreator/templates/wizards/ubuntu/webapp/wizard.xml'
--- share/qtcreator/templates/wizards/ubuntu/webapp/wizard.xml	2015-01-07 10:50:28 +0000
+++ share/qtcreator/templates/wizards/ubuntu/webapp/wizard.xml	2015-06-17 14:03:08 +0000
@@ -26,7 +26,7 @@
             <fielddescription>Maintainer:</fielddescription>
         </field>
         <field mandatory="true" name="ClickHookName">
-            <fieldcontrol class="QLineEdit" validator='^[A-Za-z0-9.-]+$' defaulttext="app" placeholdertext="app hook name"/>
+            <fieldcontrol class="QLineEdit" validator='^[A-Za-z0-9.-]+$' defaulttext="%ProjectName%" placeholdertext="app hook name"/>
             <fielddescription>App name:</fielddescription>
         </field>
 				<field name="ClickFrameworkVersion">

=== modified file 'src/ubuntu/ubuntu.pro'
--- src/ubuntu/ubuntu.pro	2015-02-16 12:27:25 +0000
+++ src/ubuntu/ubuntu.pro	2015-06-17 14:03:08 +0000
@@ -1,4 +1,4 @@
-QT += network qml quick webkitwidgets script scripttools dbus
+QT += network qml quick webkitwidgets dbus
 
 include(../plugin.pri)
 

=== modified file 'src/ubuntu/ubuntuclickdialog.cpp'
--- src/ubuntu/ubuntuclickdialog.cpp	2015-02-19 23:46:50 +0000
+++ src/ubuntu/ubuntuclickdialog.cpp	2015-06-17 14:03:08 +0000
@@ -92,11 +92,11 @@
     return dlg.m_exitCode;
 }
 
-bool UbuntuClickDialog::createClickChrootModal(bool redetectKits, const QString &arch, QWidget *parent)
+bool UbuntuClickDialog::createClickChrootModal(bool redetectKits, const QString &arch, const QString &framework, QWidget *parent)
 {
 
     UbuntuClickTool::Target t;
-    if(!UbuntuCreateNewChrootDialog::getNewChrootTarget(&t,arch,parent))
+    if(!UbuntuCreateNewChrootDialog::getNewChrootTarget(&t,arch,framework,parent))
         return false;
 
     ProjectExplorer::ProcessParameters params;

=== modified file 'src/ubuntu/ubuntuclickdialog.h'
--- src/ubuntu/ubuntuclickdialog.h	2015-01-30 12:20:51 +0000
+++ src/ubuntu/ubuntuclickdialog.h	2015-06-17 14:03:08 +0000
@@ -53,7 +53,7 @@
 
     static int runClickModal(const ProjectExplorer::ProcessParameters &params, QWidget *parent = 0);
     static int runClickModal (const QList<ProjectExplorer::ProcessParameters> &params, QWidget *parent = 0);
-    static bool createClickChrootModal (bool redetectKits = true , const QString &arch = QString(),QWidget *parent = 0);
+    static bool createClickChrootModal (bool redetectKits = true , const QString &arch = QString(), const QString &framework = QString(), QWidget *parent = 0);
 
     static int maintainClickModal (const UbuntuClickTool::Target &target, const UbuntuClickTool::MaintainMode &mode);
     static int maintainClickModal (const QList<UbuntuClickTool::Target> &targetList, const UbuntuClickTool::MaintainMode &mode);

=== modified file 'src/ubuntu/ubuntuclickmanifest.cpp'
--- src/ubuntu/ubuntuclickmanifest.cpp	2015-01-13 09:55:54 +0000
+++ src/ubuntu/ubuntuclickmanifest.cpp	2015-06-17 14:03:08 +0000
@@ -22,13 +22,13 @@
 #include "ubuntushared.h"
 
 #include <QFile>
-#include <QtScriptTools/QScriptEngineDebugger>
 #include <QJsonDocument>
 #include <QProcess>
 #include <QDebug>
 #include <QMainWindow>
 #include <QAction>
-#include <QScriptValueIterator>
+#include <QJSEngine>
+#include <QJSValueIterator>
 
 #include <cmakeprojectmanager/cmakeprojectconstants.h>
 #include <projectexplorer/session.h>
@@ -46,21 +46,14 @@
     QObject(parent), m_bInitialized(false), m_bNameDashReplaced(false)
 
 {
-    QScriptEngineDebugger debugger;
-     debugger.attachTo(&engine);
-     debugger.setAutoShowStandardWindow(true);
-
     QFile manifestAppFile(QLatin1String(":/ubuntu/manifestlib.js"));
     if (!manifestAppFile.open(QIODevice::ReadOnly)) { if(debug) qDebug() << QLatin1String("unable to open js app"); return; }
     QString manifestApp = QString::fromLatin1(manifestAppFile.readAll());
     manifestAppFile.close();
 
-    QScriptProgram program(manifestApp);
-    QScriptValue val = engine.evaluate(program);
+    QJSValue val = engine.evaluate(manifestApp,QStringLiteral("manifestlib.js"));
     if (val.isNull()) { qWarning() << QLatin1String("unable to process app"); return; }
 
-    //load(QLatin1String(":/ubuntu/manifest.json.template"));
-
 }
 
 void UbuntuClickManifest::setName(QString name) {
@@ -151,26 +144,26 @@
     QList<UbuntuClickManifest::Hook> hooks;
     if (!isInitialized()) { return hooks; }
 
-    QScriptValue scriptHooks = callGetFunction(QLatin1String("getHooks"),QScriptValueList());
+    QJSValue scriptHooks = callGetFunction(QLatin1String("getHooks"),QJSValueList());
     if(!scriptHooks.isObject())
         return hooks;
 
-    QScriptValueIterator it(scriptHooks);
+    QJSValueIterator it(scriptHooks);
     while (it.hasNext()) {
         it.next();
-        QScriptValue appDescriptor = it.value();
+        QJSValue appDescriptor = it.value();
         if(!appDescriptor.isObject()) {
             printToOutputPane(tr("Invalid hook in manifest.json file."));
             continue;
         }
 
-        if(!appDescriptor.property(QLatin1String("apparmor")).isValid()) {
+        if(!appDescriptor.hasProperty(QLatin1String("apparmor"))) {
             printToOutputPane(tr("The apparmor path is missing in the manifest file"));
             continue;
         }
 
-        bool isScope = appDescriptor.property(QLatin1String("scope")).isValid();
-        bool isApp = appDescriptor.property(QLatin1String("desktop")).isValid();
+        bool isScope = appDescriptor.hasProperty(QLatin1String("scope"));
+        bool isApp = appDescriptor.hasProperty(QLatin1String("desktop"));
 
         if( (isScope && isApp) || (!isScope && !isApp)) {
             printToOutputPane(tr("The manifest file needs to specify if this is a app or a scope"));
@@ -195,7 +188,7 @@
 {
     Q_UNUSED(hook);
 
-    QScriptValue scriptValue = engine.newObject();
+    QJSValue scriptValue = engine.newObject();
 
     scriptValue.setProperty(QStringLiteral("appId"),hook.appId);
     scriptValue.setProperty(QStringLiteral("apparmor"),hook.appArmorFile);
@@ -207,7 +200,7 @@
         //not known
         return;
 
-    callSetFunction(QStringLiteral("setHook"),QScriptValueList{scriptValue});
+    callSetFunction(QStringLiteral("setHook"),QJSValueList{scriptValue});
 }
 
 void UbuntuClickManifest::setFrameworkName(const QString &name)
@@ -227,15 +220,15 @@
 {
     if (!isInitialized()) { return QString(); }
 
-    QScriptValue v = callGetFunction(QLatin1String("getAppArmorFileName"),QScriptValueList()<<QScriptValue(appId));
+    QJSValue v = callGetFunction(QLatin1String("getAppArmorFileName"),QJSValueList()<<QJSValue(appId));
     return v.toString();
 }
 
 bool UbuntuClickManifest::setAppArmorFileName(const QString &appId, const QString &name)
 {
     if (!isInitialized()) { return false; }
-    bool result = callFunction(QLatin1String("setAppArmorFileName"),QScriptValueList()<<QScriptValue(appId)<<QScriptValue(name)).toBool();
-    callSetFunction(QLatin1String("setAppArmorFileName"), QScriptValueList()<<appId<<name);
+    bool result = callFunction(QLatin1String("setAppArmorFileName"),QJSValueList()<<QJSValue(appId)<<QJSValue(name)).toBool();
+    callSetFunction(QLatin1String("setAppArmorFileName"), QJSValueList()<<appId<<name);
     if(result)
         emit appArmorFileNameChanged(appId, name);
 
@@ -244,7 +237,7 @@
 
 bool UbuntuClickManifest::enableDebugging()
 {
-    return callFunction(QLatin1String("injectDebugPolicy"),QScriptValueList()).toBool();
+    return callFunction(QLatin1String("injectDebugPolicy"),QJSValueList()).toBool();
 }
 
 void UbuntuClickManifest::save(QString fileName) {
@@ -354,7 +347,7 @@
 bool UbuntuClickManifest::loadFromString(const QString &data)
 {
     //@TODO probably return the error message
-    QScriptValue ret = callFunction(QStringLiteral("fromJSON"),QScriptValueList{QScriptValue(data)});
+    QJSValue ret = callFunction(QStringLiteral("fromJSON"),QJSValueList{QJSValue(data)});
     bool success = ret.toBool();
     if(success) {
         m_bInitialized = true;
@@ -364,47 +357,47 @@
     return success;
 }
 
-QScriptValue UbuntuClickManifest::callFunction(QString functionName, QScriptValueList args) {
-    QScriptValue global = engine.globalObject();
-    QScriptValue cmd = global.property(functionName);
-    return cmd.call(QScriptValue(),args);
+QJSValue UbuntuClickManifest::callFunction(QString functionName, QJSValueList args) {
+    QJSValue global = engine.globalObject();
+    QJSValue cmd = global.property(functionName);
+    return cmd.call(args);
 }
 
-void UbuntuClickManifest::callSetFunction(QString functionName, QScriptValueList args) {
+void UbuntuClickManifest::callSetFunction(QString functionName, QJSValueList args) {
     callFunction(functionName,args);
 }
 
-QScriptValue UbuntuClickManifest::callGetFunction(QString functionName, QScriptValueList args) {
+QJSValue UbuntuClickManifest::callGetFunction(QString functionName, QJSValueList args) {
     return callFunction(functionName,args);
 }
 
 QStringList UbuntuClickManifest::callGetStringListFunction(QString functionName) {
-    QScriptValue retval = callFunction(functionName,QScriptValueList());
+    QJSValue retval = callFunction(functionName,QJSValueList());
     return retval.toVariant().toStringList();
 }
 
 QString UbuntuClickManifest::callGetStringFunction(QString functionName) {
-    QScriptValue retval = callFunction(functionName,QScriptValueList());
+    QJSValue retval = callFunction(functionName,QJSValueList());
     return retval.toVariant().toString();
 }
 
 void UbuntuClickManifest::callSetStringListFunction(QString functionName, QStringList args) {
-    QScriptValueList vargs;
+    QJSValueList vargs;
     foreach (QString arg, args)
-        vargs << QScriptValue(arg);
+        vargs << QJSValue(arg);
     callSetFunction(functionName,vargs);
 }
 
 void UbuntuClickManifest::callSetStringFunction(QString functionName, QString args) {
-    QScriptValueList vargs;
-    vargs << QScriptValue(args);
+    QJSValueList vargs;
+    vargs << QJSValue(args);
     callSetFunction(functionName,vargs);
 }
 
 QStringList UbuntuClickManifest::callGetStringListFunction(QString functionName, QString args) {
-    QScriptValueList vargs;
-    vargs << QScriptValue(args);
-    QScriptValue retval = callFunction(functionName,vargs);
+    QJSValueList vargs;
+    vargs << QJSValue(args);
+    QJSValue retval = callFunction(functionName,vargs);
     return retval.toVariant().toStringList();
 }
 

=== modified file 'src/ubuntu/ubuntuclickmanifest.h'
--- src/ubuntu/ubuntuclickmanifest.h	2015-01-13 09:55:54 +0000
+++ src/ubuntu/ubuntuclickmanifest.h	2015-06-17 14:03:08 +0000
@@ -20,10 +20,8 @@
 #define UBUNTUCLICKMANIFEST_H
 
 #include <QObject>
-#include <QScriptProgram>
-#include <QScriptEngine>
+#include <QJSEngine>
 #include <QStringList>
-#include <QScriptValue>
 
 namespace ProjectExplorer { class Project; }
 
@@ -116,19 +114,18 @@
     void nameDashReplaced(){ m_bNameDashReplaced = true; }
 
 protected:
-    void callSetFunction(QString functionName, QScriptValueList args);
+    void callSetFunction(QString functionName, QJSValueList args);
     void callSetStringListFunction(QString functionName, QStringList args);
     void callSetStringFunction(QString functionName, QString args);
 
-    QScriptValue callGetFunction(QString functionName, QScriptValueList args);
+    QJSValue callGetFunction(QString functionName, QJSValueList args);
     QStringList callGetStringListFunction(QString functionName);
     QStringList callGetStringListFunction(QString functionName, QString args);
     QString callGetStringFunction(QString functionName);
 
-    QScriptValue callFunction(QString functionName, QScriptValueList args);
+    QJSValue callFunction(QString functionName, QJSValueList args);
 
-    QScriptProgram m_manifestJsApp;
-    QScriptEngine engine;
+    QJSEngine engine;
 
     QString m_userName;
 

=== modified file 'src/ubuntu/ubuntucreatenewchrootdialog.cpp'
--- src/ubuntu/ubuntucreatenewchrootdialog.cpp	2014-11-19 10:28:30 +0000
+++ src/ubuntu/ubuntucreatenewchrootdialog.cpp	2015-06-17 14:03:08 +0000
@@ -40,7 +40,7 @@
 
 namespace Internal {
 
-UbuntuCreateNewChrootDialog::UbuntuCreateNewChrootDialog(const QString &arch, QWidget *parent) :
+UbuntuCreateNewChrootDialog::UbuntuCreateNewChrootDialog(const QString &arch, const QString &framework,  QWidget *parent) :
     QDialog(parent),
     ui(new Ui::UbuntuCreateNewChrootDialog)
 {
@@ -48,7 +48,11 @@
 
     //add supported targets
     for(int i = 0; Constants::UBUNTU_CLICK_SUPPORTED_TARGETS[i][0][0] != '\0'; i++){
-        ui->comboBoxSeries->addItem(QLatin1String(Constants::UBUNTU_CLICK_SUPPORTED_TARGETS[i][2]),i);
+        const QString currFwDisplayName = QLatin1String(Constants::UBUNTU_CLICK_SUPPORTED_TARGETS[i][2]);
+        const QString currFw = QLatin1String(Constants::UBUNTU_CLICK_SUPPORTED_TARGETS[i][1]);
+
+        if ( framework.isNull() || currFw == framework)
+            ui->comboBoxSeries->addItem(currFwDisplayName,i);
     }
 
     //add supported architectures
@@ -70,9 +74,9 @@
  * Opens a dialog that lets the user select a new chroot, returns false
  * if the user pressed cancel
  */
-bool UbuntuCreateNewChrootDialog::getNewChrootTarget(UbuntuClickTool::Target *target, const QString &arch, QWidget *parent)
+bool UbuntuCreateNewChrootDialog::getNewChrootTarget(UbuntuClickTool::Target *target, const QString &arch, const QString &framework, QWidget *parent)
 {
-    UbuntuCreateNewChrootDialog dlg(arch, parent ? parent : Core::ICore::mainWindow());
+    UbuntuCreateNewChrootDialog dlg(arch, framework, parent ? parent : Core::ICore::mainWindow());
     if( dlg.exec() == QDialog::Accepted) {
         bool ok = false;
 

=== modified file 'src/ubuntu/ubuntucreatenewchrootdialog.h'
--- src/ubuntu/ubuntucreatenewchrootdialog.h	2014-07-31 09:41:18 +0000
+++ src/ubuntu/ubuntucreatenewchrootdialog.h	2015-06-17 14:03:08 +0000
@@ -35,10 +35,10 @@
     Q_OBJECT
 
 public:
-    explicit UbuntuCreateNewChrootDialog(const QString &arch = QString(), QWidget *parent = 0);
+    explicit UbuntuCreateNewChrootDialog(const QString &arch = QString(), const QString &framework = QString(), QWidget *parent = 0);
     ~UbuntuCreateNewChrootDialog();
 
-    static bool getNewChrootTarget(UbuntuClickTool::Target *target, const QString &arch, QWidget *parent = 0);
+    static bool getNewChrootTarget(UbuntuClickTool::Target *target, const QString &arch, const QString &framework, QWidget *parent = 0);
 
 private:
     Ui::UbuntuCreateNewChrootDialog *ui;

=== modified file 'src/ubuntu/ubuntukitmanager.cpp'
--- src/ubuntu/ubuntukitmanager.cpp	2015-04-10 15:06:01 +0000
+++ src/ubuntu/ubuntukitmanager.cpp	2015-06-17 14:03:08 +0000
@@ -146,7 +146,7 @@
                               tr("There is no compatible chroot available on your system, do you want to create it now?"));
 
         if(choice == QMessageBox::Yes) {
-            if(!UbuntuClickDialog::createClickChrootModal(false, device->architecture()))
+            if(!UbuntuClickDialog::createClickChrootModal(false, device->architecture(), device->framework()))
                 return;
 
             toolchains = clickToolChains();

=== modified file 'src/ubuntu/ubuntupackagingmodel.cpp'
--- src/ubuntu/ubuntupackagingmodel.cpp	2015-04-16 09:30:54 +0000
+++ src/ubuntu/ubuntupackagingmodel.cpp	2015-06-17 14:03:08 +0000
@@ -57,7 +57,6 @@
 
 #include <QMenu>
 #include <QMessageBox>
-#include <QScriptEngine>
 #include <QRegularExpression>
 #include <QApplication>
 

=== modified file 'src/ubuntu/ubuntuplugin.cpp'
--- src/ubuntu/ubuntuplugin.cpp	2015-01-13 16:37:58 +0000
+++ src/ubuntu/ubuntuplugin.cpp	2015-06-17 14:03:08 +0000
@@ -106,6 +106,10 @@
     Q_UNUSED(arguments)
     Q_UNUSED(errorString)
 
+    QFont defaultFont = QGuiApplication::font();
+    defaultFont.setFamily(QStringLiteral("Ubuntu"));
+    defaultFont.setWeight(QFont::Light);
+
     qmlRegisterUncreatableType<UbuntuQmlDeviceConnectionState>("Ubuntu.DevicesModel",0,1,"DeviceConnectionState",QStringLiteral("Not instantiable"));
     qmlRegisterUncreatableType<UbuntuQmlDeviceDetectionState>("Ubuntu.DevicesModel",0,1,"DeviceDetectionState",QStringLiteral("Not instantiable"));
     qmlRegisterUncreatableType<UbuntuQmlFeatureState>("Ubuntu.DevicesModel",0,1,"FeatureState",QStringLiteral("Not instantiable"));
@@ -269,6 +273,12 @@
 
     connect(m_migrateProjectAction, SIGNAL(triggered()), this, SLOT(migrateProject()));
 
+    /* Fix Bug lp:1340061 "Some dialogs have unreadable (too small) text"
+     * The Bug is caused by UITK that overrides the default Font that is based
+     * on the grid units, which is not useable in Widget based applications
+     */
+    QGuiApplication::setFont(defaultFont);
+
     return true;
 }
 

=== modified file 'src/ubuntu/ubuntusettingsclickwidget.cpp'
--- src/ubuntu/ubuntusettingsclickwidget.cpp	2015-02-19 22:43:30 +0000
+++ src/ubuntu/ubuntusettingsclickwidget.cpp	2015-06-17 14:03:08 +0000
@@ -84,8 +84,7 @@
     //make sure the current settings are stored
     apply();
 
-    QString dummy;
-    Internal::UbuntuClickDialog::createClickChrootModal(true, dummy, this);
+    Internal::UbuntuClickDialog::createClickChrootModal(true, QString(), QString(), this);
     listExistingClickTargets();
 }
 

=== modified file 'src/ubuntu/wizards/ubuntufirstrunwizard.cpp'
--- src/ubuntu/wizards/ubuntufirstrunwizard.cpp	2015-05-04 11:53:35 +0000
+++ src/ubuntu/wizards/ubuntufirstrunwizard.cpp	2015-06-17 14:03:08 +0000
@@ -157,7 +157,7 @@
 
 void UbuntuSetupChrootWizardPage::onCreateKitButtonClicked()
 {
-    UbuntuClickDialog::createClickChrootModal(true,QString(),this);
+    UbuntuClickDialog::createClickChrootModal(true,QString(), QString(),this);
     initializePage();
 }
 

=== modified file 'tests/manifest/manifest.pro'
--- tests/manifest/manifest.pro	2014-07-21 09:29:06 +0000
+++ tests/manifest/manifest.pro	2015-06-17 14:03:08 +0000
@@ -1,4 +1,4 @@
-QT = core gui script scripttools
+QT = core gui qml
 
 CONFIG += c++11