Commit dd58181b authored by David Jarvie's avatar David Jarvie
Browse files

Merge commit '9678b1c491dc55f4fd31c13ed85ad62d8c790e1d'

parents 88c19971 91265bbb
project(kalarm)
add_definitions(-DQT_STRICT_ITERATORS)
add_definitions( -DQT_NO_CAST_FROM_ASCII )
add_definitions( -DQT_NO_CAST_TO_ASCII )
add_definitions(-DQT_NO_CAST_FROM_ASCII)
add_definitions(-DQT_NO_CAST_TO_ASCII)
add_definitions(-DQT_MESSAGELOGCONTEXT)
set(CMAKE_AUTOMOC_RELAXED_MODE ON)
include_directories(
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/
......@@ -22,7 +20,11 @@ add_subdirectory(autostart)
add_subdirectory(kconf_update)
set(libkalarm_common_SRCS)
ecm_qt_declare_logging_category(libkalarm_common_SRCS HEADER kalarm_debug.h IDENTIFIER KALARM_LOG CATEGORY_NAME log_kalarm)
ecm_qt_declare_logging_category(libkalarm_common_SRCS
HEADER kalarm_debug.h
IDENTIFIER KALARM_LOG
CATEGORY_NAME log_kalarm
DEFAULT_SEVERITY Warning)
########### next target ###############
set(libkalarm_SRCS
......@@ -139,24 +141,24 @@ add_dependencies(kalarm_bin kmail_xml)
set_target_properties(kalarm_bin PROPERTIES OUTPUT_NAME kalarm)
target_link_libraries(kalarm_bin
KF5::AlarmCalendar
KF5::CalendarCore
KF5::CalendarUtils
KF5::Contacts
KF5::Mime
KF5::IdentityManagement
KF5::MailTransport
KF5::AkonadiCore
KF5::AkonadiMime
KF5::AkonadiContact
KF5::Holidays
KF5::Codecs
KF5::ConfigCore
KF5::Libkdepim
Phonon::phonon4qt5
KF5::Auth
KF5::DBusAddons
KF5::PimCommon
KF5::AlarmCalendar
KF5::CalendarCore
KF5::CalendarUtils
KF5::Contacts
KF5::Mime
KF5::IdentityManagement
KF5::MailTransport
KF5::AkonadiCore
KF5::AkonadiMime
KF5::AkonadiContact
KF5::Holidays
KF5::Codecs
KF5::ConfigCore
KF5::Libkdepim
Phonon::phonon4qt5
KF5::Auth
KF5::DBusAddons
KF5::PimCommon
)
if (Qt5X11Extras_FOUND)
......
KAlarm Change Log
=== Version 2.11.4 --- 22 January 2016 ===
=== Version 2.11.4 --- 27 January 2016 ===
- Fix reminder time edit being covered by 'in advance' combo [KDE Bug 357018]
- Fix crash after editing an alarm, if spell check is enabled [KDE Bug 356048]
- Fix occasional crash on startup [KDE Bug 358217]
- Fix specification on command line of a reminder after the alarm.
=== Version 2.11.3 (KDE Applications 15.08.3) --- 4 November 2015 ===
- Re-enable use of sendmail for email alarms.
......
/*
* commandoptions.cpp - extract command line options
* Program: kalarm
* Copyright © 2001-2015 by David Jarvie <djarvie@kde.org>
* Copyright © 2001-2016 by David Jarvie <djarvie@kde.org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
......@@ -387,7 +387,7 @@ CommandOptions::CommandOptions()
QByteArray optval = mArgs->getOption(onceOnly ? "reminder-once" : "reminder").toLocal8Bit();
bool after = (optval[0] == '+');
if (after)
optval = optval.right(1);
optval.remove(0, 1); // it's a reminder after the main alarm
if (!convInterval(optval, recurType, mReminderMinutes))
setErrorParameter(opt);
else if (recurType == KARecurrence::MINUTELY && mAlarmTime.isDateOnly())
......
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