From 3b514f853595c686d4ed8830567c1f27ea533faf Mon Sep 17 00:00:00 2001 From: Mikhail Svetkin Date: Fri, 4 Jan 2019 16:01:46 +0100 Subject: qtlite: Fix build libs with -no-feature-regularexpression Change-Id: I427ff1f8f4986fbf466aba60a9d3de614c1e006f Reviewed-by: Lars Knoll --- src/corelib/serialization/qjsoncbor.cpp | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'src/corelib/serialization/qjsoncbor.cpp') diff --git a/src/corelib/serialization/qjsoncbor.cpp b/src/corelib/serialization/qjsoncbor.cpp index 158f1950d0..4f756df97c 100644 --- a/src/corelib/serialization/qjsoncbor.cpp +++ b/src/corelib/serialization/qjsoncbor.cpp @@ -543,14 +543,19 @@ QVariant QCborValue::toVariant() const case Url: return toUrl(); +#if QT_CONFIG(regularexpression) case RegularExpression: return toRegularExpression(); +#endif case Uuid: return toUuid(); case Invalid: return QVariant(); + + default: + break; } if (isSimpleType()) @@ -714,8 +719,10 @@ QCborValue QCborValue::fromVariant(const QVariant &variant) case QVariant::Hash: return QCborMap::fromVariantHash(variant.toHash()); #ifndef QT_BOOTSTRAPPED +#if QT_CONFIG(regularexpression) case QVariant::RegularExpression: return QCborValue(variant.toRegularExpression()); +#endif case QMetaType::QJsonValue: return fromJsonValue(variant.toJsonValue()); case QMetaType::QJsonObject: -- cgit v1.2.3