whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make QVariant compile with QT_NO_QUUID_STRING 

Task-number: QTBUG-24816

Change-Id: I76e6a6bcf1a2381e14f400648e3cb8ba554772a6
Reviewed-by: Tasuku Suzuki <tasuku.suzuki@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
bb10
Jeremy Katz 2012-06-18 17:18:13 +02:00 committed by Qt by Nokia
parent a44bbc3c1c
commit 6eed1ff9d5
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/corelib/kernel/qvariant.cpp
View File

@ -341,9 +341,11 @@ static bool convert(const QVariant::Private *d, int t, void *result, bool *ok)
*str = v_cast<QUrl>(d)->toString();
break;
#endif
#ifndef QT_NO_QUUID_STRING
case QVariant::Uuid:
*str = v_cast<QUuid>(d)->toString();
break;
#endif
default:
return false;
}
@ -720,9 +722,11 @@ static bool convert(const QVariant::Private *d, int t, void *result, bool *ok)
#endif
case QVariant::Uuid:
switch (d->type) {
#ifndef QT_NO_QUUID_STRING
case QVariant::String:
*static_cast<QUuid *>(result) = QUuid(*v_cast<QString>(d));
break;
#endif
default:
return false;
}