Merge lp:~zeller-benjamin/qtcreator-plugin-ubuntu/bughunt-201506 into lp:qtcreator-plugin-ubuntu
- bughunt-201506
- Merge into trunk
Proposed by
Benjamin Zeller
| Status: | Merged | ||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| Approved by: | Zoltan Balogh | ||||||||||||||||
| 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 | ||||||||||||||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Zoltan Balogh | Approve | ||
| PS Jenkins bot | continuous-integration | Approve | |
|
Review via email:
|
|||
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.
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote : | # |
review:
Approve
(continuous-integration)
- 399. By Benjamin Zeller
-
Merge trunk
- 400. By Benjamin Zeller
-
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 | 38 | <file source="app/Main.qml" target="app/Main.qml" openeditor="true"/> | 38 | <file source="app/Main.qml" target="app/Main.qml" openeditor="true"/> |
| 6 | 39 | <file source="po/CMakeLists.txt" target="po/CMakeLists.txt" openeditor="false"/> | 39 | <file source="po/CMakeLists.txt" target="po/CMakeLists.txt" openeditor="false"/> |
| 7 | 40 | </files> | 40 | </files> |
| 27 | 41 | 41 | ||
| 28 | 42 | <!-- Create a 2nd wizard page with click package parameters --> | 42 | <!-- Create a 2nd wizard page with click package parameters --> |
| 29 | 43 | <fieldpagetitle>Click package parameters</fieldpagetitle> | 43 | <fieldpagetitle>Click package parameters</fieldpagetitle> |
| 30 | 44 | <fields> | 44 | <fields> |
| 31 | 45 | <field mandatory="true" name="ClickDomain"> | 45 | <field mandatory="true" name="ClickDomain"> |
| 32 | 46 | <fieldcontrol class="QLineEdit" validator='^[A-Za-z0-9-]+$' | 46 | <fieldcontrol class="QLineEdit" validator='^[A-Za-z0-9-]+$' |
| 33 | 47 | defaulttext="" placeholdertext="Nickname"/> | 47 | defaulttext="" placeholdertext="Nickname"/> |
| 34 | 48 | <fielddescription>Nickname:</fielddescription> | 48 | <fielddescription>Nickname:</fielddescription> |
| 35 | 49 | </field> | 49 | </field> |
| 36 | 50 | <field mandatory="true" name="ClickMaintainer"> | 50 | <field mandatory="true" name="ClickMaintainer"> |
| 37 | 51 | <fieldcontrol class="QLineEdit" validator='^[^"]+$' | 51 | <fieldcontrol class="QLineEdit" validator='^[^"]+$' |
| 38 | 52 | defaulttext="" placeholdertext="Maintainer"/> | 52 | defaulttext="" placeholdertext="Maintainer"/> |
| 39 | 53 | <fielddescription>Maintainer:</fielddescription> | 53 | <fielddescription>Maintainer:</fielddescription> |
| 40 | 54 | </field> | 54 | </field> |
| 41 | 55 | <field mandatory="true" name="ClickHookName"> | 55 | <field mandatory="true" name="ClickHookName"> |
| 42 | 56 | <fieldcontrol class="QLineEdit" validator='^[A-Za-z0-9.-]+$' | 56 | <fieldcontrol class="QLineEdit" validator='^[A-Za-z0-9.-]+$' |
| 43 | 57 | defaulttext="myapp" placeholdertext="app hook name"/> | 57 | defaulttext="%ProjectName%" placeholdertext="app hook name"/> |
| 44 | 58 | <fielddescription>App name:</fielddescription> | 58 | <fielddescription>App name:</fielddescription> |
| 45 | 59 | </field> | 59 | </field> |
| 46 | 60 | <field name="ClickFrameworkVersion"> | 60 | <field name="ClickFrameworkVersion"> |
| 47 | 61 | <fieldcontrol class="QComboBox" defaultindex="0"> | 61 | <fieldcontrol class="QComboBox" defaultindex="0"> |
| 48 | 62 | <comboentries> | 62 | <comboentries> |
| 49 | 63 | 63 | ||
| 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 | 40 | <file source="backend/tests/unit/tst_mytype.qml" target="backend/tests/unit/tst_mytype.qml" openeditor="false"/> | 40 | <file source="backend/tests/unit/tst_mytype.qml" target="backend/tests/unit/tst_mytype.qml" openeditor="false"/> |
| 55 | 41 | </files> | 41 | </files> |
| 56 | 42 | 42 | ||
| 87 | 43 | <!-- Create a 2nd wizard page with click package parameters --> | 43 | <!-- Create a 2nd wizard page with click package parameters --> |
| 88 | 44 | <fieldpagetitle>Click package parameters</fieldpagetitle> | 44 | <fieldpagetitle>Click package parameters</fieldpagetitle> |
| 89 | 45 | <fields> | 45 | <fields> |
| 90 | 46 | <field mandatory="true" name="ClickDomain"> | 46 | <field mandatory="true" name="ClickDomain"> |
| 91 | 47 | <fieldcontrol class="QLineEdit" validator='^[A-Za-z0-9-]+$' | 47 | <fieldcontrol class="QLineEdit" validator='^[A-Za-z0-9-]+$' |
| 92 | 48 | defaulttext="" placeholdertext="Nickname"/> | 48 | defaulttext="" placeholdertext="Nickname"/> |
| 93 | 49 | <fielddescription>Nickname:</fielddescription> | 49 | <fielddescription>Nickname:</fielddescription> |
| 94 | 50 | </field> | 50 | </field> |
| 95 | 51 | <field mandatory="true" name="ClickMaintainer"> | 51 | <field mandatory="true" name="ClickMaintainer"> |
| 96 | 52 | <fieldcontrol class="QLineEdit" validator='^[^"]+$' | 52 | <fieldcontrol class="QLineEdit" validator='^[^"]+$' |
| 97 | 53 | defaulttext="" placeholdertext="Maintainer"/> | 53 | defaulttext="" placeholdertext="Maintainer"/> |
| 98 | 54 | <fielddescription>Maintainer:</fielddescription> | 54 | <fielddescription>Maintainer:</fielddescription> |
| 99 | 55 | </field> | 55 | </field> |
| 100 | 56 | <field mandatory="true" name="ClickHookName"> | 56 | <field mandatory="true" name="ClickHookName"> |
| 101 | 57 | <fieldcontrol class="QLineEdit" validator='^[A-Za-z0-9.-]+$' | 57 | <fieldcontrol class="QLineEdit" validator='^[A-Za-z0-9.-]+$' |
| 102 | 58 | defaulttext="app" placeholdertext="app hook name"/> | 58 | defaulttext="%ProjectName%" placeholdertext="app hook name"/> |
| 103 | 59 | <fielddescription>App name:</fielddescription> | 59 | <fielddescription>App name:</fielddescription> |
| 104 | 60 | </field> | 60 | </field> |
| 105 | 61 | <field name="ClickFrameworkVersion"> | 61 | <field name="ClickFrameworkVersion"> |
| 106 | 62 | <fieldcontrol class="QComboBox" defaultindex="0"> | 62 | <fieldcontrol class="QComboBox" defaultindex="0"> |
| 107 | 63 | <comboentries> | 63 | <comboentries> |
| 108 | 64 | <!-- 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 --> | 64 | <!-- 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 | 65 | <comboentry value="ubuntu-sdk-dummy-framework"> | 65 | <comboentry value="ubuntu-sdk-dummy-framework"> |
| 110 | 66 | <comboentrytext>Dummy Framework</comboentrytext> | 66 | <comboentrytext>Dummy Framework</comboentrytext> |
| 111 | 67 | </comboentry> | 67 | </comboentry> |
| 112 | 68 | </comboentries> | 68 | </comboentries> |
| 113 | 69 | </fieldcontrol> | 69 | </fieldcontrol> |
| 114 | 70 | <fielddescription>Framework:</fielddescription> | 70 | <fielddescription>Framework:</fielddescription> |
| 115 | 71 | </field> | 71 | </field> |
| 116 | 72 | </fields> | 72 | </fields> |
| 117 | 73 | <validationrules> | 73 | <validationrules> |
| 118 | 74 | <validationrule condition='/^(.*)\s+<(.*@.*)>$/.test("%ClickMaintainer%")'> | 74 | <validationrule condition='/^(.*)\s+<(.*@.*)>$/.test("%ClickMaintainer%")'> |
| 119 | 75 | <message>Invalid format for maintainer (should be like "Joe Bloggs <joe.bloggs@isp.com>")</message> | 75 | <message>Invalid format for maintainer (should be like "Joe Bloggs <joe.bloggs@isp.com>")</message> |
| 120 | 76 | 76 | ||
| 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 | 33 | </field> | 33 | </field> |
| 126 | 34 | <field mandatory="true" name="ClickHookName"> | 34 | <field mandatory="true" name="ClickHookName"> |
| 127 | 35 | <fieldcontrol class="QLineEdit" validator='^[A-Za-z0-9.-]+$' | 35 | <fieldcontrol class="QLineEdit" validator='^[A-Za-z0-9.-]+$' |
| 129 | 36 | defaulttext="myapp" placeholdertext="app hook name"/> | 36 | defaulttext="%ProjectName%" placeholdertext="app hook name"/> |
| 130 | 37 | <fielddescription>App name:</fielddescription> | 37 | <fielddescription>App name:</fielddescription> |
| 131 | 38 | </field> | 38 | </field> |
| 132 | 39 | <field name="ClickFrameworkVersion"> | 39 | <field name="ClickFrameworkVersion"> |
| 133 | 40 | 40 | ||
| 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 | 58 | </field> | 58 | </field> |
| 139 | 59 | <field mandatory="true" name="ClickHookName"> | 59 | <field mandatory="true" name="ClickHookName"> |
| 140 | 60 | <fieldcontrol class="QLineEdit" validator='^[^"]+$' | 60 | <fieldcontrol class="QLineEdit" validator='^[^"]+$' |
| 142 | 61 | defaulttext="app" placeholdertext="app hook name"/> | 61 | defaulttext="%ProjectName%" placeholdertext="app hook name"/> |
| 143 | 62 | <fielddescription>App name:</fielddescription> | 62 | <fielddescription>App name:</fielddescription> |
| 144 | 63 | </field> | 63 | </field> |
| 145 | 64 | <field name="ClickFrameworkVersion"> | 64 | <field name="ClickFrameworkVersion"> |
| 146 | 65 | 65 | ||
| 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 | 32 | <file source="appName/tests/autopilot/displayName/tests/__init__.py" target="%ClickHookName%/tests/autopilot/%ProjectName%/tests/__init__.py" openeditor="false"/> | 32 | <file source="appName/tests/autopilot/displayName/tests/__init__.py" target="%ClickHookName%/tests/autopilot/%ProjectName%/tests/__init__.py" openeditor="false"/> |
| 152 | 33 | <file source="appName/tests/unit/tst_main.qml" target="%ClickHookName%/tests/unit/tst_main.qml" openeditor="false"/> | 33 | <file source="appName/tests/unit/tst_main.qml" target="%ClickHookName%/tests/unit/tst_main.qml" openeditor="false"/> |
| 153 | 34 | </files> | 34 | </files> |
| 185 | 35 | 35 | ||
| 186 | 36 | <!-- Create a 2nd wizard page with click package parameters --> | 36 | <!-- Create a 2nd wizard page with click package parameters --> |
| 187 | 37 | <fieldpagetitle>Click package parameters</fieldpagetitle> | 37 | <fieldpagetitle>Click package parameters</fieldpagetitle> |
| 188 | 38 | <fields> | 38 | <fields> |
| 189 | 39 | <field mandatory="true" name="ClickDomain"> | 39 | <field mandatory="true" name="ClickDomain"> |
| 190 | 40 | <fieldcontrol class="QLineEdit" validator='^[A-Za-z0-9-]+$' | 40 | <fieldcontrol class="QLineEdit" validator='^[A-Za-z0-9-]+$' |
| 191 | 41 | defaulttext="" placeholdertext="Nickname"/> | 41 | defaulttext="" placeholdertext="Nickname"/> |
| 192 | 42 | <fielddescription>Nickname:</fielddescription> | 42 | <fielddescription>Nickname:</fielddescription> |
| 193 | 43 | </field> | 43 | </field> |
| 194 | 44 | <field mandatory="true" name="ClickMaintainer"> | 44 | <field mandatory="true" name="ClickMaintainer"> |
| 195 | 45 | <fieldcontrol class="QLineEdit" validator='^[^"]+$' | 45 | <fieldcontrol class="QLineEdit" validator='^[^"]+$' |
| 196 | 46 | defaulttext="" placeholdertext="Maintainer"/> | 46 | defaulttext="" placeholdertext="Maintainer"/> |
| 197 | 47 | <fielddescription>Maintainer:</fielddescription> | 47 | <fielddescription>Maintainer:</fielddescription> |
| 198 | 48 | </field> | 48 | </field> |
| 199 | 49 | <field mandatory="true" name="ClickHookName"> | 49 | <field mandatory="true" name="ClickHookName"> |
| 200 | 50 | <fieldcontrol class="QLineEdit" validator='^[A-Za-z0-9.-]+$' | 50 | <fieldcontrol class="QLineEdit" validator='^[A-Za-z0-9.-]+$' |
| 201 | 51 | defaulttext="app" placeholdertext="app hook name"/> | 51 | defaulttext="%ProjectName%" placeholdertext="app hook name"/> |
| 202 | 52 | <fielddescription>App name:</fielddescription> | 52 | <fielddescription>App name:</fielddescription> |
| 203 | 53 | </field> | 53 | </field> |
| 204 | 54 | <field name="ClickFrameworkVersion"> | 54 | <field name="ClickFrameworkVersion"> |
| 205 | 55 | <fieldcontrol class="QComboBox" defaultindex="0"> | 55 | <fieldcontrol class="QComboBox" defaultindex="0"> |
| 206 | 56 | <comboentries> | 56 | <comboentries> |
| 207 | 57 | <!-- 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 --> | 57 | <!-- 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 | 58 | <comboentry value="ubuntu-sdk-dummy-framework"> | 58 | <comboentry value="ubuntu-sdk-dummy-framework"> |
| 209 | 59 | <comboentrytext>Dummy Framework</comboentrytext> | 59 | <comboentrytext>Dummy Framework</comboentrytext> |
| 210 | 60 | </comboentry> | 60 | </comboentry> |
| 211 | 61 | </comboentries> | 61 | </comboentries> |
| 212 | 62 | </fieldcontrol> | 62 | </fieldcontrol> |
| 213 | 63 | <fielddescription>Framework:</fielddescription> | 63 | <fielddescription>Framework:</fielddescription> |
| 214 | 64 | </field> | 64 | </field> |
| 215 | 65 | </fields> | 65 | </fields> |
| 216 | 66 | <validationrules> | 66 | <validationrules> |
| 217 | 67 | <validationrule condition='/^(.*)\s+<(.*@.*)>$/.test("%ClickMaintainer%")'> | 67 | <validationrule condition='/^(.*)\s+<(.*@.*)>$/.test("%ClickMaintainer%")'> |
| 218 | 68 | <message>Invalid format for maintainer (should be like "Joe Bloggs <joe.bloggs@isp.com>")</message> | 68 | <message>Invalid format for maintainer (should be like "Joe Bloggs <joe.bloggs@isp.com>")</message> |
| 219 | 69 | 69 | ||
| 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 | 64 | </field> | 64 | </field> |
| 225 | 65 | <field mandatory="true" name="ClickHookName"> | 65 | <field mandatory="true" name="ClickHookName"> |
| 226 | 66 | <fieldcontrol class="QLineEdit" validator='^[A-Za-z0-9.-]+$' | 66 | <fieldcontrol class="QLineEdit" validator='^[A-Za-z0-9.-]+$' |
| 228 | 67 | defaulttext="myscope" placeholdertext="scope hook name"/> | 67 | defaulttext="%ProjectName%" placeholdertext="scope hook name"/> |
| 229 | 68 | <fielddescription>Scope name:</fielddescription> | 68 | <fielddescription>Scope name:</fielddescription> |
| 230 | 69 | </field> | 69 | </field> |
| 231 | 70 | <field name="ClickFrameworkVersion"> | 70 | <field name="ClickFrameworkVersion"> |
| 232 | 71 | 71 | ||
| 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 | 27 | <file source="appName/tests/autopilot/displayName/tests/__init__.py" target="%ClickHookName%/tests/autopilot/%ProjectName%/tests/__init__.py" openeditor="false"/> | 27 | <file source="appName/tests/autopilot/displayName/tests/__init__.py" target="%ClickHookName%/tests/autopilot/%ProjectName%/tests/__init__.py" openeditor="false"/> |
| 238 | 28 | <file source="appName/tests/unit/tst_main.qml" target="%ClickHookName%/tests/unit/tst_main.qml" openeditor="false"/> | 28 | <file source="appName/tests/unit/tst_main.qml" target="%ClickHookName%/tests/unit/tst_main.qml" openeditor="false"/> |
| 239 | 29 | </files> | 29 | </files> |
| 271 | 30 | 30 | ||
| 272 | 31 | <!-- Create a 2nd wizard page with click package parameters --> | 31 | <!-- Create a 2nd wizard page with click package parameters --> |
| 273 | 32 | <fieldpagetitle>Click package parameters</fieldpagetitle> | 32 | <fieldpagetitle>Click package parameters</fieldpagetitle> |
| 274 | 33 | <fields> | 33 | <fields> |
| 275 | 34 | <field mandatory="true" name="ClickDomain"> | 34 | <field mandatory="true" name="ClickDomain"> |
| 276 | 35 | <fieldcontrol class="QLineEdit" validator='^[A-Za-z0-9-]+$' | 35 | <fieldcontrol class="QLineEdit" validator='^[A-Za-z0-9-]+$' |
| 277 | 36 | defaulttext="" placeholdertext="Nickname"/> | 36 | defaulttext="" placeholdertext="Nickname"/> |
| 278 | 37 | <fielddescription>Nickname:</fielddescription> | 37 | <fielddescription>Nickname:</fielddescription> |
| 279 | 38 | </field> | 38 | </field> |
| 280 | 39 | <field mandatory="true" name="ClickMaintainer"> | 39 | <field mandatory="true" name="ClickMaintainer"> |
| 281 | 40 | <fieldcontrol class="QLineEdit" validator='^[^"]+$' | 40 | <fieldcontrol class="QLineEdit" validator='^[^"]+$' |
| 282 | 41 | defaulttext="" placeholdertext="Maintainer"/> | 41 | defaulttext="" placeholdertext="Maintainer"/> |
| 283 | 42 | <fielddescription>Maintainer:</fielddescription> | 42 | <fielddescription>Maintainer:</fielddescription> |
| 284 | 43 | </field> | 43 | </field> |
| 285 | 44 | <field mandatory="true" name="ClickHookName"> | 44 | <field mandatory="true" name="ClickHookName"> |
| 286 | 45 | <fieldcontrol class="QLineEdit" validator='^[A-Za-z0-9.-]+$' | 45 | <fieldcontrol class="QLineEdit" validator='^[A-Za-z0-9.-]+$' |
| 287 | 46 | defaulttext="app" placeholdertext="app hook name"/> | 46 | defaulttext="%ProjectName%" placeholdertext="app hook name"/> |
| 288 | 47 | <fielddescription>App name:</fielddescription> | 47 | <fielddescription>App name:</fielddescription> |
| 289 | 48 | </field> | 48 | </field> |
| 290 | 49 | <field name="ClickFrameworkVersion"> | 49 | <field name="ClickFrameworkVersion"> |
| 291 | 50 | <fieldcontrol class="QComboBox" defaultindex="0"> | 50 | <fieldcontrol class="QComboBox" defaultindex="0"> |
| 292 | 51 | <comboentries> | 51 | <comboentries> |
| 293 | 52 | <!-- 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 --> | 52 | <!-- 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 | 53 | <comboentry value="ubuntu-sdk-dummy-framework"> | 53 | <comboentry value="ubuntu-sdk-dummy-framework"> |
| 295 | 54 | <comboentrytext>Dummy Framework</comboentrytext> | 54 | <comboentrytext>Dummy Framework</comboentrytext> |
| 296 | 55 | </comboentry> | 55 | </comboentry> |
| 297 | 56 | </comboentries> | 56 | </comboentries> |
| 298 | 57 | </fieldcontrol> | 57 | </fieldcontrol> |
| 299 | 58 | <fielddescription>Framework:</fielddescription> | 58 | <fielddescription>Framework:</fielddescription> |
| 300 | 59 | </field> | 59 | </field> |
| 301 | 60 | </fields> | 60 | </fields> |
| 302 | 61 | <validationrules> | 61 | <validationrules> |
| 303 | 62 | <validationrule condition='/^(.*)\s+<(.*@.*)>$/.test("%ClickMaintainer%")'> | 62 | <validationrule condition='/^(.*)\s+<(.*@.*)>$/.test("%ClickMaintainer%")'> |
| 304 | 63 | <message>Invalid format for maintainer (should be like "Joe Bloggs <joe.bloggs@isp.com>")</message> | 63 | <message>Invalid format for maintainer (should be like "Joe Bloggs <joe.bloggs@isp.com>")</message> |
| 305 | 64 | 64 | ||
| 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 | 1 | <?xml version="1.0" encoding="UTF-8"?> | 1 | <?xml version="1.0" encoding="UTF-8"?> |
| 313 | 2 | <wizard version="1" kind="project" firstpage="10" id="A1_UbuntuAppSimple'" category="A.UbuntuProject" | 2 | <wizard version="1" kind="project" firstpage="10" id="A3_UbuntuAppSimple'" category="A.UbuntuProject" |
| 314 | 3 | platformIndependent="true" | 3 | platformIndependent="true" |
| 315 | 4 | class="ubuntu-project-plain-qml" | 4 | class="ubuntu-project-plain-qml" |
| 316 | 5 | featuresRequired="" | 5 | featuresRequired="" |
| 317 | 6 | > | 6 | > |
| 318 | @@ -25,36 +25,36 @@ | |||
| 319 | 25 | <file source="../share/.excludes" target=".excludes" openeditor="false"/> | 25 | <file source="../share/.excludes" target=".excludes" openeditor="false"/> |
| 320 | 26 | </files> | 26 | </files> |
| 321 | 27 | 27 | ||
| 352 | 28 | <!-- Create a 2nd wizard page with click package parameters --> | 28 | <!-- Create a 2nd wizard page with click package parameters --> |
| 353 | 29 | <fieldpagetitle>Click package parameters</fieldpagetitle> | 29 | <fieldpagetitle>Click package parameters</fieldpagetitle> |
| 354 | 30 | <fields> | 30 | <fields> |
| 355 | 31 | <field mandatory="true" name="ClickDomain"> | 31 | <field mandatory="true" name="ClickDomain"> |
| 356 | 32 | <fieldcontrol class="QLineEdit" validator='^[A-Za-z0-9-]+$' | 32 | <fieldcontrol class="QLineEdit" validator='^[A-Za-z0-9-]+$' |
| 357 | 33 | defaulttext="" placeholdertext="Nickname"/> | 33 | defaulttext="" placeholdertext="Nickname"/> |
| 358 | 34 | <fielddescription>Nickname:</fielddescription> | 34 | <fielddescription>Nickname:</fielddescription> |
| 359 | 35 | </field> | 35 | </field> |
| 360 | 36 | <field mandatory="true" name="ClickMaintainer"> | 36 | <field mandatory="true" name="ClickMaintainer"> |
| 361 | 37 | <fieldcontrol class="QLineEdit" validator='^[^"]+$' | 37 | <fieldcontrol class="QLineEdit" validator='^[^"]+$' |
| 362 | 38 | defaulttext="" placeholdertext="Maintainer"/> | 38 | defaulttext="" placeholdertext="Maintainer"/> |
| 363 | 39 | <fielddescription>Maintainer:</fielddescription> | 39 | <fielddescription>Maintainer:</fielddescription> |
| 364 | 40 | </field> | 40 | </field> |
| 365 | 41 | <field mandatory="true" name="ClickHookName"> | 41 | <field mandatory="true" name="ClickHookName"> |
| 366 | 42 | <fieldcontrol class="QLineEdit" validator='^[A-Za-z0-9.-]+$' | 42 | <fieldcontrol class="QLineEdit" validator='^[A-Za-z0-9.-]+$' |
| 367 | 43 | defaulttext="app" placeholdertext="app hook name"/> | 43 | defaulttext="%ProjectName%" placeholdertext="app hook name"/> |
| 368 | 44 | <fielddescription>App name:</fielddescription> | 44 | <fielddescription>App name:</fielddescription> |
| 369 | 45 | </field> | 45 | </field> |
| 370 | 46 | <field name="ClickFrameworkVersion"> | 46 | <field name="ClickFrameworkVersion"> |
| 371 | 47 | <fieldcontrol class="QComboBox" defaultindex="0"> | 47 | <fieldcontrol class="QComboBox" defaultindex="0"> |
| 372 | 48 | <comboentries> | 48 | <comboentries> |
| 373 | 49 | <!-- 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 --> | 49 | <!-- 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 | 50 | <comboentry value="ubuntu-sdk-dummy-framework"> | 50 | <comboentry value="ubuntu-sdk-dummy-framework"> |
| 375 | 51 | <comboentrytext>Dummy Framework</comboentrytext> | 51 | <comboentrytext>Dummy Framework</comboentrytext> |
| 376 | 52 | </comboentry> | 52 | </comboentry> |
| 377 | 53 | </comboentries> | 53 | </comboentries> |
| 378 | 54 | </fieldcontrol> | 54 | </fieldcontrol> |
| 379 | 55 | <fielddescription>Framework:</fielddescription> | 55 | <fielddescription>Framework:</fielddescription> |
| 380 | 56 | </field> | 56 | </field> |
| 381 | 57 | </fields> | 57 | </fields> |
| 382 | 58 | <validationrules> | 58 | <validationrules> |
| 383 | 59 | <validationrule condition='/^(.*)\s+<(.*@.*)>$/.test("%ClickMaintainer%")'> | 59 | <validationrule condition='/^(.*)\s+<(.*@.*)>$/.test("%ClickMaintainer%")'> |
| 384 | 60 | <message>Invalid format for maintainer (should be like "Joe Bloggs <joe.bloggs@isp.com>")</message> | 60 | <message>Invalid format for maintainer (should be like "Joe Bloggs <joe.bloggs@isp.com>")</message> |
| 385 | 61 | 61 | ||
| 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 | 26 | <file source="po/CMakeLists.txt" target="po/CMakeLists.txt" openeditor="false"/> | 26 | <file source="po/CMakeLists.txt" target="po/CMakeLists.txt" openeditor="false"/> |
| 391 | 27 | </files> | 27 | </files> |
| 392 | 28 | 28 | ||
| 423 | 29 | <!-- Create a 2nd wizard page with click package parameters --> | 29 | <!-- Create a 2nd wizard page with click package parameters --> |
| 424 | 30 | <fieldpagetitle>Click package parameters</fieldpagetitle> | 30 | <fieldpagetitle>Click package parameters</fieldpagetitle> |
| 425 | 31 | <fields> | 31 | <fields> |
| 426 | 32 | <field mandatory="true" name="ClickDomain"> | 32 | <field mandatory="true" name="ClickDomain"> |
| 427 | 33 | <fieldcontrol class="QLineEdit" validator='^[A-Za-z0-9-]+$' | 33 | <fieldcontrol class="QLineEdit" validator='^[A-Za-z0-9-]+$' |
| 428 | 34 | defaulttext="" placeholdertext="Nickname"/> | 34 | defaulttext="" placeholdertext="Nickname"/> |
| 429 | 35 | <fielddescription>Nickname:</fielddescription> | 35 | <fielddescription>Nickname:</fielddescription> |
| 430 | 36 | </field> | 36 | </field> |
| 431 | 37 | <field mandatory="true" name="ClickMaintainer"> | 37 | <field mandatory="true" name="ClickMaintainer"> |
| 432 | 38 | <fieldcontrol class="QLineEdit" validator='^[^"]+$' | 38 | <fieldcontrol class="QLineEdit" validator='^[^"]+$' |
| 433 | 39 | defaulttext="" placeholdertext="Maintainer"/> | 39 | defaulttext="" placeholdertext="Maintainer"/> |
| 434 | 40 | <fielddescription>Maintainer:</fielddescription> | 40 | <fielddescription>Maintainer:</fielddescription> |
| 435 | 41 | </field> | 41 | </field> |
| 436 | 42 | <field mandatory="true" name="ClickHookName"> | 42 | <field mandatory="true" name="ClickHookName"> |
| 437 | 43 | <fieldcontrol class="QLineEdit" validator='^[A-Za-z0-9.-]+$' | 43 | <fieldcontrol class="QLineEdit" validator='^[A-Za-z0-9.-]+$' |
| 438 | 44 | defaulttext="myapp" placeholdertext="app hook name"/> | 44 | defaulttext="%ProjectName%" placeholdertext="app hook name"/> |
| 439 | 45 | <fielddescription>App name:</fielddescription> | 45 | <fielddescription>App name:</fielddescription> |
| 440 | 46 | </field> | 46 | </field> |
| 441 | 47 | <field name="ClickFrameworkVersion"> | 47 | <field name="ClickFrameworkVersion"> |
| 442 | 48 | <fieldcontrol class="QComboBox" defaultindex="0"> | 48 | <fieldcontrol class="QComboBox" defaultindex="0"> |
| 443 | 49 | <comboentries> | 49 | <comboentries> |
| 444 | 50 | <!-- 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 --> | 50 | <!-- 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 | 51 | <comboentry value="ubuntu-sdk-dummy-framework"> | 51 | <comboentry value="ubuntu-sdk-dummy-framework"> |
| 446 | 52 | <comboentrytext>Dummy Framework</comboentrytext> | 52 | <comboentrytext>Dummy Framework</comboentrytext> |
| 447 | 53 | </comboentry> | 53 | </comboentry> |
| 448 | 54 | </comboentries> | 54 | </comboentries> |
| 449 | 55 | </fieldcontrol> | 55 | </fieldcontrol> |
| 450 | 56 | <fielddescription>Framework:</fielddescription> | 56 | <fielddescription>Framework:</fielddescription> |
| 451 | 57 | </field> | 57 | </field> |
| 452 | 58 | </fields> | 58 | </fields> |
| 453 | 59 | <validationrules> | 59 | <validationrules> |
| 454 | 60 | <validationrule condition='/^(.*)\s+<(.*@.*)>$/.test("%ClickMaintainer%")'> | 60 | <validationrule condition='/^(.*)\s+<(.*@.*)>$/.test("%ClickMaintainer%")'> |
| 455 | 61 | <message>Invalid format for maintainer (should be like "Joe Bloggs <joe.bloggs@isp.com>")</message> | 61 | <message>Invalid format for maintainer (should be like "Joe Bloggs <joe.bloggs@isp.com>")</message> |
| 456 | 62 | 62 | ||
| 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 | 26 | <fielddescription>Maintainer:</fielddescription> | 26 | <fielddescription>Maintainer:</fielddescription> |
| 462 | 27 | </field> | 27 | </field> |
| 463 | 28 | <field mandatory="true" name="ClickHookName"> | 28 | <field mandatory="true" name="ClickHookName"> |
| 465 | 29 | <fieldcontrol class="QLineEdit" validator='^[A-Za-z0-9.-]+$' defaulttext="app" placeholdertext="app hook name"/> | 29 | <fieldcontrol class="QLineEdit" validator='^[A-Za-z0-9.-]+$' defaulttext="%ProjectName%" placeholdertext="app hook name"/> |
| 466 | 30 | <fielddescription>App name:</fielddescription> | 30 | <fielddescription>App name:</fielddescription> |
| 467 | 31 | </field> | 31 | </field> |
| 468 | 32 | <field name="ClickFrameworkVersion"> | 32 | <field name="ClickFrameworkVersion"> |
| 469 | 33 | 33 | ||
| 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 @@ | |||
| 475 | 1 | QT += network qml quick webkitwidgets script scripttools dbus | 1 | QT += network qml quick webkitwidgets dbus |
| 476 | 2 | 2 | ||
| 477 | 3 | include(../plugin.pri) | 3 | include(../plugin.pri) |
| 478 | 4 | 4 | ||
| 479 | 5 | 5 | ||
| 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 | 92 | return dlg.m_exitCode; | 92 | return dlg.m_exitCode; |
| 485 | 93 | } | 93 | } |
| 486 | 94 | 94 | ||
| 488 | 95 | bool UbuntuClickDialog::createClickChrootModal(bool redetectKits, const QString &arch, QWidget *parent) | 95 | bool UbuntuClickDialog::createClickChrootModal(bool redetectKits, const QString &arch, const QString &framework, QWidget *parent) |
| 489 | 96 | { | 96 | { |
| 490 | 97 | 97 | ||
| 491 | 98 | UbuntuClickTool::Target t; | 98 | UbuntuClickTool::Target t; |
| 493 | 99 | if(!UbuntuCreateNewChrootDialog::getNewChrootTarget(&t,arch,parent)) | 99 | if(!UbuntuCreateNewChrootDialog::getNewChrootTarget(&t,arch,framework,parent)) |
| 494 | 100 | return false; | 100 | return false; |
| 495 | 101 | 101 | ||
| 496 | 102 | ProjectExplorer::ProcessParameters params; | 102 | ProjectExplorer::ProcessParameters params; |
| 497 | 103 | 103 | ||
| 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 | 53 | 53 | ||
| 503 | 54 | static int runClickModal(const ProjectExplorer::ProcessParameters ¶ms, QWidget *parent = 0); | 54 | static int runClickModal(const ProjectExplorer::ProcessParameters ¶ms, QWidget *parent = 0); |
| 504 | 55 | static int runClickModal (const QList<ProjectExplorer::ProcessParameters> ¶ms, QWidget *parent = 0); | 55 | static int runClickModal (const QList<ProjectExplorer::ProcessParameters> ¶ms, QWidget *parent = 0); |
| 506 | 56 | static bool createClickChrootModal (bool redetectKits = true , const QString &arch = QString(),QWidget *parent = 0); | 56 | static bool createClickChrootModal (bool redetectKits = true , const QString &arch = QString(), const QString &framework = QString(), QWidget *parent = 0); |
| 507 | 57 | 57 | ||
| 508 | 58 | static int maintainClickModal (const UbuntuClickTool::Target &target, const UbuntuClickTool::MaintainMode &mode); | 58 | static int maintainClickModal (const UbuntuClickTool::Target &target, const UbuntuClickTool::MaintainMode &mode); |
| 509 | 59 | static int maintainClickModal (const QList<UbuntuClickTool::Target> &targetList, const UbuntuClickTool::MaintainMode &mode); | 59 | static int maintainClickModal (const QList<UbuntuClickTool::Target> &targetList, const UbuntuClickTool::MaintainMode &mode); |
| 510 | 60 | 60 | ||
| 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 | 22 | #include "ubuntushared.h" | 22 | #include "ubuntushared.h" |
| 516 | 23 | 23 | ||
| 517 | 24 | #include <QFile> | 24 | #include <QFile> |
| 518 | 25 | #include <QtScriptTools/QScriptEngineDebugger> | ||
| 519 | 26 | #include <QJsonDocument> | 25 | #include <QJsonDocument> |
| 520 | 27 | #include <QProcess> | 26 | #include <QProcess> |
| 521 | 28 | #include <QDebug> | 27 | #include <QDebug> |
| 522 | 29 | #include <QMainWindow> | 28 | #include <QMainWindow> |
| 523 | 30 | #include <QAction> | 29 | #include <QAction> |
| 525 | 31 | #include <QScriptValueIterator> | 30 | #include <QJSEngine> |
| 526 | 31 | #include <QJSValueIterator> | ||
| 527 | 32 | 32 | ||
| 528 | 33 | #include <cmakeprojectmanager/cmakeprojectconstants.h> | 33 | #include <cmakeprojectmanager/cmakeprojectconstants.h> |
| 529 | 34 | #include <projectexplorer/session.h> | 34 | #include <projectexplorer/session.h> |
| 530 | @@ -46,21 +46,14 @@ | |||
| 531 | 46 | QObject(parent), m_bInitialized(false), m_bNameDashReplaced(false) | 46 | QObject(parent), m_bInitialized(false), m_bNameDashReplaced(false) |
| 532 | 47 | 47 | ||
| 533 | 48 | { | 48 | { |
| 534 | 49 | QScriptEngineDebugger debugger; | ||
| 535 | 50 | debugger.attachTo(&engine); | ||
| 536 | 51 | debugger.setAutoShowStandardWindow(true); | ||
| 537 | 52 | |||
| 538 | 53 | QFile manifestAppFile(QLatin1String(":/ubuntu/manifestlib.js")); | 49 | QFile manifestAppFile(QLatin1String(":/ubuntu/manifestlib.js")); |
| 539 | 54 | if (!manifestAppFile.open(QIODevice::ReadOnly)) { if(debug) qDebug() << QLatin1String("unable to open js app"); return; } | 50 | if (!manifestAppFile.open(QIODevice::ReadOnly)) { if(debug) qDebug() << QLatin1String("unable to open js app"); return; } |
| 540 | 55 | QString manifestApp = QString::fromLatin1(manifestAppFile.readAll()); | 51 | QString manifestApp = QString::fromLatin1(manifestAppFile.readAll()); |
| 541 | 56 | manifestAppFile.close(); | 52 | manifestAppFile.close(); |
| 542 | 57 | 53 | ||
| 545 | 58 | QScriptProgram program(manifestApp); | 54 | QJSValue val = engine.evaluate(manifestApp,QStringLiteral("manifestlib.js")); |
| 544 | 59 | QScriptValue val = engine.evaluate(program); | ||
| 546 | 60 | if (val.isNull()) { qWarning() << QLatin1String("unable to process app"); return; } | 55 | if (val.isNull()) { qWarning() << QLatin1String("unable to process app"); return; } |
| 547 | 61 | 56 | ||
| 548 | 62 | //load(QLatin1String(":/ubuntu/manifest.json.template")); | ||
| 549 | 63 | |||
| 550 | 64 | } | 57 | } |
| 551 | 65 | 58 | ||
| 552 | 66 | void UbuntuClickManifest::setName(QString name) { | 59 | void UbuntuClickManifest::setName(QString name) { |
| 553 | @@ -151,26 +144,26 @@ | |||
| 554 | 151 | QList<UbuntuClickManifest::Hook> hooks; | 144 | QList<UbuntuClickManifest::Hook> hooks; |
| 555 | 152 | if (!isInitialized()) { return hooks; } | 145 | if (!isInitialized()) { return hooks; } |
| 556 | 153 | 146 | ||
| 558 | 154 | QScriptValue scriptHooks = callGetFunction(QLatin1String("getHooks"),QScriptValueList()); | 147 | QJSValue scriptHooks = callGetFunction(QLatin1String("getHooks"),QJSValueList()); |
| 559 | 155 | if(!scriptHooks.isObject()) | 148 | if(!scriptHooks.isObject()) |
| 560 | 156 | return hooks; | 149 | return hooks; |
| 561 | 157 | 150 | ||
| 563 | 158 | QScriptValueIterator it(scriptHooks); | 151 | QJSValueIterator it(scriptHooks); |
| 564 | 159 | while (it.hasNext()) { | 152 | while (it.hasNext()) { |
| 565 | 160 | it.next(); | 153 | it.next(); |
| 567 | 161 | QScriptValue appDescriptor = it.value(); | 154 | QJSValue appDescriptor = it.value(); |
| 568 | 162 | if(!appDescriptor.isObject()) { | 155 | if(!appDescriptor.isObject()) { |
| 569 | 163 | printToOutputPane(tr("Invalid hook in manifest.json file.")); | 156 | printToOutputPane(tr("Invalid hook in manifest.json file.")); |
| 570 | 164 | continue; | 157 | continue; |
| 571 | 165 | } | 158 | } |
| 572 | 166 | 159 | ||
| 574 | 167 | if(!appDescriptor.property(QLatin1String("apparmor")).isValid()) { | 160 | if(!appDescriptor.hasProperty(QLatin1String("apparmor"))) { |
| 575 | 168 | printToOutputPane(tr("The apparmor path is missing in the manifest file")); | 161 | printToOutputPane(tr("The apparmor path is missing in the manifest file")); |
| 576 | 169 | continue; | 162 | continue; |
| 577 | 170 | } | 163 | } |
| 578 | 171 | 164 | ||
| 581 | 172 | bool isScope = appDescriptor.property(QLatin1String("scope")).isValid(); | 165 | bool isScope = appDescriptor.hasProperty(QLatin1String("scope")); |
| 582 | 173 | bool isApp = appDescriptor.property(QLatin1String("desktop")).isValid(); | 166 | bool isApp = appDescriptor.hasProperty(QLatin1String("desktop")); |
| 583 | 174 | 167 | ||
| 584 | 175 | if( (isScope && isApp) || (!isScope && !isApp)) { | 168 | if( (isScope && isApp) || (!isScope && !isApp)) { |
| 585 | 176 | printToOutputPane(tr("The manifest file needs to specify if this is a app or a scope")); | 169 | printToOutputPane(tr("The manifest file needs to specify if this is a app or a scope")); |
| 586 | @@ -195,7 +188,7 @@ | |||
| 587 | 195 | { | 188 | { |
| 588 | 196 | Q_UNUSED(hook); | 189 | Q_UNUSED(hook); |
| 589 | 197 | 190 | ||
| 591 | 198 | QScriptValue scriptValue = engine.newObject(); | 191 | QJSValue scriptValue = engine.newObject(); |
| 592 | 199 | 192 | ||
| 593 | 200 | scriptValue.setProperty(QStringLiteral("appId"),hook.appId); | 193 | scriptValue.setProperty(QStringLiteral("appId"),hook.appId); |
| 594 | 201 | scriptValue.setProperty(QStringLiteral("apparmor"),hook.appArmorFile); | 194 | scriptValue.setProperty(QStringLiteral("apparmor"),hook.appArmorFile); |
| 595 | @@ -207,7 +200,7 @@ | |||
| 596 | 207 | //not known | 200 | //not known |
| 597 | 208 | return; | 201 | return; |
| 598 | 209 | 202 | ||
| 600 | 210 | callSetFunction(QStringLiteral("setHook"),QScriptValueList{scriptValue}); | 203 | callSetFunction(QStringLiteral("setHook"),QJSValueList{scriptValue}); |
| 601 | 211 | } | 204 | } |
| 602 | 212 | 205 | ||
| 603 | 213 | void UbuntuClickManifest::setFrameworkName(const QString &name) | 206 | void UbuntuClickManifest::setFrameworkName(const QString &name) |
| 604 | @@ -227,15 +220,15 @@ | |||
| 605 | 227 | { | 220 | { |
| 606 | 228 | if (!isInitialized()) { return QString(); } | 221 | if (!isInitialized()) { return QString(); } |
| 607 | 229 | 222 | ||
| 609 | 230 | QScriptValue v = callGetFunction(QLatin1String("getAppArmorFileName"),QScriptValueList()<<QScriptValue(appId)); | 223 | QJSValue v = callGetFunction(QLatin1String("getAppArmorFileName"),QJSValueList()<<QJSValue(appId)); |
| 610 | 231 | return v.toString(); | 224 | return v.toString(); |
| 611 | 232 | } | 225 | } |
| 612 | 233 | 226 | ||
| 613 | 234 | bool UbuntuClickManifest::setAppArmorFileName(const QString &appId, const QString &name) | 227 | bool UbuntuClickManifest::setAppArmorFileName(const QString &appId, const QString &name) |
| 614 | 235 | { | 228 | { |
| 615 | 236 | if (!isInitialized()) { return false; } | 229 | if (!isInitialized()) { return false; } |
| 618 | 237 | bool result = callFunction(QLatin1String("setAppArmorFileName"),QScriptValueList()<<QScriptValue(appId)<<QScriptValue(name)).toBool(); | 230 | bool result = callFunction(QLatin1String("setAppArmorFileName"),QJSValueList()<<QJSValue(appId)<<QJSValue(name)).toBool(); |
| 619 | 238 | callSetFunction(QLatin1String("setAppArmorFileName"), QScriptValueList()<<appId<<name); | 231 | callSetFunction(QLatin1String("setAppArmorFileName"), QJSValueList()<<appId<<name); |
| 620 | 239 | if(result) | 232 | if(result) |
| 621 | 240 | emit appArmorFileNameChanged(appId, name); | 233 | emit appArmorFileNameChanged(appId, name); |
| 622 | 241 | 234 | ||
| 623 | @@ -244,7 +237,7 @@ | |||
| 624 | 244 | 237 | ||
| 625 | 245 | bool UbuntuClickManifest::enableDebugging() | 238 | bool UbuntuClickManifest::enableDebugging() |
| 626 | 246 | { | 239 | { |
| 628 | 247 | return callFunction(QLatin1String("injectDebugPolicy"),QScriptValueList()).toBool(); | 240 | return callFunction(QLatin1String("injectDebugPolicy"),QJSValueList()).toBool(); |
| 629 | 248 | } | 241 | } |
| 630 | 249 | 242 | ||
| 631 | 250 | void UbuntuClickManifest::save(QString fileName) { | 243 | void UbuntuClickManifest::save(QString fileName) { |
| 632 | @@ -354,7 +347,7 @@ | |||
| 633 | 354 | bool UbuntuClickManifest::loadFromString(const QString &data) | 347 | bool UbuntuClickManifest::loadFromString(const QString &data) |
| 634 | 355 | { | 348 | { |
| 635 | 356 | //@TODO probably return the error message | 349 | //@TODO probably return the error message |
| 637 | 357 | QScriptValue ret = callFunction(QStringLiteral("fromJSON"),QScriptValueList{QScriptValue(data)}); | 350 | QJSValue ret = callFunction(QStringLiteral("fromJSON"),QJSValueList{QJSValue(data)}); |
| 638 | 358 | bool success = ret.toBool(); | 351 | bool success = ret.toBool(); |
| 639 | 359 | if(success) { | 352 | if(success) { |
| 640 | 360 | m_bInitialized = true; | 353 | m_bInitialized = true; |
| 641 | @@ -364,47 +357,47 @@ | |||
| 642 | 364 | return success; | 357 | return success; |
| 643 | 365 | } | 358 | } |
| 644 | 366 | 359 | ||
| 649 | 367 | QScriptValue UbuntuClickManifest::callFunction(QString functionName, QScriptValueList args) { | 360 | QJSValue UbuntuClickManifest::callFunction(QString functionName, QJSValueList args) { |
| 650 | 368 | QScriptValue global = engine.globalObject(); | 361 | QJSValue global = engine.globalObject(); |
| 651 | 369 | QScriptValue cmd = global.property(functionName); | 362 | QJSValue cmd = global.property(functionName); |
| 652 | 370 | return cmd.call(QScriptValue(),args); | 363 | return cmd.call(args); |
| 653 | 371 | } | 364 | } |
| 654 | 372 | 365 | ||
| 656 | 373 | void UbuntuClickManifest::callSetFunction(QString functionName, QScriptValueList args) { | 366 | void UbuntuClickManifest::callSetFunction(QString functionName, QJSValueList args) { |
| 657 | 374 | callFunction(functionName,args); | 367 | callFunction(functionName,args); |
| 658 | 375 | } | 368 | } |
| 659 | 376 | 369 | ||
| 661 | 377 | QScriptValue UbuntuClickManifest::callGetFunction(QString functionName, QScriptValueList args) { | 370 | QJSValue UbuntuClickManifest::callGetFunction(QString functionName, QJSValueList args) { |
| 662 | 378 | return callFunction(functionName,args); | 371 | return callFunction(functionName,args); |
| 663 | 379 | } | 372 | } |
| 664 | 380 | 373 | ||
| 665 | 381 | QStringList UbuntuClickManifest::callGetStringListFunction(QString functionName) { | 374 | QStringList UbuntuClickManifest::callGetStringListFunction(QString functionName) { |
| 667 | 382 | QScriptValue retval = callFunction(functionName,QScriptValueList()); | 375 | QJSValue retval = callFunction(functionName,QJSValueList()); |
| 668 | 383 | return retval.toVariant().toStringList(); | 376 | return retval.toVariant().toStringList(); |
| 669 | 384 | } | 377 | } |
| 670 | 385 | 378 | ||
| 671 | 386 | QString UbuntuClickManifest::callGetStringFunction(QString functionName) { | 379 | QString UbuntuClickManifest::callGetStringFunction(QString functionName) { |
| 673 | 387 | QScriptValue retval = callFunction(functionName,QScriptValueList()); | 380 | QJSValue retval = callFunction(functionName,QJSValueList()); |
| 674 | 388 | return retval.toVariant().toString(); | 381 | return retval.toVariant().toString(); |
| 675 | 389 | } | 382 | } |
| 676 | 390 | 383 | ||
| 677 | 391 | void UbuntuClickManifest::callSetStringListFunction(QString functionName, QStringList args) { | 384 | void UbuntuClickManifest::callSetStringListFunction(QString functionName, QStringList args) { |
| 679 | 392 | QScriptValueList vargs; | 385 | QJSValueList vargs; |
| 680 | 393 | foreach (QString arg, args) | 386 | foreach (QString arg, args) |
| 682 | 394 | vargs << QScriptValue(arg); | 387 | vargs << QJSValue(arg); |
| 683 | 395 | callSetFunction(functionName,vargs); | 388 | callSetFunction(functionName,vargs); |
| 684 | 396 | } | 389 | } |
| 685 | 397 | 390 | ||
| 686 | 398 | void UbuntuClickManifest::callSetStringFunction(QString functionName, QString args) { | 391 | void UbuntuClickManifest::callSetStringFunction(QString functionName, QString args) { |
| 689 | 399 | QScriptValueList vargs; | 392 | QJSValueList vargs; |
| 690 | 400 | vargs << QScriptValue(args); | 393 | vargs << QJSValue(args); |
| 691 | 401 | callSetFunction(functionName,vargs); | 394 | callSetFunction(functionName,vargs); |
| 692 | 402 | } | 395 | } |
| 693 | 403 | 396 | ||
| 694 | 404 | QStringList UbuntuClickManifest::callGetStringListFunction(QString functionName, QString args) { | 397 | QStringList UbuntuClickManifest::callGetStringListFunction(QString functionName, QString args) { |
| 698 | 405 | QScriptValueList vargs; | 398 | QJSValueList vargs; |
| 699 | 406 | vargs << QScriptValue(args); | 399 | vargs << QJSValue(args); |
| 700 | 407 | QScriptValue retval = callFunction(functionName,vargs); | 400 | QJSValue retval = callFunction(functionName,vargs); |
| 701 | 408 | return retval.toVariant().toStringList(); | 401 | return retval.toVariant().toStringList(); |
| 702 | 409 | } | 402 | } |
| 703 | 410 | 403 | ||
| 704 | 411 | 404 | ||
| 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 | 20 | #define UBUNTUCLICKMANIFEST_H | 20 | #define UBUNTUCLICKMANIFEST_H |
| 710 | 21 | 21 | ||
| 711 | 22 | #include <QObject> | 22 | #include <QObject> |
| 714 | 23 | #include <QScriptProgram> | 23 | #include <QJSEngine> |
| 713 | 24 | #include <QScriptEngine> | ||
| 715 | 25 | #include <QStringList> | 24 | #include <QStringList> |
| 716 | 26 | #include <QScriptValue> | ||
| 717 | 27 | 25 | ||
| 718 | 28 | namespace ProjectExplorer { class Project; } | 26 | namespace ProjectExplorer { class Project; } |
| 719 | 29 | 27 | ||
| 720 | @@ -116,19 +114,18 @@ | |||
| 721 | 116 | void nameDashReplaced(){ m_bNameDashReplaced = true; } | 114 | void nameDashReplaced(){ m_bNameDashReplaced = true; } |
| 722 | 117 | 115 | ||
| 723 | 118 | protected: | 116 | protected: |
| 725 | 119 | void callSetFunction(QString functionName, QScriptValueList args); | 117 | void callSetFunction(QString functionName, QJSValueList args); |
| 726 | 120 | void callSetStringListFunction(QString functionName, QStringList args); | 118 | void callSetStringListFunction(QString functionName, QStringList args); |
| 727 | 121 | void callSetStringFunction(QString functionName, QString args); | 119 | void callSetStringFunction(QString functionName, QString args); |
| 728 | 122 | 120 | ||
| 730 | 123 | QScriptValue callGetFunction(QString functionName, QScriptValueList args); | 121 | QJSValue callGetFunction(QString functionName, QJSValueList args); |
| 731 | 124 | QStringList callGetStringListFunction(QString functionName); | 122 | QStringList callGetStringListFunction(QString functionName); |
| 732 | 125 | QStringList callGetStringListFunction(QString functionName, QString args); | 123 | QStringList callGetStringListFunction(QString functionName, QString args); |
| 733 | 126 | QString callGetStringFunction(QString functionName); | 124 | QString callGetStringFunction(QString functionName); |
| 734 | 127 | 125 | ||
| 736 | 128 | QScriptValue callFunction(QString functionName, QScriptValueList args); | 126 | QJSValue callFunction(QString functionName, QJSValueList args); |
| 737 | 129 | 127 | ||
| 740 | 130 | QScriptProgram m_manifestJsApp; | 128 | QJSEngine engine; |
| 739 | 131 | QScriptEngine engine; | ||
| 741 | 132 | 129 | ||
| 742 | 133 | QString m_userName; | 130 | QString m_userName; |
| 743 | 134 | 131 | ||
| 744 | 135 | 132 | ||
| 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 | 40 | 40 | ||
| 750 | 41 | namespace Internal { | 41 | namespace Internal { |
| 751 | 42 | 42 | ||
| 753 | 43 | UbuntuCreateNewChrootDialog::UbuntuCreateNewChrootDialog(const QString &arch, QWidget *parent) : | 43 | UbuntuCreateNewChrootDialog::UbuntuCreateNewChrootDialog(const QString &arch, const QString &framework, QWidget *parent) : |
| 754 | 44 | QDialog(parent), | 44 | QDialog(parent), |
| 755 | 45 | ui(new Ui::UbuntuCreateNewChrootDialog) | 45 | ui(new Ui::UbuntuCreateNewChrootDialog) |
| 756 | 46 | { | 46 | { |
| 757 | @@ -48,7 +48,11 @@ | |||
| 758 | 48 | 48 | ||
| 759 | 49 | //add supported targets | 49 | //add supported targets |
| 760 | 50 | for(int i = 0; Constants::UBUNTU_CLICK_SUPPORTED_TARGETS[i][0][0] != '\0'; i++){ | 50 | for(int i = 0; Constants::UBUNTU_CLICK_SUPPORTED_TARGETS[i][0][0] != '\0'; i++){ |
| 762 | 51 | ui->comboBoxSeries->addItem(QLatin1String(Constants::UBUNTU_CLICK_SUPPORTED_TARGETS[i][2]),i); | 51 | const QString currFwDisplayName = QLatin1String(Constants::UBUNTU_CLICK_SUPPORTED_TARGETS[i][2]); |
| 763 | 52 | const QString currFw = QLatin1String(Constants::UBUNTU_CLICK_SUPPORTED_TARGETS[i][1]); | ||
| 764 | 53 | |||
| 765 | 54 | if ( framework.isNull() || currFw == framework) | ||
| 766 | 55 | ui->comboBoxSeries->addItem(currFwDisplayName,i); | ||
| 767 | 52 | } | 56 | } |
| 768 | 53 | 57 | ||
| 769 | 54 | //add supported architectures | 58 | //add supported architectures |
| 770 | @@ -70,9 +74,9 @@ | |||
| 771 | 70 | * Opens a dialog that lets the user select a new chroot, returns false | 74 | * Opens a dialog that lets the user select a new chroot, returns false |
| 772 | 71 | * if the user pressed cancel | 75 | * if the user pressed cancel |
| 773 | 72 | */ | 76 | */ |
| 775 | 73 | bool UbuntuCreateNewChrootDialog::getNewChrootTarget(UbuntuClickTool::Target *target, const QString &arch, QWidget *parent) | 77 | bool UbuntuCreateNewChrootDialog::getNewChrootTarget(UbuntuClickTool::Target *target, const QString &arch, const QString &framework, QWidget *parent) |
| 776 | 74 | { | 78 | { |
| 778 | 75 | UbuntuCreateNewChrootDialog dlg(arch, parent ? parent : Core::ICore::mainWindow()); | 79 | UbuntuCreateNewChrootDialog dlg(arch, framework, parent ? parent : Core::ICore::mainWindow()); |
| 779 | 76 | if( dlg.exec() == QDialog::Accepted) { | 80 | if( dlg.exec() == QDialog::Accepted) { |
| 780 | 77 | bool ok = false; | 81 | bool ok = false; |
| 781 | 78 | 82 | ||
| 782 | 79 | 83 | ||
| 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 | 35 | Q_OBJECT | 35 | Q_OBJECT |
| 788 | 36 | 36 | ||
| 789 | 37 | public: | 37 | public: |
| 791 | 38 | explicit UbuntuCreateNewChrootDialog(const QString &arch = QString(), QWidget *parent = 0); | 38 | explicit UbuntuCreateNewChrootDialog(const QString &arch = QString(), const QString &framework = QString(), QWidget *parent = 0); |
| 792 | 39 | ~UbuntuCreateNewChrootDialog(); | 39 | ~UbuntuCreateNewChrootDialog(); |
| 793 | 40 | 40 | ||
| 795 | 41 | static bool getNewChrootTarget(UbuntuClickTool::Target *target, const QString &arch, QWidget *parent = 0); | 41 | static bool getNewChrootTarget(UbuntuClickTool::Target *target, const QString &arch, const QString &framework, QWidget *parent = 0); |
| 796 | 42 | 42 | ||
| 797 | 43 | private: | 43 | private: |
| 798 | 44 | Ui::UbuntuCreateNewChrootDialog *ui; | 44 | Ui::UbuntuCreateNewChrootDialog *ui; |
| 799 | 45 | 45 | ||
| 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 | 146 | tr("There is no compatible chroot available on your system, do you want to create it now?")); | 146 | tr("There is no compatible chroot available on your system, do you want to create it now?")); |
| 805 | 147 | 147 | ||
| 806 | 148 | if(choice == QMessageBox::Yes) { | 148 | if(choice == QMessageBox::Yes) { |
| 808 | 149 | if(!UbuntuClickDialog::createClickChrootModal(false, device->architecture())) | 149 | if(!UbuntuClickDialog::createClickChrootModal(false, device->architecture(), device->framework())) |
| 809 | 150 | return; | 150 | return; |
| 810 | 151 | 151 | ||
| 811 | 152 | toolchains = clickToolChains(); | 152 | toolchains = clickToolChains(); |
| 812 | 153 | 153 | ||
| 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 | 57 | 57 | ||
| 818 | 58 | #include <QMenu> | 58 | #include <QMenu> |
| 819 | 59 | #include <QMessageBox> | 59 | #include <QMessageBox> |
| 820 | 60 | #include <QScriptEngine> | ||
| 821 | 61 | #include <QRegularExpression> | 60 | #include <QRegularExpression> |
| 822 | 62 | #include <QApplication> | 61 | #include <QApplication> |
| 823 | 63 | 62 | ||
| 824 | 64 | 63 | ||
| 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 | 106 | Q_UNUSED(arguments) | 106 | Q_UNUSED(arguments) |
| 830 | 107 | Q_UNUSED(errorString) | 107 | Q_UNUSED(errorString) |
| 831 | 108 | 108 | ||
| 832 | 109 | QFont defaultFont = QGuiApplication::font(); | ||
| 833 | 110 | defaultFont.setFamily(QStringLiteral("Ubuntu")); | ||
| 834 | 111 | defaultFont.setWeight(QFont::Light); | ||
| 835 | 112 | |||
| 836 | 109 | qmlRegisterUncreatableType<UbuntuQmlDeviceConnectionState>("Ubuntu.DevicesModel",0,1,"DeviceConnectionState",QStringLiteral("Not instantiable")); | 113 | qmlRegisterUncreatableType<UbuntuQmlDeviceConnectionState>("Ubuntu.DevicesModel",0,1,"DeviceConnectionState",QStringLiteral("Not instantiable")); |
| 837 | 110 | qmlRegisterUncreatableType<UbuntuQmlDeviceDetectionState>("Ubuntu.DevicesModel",0,1,"DeviceDetectionState",QStringLiteral("Not instantiable")); | 114 | qmlRegisterUncreatableType<UbuntuQmlDeviceDetectionState>("Ubuntu.DevicesModel",0,1,"DeviceDetectionState",QStringLiteral("Not instantiable")); |
| 838 | 111 | qmlRegisterUncreatableType<UbuntuQmlFeatureState>("Ubuntu.DevicesModel",0,1,"FeatureState",QStringLiteral("Not instantiable")); | 115 | qmlRegisterUncreatableType<UbuntuQmlFeatureState>("Ubuntu.DevicesModel",0,1,"FeatureState",QStringLiteral("Not instantiable")); |
| 839 | @@ -269,6 +273,12 @@ | |||
| 840 | 269 | 273 | ||
| 841 | 270 | connect(m_migrateProjectAction, SIGNAL(triggered()), this, SLOT(migrateProject())); | 274 | connect(m_migrateProjectAction, SIGNAL(triggered()), this, SLOT(migrateProject())); |
| 842 | 271 | 275 | ||
| 843 | 276 | /* Fix Bug lp:1340061 "Some dialogs have unreadable (too small) text" | ||
| 844 | 277 | * The Bug is caused by UITK that overrides the default Font that is based | ||
| 845 | 278 | * on the grid units, which is not useable in Widget based applications | ||
| 846 | 279 | */ | ||
| 847 | 280 | QGuiApplication::setFont(defaultFont); | ||
| 848 | 281 | |||
| 849 | 272 | return true; | 282 | return true; |
| 850 | 273 | } | 283 | } |
| 851 | 274 | 284 | ||
| 852 | 275 | 285 | ||
| 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 | 84 | //make sure the current settings are stored | 84 | //make sure the current settings are stored |
| 858 | 85 | apply(); | 85 | apply(); |
| 859 | 86 | 86 | ||
| 862 | 87 | QString dummy; | 87 | Internal::UbuntuClickDialog::createClickChrootModal(true, QString(), QString(), this); |
| 861 | 88 | Internal::UbuntuClickDialog::createClickChrootModal(true, dummy, this); | ||
| 863 | 89 | listExistingClickTargets(); | 88 | listExistingClickTargets(); |
| 864 | 90 | } | 89 | } |
| 865 | 91 | 90 | ||
| 866 | 92 | 91 | ||
| 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 | 157 | 157 | ||
| 872 | 158 | void UbuntuSetupChrootWizardPage::onCreateKitButtonClicked() | 158 | void UbuntuSetupChrootWizardPage::onCreateKitButtonClicked() |
| 873 | 159 | { | 159 | { |
| 875 | 160 | UbuntuClickDialog::createClickChrootModal(true,QString(),this); | 160 | UbuntuClickDialog::createClickChrootModal(true,QString(), QString(),this); |
| 876 | 161 | initializePage(); | 161 | initializePage(); |
| 877 | 162 | } | 162 | } |
| 878 | 163 | 163 | ||
| 879 | 164 | 164 | ||
| 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 @@ | |||
| 885 | 1 | QT = core gui script scripttools | 1 | QT = core gui qml |
| 886 | 2 | 2 | ||
| 887 | 3 | CONFIG += c++11 | 3 | CONFIG += c++11 |
| 888 | 4 | 4 | ||
PASSED: Continuous integration, rev:398
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://