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

Add info about "hasAttachment"

parent 169c3de2
...@@ -136,7 +136,7 @@ else() ...@@ -136,7 +136,7 @@ else()
set(LIBMAILIMPORTER_VERSION_LIB "5.2.40") set(LIBMAILIMPORTER_VERSION_LIB "5.2.40")
set(MAILCOMMON_LIB_VERSION_LIB "5.2.56") set(MAILCOMMON_LIB_VERSION_LIB "5.2.56")
set(KDEPIM_APPS_LIB_VERSION_LIB "5.2.42") set(KDEPIM_APPS_LIB_VERSION_LIB "5.2.42")
set(MESSAGELIB_LIB_VERSION_LIB "5.2.80") set(MESSAGELIB_LIB_VERSION_LIB "5.2.81")
set(LIBKLEO_LIB_VERSION_LIB "5.2.40") set(LIBKLEO_LIB_VERSION_LIB "5.2.40")
set(LIBGRANTLEETHEME_LIB_VERSION_LIB "5.2.40") set(LIBGRANTLEETHEME_LIB_VERSION_LIB "5.2.40")
set(PIMCOMMON_LIB_VERSION_LIB "5.2.40") set(PIMCOMMON_LIB_VERSION_LIB "5.2.40")
......
...@@ -44,7 +44,7 @@ if(${CMAKE_SOURCE_DIR} STREQUAL ${accountwizard_SOURCE_DIR}) ...@@ -44,7 +44,7 @@ if(${CMAKE_SOURCE_DIR} STREQUAL ${accountwizard_SOURCE_DIR})
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) 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)
find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets Xml DBus Test) find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets Xml DBus Test)
set(MAILCOMMON_LIB_VERSION_LIB "5.2.56") set(MAILCOMMON_LIB_VERSION_LIB "5.2.56")
set(MESSAGELIB_LIB_VERSION_LIB "5.2.80") set(MESSAGELIB_LIB_VERSION_LIB "5.2.81")
set(PIMCOMMON_LIB_VERSION_LIB "5.2.40") set(PIMCOMMON_LIB_VERSION_LIB "5.2.40")
set(LIBKDEPIM_LIB_VERSION_LIB "5.2.40") set(LIBKDEPIM_LIB_VERSION_LIB "5.2.40")
......
...@@ -42,7 +42,7 @@ if(${CMAKE_SOURCE_DIR} STREQUAL ${akonadiconsole_SOURCE_DIR}) ...@@ -42,7 +42,7 @@ if(${CMAKE_SOURCE_DIR} STREQUAL ${akonadiconsole_SOURCE_DIR})
set(QT_REQUIRED_VERSION "5.6.0") set(QT_REQUIRED_VERSION "5.6.0")
find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets DBus Sql) find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets DBus Sql)
set(LIBMAILIMPORTER_VERSION_LIB "5.2.40") set(LIBMAILIMPORTER_VERSION_LIB "5.2.40")
set(MESSAGELIB_LIB_VERSION_LIB "5.2.80") set(MESSAGELIB_LIB_VERSION_LIB "5.2.81")
set(LIBKLEO_LIB_VERSION_LIB "5.2.40") set(LIBKLEO_LIB_VERSION_LIB "5.2.40")
set(LIBKDEPIM_LIB_VERSION_LIB "5.2.40") set(LIBKDEPIM_LIB_VERSION_LIB "5.2.40")
set(KCALENDARCORE_LIB_VERSION "5.2.40") set(KCALENDARCORE_LIB_VERSION "5.2.40")
......
...@@ -32,7 +32,7 @@ if(${CMAKE_SOURCE_DIR} STREQUAL ${akregator_SOURCE_DIR}) ...@@ -32,7 +32,7 @@ if(${CMAKE_SOURCE_DIR} STREQUAL ${akregator_SOURCE_DIR})
find_package(Grantlee5 "5.1" CONFIG REQUIRED) find_package(Grantlee5 "5.1" CONFIG REQUIRED)
set(LIBKLEO_LIB_VERSION_LIB "5.2.40") set(LIBKLEO_LIB_VERSION_LIB "5.2.40")
set(MESSAGELIB_LIB_VERSION_LIB "5.2.80") set(MESSAGELIB_LIB_VERSION_LIB "5.2.81")
set(KDEPIMLIBS_LIB_VERSION "5.2.40") set(KDEPIMLIBS_LIB_VERSION "5.2.40")
set(KPIMTEXTEDIT_LIB_VERSION "5.2.40") set(KPIMTEXTEDIT_LIB_VERSION "5.2.40")
set(KDEPIM_LIB_VERSION "${KDEPIM_VERSION_NUMBER}") set(KDEPIM_LIB_VERSION "${KDEPIM_VERSION_NUMBER}")
......
...@@ -39,7 +39,7 @@ if(${CMAKE_SOURCE_DIR} STREQUAL ${blogilo_SOURCE_DIR}) ...@@ -39,7 +39,7 @@ if(${CMAKE_SOURCE_DIR} STREQUAL ${blogilo_SOURCE_DIR})
find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets Test Sql WebEngine WebEngineWidgets) find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets Test Sql WebEngine WebEngineWidgets)
set(PIMCOMMON_LIB_VERSION_LIB "5.2.40") set(PIMCOMMON_LIB_VERSION_LIB "5.2.40")
set(LIBKDEPIM_LIB_VERSION_LIB "5.2.40") set(LIBKDEPIM_LIB_VERSION_LIB "5.2.40")
set(MESSAGELIB_LIB_VERSION_LIB "5.2.80") set(MESSAGELIB_LIB_VERSION_LIB "5.2.81")
# Find KF5 package # Find KF5 package
find_package(KF5DBusAddons ${KF5_VERSION} CONFIG REQUIRED) find_package(KF5DBusAddons ${KF5_VERSION} CONFIG REQUIRED)
find_package(KF5DocTools ${KF5_VERSION} REQUIRED) find_package(KF5DocTools ${KF5_VERSION} REQUIRED)
......
...@@ -29,7 +29,7 @@ if(${CMAKE_SOURCE_DIR} STREQUAL ${grantleeditor_SOURCE_DIR}) ...@@ -29,7 +29,7 @@ if(${CMAKE_SOURCE_DIR} STREQUAL ${grantleeditor_SOURCE_DIR})
set(KDEPIM_VERSION_NUMBER "5.2.50") set(KDEPIM_VERSION_NUMBER "5.2.50")
set(KDEPIM_VERSION "${KDEPIM_VERSION_NUMBER}${KDEPIM_DEV_VERSION}") set(KDEPIM_VERSION "${KDEPIM_VERSION_NUMBER}${KDEPIM_DEV_VERSION}")
set(MESSAGELIB_LIB_VERSION_LIB "5.2.80") set(MESSAGELIB_LIB_VERSION_LIB "5.2.81")
set(KDEPIMLIBS_LIB_VERSION "5.2.40") set(KDEPIMLIBS_LIB_VERSION "5.2.40")
set(KPIMTEXTEDIT_LIB_VERSION "5.2.40") set(KPIMTEXTEDIT_LIB_VERSION "5.2.40")
set(KDEPIM_LIB_VERSION "${KDEPIM_VERSION_NUMBER}") set(KDEPIM_LIB_VERSION "${KDEPIM_VERSION_NUMBER}")
......
...@@ -41,7 +41,7 @@ if(${CMAKE_SOURCE_DIR} STREQUAL ${importwizard_SOURCE_DIR}) ...@@ -41,7 +41,7 @@ if(${CMAKE_SOURCE_DIR} STREQUAL ${importwizard_SOURCE_DIR})
find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets Gui) find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets Gui)
set(LIBMAILIMPORTER_VERSION_LIB "5.2.40") set(LIBMAILIMPORTER_VERSION_LIB "5.2.40")
set(MAILCOMMON_LIB_VERSION_LIB "5.2.56") set(MAILCOMMON_LIB_VERSION_LIB "5.2.56")
set(MESSAGELIB_LIB_VERSION_LIB "5.2.80") set(MESSAGELIB_LIB_VERSION_LIB "5.2.81")
set(PIMCOMMON_LIB_VERSION_LIB "5.2.40") set(PIMCOMMON_LIB_VERSION_LIB "5.2.40")
set(LIBKDEPIM_LIB_VERSION_LIB "5.2.40") set(LIBKDEPIM_LIB_VERSION_LIB "5.2.40")
set(IDENTITYMANAGEMENT_LIB_VERSION "5.2.40") set(IDENTITYMANAGEMENT_LIB_VERSION "5.2.40")
......
...@@ -63,7 +63,7 @@ if(${CMAKE_SOURCE_DIR} STREQUAL ${kmail_SOURCE_DIR}) ...@@ -63,7 +63,7 @@ if(${CMAKE_SOURCE_DIR} STREQUAL ${kmail_SOURCE_DIR})
set(LIBGRAVATAR_VERSION_LIB "5.2.40") set(LIBGRAVATAR_VERSION_LIB "5.2.40")
set(MAILCOMMON_LIB_VERSION_LIB "5.2.56") set(MAILCOMMON_LIB_VERSION_LIB "5.2.56")
set(KDEPIM_APPS_LIB_VERSION_LIB "5.2.42") set(KDEPIM_APPS_LIB_VERSION_LIB "5.2.42")
set(MESSAGELIB_LIB_VERSION_LIB "5.2.80") set(MESSAGELIB_LIB_VERSION_LIB "5.2.81")
set(LIBKLEO_LIB_VERSION_LIB "5.2.40") set(LIBKLEO_LIB_VERSION_LIB "5.2.40")
set(PIMCOMMON_LIB_VERSION_LIB "5.2.40") set(PIMCOMMON_LIB_VERSION_LIB "5.2.40")
set(LIBKDEPIM_LIB_VERSION_LIB "5.2.40") set(LIBKDEPIM_LIB_VERSION_LIB "5.2.40")
......
...@@ -2441,6 +2441,7 @@ void KMComposerWin::doSend(MessageComposer::MessageSender::SendMethod method, ...@@ -2441,6 +2441,7 @@ void KMComposerWin::doSend(MessageComposer::MessageSender::SendMethod method,
params.setSubject(subject()); params.setSubject(subject());
params.setHtmlMail(mComposerBase->editor()->textMode() == MessageComposer::RichTextComposerNg::Rich); params.setHtmlMail(mComposerBase->editor()->textMode() == MessageComposer::RichTextComposerNg::Rich);
params.setIdentity(mComposerBase->identityCombo()->currentIdentity()); params.setIdentity(mComposerBase->identityCombo()->currentIdentity());
params.setHasAttachment(mComposerBase->attachmentModel()->rowCount() > 0);
const KIdentityManagement::Identity &ident = KMKernel::self()->identityManager()->identityForUoid(mComposerBase->identityCombo()->currentIdentity()); const KIdentityManagement::Identity &ident = KMKernel::self()->identityManager()->identityForUoid(mComposerBase->identityCombo()->currentIdentity());
QString defaultDomainName; QString defaultDomainName;
if (!ident.isNull()) { if (!ident.isNull()) {
......
...@@ -34,7 +34,7 @@ if(${CMAKE_SOURCE_DIR} STREQUAL ${sieveeditor_SOURCE_DIR}) ...@@ -34,7 +34,7 @@ if(${CMAKE_SOURCE_DIR} STREQUAL ${sieveeditor_SOURCE_DIR})
set(KDEPIM_LIB_VERSION "${KDEPIM_VERSION_NUMBER}") set(KDEPIM_LIB_VERSION "${KDEPIM_VERSION_NUMBER}")
set(KDEPIM_LIB_SOVERSION "5") set(KDEPIM_LIB_SOVERSION "5")
set(MESSAGELIB_LIB_VERSION_LIB "5.2.80") set(MESSAGELIB_LIB_VERSION_LIB "5.2.81")
set(PIMCOMMON_LIB_VERSION_LIB "5.2.40") set(PIMCOMMON_LIB_VERSION_LIB "5.2.40")
set(LIBKSIEVE_LIB_VERSION_LIB "5.2.44") set(LIBKSIEVE_LIB_VERSION_LIB "5.2.44")
......
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