Merge lp://staging/~zeller-benjamin/qtcreator-plugin-ubuntu/lp1445372 into lp://staging/qtcreator-plugin-ubuntu
Proposed by
Benjamin Zeller
Status: | Merged |
---|---|
Approved by: | Zoltan Balogh |
Approved revision: | 375 |
Merged at revision: | 376 |
Proposed branch: | lp://staging/~zeller-benjamin/qtcreator-plugin-ubuntu/lp1445372 |
Merge into: | lp://staging/qtcreator-plugin-ubuntu |
Diff against target: |
103 lines (+28/-5) 5 files modified
share/qtcreator/templates/wizards/ubuntu/simple-app-qmlproject/Makefile (+1/-1) src/ubuntu/ubuntuconstants.h (+1/-0) src/ubuntu/ubuntupackagestep.cpp (+7/-1) src/ubuntu/ubuntuqmlbuildconfiguration.cpp (+15/-3) src/ubuntu/ubuntuqmlbuildconfiguration.h (+4/-0) |
To merge this branch: | bzr merge lp://staging/~zeller-benjamin/qtcreator-plugin-ubuntu/lp1445372 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
PS Jenkins bot | continuous-integration | Approve | |
Zoltan Balogh | Approve | ||
Review via email: mp+256624@code.staging.launchpad.net |
Commit message
- Fix Bug lp:1445372, mo files are wrongly deleted by the packaging step
- Fix reversed APPID in the Makefile
Description of the change
- Fix Bug lp:1445372, mo files are wrongly deleted by the packaging step
- Fix reversed APPID in the Makefile
To post a comment you must log in.
OK