Commit 30b26454 authored by Laurent Montel's avatar Laurent Montel 😁

Merge remote-tracking branch 'origin/Applications/17.04'

parents 37c014a2 52b80e39
......@@ -24,18 +24,18 @@ include(ECMCoverageOption)
set(CALENDARSUPPORT_LIB_VERSION ${PIM_VERSION})
set(AKONADI_MIMELIB_VERSION "5.4.80")
set(KDEPIM_LIB_VERSION "5.4.80")
set(AKONADI_MIMELIB_VERSION "5.4.90")
set(KDEPIM_LIB_VERSION "5.4.90")
set(QT_REQUIRED_VERSION "5.6.0")
set(KMIME_LIB_VERSION "5.4.80")
set(CALENDARUTILS_LIB_VERSION "5.4.80")
set(KCALENDARCORE_LIB_VERSION "5.4.80")
set(IDENTITYMANAGEMENT_LIB_VERSION "5.4.80")
set(KHOLIDAYS_LIB_VERSION "5.4.80")
set(AKONADICALENDAR_LIB_VERSION "5.4.80")
set(PIMCOMMON_LIB_VERSION "5.4.80")
set(AKONADI_VERSION "5.4.80")
set(KIMAP_LIB_VERSION "5.4.80")
set(KMIME_LIB_VERSION "5.4.90")
set(CALENDARUTILS_LIB_VERSION "5.4.90")
set(KCALENDARCORE_LIB_VERSION "5.4.90")
set(IDENTITYMANAGEMENT_LIB_VERSION "5.4.90")
set(KHOLIDAYS_LIB_VERSION "5.4.90")
set(AKONADICALENDAR_LIB_VERSION "5.4.90")
set(PIMCOMMON_LIB_VERSION "5.4.90")
set(AKONADI_VERSION "5.4.90")
set(KIMAP_LIB_VERSION "5.4.90")
find_package(KF5Akonadi ${AKONADI_VERSION} CONFIG REQUIRED)
find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets Test UiTools)
find_package(KF5I18n ${KF5_VERSION} CONFIG REQUIRED)
......
......@@ -228,7 +228,7 @@ bool AttachmentHandler::saveAs(const Attachment::Ptr &attachment)
// get the saveas file name
QString saveAsFile = QFileDialog::getSaveFileName(d->mParent, i18n("Save Attachment"), attachment->label());
if (saveAsFile.isEmpty() ||
(QFile(saveAsFile).exists() &&
(QFileInfo::exists(saveAsFile) &&
(KMessageBox::warningYesNo(
d->mParent,
i18n("%1 already exists. Do you want to overwrite it?",
......
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