Merge lp://staging/~zeller-benjamin/qtcreator-plugin-ubuntu/bughunt-201506 into lp://staging/qtcreator-plugin-ubuntu
Proposed by
Benjamin Zeller
| Status: | Merged | ||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| Approved by: | Zoltan Balogh | ||||||||||||||||
| Approved revision: | 398 | ||||||||||||||||
| Merged at revision: | 404 | ||||||||||||||||
| Proposed branch: | lp://staging/~zeller-benjamin/qtcreator-plugin-ubuntu/bughunt-201506 | ||||||||||||||||
| Merge into: | lp://staging/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://staging/~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)
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
PASSED: Continuous integration, rev:398
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://