qtcreator-plugin-ubuntu

Merge lp://staging/~stolowski/qtcreator-plugin-ubuntu/remove-annotation-from-scope-template into lp://staging/qtcreator-plugin-ubuntu

  1. remove-annotation-from-scope-template
  2. Merge into trunk
Proposed by Paweł Stołowski
Status: Merged
Merge reported by: Paweł Stołowski
Merged at revision: not available
Proposed branch: lp://staging/~stolowski/qtcreator-plugin-ubuntu/remove-annotation-from-scope-template
Merge into: lp://staging/qtcreator-plugin-ubuntu
Diff against target: 337 lines (+39/-60)
14 files modified
share/qtcreator/templates/wizards/ubuntu/scope-local-content/CMakeLists.txt (+1/-1)
share/qtcreator/templates/wizards/ubuntu/scope-local-content/src/displayName-preview.cpp (+2/-1)
share/qtcreator/templates/wizards/ubuntu/scope-local-content/src/displayName-preview.h (+3/-4)
share/qtcreator/templates/wizards/ubuntu/scope-local-content/src/displayName-query.cpp (+3/-10)
share/qtcreator/templates/wizards/ubuntu/scope-local-content/src/displayName-query.h (+1/-4)
share/qtcreator/templates/wizards/ubuntu/scope-local-content/src/displayName-scope.cpp (+5/-7)
share/qtcreator/templates/wizards/ubuntu/scope-local-content/src/displayName-scope.h (+4/-4)
share/qtcreator/templates/wizards/ubuntu/scope-network/CMakeLists.txt (+1/-1)
share/qtcreator/templates/wizards/ubuntu/scope-network/src/displayName-preview.cpp (+3/-2)
share/qtcreator/templates/wizards/ubuntu/scope-network/src/displayName-preview.h (+3/-4)
share/qtcreator/templates/wizards/ubuntu/scope-network/src/displayName-query.cpp (+3/-10)
share/qtcreator/templates/wizards/ubuntu/scope-network/src/displayName-query.h (+1/-1)
share/qtcreator/templates/wizards/ubuntu/scope-network/src/displayName-scope.cpp (+5/-7)
share/qtcreator/templates/wizards/ubuntu/scope-network/src/displayName-scope.h (+4/-4)
To merge this branch: bzr merge lp://staging/~stolowski/qtcreator-plugin-ubuntu/remove-annotation-from-scope-template
Reviewer Review Type Date Requested Status
Zoltan Balogh Needs Fixing
PS Jenkins bot continuous-integration Approve
Michal Hruby (community) Approve
Review via email: mp+223430@code.staging.launchpad.net

Commit message

Don't use Annotation class in the scope template. Updated for other scopes API changes. Requires unity-scopes-api 0.5.0.

Description of the change

Don't use Annotation class in the scope template. Updated for other scopes API changes. Requires unity-scopes-api 0.5.0.

To post a comment you must log in.
Revision history for this message
Michal Hruby (mhr3) wrote :

+1 from scopes pov

review: Approve
Revision history for this message
Paweł Stołowski (stolowski) wrote :

Fixed all the issues and tested the template with qtcreator.

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

PASSED: Continuous integration, rev:192
http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-ci/314/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-utopic-amd64-ci/82
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-utopic-armhf-ci/82

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

review: Approve (continuous-integration)
Revision history for this message
Zoltan Balogh (bzoltan) wrote :

OK

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

The project wizzard has changed since this MR was filed.

Please update the MR from the trunk once the new wizzard is landed.

review: Needs Fixing
Revision history for this message
Paweł Stołowski (stolowski) wrote :

These changes already got merged with another branch (rev. 190.60.3), so ignore it. Thanks.

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