summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMontel Laurent <[email protected]>2016-07-07 13:18:42 +0200
committerMontel Laurent <[email protected]>2016-07-07 13:18:42 +0200
commit8a60d38404a43fa1a498b79b84f4e0e2c012f62b (patch)
tree5075ed63a42b973ca666686c18d9976ea28b3ae5
parentca18e95c0a006cc3be71bdc1fd620e504b405d73 (diff)
Don't use editVacaction signal which is not exist. Don't create multi connection
-rw-r--r--CMakeLists.txt2
-rw-r--r--kmail/CMakeLists.txt2
-rw-r--r--kmail/src/kmmainwidget.cpp3
-rw-r--r--sieveeditor/CMakeLists.txt2
4 files changed, 4 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e79830e..a62232f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -146,7 +146,7 @@ else()
set(CALENDARSUPPORT_LIB_VERSION_LIB "5.2.80")
set(EVENTVIEW_LIB_VERSION_LIB "5.2.80")
set(KDGANTT2_LIB_VERSION_LIB "5.2.80")
- set(LIBKSIEVE_LIB_VERSION_LIB "5.2.80")
+ set(LIBKSIEVE_LIB_VERSION_LIB "5.2.81")
find_package(KF5WebEngineViewer ${MESSAGELIB_LIB_VERSION_LIB} CONFIG REQUIRED)
set(WEBENGINE_TYPE "QtWebEngine")
diff --git a/kmail/CMakeLists.txt b/kmail/CMakeLists.txt
index e2c3589..335690f 100644
--- a/kmail/CMakeLists.txt
+++ b/kmail/CMakeLists.txt
@@ -68,7 +68,7 @@ if(${CMAKE_SOURCE_DIR} STREQUAL ${kmail_SOURCE_DIR})
set(LIBKLEO_LIB_VERSION_LIB "5.2.80")
set(PIMCOMMON_LIB_VERSION_LIB "5.2.80")
set(LIBKDEPIM_LIB_VERSION_LIB "5.2.80")
- set(LIBKSIEVE_LIB_VERSION_LIB "5.2.80")
+ set(LIBKSIEVE_LIB_VERSION_LIB "5.2.81")
find_package(KF5WebEngineViewer ${MESSAGELIB_LIB_VERSION_LIB} CONFIG REQUIRED)
set(WEBENGINE_TYPE "QtWebEngine")
diff --git a/kmail/src/kmmainwidget.cpp b/kmail/src/kmmainwidget.cpp
index 06f791d..059b99c 100644
--- a/kmail/src/kmmainwidget.cpp
+++ b/kmail/src/kmmainwidget.cpp
@@ -250,6 +250,7 @@ KMMainWidget::KMMainWidget(QWidget *parent, KXMLGUIClient *aGUIClient,
Akonadi::ControlGui::widgetNeedsAkonadi(this);
mFavoritesModel = Q_NULLPTR;
mVacationManager = new KSieveUi::VacationManager(this);
+ connect(mVacationManager, SIGNAL(updateVacationScriptStatus(bool,QString)), SLOT(updateVacationScriptStatus(bool,QString)));
mToolbarActionSeparator = new QAction(this);
mToolbarActionSeparator->setSeparator(true);
@@ -2232,8 +2233,6 @@ void KMMainWidget::slotCheckVacation()
}
mVacationManager->checkVacation();
- connect(mVacationManager, SIGNAL(updateVacationScriptStatus(bool,QString)), SLOT(updateVacationScriptStatus(bool,QString)));
- connect(mVacationManager, &KSieveUi::VacationManager::editVacation, this, &KMMainWidget::slotEditCurrentVacation);
}
void KMMainWidget::slotEditCurrentVacation()
diff --git a/sieveeditor/CMakeLists.txt b/sieveeditor/CMakeLists.txt
index 59e9d47..9ba0442 100644
--- a/sieveeditor/CMakeLists.txt
+++ b/sieveeditor/CMakeLists.txt
@@ -43,7 +43,7 @@ if(${CMAKE_SOURCE_DIR} STREQUAL ${sieveeditor_SOURCE_DIR})
set(MESSAGELIB_LIB_VERSION_LIB "5.2.90")
set(PIMCOMMON_LIB_VERSION_LIB "5.2.80")
- set(LIBKSIEVE_LIB_VERSION_LIB "5.2.80")
+ set(LIBKSIEVE_LIB_VERSION_LIB "5.2.81")
set(QT_REQUIRED_VERSION "5.6.0")
find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets Network Test)