diff options
| author | Jeremy Katz <jeremy.katz@nokia.com> | 2012-06-18 17:18:13 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-20 12:38:32 +0200 |
| commit | 6eed1ff9d5c28c8653e36f2d9e0ef18d3f831d69 (patch) | |
| tree | 3c927d9f9c89ff10c2b34492806ba179e520e6a7 | |
| parent | a44bbc3c1c02a05b212dffa1276e877739cdfcf0 (diff) | |
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>
| -rw-r--r-- | src/corelib/kernel/qvariant.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/corelib/kernel/qvariant.cpp b/src/corelib/kernel/qvariant.cpp index ffc8634912..b9ccb2415e 100644 --- a/src/corelib/kernel/qvariant.cpp +++ b/src/corelib/kernel/qvariant.cpp @@ -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; } |