Merge lp://qastaging/~xnox/unity-action-api/fix-cross into lp://qastaging/unity-action-api
Proposed by
Dimitri John Ledkov
Status: | Merged |
---|---|
Approved by: | Michał Sawicz |
Approved revision: | 31 |
Merged at revision: | 31 |
Proposed branch: | lp://qastaging/~xnox/unity-action-api/fix-cross |
Merge into: | lp://qastaging/unity-action-api |
Diff against target: |
14 lines (+5/-1) 1 file modified
documentation/qml/CMakeLists.txt (+5/-1) |
To merge this branch: | bzr merge lp://qastaging/~xnox/unity-action-api/fix-cross |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Michał Sawicz | Approve | ||
PS Jenkins bot (community) | continuous-integration | Approve | |
Review via email: mp+198847@code.qastaging.launchpad.net |
Commit message
Fix cross-compilation, by using correct qdoc at compile time.
Description of the change
Fix cross-compilation, by using correct qdoc at compile time.
To post a comment you must log in.
PASSED: Continuous integration, rev:31 jenkins. qa.ubuntu. com/job/ unity-action- api-ci/ 45/ jenkins. qa.ubuntu. com/job/ unity-action- api-trusty- amd64-ci/ 1 jenkins. qa.ubuntu. com/job/ unity-action- api-trusty- armhf-ci/ 1 jenkins. qa.ubuntu. com/job/ unity-action- api-trusty- armhf-ci/ 1/artifact/ work/output/ *zip*/output. zip
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
deb: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/unity- action- api-ci/ 45/rebuild
http://