Merge lp://qastaging/~ubuntu-sdk-team/ubuntu-ui-toolkit/contextPropertyWindowQStringLiteral into lp://qastaging/ubuntu-ui-toolkit/staging
Status: | Merged |
---|---|
Approved by: | Tim Peeters |
Approved revision: | 2134 |
Merged at revision: | 2134 |
Proposed branch: | lp://qastaging/~ubuntu-sdk-team/ubuntu-ui-toolkit/contextPropertyWindowQStringLiteral |
Merge into: | lp://qastaging/ubuntu-ui-toolkit/staging |
Diff against target: |
12 lines (+1/-1) 1 file modified
src/UbuntuToolkit/ubuntutoolkitmodule.cpp (+1/-1) |
To merge this branch: | bzr merge lp://qastaging/~ubuntu-sdk-team/ubuntu-ui-toolkit/contextPropertyWindowQStringLiteral |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
ubuntu-sdk-build-bot | continuous-integration | Approve | |
Tim Peeters | Pending | ||
Review via email:
|
Commit message
Fix warning about using implicit char* to QString conversion
Description of the change
This fixes a missing QStringLiteral macro around the "window" context property.
ubuntutoolkitmo
ubuntutoolkitmo
context-
In file included from /usr/include/
/usr/include/
inline QT_ASCII_CAST_WARN QString(const char *ch)
PASSED: Continuous integration, rev:2134 /jenkins. ubuntu. com/ubuntu- sdk/job/ ubuntu- ui-toolkit- ci-amd64- devel/1305/ /jenkins. ubuntu. com/ubuntu- sdk/job/ generic- update- mp/6932/ console
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild: /jenkins. ubuntu. com/ubuntu- sdk/job/ ubuntu- ui-toolkit- ci-amd64- devel/1305/ rebuild
https:/