qtcreator-plugin-ubuntu

Merge lp://staging/~nikwen/qtcreator-plugin-ubuntu/translation-build-fix into lp://staging/qtcreator-plugin-ubuntu

  1. translation-build-fix
  2. Merge into trunk
Proposed by Niklas Wenzel
Status: Merged
Approved by: Zoltan Balogh
Approved revision: 326
Merged at revision: 395
Proposed branch: lp://staging/~nikwen/qtcreator-plugin-ubuntu/translation-build-fix
Merge into: lp://staging/qtcreator-plugin-ubuntu
Diff against target: 134 lines (+52/-7)
4 files modified
share/qtcreator/ubuntu/menu.json (+5/-7)
share/qtcreator/ubuntu/scripts/i18n_build_translations (+33/-0)
src/ubuntu/ubuntuconstants.h (+1/-0)
src/ubuntu/ubuntumenu.cpp (+13/-0)
To merge this branch: bzr merge lp://staging/~nikwen/qtcreator-plugin-ubuntu/translation-build-fix
Reviewer Review Type Date Requested Status
Zoltan Balogh Approve
Review via email: mp+245416@code.staging.launchpad.net

Commit message

Fix building translations

Description of the change

Fix building translations

To post a comment you must log in.
Revision history for this message
Niklas Wenzel (nikwen) wrote :

I also added some instructions for testing changes to the README file which weren't obvious to me at first. If you want, I can remove them but I believe they may be helpful to other people as well.

Revision history for this message
Zoltan Balogh (bzoltan) wrote :

I would not overload the README with instruction on how to pollute the root fs of the development environment.

In my opinion the best way to test a developmen branch of the Ubuntu SDK is to make a source package, build it and install it:

$ dch -i
$ debuild -i -I -S -sa
$ cd ..
$ cowbuild-dist `lsb_release -sc` [arch] `ls -1rt qtcreator-plugin-ubuntu*dsc|tail -1`

review: Needs Fixing
Revision history for this message
Niklas Wenzel (nikwen) wrote :

Ok, great. As I said, I'll revert that change. :)

lp://staging/~nikwen/qtcreator-plugin-ubuntu/translation-build-fix updated
322. By Niklas Wenzel

Revert changes to README

Revision history for this message
Niklas Wenzel (nikwen) wrote :

Here you go.

Thank you for looking into this. :)

Revision history for this message
Niklas Wenzel (nikwen) wrote :

Anyone looking into this?

Revision history for this message
Zoltan Balogh (bzoltan) wrote :

I started to test and so integrate the MR

It fails on unit tests - http://pastebin.ubuntu.com/10625894/

Would you mind to check out and fix the MR to pass the unit tests?

review: Needs Fixing
lp://staging/~nikwen/qtcreator-plugin-ubuntu/translation-build-fix updated
323. By Niklas Wenzel

Merge trunk

Revision history for this message
Niklas Wenzel (nikwen) wrote :

There seems to be a problem with the "Translations" menu entry being greyed out now. I'll look into it as soon as I have enough time for that. ;)

lp://staging/~nikwen/qtcreator-plugin-ubuntu/translation-build-fix updated
324. By Niklas Wenzel

Merge trunk

325. By Niklas Wenzel

Make translation menu accessible again

326. By Niklas Wenzel

Fix context array

Revision history for this message
Zoltan Balogh (bzoltan) wrote :

OK

review: Approve
Revision history for this message
Niklas Wenzel (nikwen) wrote :

Thanks for merging! :)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: