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

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

parents e0df2e9c 5458de68
......@@ -41,21 +41,21 @@ include(ECMAddAppIcon)
include(ECMQtDeclareLoggingCategory)
set(AKONADI_MIMELIB_VERSION "5.13.80")
set(AKONADI_CONTACT_VERSION "5.13.80")
set(IDENTITYMANAGEMENT_LIB_VERSION "5.13.80")
set(KLDAP_LIB_VERSION "5.13.80")
set(KMAILTRANSPORT_LIB_VERSION "5.13.80")
set(CALENDARUTILS_LIB_VERSION "5.13.80")
set(AKONADICALENDAR_LIB_VERSION "5.13.80")
set(KONTACTINTERFACE_LIB_VERSION "5.13.80")
set(KMIME_LIB_VERSION "5.13.80")
set(KPIMTEXTEDIT_LIB_VERSION "5.13.80")
set(AKONADI_VERSION "5.13.80")
set(AKONADI_MIMELIB_VERSION "5.13.90")
set(AKONADI_CONTACT_VERSION "5.13.90")
set(IDENTITYMANAGEMENT_LIB_VERSION "5.13.90")
set(KLDAP_LIB_VERSION "5.13.90")
set(KMAILTRANSPORT_LIB_VERSION "5.13.90")
set(CALENDARUTILS_LIB_VERSION "5.13.90")
set(AKONADICALENDAR_LIB_VERSION "5.13.90")
set(KONTACTINTERFACE_LIB_VERSION "5.13.90")
set(KMIME_LIB_VERSION "5.13.90")
set(KPIMTEXTEDIT_LIB_VERSION "5.13.90")
set(AKONADI_VERSION "5.13.90")
set(KDEPIM_LIB_VERSION "${KDEPIM_VERSION_NUMBER}")
set(KDEPIM_LIB_SOVERSION "5")
set(AKONADINOTES_LIB_VERSION "5.13.80")
set(AKONADINOTES_LIB_VERSION "5.13.90")
set(QT_REQUIRED_VERSION "5.12.0")
option(KDEPIM_ENTERPRISE_BUILD "Enable features specific to the enterprise branch, which are normally disabled. Also, it disables many components not needed for Kontact such as the Kolab client." FALSE)
......@@ -68,14 +68,14 @@ if (TARGET KUserFeedbackWidgets)
add_definitions(-DWITH_KUSERFEEDBACK)
endif()
set(KDEPIM_APPS_LIB_VERSION_LIB "5.13.80")
set(PIMCOMMON_LIB_VERSION_LIB "5.13.80")
set(LIBKDEPIM_LIB_VERSION_LIB "5.13.80")
set(LIBINCIDENCEEDITOR_LIB_VERSION_LIB "5.13.80")
set(CALENDARSUPPORT_LIB_VERSION_LIB "5.13.80")
set(EVENTVIEW_LIB_VERSION_LIB "5.13.80")
set(KDEPIM_APPS_LIB_VERSION_LIB "5.13.90")
set(PIMCOMMON_LIB_VERSION_LIB "5.13.90")
set(LIBKDEPIM_LIB_VERSION_LIB "5.13.90")
set(LIBINCIDENCEEDITOR_LIB_VERSION_LIB "5.13.90")
set(CALENDARSUPPORT_LIB_VERSION_LIB "5.13.90")
set(EVENTVIEW_LIB_VERSION_LIB "5.13.90")
find_package(KF5AkonadiSearch "5.13.80" CONFIG REQUIRED)
find_package(KF5AkonadiSearch "5.13.90" CONFIG REQUIRED)
set_package_properties(KF5AkonadiSearch PROPERTIES DESCRIPTION "The Akonadi Search libraries" URL "https://www.kde.org" TYPE REQUIRED PURPOSE "Provides search capabilities in KMail and Akonadi")
# Find KF5 package
......
......@@ -149,8 +149,6 @@ void StyledCalendarDelegate::paint(QPainter *painter, const QStyleOptionViewItem
QColor color = KOHelper::resourceColorKnown(col);
if (!color.isValid()) {
color = KOHelper::resourceColor(col);
} else {
color = KOHelper::resourceColor(col);
}
if (color.isValid()) {
painter->save();
......
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