Merge lp://staging/~mir-team/qtubuntu/change-naming-to-match-upstream into lp://staging/qtubuntu
Proposed by
Gerry Boland
Status: | Work in progress |
---|---|
Proposed branch: | lp://staging/~mir-team/qtubuntu/change-naming-to-match-upstream |
Merge into: | lp://staging/qtubuntu |
Diff against target: |
306 lines (+65/-65) 15 files modified
src/ubuntumirclient/qmirclientbackingstore.cpp (+2/-2) src/ubuntumirclient/qmirclientclipboard.cpp (+1/-1) src/ubuntumirclient/qmirclientglcontext.cpp (+3/-3) src/ubuntumirclient/qmirclientglcontext.h (+1/-1) src/ubuntumirclient/qmirclientinput.cpp (+7/-7) src/ubuntumirclient/qmirclientintegration.cpp (+10/-10) src/ubuntumirclient/qmirclientintegration.h (+1/-1) src/ubuntumirclient/qmirclientnativeinterface.cpp (+3/-3) src/ubuntumirclient/qmirclientorientationchangeevent_p.h (+1/-1) src/ubuntumirclient/qmirclientplatformservices.cpp (+1/-1) src/ubuntumirclient/qmirclientplugin.cpp (+2/-2) src/ubuntumirclient/qmirclientscreen.cpp (+3/-3) src/ubuntumirclient/qmirclienttheme.cpp (+1/-1) src/ubuntumirclient/qmirclientwindow.cpp (+5/-5) src/ubuntumirclient/ubuntumirclient.pro (+24/-24) |
To merge this branch: | bzr merge lp://staging/~mir-team/qtubuntu/change-naming-to-match-upstream |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
PS Jenkins bot | continuous-integration | Approve | |
Ubuntu Phablet Team | Pending | ||
Review via email: mp+267550@code.staging.launchpad.net |
Commit message
Rename QPA files to match upstream, all files prefixed with "qmirclient"
To post a comment you must log in.
Unmerged revisions
- 272. By Gerry Boland
-
Rename QPA files to match upstream, all files prefixed with "qmirclient"
PASSED: Continuous integration, rev:272 jenkins. qa.ubuntu. com/job/ qtubuntu- ci/238/ jenkins. qa.ubuntu. com/job/ qtubuntu- wily-armhf- ci/29 jenkins. qa.ubuntu. com/job/ qtubuntu- wily-armhf- ci/29/artifact/ work/output/ *zip*/output. zip
http://
Executed test runs:
SUCCESS: http://
deb: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/qtubuntu- ci/238/ rebuild
http://