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

[Cris Dywan]

Use safe qstrcmp: typeName() can be 0

=== modified file 'src/Ubuntu/UbuntuToolkit/privates/ucpagewrapper.cpp'
--- src/Ubuntu/UbuntuToolkit/privates/ucpagewrapper.cpp	2016-07-20 11:45:52 +0000
+++ src/Ubuntu/UbuntuToolkit/privates/ucpagewrapper.cpp	2016-08-08 12:01:08 +0000
@@ -210,7 +210,7 @@
     for (;i != propMap.constEnd(); i++) {
         QQmlProperty prop(target, i.key(), context);
         bool convertible = true;
-        if (!strcmp(i.value().typeName(),"void*")) {
+        if (!qstrcmp(i.value().typeName(),"void*")) {
             // we have void*, we cannot convert that one, so we must force the conversion
             void *pvalue = i.value().value<void*>();
             QVariant value(QVariant::Type(prop.propertyType()), pvalue);