From 6eed1ff9d5c28c8653e36f2d9e0ef18d3f831d69 Mon Sep 17 00:00:00 2001
From: Jeremy Katz <jeremy.katz@nokia.com>
Date: Mon, 18 Jun 2012 17:18:13 +0200
Subject: 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>
---
 src/corelib/kernel/qvariant.cpp | 4 ++++
 1 file changed, 4 insertions(+)

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;
         }
-- 
cgit v1.2.3