Merge lp://staging/~zeller-benjamin/qtcreator-plugin-ubuntu/bughunt-27082015 into lp://staging/qtcreator-plugin-ubuntu/3.1
Proposed by
Benjamin Zeller
| Status: | Merged | ||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| Merged at revision: | 408 | ||||||||||||||||
| Proposed branch: | lp://staging/~zeller-benjamin/qtcreator-plugin-ubuntu/bughunt-27082015 | ||||||||||||||||
| Merge into: | lp://staging/qtcreator-plugin-ubuntu/3.1 | ||||||||||||||||
| Diff against target: |
409 lines (+122/-42) 12 files modified
share/qtcreator/templates/wizards/ubuntu/backend-app-qmake/appName/appName.desktop (+1/-1) share/qtcreator/templates/wizards/ubuntu/backend-app-qmake/appName/appName.pro (+9/-3) share/qtcreator/templates/wizards/ubuntu/backend-app-qmake/projectName.pro (+6/-5) share/qtcreator/templates/wizards/ubuntu/qtquick-app-qmake/appName/appName.desktop (+1/-1) share/qtcreator/templates/wizards/ubuntu/qtquick-app-qmake/appName/appName.pro (+9/-2) share/qtcreator/templates/wizards/ubuntu/qtquick-app-qmake/projectName.pro (+7/-6) share/qtcreator/templates/wizards/ubuntu/simple-app-qmake/appName/appName.desktop (+1/-1) share/qtcreator/templates/wizards/ubuntu/simple-app-qmake/appName/appName.pro (+9/-3) share/qtcreator/templates/wizards/ubuntu/simple-app-qmake/projectName.pro (+7/-6) share/qtcreator/ubuntu/scripts/qtc_device_applaunch.py (+8/-3) src/ubuntu/ubuntupackagestep.cpp (+1/-1) ubuntu-click-tools.prf (+63/-10) |
||||||||||||||||
| To merge this branch: | bzr merge lp://staging/~zeller-benjamin/qtcreator-plugin-ubuntu/bughunt-27082015 | ||||||||||||||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Zoltan Balogh | Approve | ||
|
Review via email:
|
|||
Commit message
- Catch "permission denied" error if opening syslog is not allowed
- Fix Bug lp:1480771 "Wrong directory used for translation"
- Fix Bug lp:1443351 ".desktop file is not translated for qmake based
projects"
- Fix Bug lp:1479581 "Debug helper is disabled by default"
- Fix Bug lp:1481325 "fix i18n integration in qmake template"
Description of the change
- Catch "permission denied" error if opening syslog is not allowed
- Fix Bug lp:1480771 "Wrong directory used for translation"
- Fix Bug lp:1443351 ".desktop file is not translated for qmake based
projects"
- Fix Bug lp:1479581 "Debug helper is disabled by default"
- Fix Bug lp:1481325 "fix i18n integration in qmake template"
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Let's test it