qtcreator-plugin-ubuntu

Merge lp://staging/~juhapekka-piiroinen/qtcreator-plugin-ubuntu/fix-bug-1232213 into lp://staging/qtcreator-plugin-ubuntu

  1. fix-bug-1232213
  2. Merge into trunk
Proposed by Juhapekka Piiroinen
Status: Merged
Approved by: Zoltan Balogh
Approved revision: 52
Merged at revision: 47
Proposed branch: lp://staging/~juhapekka-piiroinen/qtcreator-plugin-ubuntu/fix-bug-1232213
Merge into: lp://staging/qtcreator-plugin-ubuntu
Diff against target: 300 lines (+102/-49)
9 files modified
debian/changelog (+6/-0)
share/qtcreator/ubuntu/menu.json (+28/-29)
share/qtcreator/ubuntu/scripts/i18n_update_template (+42/-0)
share/qtcreator/ubuntu/scripts/qtc_project_click_create (+2/-2)
src/ubuntu/ubuntumenu.cpp (+3/-2)
src/ubuntu/ubuntupolicygroupinfo.cpp (+1/-1)
src/ubuntu/ubuntupolicygroupinfo.h (+2/-2)
src/ubuntu/ubuntusecuritypolicypickerdialog.cpp (+8/-3)
src/ubuntu/ubuntusecuritypolicypickerdialog.ui (+10/-10)
To merge this branch: bzr merge lp://staging/~juhapekka-piiroinen/qtcreator-plugin-ubuntu/fix-bug-1232213
Reviewer Review Type Date Requested Status
Zoltan Balogh Approve
PS Jenkins bot continuous-integration Approve
Timo Jyrinki Needs Fixing
Review via email: mp+188269@code.staging.launchpad.net

Description of the change

created click pkg for cordova desktop has qmlscene exec (LP: #1232213)
do not execute i18n stuff on all project files (LP: #1176433)
Internationalization workflow improvements (LP: #1177449)
[i18n] The .pot file generator should provide relative paths (LP: #1180325)
Split out reserved security policies from regular ones (LP: #1227814)

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:47
http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-ci/57/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-saucy-amd64-ci/57
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-saucy-armhf-ci/57

Click here to trigger a rebuild:
http://s-jenkins:8080/job/qtcreator-plugin-ubuntu-ci/57/rebuild

review: Approve (continuous-integration)
lp://staging/~juhapekka-piiroinen/qtcreator-plugin-ubuntu/fix-bug-1232213 updated
48. By Juhapekka Piiroinen

* do not execute i18n stuff on all project files (LP: #1176433)
* Internationalization workflow improvements (LP: #1177449)

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:48
http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-ci/58/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-saucy-amd64-ci/58
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-saucy-armhf-ci/58

Click here to trigger a rebuild:
http://s-jenkins:8080/job/qtcreator-plugin-ubuntu-ci/58/rebuild

review: Approve (continuous-integration)
lp://staging/~juhapekka-piiroinen/qtcreator-plugin-ubuntu/fix-bug-1232213 updated
49. By Juhapekka Piiroinen

[i18n] The .pot file generator should provide relative paths (LP: #1180325)

Revision history for this message
Timo Jyrinki (timo-jyrinki) wrote :

Bug #1232213 seems to be fixed, probably other bugs to fix on the cordova plugin side though. But the .desktop file now doesn't have qmlscene anymore.

The sed line is flawed though, as it requires Exec=qmlscene to work, while I have examples of Exec=/usr/bin/qmlscene at least and possibly other examples are found.

I quickly tried out the translation related features, seem fine.

review: Approve
Revision history for this message
Timo Jyrinki (timo-jyrinki) wrote :

Meant needs fixing.

review: Needs Fixing
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:49
http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-ci/59/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-saucy-amd64-ci/59
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-saucy-armhf-ci/59

Click here to trigger a rebuild:
http://s-jenkins:8080/job/qtcreator-plugin-ubuntu-ci/59/rebuild

review: Approve (continuous-integration)
lp://staging/~juhapekka-piiroinen/qtcreator-plugin-ubuntu/fix-bug-1232213 updated
50. By Juhapekka Piiroinen

Split out reserved security policies from regular ones (LP: #1227814)

51. By Juhapekka Piiroinen

Fixed flawed sed line in share/qtcreator/ubuntu/scripts/qtc_project_click_create

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:51
http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-ci/60/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-saucy-amd64-ci/60
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-saucy-armhf-ci/60

Click here to trigger a rebuild:
http://s-jenkins:8080/job/qtcreator-plugin-ubuntu-ci/60/rebuild

review: Approve (continuous-integration)
lp://staging/~juhapekka-piiroinen/qtcreator-plugin-ubuntu/fix-bug-1232213 updated
52. By Juhapekka Piiroinen

Fixed an issue where Click package creation or installation wasnt visible for cordova projects.

Revision history for this message
Zoltan Balogh (bzoltan) :
review: Approve

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