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

Proposed by Benjamin Zeller on 2015-06-09
Status: Merged
Approved by: Zoltan Balogh on 2015-06-16
Approved revision: 398
Merged at revision: 404
Proposed branch: lp:~zeller-benjamin/qtcreator-plugin-ubuntu/bughunt-201506
Merge into: lp:qtcreator-plugin-ubuntu
Diff against target: 887 lines (+241/-239)
23 files modified
share/qtcreator/templates/wizards/ubuntu/backend-app-cmake/wizard.xml (+19/-19)
share/qtcreator/templates/wizards/ubuntu/backend-app-qmake/wizard.xml (+30/-30)
share/qtcreator/templates/wizards/ubuntu/goproject/wizard.xml (+1/-1)
share/qtcreator/templates/wizards/ubuntu/html5-simple/wizard.xml (+1/-1)
share/qtcreator/templates/wizards/ubuntu/qtquick-app-qmake/wizard.xml (+31/-31)
share/qtcreator/templates/wizards/ubuntu/scope/wizard.xml (+1/-1)
share/qtcreator/templates/wizards/ubuntu/simple-app-qmake/wizard.xml (+31/-31)
share/qtcreator/templates/wizards/ubuntu/simple-app-qmlproject/wizard.xml (+32/-32)
share/qtcreator/templates/wizards/ubuntu/simple-i18n-cmake/wizard.xml (+30/-30)
share/qtcreator/templates/wizards/ubuntu/webapp/wizard.xml (+1/-1)
src/ubuntu/ubuntu.pro (+1/-1)
src/ubuntu/ubuntuclickdialog.cpp (+2/-2)
src/ubuntu/ubuntuclickdialog.h (+1/-1)
src/ubuntu/ubuntuclickmanifest.cpp (+31/-38)
src/ubuntu/ubuntuclickmanifest.h (+5/-8)
src/ubuntu/ubuntucreatenewchrootdialog.cpp (+8/-4)
src/ubuntu/ubuntucreatenewchrootdialog.h (+2/-2)
src/ubuntu/ubuntukitmanager.cpp (+1/-1)
src/ubuntu/ubuntupackagingmodel.cpp (+0/-1)
src/ubuntu/ubuntuplugin.cpp (+10/-0)
src/ubuntu/ubuntusettingsclickwidget.cpp (+1/-2)
src/ubuntu/wizards/ubuntufirstrunwizard.cpp (+1/-1)
tests/manifest/manifest.pro (+1/-1)
To merge this branch: bzr merge lp:~zeller-benjamin/qtcreator-plugin-ubuntu/bughunt-201506
Reviewer Review Type Date Requested Status
Zoltan Balogh 2015-06-09 Approve on 2015-06-16
PS Jenkins bot continuous-integration Approve on 2015-06-15
Review via email: mp+261541@code.launchpad.net

Commit message

- 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"

Description of the change

- 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"

To post a comment you must log in.
Zoltan Balogh (bzoltan) wrote :

OK

review: Approve
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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'share/qtcreator/templates/wizards/ubuntu/backend-app-cmake/wizard.xml'
2--- share/qtcreator/templates/wizards/ubuntu/backend-app-cmake/wizard.xml 2015-05-26 09:46:32 +0000
3+++ share/qtcreator/templates/wizards/ubuntu/backend-app-cmake/wizard.xml 2015-06-17 14:03:08 +0000
4@@ -38,25 +38,25 @@
5 <file source="app/Main.qml" target="app/Main.qml" openeditor="true"/>
6 <file source="po/CMakeLists.txt" target="po/CMakeLists.txt" openeditor="false"/>
7 </files>
8-
9- <!-- Create a 2nd wizard page with click package parameters -->
10- <fieldpagetitle>Click package parameters</fieldpagetitle>
11- <fields>
12- <field mandatory="true" name="ClickDomain">
13- <fieldcontrol class="QLineEdit" validator='^[A-Za-z0-9-]+$'
14- defaulttext="" placeholdertext="Nickname"/>
15- <fielddescription>Nickname:</fielddescription>
16- </field>
17- <field mandatory="true" name="ClickMaintainer">
18- <fieldcontrol class="QLineEdit" validator='^[^"]+$'
19- defaulttext="" placeholdertext="Maintainer"/>
20- <fielddescription>Maintainer:</fielddescription>
21- </field>
22- <field mandatory="true" name="ClickHookName">
23- <fieldcontrol class="QLineEdit" validator='^[A-Za-z0-9.-]+$'
24- defaulttext="myapp" placeholdertext="app hook name"/>
25- <fielddescription>App name:</fielddescription>
26- </field>
27+
28+ <!-- Create a 2nd wizard page with click package parameters -->
29+ <fieldpagetitle>Click package parameters</fieldpagetitle>
30+ <fields>
31+ <field mandatory="true" name="ClickDomain">
32+ <fieldcontrol class="QLineEdit" validator='^[A-Za-z0-9-]+$'
33+ defaulttext="" placeholdertext="Nickname"/>
34+ <fielddescription>Nickname:</fielddescription>
35+ </field>
36+ <field mandatory="true" name="ClickMaintainer">
37+ <fieldcontrol class="QLineEdit" validator='^[^"]+$'
38+ defaulttext="" placeholdertext="Maintainer"/>
39+ <fielddescription>Maintainer:</fielddescription>
40+ </field>
41+ <field mandatory="true" name="ClickHookName">
42+ <fieldcontrol class="QLineEdit" validator='^[A-Za-z0-9.-]+$'
43+ defaulttext="%ProjectName%" placeholdertext="app hook name"/>
44+ <fielddescription>App name:</fielddescription>
45+ </field>
46 <field name="ClickFrameworkVersion">
47 <fieldcontrol class="QComboBox" defaultindex="0">
48 <comboentries>
49
50=== modified file 'share/qtcreator/templates/wizards/ubuntu/backend-app-qmake/wizard.xml'
51--- share/qtcreator/templates/wizards/ubuntu/backend-app-qmake/wizard.xml 2015-05-26 09:46:32 +0000
52+++ share/qtcreator/templates/wizards/ubuntu/backend-app-qmake/wizard.xml 2015-06-17 14:03:08 +0000
53@@ -40,36 +40,36 @@
54 <file source="backend/tests/unit/tst_mytype.qml" target="backend/tests/unit/tst_mytype.qml" openeditor="false"/>
55 </files>
56
57- <!-- Create a 2nd wizard page with click package parameters -->
58- <fieldpagetitle>Click package parameters</fieldpagetitle>
59- <fields>
60- <field mandatory="true" name="ClickDomain">
61- <fieldcontrol class="QLineEdit" validator='^[A-Za-z0-9-]+$'
62- defaulttext="" placeholdertext="Nickname"/>
63- <fielddescription>Nickname:</fielddescription>
64- </field>
65- <field mandatory="true" name="ClickMaintainer">
66- <fieldcontrol class="QLineEdit" validator='^[^"]+$'
67- defaulttext="" placeholdertext="Maintainer"/>
68- <fielddescription>Maintainer:</fielddescription>
69- </field>
70- <field mandatory="true" name="ClickHookName">
71- <fieldcontrol class="QLineEdit" validator='^[A-Za-z0-9.-]+$'
72- defaulttext="app" placeholdertext="app hook name"/>
73- <fielddescription>App name:</fielddescription>
74- </field>
75- <field name="ClickFrameworkVersion">
76- <fieldcontrol class="QComboBox" defaultindex="0">
77- <comboentries>
78- <!-- 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 -->
79- <comboentry value="ubuntu-sdk-dummy-framework">
80- <comboentrytext>Dummy Framework</comboentrytext>
81- </comboentry>
82- </comboentries>
83- </fieldcontrol>
84- <fielddescription>Framework:</fielddescription>
85- </field>
86- </fields>
87+ <!-- Create a 2nd wizard page with click package parameters -->
88+ <fieldpagetitle>Click package parameters</fieldpagetitle>
89+ <fields>
90+ <field mandatory="true" name="ClickDomain">
91+ <fieldcontrol class="QLineEdit" validator='^[A-Za-z0-9-]+$'
92+ defaulttext="" placeholdertext="Nickname"/>
93+ <fielddescription>Nickname:</fielddescription>
94+ </field>
95+ <field mandatory="true" name="ClickMaintainer">
96+ <fieldcontrol class="QLineEdit" validator='^[^"]+$'
97+ defaulttext="" placeholdertext="Maintainer"/>
98+ <fielddescription>Maintainer:</fielddescription>
99+ </field>
100+ <field mandatory="true" name="ClickHookName">
101+ <fieldcontrol class="QLineEdit" validator='^[A-Za-z0-9.-]+$'
102+ defaulttext="%ProjectName%" placeholdertext="app hook name"/>
103+ <fielddescription>App name:</fielddescription>
104+ </field>
105+ <field name="ClickFrameworkVersion">
106+ <fieldcontrol class="QComboBox" defaultindex="0">
107+ <comboentries>
108+ <!-- 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 -->
109+ <comboentry value="ubuntu-sdk-dummy-framework">
110+ <comboentrytext>Dummy Framework</comboentrytext>
111+ </comboentry>
112+ </comboentries>
113+ </fieldcontrol>
114+ <fielddescription>Framework:</fielddescription>
115+ </field>
116+ </fields>
117 <validationrules>
118 <validationrule condition='/^(.*)\s+&lt;(.*@.*)&gt;$/.test("%ClickMaintainer%")'>
119 <message>Invalid format for maintainer (should be like "Joe Bloggs &lt;joe.bloggs@isp.com&gt;")</message>
120
121=== modified file 'share/qtcreator/templates/wizards/ubuntu/goproject/wizard.xml'
122--- share/qtcreator/templates/wizards/ubuntu/goproject/wizard.xml 2015-01-20 19:19:41 +0000
123+++ share/qtcreator/templates/wizards/ubuntu/goproject/wizard.xml 2015-06-17 14:03:08 +0000
124@@ -33,7 +33,7 @@
125 </field>
126 <field mandatory="true" name="ClickHookName">
127 <fieldcontrol class="QLineEdit" validator='^[A-Za-z0-9.-]+$'
128- defaulttext="myapp" placeholdertext="app hook name"/>
129+ defaulttext="%ProjectName%" placeholdertext="app hook name"/>
130 <fielddescription>App name:</fielddescription>
131 </field>
132 <field name="ClickFrameworkVersion">
133
134=== modified file 'share/qtcreator/templates/wizards/ubuntu/html5-simple/wizard.xml'
135--- share/qtcreator/templates/wizards/ubuntu/html5-simple/wizard.xml 2015-04-14 18:32:00 +0000
136+++ share/qtcreator/templates/wizards/ubuntu/html5-simple/wizard.xml 2015-06-17 14:03:08 +0000
137@@ -58,7 +58,7 @@
138 </field>
139 <field mandatory="true" name="ClickHookName">
140 <fieldcontrol class="QLineEdit" validator='^[^"]+$'
141- defaulttext="app" placeholdertext="app hook name"/>
142+ defaulttext="%ProjectName%" placeholdertext="app hook name"/>
143 <fielddescription>App name:</fielddescription>
144 </field>
145 <field name="ClickFrameworkVersion">
146
147=== modified file 'share/qtcreator/templates/wizards/ubuntu/qtquick-app-qmake/wizard.xml'
148--- share/qtcreator/templates/wizards/ubuntu/qtquick-app-qmake/wizard.xml 2015-05-26 09:46:32 +0000
149+++ share/qtcreator/templates/wizards/ubuntu/qtquick-app-qmake/wizard.xml 2015-06-17 14:03:08 +0000
150@@ -32,37 +32,37 @@
151 <file source="appName/tests/autopilot/displayName/tests/__init__.py" target="%ClickHookName%/tests/autopilot/%ProjectName%/tests/__init__.py" openeditor="false"/>
152 <file source="appName/tests/unit/tst_main.qml" target="%ClickHookName%/tests/unit/tst_main.qml" openeditor="false"/>
153 </files>
154-
155- <!-- Create a 2nd wizard page with click package parameters -->
156- <fieldpagetitle>Click package parameters</fieldpagetitle>
157- <fields>
158- <field mandatory="true" name="ClickDomain">
159- <fieldcontrol class="QLineEdit" validator='^[A-Za-z0-9-]+$'
160- defaulttext="" placeholdertext="Nickname"/>
161- <fielddescription>Nickname:</fielddescription>
162- </field>
163- <field mandatory="true" name="ClickMaintainer">
164- <fieldcontrol class="QLineEdit" validator='^[^"]+$'
165- defaulttext="" placeholdertext="Maintainer"/>
166- <fielddescription>Maintainer:</fielddescription>
167- </field>
168- <field mandatory="true" name="ClickHookName">
169- <fieldcontrol class="QLineEdit" validator='^[A-Za-z0-9.-]+$'
170- defaulttext="app" placeholdertext="app hook name"/>
171- <fielddescription>App name:</fielddescription>
172- </field>
173- <field name="ClickFrameworkVersion">
174- <fieldcontrol class="QComboBox" defaultindex="0">
175- <comboentries>
176- <!-- 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 -->
177- <comboentry value="ubuntu-sdk-dummy-framework">
178- <comboentrytext>Dummy Framework</comboentrytext>
179- </comboentry>
180- </comboentries>
181- </fieldcontrol>
182- <fielddescription>Framework:</fielddescription>
183- </field>
184- </fields>
185+
186+ <!-- Create a 2nd wizard page with click package parameters -->
187+ <fieldpagetitle>Click package parameters</fieldpagetitle>
188+ <fields>
189+ <field mandatory="true" name="ClickDomain">
190+ <fieldcontrol class="QLineEdit" validator='^[A-Za-z0-9-]+$'
191+ defaulttext="" placeholdertext="Nickname"/>
192+ <fielddescription>Nickname:</fielddescription>
193+ </field>
194+ <field mandatory="true" name="ClickMaintainer">
195+ <fieldcontrol class="QLineEdit" validator='^[^"]+$'
196+ defaulttext="" placeholdertext="Maintainer"/>
197+ <fielddescription>Maintainer:</fielddescription>
198+ </field>
199+ <field mandatory="true" name="ClickHookName">
200+ <fieldcontrol class="QLineEdit" validator='^[A-Za-z0-9.-]+$'
201+ defaulttext="%ProjectName%" placeholdertext="app hook name"/>
202+ <fielddescription>App name:</fielddescription>
203+ </field>
204+ <field name="ClickFrameworkVersion">
205+ <fieldcontrol class="QComboBox" defaultindex="0">
206+ <comboentries>
207+ <!-- 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 -->
208+ <comboentry value="ubuntu-sdk-dummy-framework">
209+ <comboentrytext>Dummy Framework</comboentrytext>
210+ </comboentry>
211+ </comboentries>
212+ </fieldcontrol>
213+ <fielddescription>Framework:</fielddescription>
214+ </field>
215+ </fields>
216 <validationrules>
217 <validationrule condition='/^(.*)\s+&lt;(.*@.*)&gt;$/.test("%ClickMaintainer%")'>
218 <message>Invalid format for maintainer (should be like "Joe Bloggs &lt;joe.bloggs@isp.com&gt;")</message>
219
220=== modified file 'share/qtcreator/templates/wizards/ubuntu/scope/wizard.xml'
221--- share/qtcreator/templates/wizards/ubuntu/scope/wizard.xml 2015-06-11 10:03:53 +0000
222+++ share/qtcreator/templates/wizards/ubuntu/scope/wizard.xml 2015-06-17 14:03:08 +0000
223@@ -64,7 +64,7 @@
224 </field>
225 <field mandatory="true" name="ClickHookName">
226 <fieldcontrol class="QLineEdit" validator='^[A-Za-z0-9.-]+$'
227- defaulttext="myscope" placeholdertext="scope hook name"/>
228+ defaulttext="%ProjectName%" placeholdertext="scope hook name"/>
229 <fielddescription>Scope name:</fielddescription>
230 </field>
231 <field name="ClickFrameworkVersion">
232
233=== modified file 'share/qtcreator/templates/wizards/ubuntu/simple-app-qmake/wizard.xml'
234--- share/qtcreator/templates/wizards/ubuntu/simple-app-qmake/wizard.xml 2015-05-26 09:46:32 +0000
235+++ share/qtcreator/templates/wizards/ubuntu/simple-app-qmake/wizard.xml 2015-06-17 14:03:08 +0000
236@@ -27,37 +27,37 @@
237 <file source="appName/tests/autopilot/displayName/tests/__init__.py" target="%ClickHookName%/tests/autopilot/%ProjectName%/tests/__init__.py" openeditor="false"/>
238 <file source="appName/tests/unit/tst_main.qml" target="%ClickHookName%/tests/unit/tst_main.qml" openeditor="false"/>
239 </files>
240-
241- <!-- Create a 2nd wizard page with click package parameters -->
242- <fieldpagetitle>Click package parameters</fieldpagetitle>
243- <fields>
244- <field mandatory="true" name="ClickDomain">
245- <fieldcontrol class="QLineEdit" validator='^[A-Za-z0-9-]+$'
246- defaulttext="" placeholdertext="Nickname"/>
247- <fielddescription>Nickname:</fielddescription>
248- </field>
249- <field mandatory="true" name="ClickMaintainer">
250- <fieldcontrol class="QLineEdit" validator='^[^"]+$'
251- defaulttext="" placeholdertext="Maintainer"/>
252- <fielddescription>Maintainer:</fielddescription>
253- </field>
254- <field mandatory="true" name="ClickHookName">
255- <fieldcontrol class="QLineEdit" validator='^[A-Za-z0-9.-]+$'
256- defaulttext="app" placeholdertext="app hook name"/>
257- <fielddescription>App name:</fielddescription>
258- </field>
259- <field name="ClickFrameworkVersion">
260- <fieldcontrol class="QComboBox" defaultindex="0">
261- <comboentries>
262- <!-- 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 -->
263- <comboentry value="ubuntu-sdk-dummy-framework">
264- <comboentrytext>Dummy Framework</comboentrytext>
265- </comboentry>
266- </comboentries>
267- </fieldcontrol>
268- <fielddescription>Framework:</fielddescription>
269- </field>
270- </fields>
271+
272+ <!-- Create a 2nd wizard page with click package parameters -->
273+ <fieldpagetitle>Click package parameters</fieldpagetitle>
274+ <fields>
275+ <field mandatory="true" name="ClickDomain">
276+ <fieldcontrol class="QLineEdit" validator='^[A-Za-z0-9-]+$'
277+ defaulttext="" placeholdertext="Nickname"/>
278+ <fielddescription>Nickname:</fielddescription>
279+ </field>
280+ <field mandatory="true" name="ClickMaintainer">
281+ <fieldcontrol class="QLineEdit" validator='^[^"]+$'
282+ defaulttext="" placeholdertext="Maintainer"/>
283+ <fielddescription>Maintainer:</fielddescription>
284+ </field>
285+ <field mandatory="true" name="ClickHookName">
286+ <fieldcontrol class="QLineEdit" validator='^[A-Za-z0-9.-]+$'
287+ defaulttext="%ProjectName%" placeholdertext="app hook name"/>
288+ <fielddescription>App name:</fielddescription>
289+ </field>
290+ <field name="ClickFrameworkVersion">
291+ <fieldcontrol class="QComboBox" defaultindex="0">
292+ <comboentries>
293+ <!-- 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 -->
294+ <comboentry value="ubuntu-sdk-dummy-framework">
295+ <comboentrytext>Dummy Framework</comboentrytext>
296+ </comboentry>
297+ </comboentries>
298+ </fieldcontrol>
299+ <fielddescription>Framework:</fielddescription>
300+ </field>
301+ </fields>
302 <validationrules>
303 <validationrule condition='/^(.*)\s+&lt;(.*@.*)&gt;$/.test("%ClickMaintainer%")'>
304 <message>Invalid format for maintainer (should be like "Joe Bloggs &lt;joe.bloggs@isp.com&gt;")</message>
305
306=== modified file 'share/qtcreator/templates/wizards/ubuntu/simple-app-qmlproject/wizard.xml'
307--- share/qtcreator/templates/wizards/ubuntu/simple-app-qmlproject/wizard.xml 2015-05-15 16:57:22 +0000
308+++ share/qtcreator/templates/wizards/ubuntu/simple-app-qmlproject/wizard.xml 2015-06-17 14:03:08 +0000
309@@ -1,6 +1,6 @@
310 <?xml version="1.0" encoding="UTF-8"?>
311-<wizard version="1" kind="project" firstpage="10" id="A1_UbuntuAppSimple'" category="A.UbuntuProject"
312- platformIndependent="true"
313+<wizard version="1" kind="project" firstpage="10" id="A3_UbuntuAppSimple'" category="A.UbuntuProject"
314+ platformIndependent="true"
315 class="ubuntu-project-plain-qml"
316 featuresRequired=""
317 >
318@@ -25,36 +25,36 @@
319 <file source="../share/.excludes" target=".excludes" openeditor="false"/>
320 </files>
321
322- <!-- Create a 2nd wizard page with click package parameters -->
323- <fieldpagetitle>Click package parameters</fieldpagetitle>
324- <fields>
325- <field mandatory="true" name="ClickDomain">
326- <fieldcontrol class="QLineEdit" validator='^[A-Za-z0-9-]+$'
327- defaulttext="" placeholdertext="Nickname"/>
328- <fielddescription>Nickname:</fielddescription>
329- </field>
330- <field mandatory="true" name="ClickMaintainer">
331- <fieldcontrol class="QLineEdit" validator='^[^"]+$'
332- defaulttext="" placeholdertext="Maintainer"/>
333- <fielddescription>Maintainer:</fielddescription>
334- </field>
335- <field mandatory="true" name="ClickHookName">
336- <fieldcontrol class="QLineEdit" validator='^[A-Za-z0-9.-]+$'
337- defaulttext="app" placeholdertext="app hook name"/>
338- <fielddescription>App name:</fielddescription>
339- </field>
340- <field name="ClickFrameworkVersion">
341- <fieldcontrol class="QComboBox" defaultindex="0">
342- <comboentries>
343- <!-- 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 -->
344- <comboentry value="ubuntu-sdk-dummy-framework">
345- <comboentrytext>Dummy Framework</comboentrytext>
346- </comboentry>
347- </comboentries>
348- </fieldcontrol>
349- <fielddescription>Framework:</fielddescription>
350- </field>
351- </fields>
352+ <!-- Create a 2nd wizard page with click package parameters -->
353+ <fieldpagetitle>Click package parameters</fieldpagetitle>
354+ <fields>
355+ <field mandatory="true" name="ClickDomain">
356+ <fieldcontrol class="QLineEdit" validator='^[A-Za-z0-9-]+$'
357+ defaulttext="" placeholdertext="Nickname"/>
358+ <fielddescription>Nickname:</fielddescription>
359+ </field>
360+ <field mandatory="true" name="ClickMaintainer">
361+ <fieldcontrol class="QLineEdit" validator='^[^"]+$'
362+ defaulttext="" placeholdertext="Maintainer"/>
363+ <fielddescription>Maintainer:</fielddescription>
364+ </field>
365+ <field mandatory="true" name="ClickHookName">
366+ <fieldcontrol class="QLineEdit" validator='^[A-Za-z0-9.-]+$'
367+ defaulttext="%ProjectName%" placeholdertext="app hook name"/>
368+ <fielddescription>App name:</fielddescription>
369+ </field>
370+ <field name="ClickFrameworkVersion">
371+ <fieldcontrol class="QComboBox" defaultindex="0">
372+ <comboentries>
373+ <!-- 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 -->
374+ <comboentry value="ubuntu-sdk-dummy-framework">
375+ <comboentrytext>Dummy Framework</comboentrytext>
376+ </comboentry>
377+ </comboentries>
378+ </fieldcontrol>
379+ <fielddescription>Framework:</fielddescription>
380+ </field>
381+ </fields>
382 <validationrules>
383 <validationrule condition='/^(.*)\s+&lt;(.*@.*)&gt;$/.test("%ClickMaintainer%")'>
384 <message>Invalid format for maintainer (should be like "Joe Bloggs &lt;joe.bloggs@isp.com&gt;")</message>
385
386=== modified file 'share/qtcreator/templates/wizards/ubuntu/simple-i18n-cmake/wizard.xml'
387--- share/qtcreator/templates/wizards/ubuntu/simple-i18n-cmake/wizard.xml 2015-05-26 09:46:32 +0000
388+++ share/qtcreator/templates/wizards/ubuntu/simple-i18n-cmake/wizard.xml 2015-06-17 14:03:08 +0000
389@@ -26,36 +26,36 @@
390 <file source="po/CMakeLists.txt" target="po/CMakeLists.txt" openeditor="false"/>
391 </files>
392
393- <!-- Create a 2nd wizard page with click package parameters -->
394- <fieldpagetitle>Click package parameters</fieldpagetitle>
395- <fields>
396- <field mandatory="true" name="ClickDomain">
397- <fieldcontrol class="QLineEdit" validator='^[A-Za-z0-9-]+$'
398- defaulttext="" placeholdertext="Nickname"/>
399- <fielddescription>Nickname:</fielddescription>
400- </field>
401- <field mandatory="true" name="ClickMaintainer">
402- <fieldcontrol class="QLineEdit" validator='^[^"]+$'
403- defaulttext="" placeholdertext="Maintainer"/>
404- <fielddescription>Maintainer:</fielddescription>
405- </field>
406- <field mandatory="true" name="ClickHookName">
407- <fieldcontrol class="QLineEdit" validator='^[A-Za-z0-9.-]+$'
408- defaulttext="myapp" placeholdertext="app hook name"/>
409- <fielddescription>App name:</fielddescription>
410- </field>
411- <field name="ClickFrameworkVersion">
412- <fieldcontrol class="QComboBox" defaultindex="0">
413- <comboentries>
414- <!-- 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 -->
415- <comboentry value="ubuntu-sdk-dummy-framework">
416- <comboentrytext>Dummy Framework</comboentrytext>
417- </comboentry>
418- </comboentries>
419- </fieldcontrol>
420- <fielddescription>Framework:</fielddescription>
421- </field>
422- </fields>
423+ <!-- Create a 2nd wizard page with click package parameters -->
424+ <fieldpagetitle>Click package parameters</fieldpagetitle>
425+ <fields>
426+ <field mandatory="true" name="ClickDomain">
427+ <fieldcontrol class="QLineEdit" validator='^[A-Za-z0-9-]+$'
428+ defaulttext="" placeholdertext="Nickname"/>
429+ <fielddescription>Nickname:</fielddescription>
430+ </field>
431+ <field mandatory="true" name="ClickMaintainer">
432+ <fieldcontrol class="QLineEdit" validator='^[^"]+$'
433+ defaulttext="" placeholdertext="Maintainer"/>
434+ <fielddescription>Maintainer:</fielddescription>
435+ </field>
436+ <field mandatory="true" name="ClickHookName">
437+ <fieldcontrol class="QLineEdit" validator='^[A-Za-z0-9.-]+$'
438+ defaulttext="%ProjectName%" placeholdertext="app hook name"/>
439+ <fielddescription>App name:</fielddescription>
440+ </field>
441+ <field name="ClickFrameworkVersion">
442+ <fieldcontrol class="QComboBox" defaultindex="0">
443+ <comboentries>
444+ <!-- 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 -->
445+ <comboentry value="ubuntu-sdk-dummy-framework">
446+ <comboentrytext>Dummy Framework</comboentrytext>
447+ </comboentry>
448+ </comboentries>
449+ </fieldcontrol>
450+ <fielddescription>Framework:</fielddescription>
451+ </field>
452+ </fields>
453 <validationrules>
454 <validationrule condition='/^(.*)\s+&lt;(.*@.*)&gt;$/.test("%ClickMaintainer%")'>
455 <message>Invalid format for maintainer (should be like "Joe Bloggs &lt;joe.bloggs@isp.com&gt;")</message>
456
457=== modified file 'share/qtcreator/templates/wizards/ubuntu/webapp/wizard.xml'
458--- share/qtcreator/templates/wizards/ubuntu/webapp/wizard.xml 2015-01-07 10:50:28 +0000
459+++ share/qtcreator/templates/wizards/ubuntu/webapp/wizard.xml 2015-06-17 14:03:08 +0000
460@@ -26,7 +26,7 @@
461 <fielddescription>Maintainer:</fielddescription>
462 </field>
463 <field mandatory="true" name="ClickHookName">
464- <fieldcontrol class="QLineEdit" validator='^[A-Za-z0-9.-]+$' defaulttext="app" placeholdertext="app hook name"/>
465+ <fieldcontrol class="QLineEdit" validator='^[A-Za-z0-9.-]+$' defaulttext="%ProjectName%" placeholdertext="app hook name"/>
466 <fielddescription>App name:</fielddescription>
467 </field>
468 <field name="ClickFrameworkVersion">
469
470=== modified file 'src/ubuntu/ubuntu.pro'
471--- src/ubuntu/ubuntu.pro 2015-02-16 12:27:25 +0000
472+++ src/ubuntu/ubuntu.pro 2015-06-17 14:03:08 +0000
473@@ -1,4 +1,4 @@
474-QT += network qml quick webkitwidgets script scripttools dbus
475+QT += network qml quick webkitwidgets dbus
476
477 include(../plugin.pri)
478
479
480=== modified file 'src/ubuntu/ubuntuclickdialog.cpp'
481--- src/ubuntu/ubuntuclickdialog.cpp 2015-02-19 23:46:50 +0000
482+++ src/ubuntu/ubuntuclickdialog.cpp 2015-06-17 14:03:08 +0000
483@@ -92,11 +92,11 @@
484 return dlg.m_exitCode;
485 }
486
487-bool UbuntuClickDialog::createClickChrootModal(bool redetectKits, const QString &arch, QWidget *parent)
488+bool UbuntuClickDialog::createClickChrootModal(bool redetectKits, const QString &arch, const QString &framework, QWidget *parent)
489 {
490
491 UbuntuClickTool::Target t;
492- if(!UbuntuCreateNewChrootDialog::getNewChrootTarget(&t,arch,parent))
493+ if(!UbuntuCreateNewChrootDialog::getNewChrootTarget(&t,arch,framework,parent))
494 return false;
495
496 ProjectExplorer::ProcessParameters params;
497
498=== modified file 'src/ubuntu/ubuntuclickdialog.h'
499--- src/ubuntu/ubuntuclickdialog.h 2015-01-30 12:20:51 +0000
500+++ src/ubuntu/ubuntuclickdialog.h 2015-06-17 14:03:08 +0000
501@@ -53,7 +53,7 @@
502
503 static int runClickModal(const ProjectExplorer::ProcessParameters &params, QWidget *parent = 0);
504 static int runClickModal (const QList<ProjectExplorer::ProcessParameters> &params, QWidget *parent = 0);
505- static bool createClickChrootModal (bool redetectKits = true , const QString &arch = QString(),QWidget *parent = 0);
506+ static bool createClickChrootModal (bool redetectKits = true , const QString &arch = QString(), const QString &framework = QString(), QWidget *parent = 0);
507
508 static int maintainClickModal (const UbuntuClickTool::Target &target, const UbuntuClickTool::MaintainMode &mode);
509 static int maintainClickModal (const QList<UbuntuClickTool::Target> &targetList, const UbuntuClickTool::MaintainMode &mode);
510
511=== modified file 'src/ubuntu/ubuntuclickmanifest.cpp'
512--- src/ubuntu/ubuntuclickmanifest.cpp 2015-01-13 09:55:54 +0000
513+++ src/ubuntu/ubuntuclickmanifest.cpp 2015-06-17 14:03:08 +0000
514@@ -22,13 +22,13 @@
515 #include "ubuntushared.h"
516
517 #include <QFile>
518-#include <QtScriptTools/QScriptEngineDebugger>
519 #include <QJsonDocument>
520 #include <QProcess>
521 #include <QDebug>
522 #include <QMainWindow>
523 #include <QAction>
524-#include <QScriptValueIterator>
525+#include <QJSEngine>
526+#include <QJSValueIterator>
527
528 #include <cmakeprojectmanager/cmakeprojectconstants.h>
529 #include <projectexplorer/session.h>
530@@ -46,21 +46,14 @@
531 QObject(parent), m_bInitialized(false), m_bNameDashReplaced(false)
532
533 {
534- QScriptEngineDebugger debugger;
535- debugger.attachTo(&engine);
536- debugger.setAutoShowStandardWindow(true);
537-
538 QFile manifestAppFile(QLatin1String(":/ubuntu/manifestlib.js"));
539 if (!manifestAppFile.open(QIODevice::ReadOnly)) { if(debug) qDebug() << QLatin1String("unable to open js app"); return; }
540 QString manifestApp = QString::fromLatin1(manifestAppFile.readAll());
541 manifestAppFile.close();
542
543- QScriptProgram program(manifestApp);
544- QScriptValue val = engine.evaluate(program);
545+ QJSValue val = engine.evaluate(manifestApp,QStringLiteral("manifestlib.js"));
546 if (val.isNull()) { qWarning() << QLatin1String("unable to process app"); return; }
547
548- //load(QLatin1String(":/ubuntu/manifest.json.template"));
549-
550 }
551
552 void UbuntuClickManifest::setName(QString name) {
553@@ -151,26 +144,26 @@
554 QList<UbuntuClickManifest::Hook> hooks;
555 if (!isInitialized()) { return hooks; }
556
557- QScriptValue scriptHooks = callGetFunction(QLatin1String("getHooks"),QScriptValueList());
558+ QJSValue scriptHooks = callGetFunction(QLatin1String("getHooks"),QJSValueList());
559 if(!scriptHooks.isObject())
560 return hooks;
561
562- QScriptValueIterator it(scriptHooks);
563+ QJSValueIterator it(scriptHooks);
564 while (it.hasNext()) {
565 it.next();
566- QScriptValue appDescriptor = it.value();
567+ QJSValue appDescriptor = it.value();
568 if(!appDescriptor.isObject()) {
569 printToOutputPane(tr("Invalid hook in manifest.json file."));
570 continue;
571 }
572
573- if(!appDescriptor.property(QLatin1String("apparmor")).isValid()) {
574+ if(!appDescriptor.hasProperty(QLatin1String("apparmor"))) {
575 printToOutputPane(tr("The apparmor path is missing in the manifest file"));
576 continue;
577 }
578
579- bool isScope = appDescriptor.property(QLatin1String("scope")).isValid();
580- bool isApp = appDescriptor.property(QLatin1String("desktop")).isValid();
581+ bool isScope = appDescriptor.hasProperty(QLatin1String("scope"));
582+ bool isApp = appDescriptor.hasProperty(QLatin1String("desktop"));
583
584 if( (isScope && isApp) || (!isScope && !isApp)) {
585 printToOutputPane(tr("The manifest file needs to specify if this is a app or a scope"));
586@@ -195,7 +188,7 @@
587 {
588 Q_UNUSED(hook);
589
590- QScriptValue scriptValue = engine.newObject();
591+ QJSValue scriptValue = engine.newObject();
592
593 scriptValue.setProperty(QStringLiteral("appId"),hook.appId);
594 scriptValue.setProperty(QStringLiteral("apparmor"),hook.appArmorFile);
595@@ -207,7 +200,7 @@
596 //not known
597 return;
598
599- callSetFunction(QStringLiteral("setHook"),QScriptValueList{scriptValue});
600+ callSetFunction(QStringLiteral("setHook"),QJSValueList{scriptValue});
601 }
602
603 void UbuntuClickManifest::setFrameworkName(const QString &name)
604@@ -227,15 +220,15 @@
605 {
606 if (!isInitialized()) { return QString(); }
607
608- QScriptValue v = callGetFunction(QLatin1String("getAppArmorFileName"),QScriptValueList()<<QScriptValue(appId));
609+ QJSValue v = callGetFunction(QLatin1String("getAppArmorFileName"),QJSValueList()<<QJSValue(appId));
610 return v.toString();
611 }
612
613 bool UbuntuClickManifest::setAppArmorFileName(const QString &appId, const QString &name)
614 {
615 if (!isInitialized()) { return false; }
616- bool result = callFunction(QLatin1String("setAppArmorFileName"),QScriptValueList()<<QScriptValue(appId)<<QScriptValue(name)).toBool();
617- callSetFunction(QLatin1String("setAppArmorFileName"), QScriptValueList()<<appId<<name);
618+ bool result = callFunction(QLatin1String("setAppArmorFileName"),QJSValueList()<<QJSValue(appId)<<QJSValue(name)).toBool();
619+ callSetFunction(QLatin1String("setAppArmorFileName"), QJSValueList()<<appId<<name);
620 if(result)
621 emit appArmorFileNameChanged(appId, name);
622
623@@ -244,7 +237,7 @@
624
625 bool UbuntuClickManifest::enableDebugging()
626 {
627- return callFunction(QLatin1String("injectDebugPolicy"),QScriptValueList()).toBool();
628+ return callFunction(QLatin1String("injectDebugPolicy"),QJSValueList()).toBool();
629 }
630
631 void UbuntuClickManifest::save(QString fileName) {
632@@ -354,7 +347,7 @@
633 bool UbuntuClickManifest::loadFromString(const QString &data)
634 {
635 //@TODO probably return the error message
636- QScriptValue ret = callFunction(QStringLiteral("fromJSON"),QScriptValueList{QScriptValue(data)});
637+ QJSValue ret = callFunction(QStringLiteral("fromJSON"),QJSValueList{QJSValue(data)});
638 bool success = ret.toBool();
639 if(success) {
640 m_bInitialized = true;
641@@ -364,47 +357,47 @@
642 return success;
643 }
644
645-QScriptValue UbuntuClickManifest::callFunction(QString functionName, QScriptValueList args) {
646- QScriptValue global = engine.globalObject();
647- QScriptValue cmd = global.property(functionName);
648- return cmd.call(QScriptValue(),args);
649+QJSValue UbuntuClickManifest::callFunction(QString functionName, QJSValueList args) {
650+ QJSValue global = engine.globalObject();
651+ QJSValue cmd = global.property(functionName);
652+ return cmd.call(args);
653 }
654
655-void UbuntuClickManifest::callSetFunction(QString functionName, QScriptValueList args) {
656+void UbuntuClickManifest::callSetFunction(QString functionName, QJSValueList args) {
657 callFunction(functionName,args);
658 }
659
660-QScriptValue UbuntuClickManifest::callGetFunction(QString functionName, QScriptValueList args) {
661+QJSValue UbuntuClickManifest::callGetFunction(QString functionName, QJSValueList args) {
662 return callFunction(functionName,args);
663 }
664
665 QStringList UbuntuClickManifest::callGetStringListFunction(QString functionName) {
666- QScriptValue retval = callFunction(functionName,QScriptValueList());
667+ QJSValue retval = callFunction(functionName,QJSValueList());
668 return retval.toVariant().toStringList();
669 }
670
671 QString UbuntuClickManifest::callGetStringFunction(QString functionName) {
672- QScriptValue retval = callFunction(functionName,QScriptValueList());
673+ QJSValue retval = callFunction(functionName,QJSValueList());
674 return retval.toVariant().toString();
675 }
676
677 void UbuntuClickManifest::callSetStringListFunction(QString functionName, QStringList args) {
678- QScriptValueList vargs;
679+ QJSValueList vargs;
680 foreach (QString arg, args)
681- vargs << QScriptValue(arg);
682+ vargs << QJSValue(arg);
683 callSetFunction(functionName,vargs);
684 }
685
686 void UbuntuClickManifest::callSetStringFunction(QString functionName, QString args) {
687- QScriptValueList vargs;
688- vargs << QScriptValue(args);
689+ QJSValueList vargs;
690+ vargs << QJSValue(args);
691 callSetFunction(functionName,vargs);
692 }
693
694 QStringList UbuntuClickManifest::callGetStringListFunction(QString functionName, QString args) {
695- QScriptValueList vargs;
696- vargs << QScriptValue(args);
697- QScriptValue retval = callFunction(functionName,vargs);
698+ QJSValueList vargs;
699+ vargs << QJSValue(args);
700+ QJSValue retval = callFunction(functionName,vargs);
701 return retval.toVariant().toStringList();
702 }
703
704
705=== modified file 'src/ubuntu/ubuntuclickmanifest.h'
706--- src/ubuntu/ubuntuclickmanifest.h 2015-01-13 09:55:54 +0000
707+++ src/ubuntu/ubuntuclickmanifest.h 2015-06-17 14:03:08 +0000
708@@ -20,10 +20,8 @@
709 #define UBUNTUCLICKMANIFEST_H
710
711 #include <QObject>
712-#include <QScriptProgram>
713-#include <QScriptEngine>
714+#include <QJSEngine>
715 #include <QStringList>
716-#include <QScriptValue>
717
718 namespace ProjectExplorer { class Project; }
719
720@@ -116,19 +114,18 @@
721 void nameDashReplaced(){ m_bNameDashReplaced = true; }
722
723 protected:
724- void callSetFunction(QString functionName, QScriptValueList args);
725+ void callSetFunction(QString functionName, QJSValueList args);
726 void callSetStringListFunction(QString functionName, QStringList args);
727 void callSetStringFunction(QString functionName, QString args);
728
729- QScriptValue callGetFunction(QString functionName, QScriptValueList args);
730+ QJSValue callGetFunction(QString functionName, QJSValueList args);
731 QStringList callGetStringListFunction(QString functionName);
732 QStringList callGetStringListFunction(QString functionName, QString args);
733 QString callGetStringFunction(QString functionName);
734
735- QScriptValue callFunction(QString functionName, QScriptValueList args);
736+ QJSValue callFunction(QString functionName, QJSValueList args);
737
738- QScriptProgram m_manifestJsApp;
739- QScriptEngine engine;
740+ QJSEngine engine;
741
742 QString m_userName;
743
744
745=== modified file 'src/ubuntu/ubuntucreatenewchrootdialog.cpp'
746--- src/ubuntu/ubuntucreatenewchrootdialog.cpp 2014-11-19 10:28:30 +0000
747+++ src/ubuntu/ubuntucreatenewchrootdialog.cpp 2015-06-17 14:03:08 +0000
748@@ -40,7 +40,7 @@
749
750 namespace Internal {
751
752-UbuntuCreateNewChrootDialog::UbuntuCreateNewChrootDialog(const QString &arch, QWidget *parent) :
753+UbuntuCreateNewChrootDialog::UbuntuCreateNewChrootDialog(const QString &arch, const QString &framework, QWidget *parent) :
754 QDialog(parent),
755 ui(new Ui::UbuntuCreateNewChrootDialog)
756 {
757@@ -48,7 +48,11 @@
758
759 //add supported targets
760 for(int i = 0; Constants::UBUNTU_CLICK_SUPPORTED_TARGETS[i][0][0] != '\0'; i++){
761- ui->comboBoxSeries->addItem(QLatin1String(Constants::UBUNTU_CLICK_SUPPORTED_TARGETS[i][2]),i);
762+ const QString currFwDisplayName = QLatin1String(Constants::UBUNTU_CLICK_SUPPORTED_TARGETS[i][2]);
763+ const QString currFw = QLatin1String(Constants::UBUNTU_CLICK_SUPPORTED_TARGETS[i][1]);
764+
765+ if ( framework.isNull() || currFw == framework)
766+ ui->comboBoxSeries->addItem(currFwDisplayName,i);
767 }
768
769 //add supported architectures
770@@ -70,9 +74,9 @@
771 * Opens a dialog that lets the user select a new chroot, returns false
772 * if the user pressed cancel
773 */
774-bool UbuntuCreateNewChrootDialog::getNewChrootTarget(UbuntuClickTool::Target *target, const QString &arch, QWidget *parent)
775+bool UbuntuCreateNewChrootDialog::getNewChrootTarget(UbuntuClickTool::Target *target, const QString &arch, const QString &framework, QWidget *parent)
776 {
777- UbuntuCreateNewChrootDialog dlg(arch, parent ? parent : Core::ICore::mainWindow());
778+ UbuntuCreateNewChrootDialog dlg(arch, framework, parent ? parent : Core::ICore::mainWindow());
779 if( dlg.exec() == QDialog::Accepted) {
780 bool ok = false;
781
782
783=== modified file 'src/ubuntu/ubuntucreatenewchrootdialog.h'
784--- src/ubuntu/ubuntucreatenewchrootdialog.h 2014-07-31 09:41:18 +0000
785+++ src/ubuntu/ubuntucreatenewchrootdialog.h 2015-06-17 14:03:08 +0000
786@@ -35,10 +35,10 @@
787 Q_OBJECT
788
789 public:
790- explicit UbuntuCreateNewChrootDialog(const QString &arch = QString(), QWidget *parent = 0);
791+ explicit UbuntuCreateNewChrootDialog(const QString &arch = QString(), const QString &framework = QString(), QWidget *parent = 0);
792 ~UbuntuCreateNewChrootDialog();
793
794- static bool getNewChrootTarget(UbuntuClickTool::Target *target, const QString &arch, QWidget *parent = 0);
795+ static bool getNewChrootTarget(UbuntuClickTool::Target *target, const QString &arch, const QString &framework, QWidget *parent = 0);
796
797 private:
798 Ui::UbuntuCreateNewChrootDialog *ui;
799
800=== modified file 'src/ubuntu/ubuntukitmanager.cpp'
801--- src/ubuntu/ubuntukitmanager.cpp 2015-04-10 15:06:01 +0000
802+++ src/ubuntu/ubuntukitmanager.cpp 2015-06-17 14:03:08 +0000
803@@ -146,7 +146,7 @@
804 tr("There is no compatible chroot available on your system, do you want to create it now?"));
805
806 if(choice == QMessageBox::Yes) {
807- if(!UbuntuClickDialog::createClickChrootModal(false, device->architecture()))
808+ if(!UbuntuClickDialog::createClickChrootModal(false, device->architecture(), device->framework()))
809 return;
810
811 toolchains = clickToolChains();
812
813=== modified file 'src/ubuntu/ubuntupackagingmodel.cpp'
814--- src/ubuntu/ubuntupackagingmodel.cpp 2015-04-16 09:30:54 +0000
815+++ src/ubuntu/ubuntupackagingmodel.cpp 2015-06-17 14:03:08 +0000
816@@ -57,7 +57,6 @@
817
818 #include <QMenu>
819 #include <QMessageBox>
820-#include <QScriptEngine>
821 #include <QRegularExpression>
822 #include <QApplication>
823
824
825=== modified file 'src/ubuntu/ubuntuplugin.cpp'
826--- src/ubuntu/ubuntuplugin.cpp 2015-01-13 16:37:58 +0000
827+++ src/ubuntu/ubuntuplugin.cpp 2015-06-17 14:03:08 +0000
828@@ -106,6 +106,10 @@
829 Q_UNUSED(arguments)
830 Q_UNUSED(errorString)
831
832+ QFont defaultFont = QGuiApplication::font();
833+ defaultFont.setFamily(QStringLiteral("Ubuntu"));
834+ defaultFont.setWeight(QFont::Light);
835+
836 qmlRegisterUncreatableType<UbuntuQmlDeviceConnectionState>("Ubuntu.DevicesModel",0,1,"DeviceConnectionState",QStringLiteral("Not instantiable"));
837 qmlRegisterUncreatableType<UbuntuQmlDeviceDetectionState>("Ubuntu.DevicesModel",0,1,"DeviceDetectionState",QStringLiteral("Not instantiable"));
838 qmlRegisterUncreatableType<UbuntuQmlFeatureState>("Ubuntu.DevicesModel",0,1,"FeatureState",QStringLiteral("Not instantiable"));
839@@ -269,6 +273,12 @@
840
841 connect(m_migrateProjectAction, SIGNAL(triggered()), this, SLOT(migrateProject()));
842
843+ /* Fix Bug lp:1340061 "Some dialogs have unreadable (too small) text"
844+ * The Bug is caused by UITK that overrides the default Font that is based
845+ * on the grid units, which is not useable in Widget based applications
846+ */
847+ QGuiApplication::setFont(defaultFont);
848+
849 return true;
850 }
851
852
853=== modified file 'src/ubuntu/ubuntusettingsclickwidget.cpp'
854--- src/ubuntu/ubuntusettingsclickwidget.cpp 2015-02-19 22:43:30 +0000
855+++ src/ubuntu/ubuntusettingsclickwidget.cpp 2015-06-17 14:03:08 +0000
856@@ -84,8 +84,7 @@
857 //make sure the current settings are stored
858 apply();
859
860- QString dummy;
861- Internal::UbuntuClickDialog::createClickChrootModal(true, dummy, this);
862+ Internal::UbuntuClickDialog::createClickChrootModal(true, QString(), QString(), this);
863 listExistingClickTargets();
864 }
865
866
867=== modified file 'src/ubuntu/wizards/ubuntufirstrunwizard.cpp'
868--- src/ubuntu/wizards/ubuntufirstrunwizard.cpp 2015-05-04 11:53:35 +0000
869+++ src/ubuntu/wizards/ubuntufirstrunwizard.cpp 2015-06-17 14:03:08 +0000
870@@ -157,7 +157,7 @@
871
872 void UbuntuSetupChrootWizardPage::onCreateKitButtonClicked()
873 {
874- UbuntuClickDialog::createClickChrootModal(true,QString(),this);
875+ UbuntuClickDialog::createClickChrootModal(true,QString(), QString(),this);
876 initializePage();
877 }
878
879
880=== modified file 'tests/manifest/manifest.pro'
881--- tests/manifest/manifest.pro 2014-07-21 09:29:06 +0000
882+++ tests/manifest/manifest.pro 2015-06-17 14:03:08 +0000
883@@ -1,4 +1,4 @@
884-QT = core gui script scripttools
885+QT = core gui qml
886
887 CONFIG += c++11
888

Subscribers

People subscribed via source and target branches