summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMontel Laurent <[email protected]>2016-06-13 08:11:31 +0200
committerMontel Laurent <[email protected]>2016-06-13 08:11:31 +0200
commitef3788f647e5c621ad4e1b2e72c1c6462eb6da8e (patch)
tree9f223fee283702f70e631a28dcdc9c407cae0307
parent169c3de2df5cbd53309f2e4d8e7b257790869b7a (diff)
Add info about "hasAttachment"
-rw-r--r--CMakeLists.txt2
-rw-r--r--accountwizard/CMakeLists.txt2
-rw-r--r--akonadiconsole/CMakeLists.txt2
-rw-r--r--akregator/CMakeLists.txt2
-rw-r--r--blogilo/CMakeLists.txt2
-rw-r--r--grantleeeditor/CMakeLists.txt2
-rw-r--r--importwizard/CMakeLists.txt2
-rw-r--r--kmail/CMakeLists.txt2
-rw-r--r--kmail/src/editor/kmcomposerwin.cpp1
-rw-r--r--sieveeditor/CMakeLists.txt2
10 files changed, 10 insertions, 9 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d2a99ae..10ec2d2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -136,7 +136,7 @@ else()
set(LIBMAILIMPORTER_VERSION_LIB "5.2.40")
set(MAILCOMMON_LIB_VERSION_LIB "5.2.56")
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(LIBGRANTLEETHEME_LIB_VERSION_LIB "5.2.40")
set(PIMCOMMON_LIB_VERSION_LIB "5.2.40")
diff --git a/accountwizard/CMakeLists.txt b/accountwizard/CMakeLists.txt
index 06adc64..2677cb1 100644
--- a/accountwizard/CMakeLists.txt
+++ b/accountwizard/CMakeLists.txt
@@ -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)
find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets Xml DBus Test)
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(LIBKDEPIM_LIB_VERSION_LIB "5.2.40")
diff --git a/akonadiconsole/CMakeLists.txt b/akonadiconsole/CMakeLists.txt
index 48bc32e..c416bc9 100644
--- a/akonadiconsole/CMakeLists.txt
+++ b/akonadiconsole/CMakeLists.txt
@@ -42,7 +42,7 @@ if(${CMAKE_SOURCE_DIR} STREQUAL ${akonadiconsole_SOURCE_DIR})
set(QT_REQUIRED_VERSION "5.6.0")
find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets DBus Sql)
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(LIBKDEPIM_LIB_VERSION_LIB "5.2.40")
set(KCALENDARCORE_LIB_VERSION "5.2.40")
diff --git a/akregator/CMakeLists.txt b/akregator/CMakeLists.txt
index ad4cb7d..df659c2 100644
--- a/akregator/CMakeLists.txt
+++ b/akregator/CMakeLists.txt
@@ -32,7 +32,7 @@ if(${CMAKE_SOURCE_DIR} STREQUAL ${akregator_SOURCE_DIR})
find_package(Grantlee5 "5.1" CONFIG REQUIRED)
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(KPIMTEXTEDIT_LIB_VERSION "5.2.40")
set(KDEPIM_LIB_VERSION "${KDEPIM_VERSION_NUMBER}")
diff --git a/blogilo/CMakeLists.txt b/blogilo/CMakeLists.txt
index 4dfc6e1..659cfb6 100644
--- a/blogilo/CMakeLists.txt
+++ b/blogilo/CMakeLists.txt
@@ -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)
set(PIMCOMMON_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_package(KF5DBusAddons ${KF5_VERSION} CONFIG REQUIRED)
find_package(KF5DocTools ${KF5_VERSION} REQUIRED)
diff --git a/grantleeeditor/CMakeLists.txt b/grantleeeditor/CMakeLists.txt
index 17c566b..b454321 100644
--- a/grantleeeditor/CMakeLists.txt
+++ b/grantleeeditor/CMakeLists.txt
@@ -29,7 +29,7 @@ if(${CMAKE_SOURCE_DIR} STREQUAL ${grantleeditor_SOURCE_DIR})
set(KDEPIM_VERSION_NUMBER "5.2.50")
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(KPIMTEXTEDIT_LIB_VERSION "5.2.40")
set(KDEPIM_LIB_VERSION "${KDEPIM_VERSION_NUMBER}")
diff --git a/importwizard/CMakeLists.txt b/importwizard/CMakeLists.txt
index 74ef531..ecb7a1d 100644
--- a/importwizard/CMakeLists.txt
+++ b/importwizard/CMakeLists.txt
@@ -41,7 +41,7 @@ if(${CMAKE_SOURCE_DIR} STREQUAL ${importwizard_SOURCE_DIR})
find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets Gui)
set(LIBMAILIMPORTER_VERSION_LIB "5.2.40")
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(LIBKDEPIM_LIB_VERSION_LIB "5.2.40")
set(IDENTITYMANAGEMENT_LIB_VERSION "5.2.40")
diff --git a/kmail/CMakeLists.txt b/kmail/CMakeLists.txt
index 0c189c1..4fc205d 100644
--- a/kmail/CMakeLists.txt
+++ b/kmail/CMakeLists.txt
@@ -63,7 +63,7 @@ if(${CMAKE_SOURCE_DIR} STREQUAL ${kmail_SOURCE_DIR})
set(LIBGRAVATAR_VERSION_LIB "5.2.40")
set(MAILCOMMON_LIB_VERSION_LIB "5.2.56")
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(PIMCOMMON_LIB_VERSION_LIB "5.2.40")
set(LIBKDEPIM_LIB_VERSION_LIB "5.2.40")
diff --git a/kmail/src/editor/kmcomposerwin.cpp b/kmail/src/editor/kmcomposerwin.cpp
index b8c0a29..d171000 100644
--- a/kmail/src/editor/kmcomposerwin.cpp
+++ b/kmail/src/editor/kmcomposerwin.cpp
@@ -2441,6 +2441,7 @@ void KMComposerWin::doSend(MessageComposer::MessageSender::SendMethod method,
params.setSubject(subject());
params.setHtmlMail(mComposerBase->editor()->textMode() == MessageComposer::RichTextComposerNg::Rich);
params.setIdentity(mComposerBase->identityCombo()->currentIdentity());
+ params.setHasAttachment(mComposerBase->attachmentModel()->rowCount() > 0);
const KIdentityManagement::Identity &ident = KMKernel::self()->identityManager()->identityForUoid(mComposerBase->identityCombo()->currentIdentity());
QString defaultDomainName;
if (!ident.isNull()) {
diff --git a/sieveeditor/CMakeLists.txt b/sieveeditor/CMakeLists.txt
index c0036c7..339e333 100644
--- a/sieveeditor/CMakeLists.txt
+++ b/sieveeditor/CMakeLists.txt
@@ -34,7 +34,7 @@ if(${CMAKE_SOURCE_DIR} STREQUAL ${sieveeditor_SOURCE_DIR})
set(KDEPIM_LIB_VERSION "${KDEPIM_VERSION_NUMBER}")
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(LIBKSIEVE_LIB_VERSION_LIB "5.2.44")