Commit bbcd2bc2 authored by Laurent Montel's avatar Laurent Montel 😁

Merge remote-tracking branch 'origin/release/20.04'

parents c628a886 e0198f5f
......@@ -30,11 +30,11 @@ set(KDEPIM_APPS_LIB_VERSION ${PIM_VERSION})
set(QT_REQUIRED_VERSION "5.12.0")
set(AKONADI_VERSION "5.13.80")
set(GRANTLEETHEME_LIB_VERSION "5.13.80")
set(AKONADICONTACT_LIB_VERSION "5.13.80")
set(LIBKLEO_LIB_VERSION "5.13.80")
set(PIMCOMMON_LIB_VERSION "5.13.80")
set(AKONADI_VERSION "5.13.90")
set(GRANTLEETHEME_LIB_VERSION "5.13.90")
set(AKONADICONTACT_LIB_VERSION "5.13.90")
set(LIBKLEO_LIB_VERSION "5.13.90")
set(PIMCOMMON_LIB_VERSION "5.13.90")
set(GRANTLEE_LIB_VERSION "5.2")
find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets DBus Gui)
......
......@@ -148,9 +148,7 @@ void GrantleeContactFormatter::setGrantleeTheme(const GrantleeTheme::Theme &them
void GrantleeContactFormatter::setForceDisableQRCode(bool b)
{
if (d->forceDisableQRCode != b) {
d->forceDisableQRCode = b;
}
d->forceDisableQRCode = b;
}
bool GrantleeContactFormatter::forceDisableQRCode() const
......
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