Commit a6f6f335 authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

We depend against kf5.92

parent 76adf860
Pipeline #151319 passed with stage
in 16 minutes and 27 seconds
......@@ -8,7 +8,6 @@
#include <KContacts/Address>
#include <KItinerary/Place>
#include <kcontacts_version.h>
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
#include <grantlee/exception.h>
......@@ -38,11 +37,7 @@ QVariant AddressFormatter::doFilter(const QVariant &input, const QVariant &arg,
address.setRegion(a.addressRegion());
address.setCountry(a.addressCountry());
#if KContacts_VERSION < QT_VERSION_CHECK(5, 92, 0)
auto s = escape(address.formattedAddress().trimmed().replace(QLatin1String("\n\n"), QLatin1String("\n")));
#else
auto s = escape(address.formatted(KContacts::AddressFormatStyle::MultiLineInternational));
#endif
return s.get().replace(QLatin1Char('\n'), QLatin1String("<br/>"));
}
......
Supports Markdown
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