diff options
author | Chris Adams <chris.adams@qinetic.com.au> | 2020-10-16 11:26:20 +1000 |
---|---|---|
committer | Chris Adams <chris.adams@qinetic.com.au> | 2020-11-02 13:19:24 +1000 |
commit | 0d7a97f0717cef8a16cdba6b37de860a531f9407 (patch) | |
tree | ec22cf720626511214e18f765475da49365e570f /src/versit/qvcard21writer.cpp | |
parent | 5679a6141c76ae7d64c3acc8a87b1adb048289e0 (diff) |
Adapt to Qt6 behavior changes
- QVariant comparison now doesn't perform type conversion
- Null QDateTime now compares less than other QDateTime values,
rather than being equal to epoch.
- Sequence type name is printed by default in warnings
- QMultiHash::operator==() can return false for empty hashes
in some cases (QTBUG-87575)
- QJsonValue will expose input like "2.0" as an integral type as
the value can be perfectly expressed as an integral (QTBUG-87443)
Change-Id: I848888ecc74b5fb790488181a0d62a04138fcd81
Reviewed-by: Pekka Vuorela <pvuorela@iki.fi>
Diffstat (limited to 'src/versit/qvcard21writer.cpp')
-rw-r--r-- | src/versit/qvcard21writer.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/versit/qvcard21writer.cpp b/src/versit/qvcard21writer.cpp index 45914a58b..7acce33ba 100644 --- a/src/versit/qvcard21writer.cpp +++ b/src/versit/qvcard21writer.cpp @@ -79,6 +79,9 @@ void QVCard21Writer::encodeVersitProperty(const QVersitProperty& property) encodeGroupsAndName(property); QMultiHash<QString,QString> parameters = property.parameters(); QVariant variant(property.variantValue()); + if (variant.type() == QVariant::Url) { + variant = QVariant(variant.toUrl().toString()); + } QString renderedValue; QByteArray renderedBytes; |