Merge branch 'jb48429-empty-name' into 'master'

[buteo-sync-plugin-carddav] Fix handling of empty contact name. JB#48429 See merge request mer-core/buteo-sync-plugin-carddav!25
sailfishos · Jun 3, 2020 · 00e1baa · 00e1baa
2 parents 1d45708 + 323e63d
commit 00e1baa
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/src/carddav.cpp b/src/carddav.cpp
@@ -370,9 +370,10 @@ void CardDavVCardConverter::contactProcessed(const QContact &c, QVersitDocument
                 // then just assume that the display label is a useful first name.
                 name.setFirstName(displaylabel);
             }
-            QString nvalue = QStringLiteral("%1;%2;;;").arg(name.lastName(), name.firstName());
+            static const QStringList nvalue = { "", "", "", "", "" };
             QVersitProperty nProp;
             nProp.setName("N");
+            nProp.setValueType(QVersitProperty::CompoundType);
             nProp.setValue(nvalue);
             d->addProperty(nProp);
         }