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

Merge remote-tracking branch 'origin/KDE/4.14'

Conflicts:
	agents/mailfilteragent/akonadi_mailfilter_agent.notifyrc
	calendarviews/prefs.cpp
	calendarviews/prefs.h
	kalarm/wakedlg.cpp
	messagecore/autotests/attachmentparttest.cpp
	messagecore/autotests/attachmentparttest.h
parents 160f0673 394012ee
......@@ -58,7 +58,6 @@ WakeFromSuspendDlg::WakeFromSuspendDlg(QWidget* parent)
setButtons(Close);
mUi = new Ui_WakeFromSuspendDlgWidget;
mUi->setupUi(mainWidget());
KConfigGroup config(KSharedConfig::openConfig(), "General");
mUi->advanceWakeTime->setValue(Preferences::wakeFromSuspendAdvance());
mMainWindow = qobject_cast<MainWindow*>(parent);
......@@ -86,6 +85,7 @@ WakeFromSuspendDlg::~WakeFromSuspendDlg()
{
if (mInstance == this)
mInstance = 0;
delete mUi;
}
/******************************************************************************
......
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