Ubuntu UI Toolkit

Merge lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/saferString into lp:~bzoltan/ubuntu-ui-toolkit/OTA13-2016-06-29

  1. saferString
  2. Merge into OTA13-2016-06-29
Proposed by Cris Dywan
Status: Merged
Merged at revision: 2049
Proposed branch: lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/saferString
Merge into: lp:~bzoltan/ubuntu-ui-toolkit/OTA13-2016-06-29
Diff against target: 12 lines (+1/-1)
1 file modified
src/Ubuntu/UbuntuToolkit/privates/ucpagewrapper.cpp (+1/-1)
To merge this branch: bzr merge lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/saferString
Reviewer Review Type Date Requested Status
Zoltan Balogh Pending
Review via email: mp+302280@code.launchpad.net

Commit message

Use safe qstrcmp: typeName() can be 0

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/Ubuntu/UbuntuToolkit/privates/ucpagewrapper.cpp'
2--- src/Ubuntu/UbuntuToolkit/privates/ucpagewrapper.cpp 2016-07-20 11:45:52 +0000
3+++ src/Ubuntu/UbuntuToolkit/privates/ucpagewrapper.cpp 2016-08-08 12:01:08 +0000
4@@ -210,7 +210,7 @@
5 for (;i != propMap.constEnd(); i++) {
6 QQmlProperty prop(target, i.key(), context);
7 bool convertible = true;
8- if (!strcmp(i.value().typeName(),"void*")) {
9+ if (!qstrcmp(i.value().typeName(),"void*")) {
10 // we have void*, we cannot convert that one, so we must force the conversion
11 void *pvalue = i.value().value<void*>();
12 QVariant value(QVariant::Type(prop.propertyType()), pvalue);

Subscribers

People subscribed via source and target branches

to all changes: