diff options
| author | Allan Sandfeld Jensen <allan.jensen@digia.com> | 2016-10-14 00:57:02 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2017-08-04 11:19:44 +0000 |
| commit | 74197140be68fd7fe54c3a346a0e769928d7a3ea (patch) | |
| tree | 331604236f096caa0c47b2949a386855f9f03fde /src/corelib/kernel/qvariant.cpp | |
| parent | fbe84a1a19f93bc99bcb9e9333642466cb984cad (diff) | |
Implement conversion from nullptr QVariant to QString and QByteArray
A nullptr QVariant should become a null QString or QByteArray,
since null strings have previous in our APIs represented the null value
in the absence of a dedicated null metatype.
Change-Id: I3b8f6386ece314d7c196959fbcf042c4fe0508a0
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/kernel/qvariant.cpp')
| -rw-r--r-- | src/corelib/kernel/qvariant.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/corelib/kernel/qvariant.cpp b/src/corelib/kernel/qvariant.cpp index a6b92f9f8f..b79716ff4c 100644 --- a/src/corelib/kernel/qvariant.cpp +++ b/src/corelib/kernel/qvariant.cpp @@ -470,6 +470,9 @@ static bool convert(const QVariant::Private *d, int t, void *result, bool *ok) case QVariant::Uuid: *str = v_cast<QUuid>(d)->toString(); break; + case QMetaType::Nullptr: + *str = QString(); + break; default: #ifndef QT_NO_QOBJECT { @@ -652,6 +655,9 @@ static bool convert(const QVariant::Private *d, int t, void *result, bool *ok) case QVariant::Uuid: *ba = v_cast<QUuid>(d)->toByteArray(); break; + case QMetaType::Nullptr: + *ba = QByteArray(); + break; default: #ifndef QT_NO_QOBJECT { @@ -3278,11 +3284,11 @@ bool QVariant::canConvert(int targetTypeId) const case QVariant::Bitmap: return currentType == QVariant::Pixmap || currentType == QVariant::Image; case QVariant::ByteArray: - return currentType == QVariant::Color + return currentType == QVariant::Color || currentType == QMetaType::Nullptr || ((QMetaType::typeFlags(currentType) & QMetaType::IsEnumeration) && QMetaType::metaObjectForType(currentType)); case QVariant::String: return currentType == QVariant::KeySequence || currentType == QVariant::Font - || currentType == QVariant::Color + || currentType == QVariant::Color || currentType == QMetaType::Nullptr || ((QMetaType::typeFlags(currentType) & QMetaType::IsEnumeration) && QMetaType::metaObjectForType(currentType)); case QVariant::KeySequence: return currentType == QVariant::String || currentType == QVariant::Int; |