Merge lp://staging/~tpeeters/ubuntu-ui-toolkit/disable-namespace into lp://staging/ubuntu-ui-toolkit/staging

Proposed by Tim Peeters
Status: Merged
Merge reported by: Tim Peeters
Merged at revision: not available
Proposed branch: lp://staging/~tpeeters/ubuntu-ui-toolkit/disable-namespace
Merge into: lp://staging/ubuntu-ui-toolkit/staging
Diff against target: 895 lines (+191/-186)
11 files modified
.qmake.conf (+2/-1)
components.api (+167/-167)
src/Ubuntu/Components/plugin/plugin.cpp (+2/-2)
src/Ubuntu/UbuntuGestures/timer.cpp (+1/-1)
src/Ubuntu/UbuntuGestures/timesource.cpp (+1/-1)
src/Ubuntu/UbuntuGestures/ucswipearea.cpp (+2/-2)
src/Ubuntu/UbuntuGestures/ucswipearea_p_p.h (+6/-6)
tests/unit/bottomedge/tst_bottomedge.cpp (+4/-4)
tests/unit/subtheming/tst_subtheming.cpp (+4/-0)
tests/unit/swipearea/GestureTest.h (+1/-1)
tests/unit/swipearea/tst_swipearea.cpp (+1/-1)
To merge this branch: bzr merge lp://staging/~tpeeters/ubuntu-ui-toolkit/disable-namespace
Reviewer Review Type Date Requested Status
ubuntu-sdk-build-bot continuous-integration Approve
Ubuntu SDK team Pending
Review via email: mp+301100@code.staging.launchpad.net

Commit message

Don't approve. I need the unit test results.

To post a comment you must log in.
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Needs Fixing (continuous-integration)
2045. By Tim Peeters

update components.api

2046. By Tim Peeters

don't explicitly use namespace in tst_bottomedge when the namespace is already being used.

2047. By Tim Peeters

fix subtheming unit test failure

Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)

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