Commit 680cb945 authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

Make it compile against last qt5.15

parent 84aa0d0e
...@@ -158,7 +158,11 @@ QString contactsToHtml(const KContacts::Addressee::List &contacts, const ColorSe ...@@ -158,7 +158,11 @@ QString contactsToHtml(const KContacts::Addressee::List &contacts, const ColorSe
} }
block.header += QLatin1Char(':'); block.header += QLatin1Char(':');
#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
block.entries = address.formattedAddress().split(QLatin1Char('\n'), QString::KeepEmptyParts); block.entries = address.formattedAddress().split(QLatin1Char('\n'), QString::KeepEmptyParts);
#else
block.entries = address.formattedAddress().split(QLatin1Char('\n'), Qt::KeepEmptyParts);
#endif
blocks.append(block); blocks.append(block);
} }
} }
...@@ -166,7 +170,11 @@ QString contactsToHtml(const KContacts::Addressee::List &contacts, const ColorSe ...@@ -166,7 +170,11 @@ QString contactsToHtml(const KContacts::Addressee::List &contacts, const ColorSe
if (!contact.note().isEmpty()) { if (!contact.note().isEmpty()) {
ContactBlock block; ContactBlock block;
block.header = i18n("Notes:"); block.header = i18n("Notes:");
#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
block.entries = contact.note().split(QLatin1Char('\n'), QString::KeepEmptyParts); block.entries = contact.note().split(QLatin1Char('\n'), QString::KeepEmptyParts);
#else
block.entries = contact.note().split(QLatin1Char('\n'), Qt::KeepEmptyParts);
#endif
blocks.append(block); blocks.append(block);
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment