diff --git a/CMakeLists.txt b/CMakeLists.txt
index 756ba01..7d39e3f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,158 +1,155 @@
 cmake_minimum_required(VERSION 3.5)
 
 # KDE Application Version, managed by release script
 set(RELEASE_SERVICE_VERSION_MAJOR "20")
 set(RELEASE_SERVICE_VERSION_MINOR "04")
 set(RELEASE_SERVICE_VERSION_MICRO "1")
 set(RELEASE_SERVICE_VERSION "${RELEASE_SERVICE_VERSION_MAJOR}.${RELEASE_SERVICE_VERSION_MINOR}.${RELEASE_SERVICE_VERSION_MICRO}")
 
 project(cervisia VERSION ${RELEASE_SERVICE_VERSION})
 
 set(QT_MIN_VERSION "5.2.0")
 
 find_package(ECM 1.3.0 REQUIRED NO_MODULE)
 set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH})
 
 add_definitions(-DTRANSLATION_DOMAIN="cervisia")
 
 include(KDEInstallDirs)
 include(KDECMakeSettings)
 include(KDECompilerSettings NO_POLICY_SCOPE)
 include(ECMInstallIcons)
 include(ECMAddAppIcon)
 include(ECMMarkNonGuiExecutable)
 include(FeatureSummary)
 include(ECMSetupVersion)
 
 ecm_setup_version(${RELEASE_SERVICE_VERSION} VARIABLE_PREFIX CERVISIA VERSION_HEADER cervisia_version.h)
 
 find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Core Widgets DBus)
 
 find_package(KF5 REQUIRED COMPONENTS Parts DocTools Init IconThemes Notifications WidgetsAddons ItemViews Su)
-if (EXISTS "${CMAKE_SOURCE_DIR}/.git")
-   add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x060000)
-endif()
 
 add_subdirectory( doc )
 add_subdirectory( cvsservice )
 add_subdirectory( pics )
 
 set(_KDECONFDIR_ ${CONFIG_INSTALL_DIR})
 set(_KDEHTMLDIR_ ${HTML_INSTALL_DIR})
 
 ########### next target ###############
 
 set(libcervisia_SRCS
    annotatedialog.cpp
    diffdialog.cpp
    patchoptiondialog.cpp
    logdialog.cpp
    progressdialog.cpp
    resolvedialog.cpp
    resolvedialog_p.cpp
    annotateview.cpp
    diffview.cpp
    loglist.cpp
    logplainview.cpp
    logtree.cpp
    annotatecontroller.cpp
    loginfo.cpp
    misc.cpp
    qttableview.cpp
    tooltip.cpp
    settingsdialog.cpp
    debug.cpp
    )
 
 qt5_add_dbus_interfaces( libcervisia_SRCS cvsservice/org.kde.cervisia5.cvsservice.xml )
 qt5_add_dbus_interfaces( libcervisia_SRCS cvsservice/org.kde.cervisia5.cvsjob.xml )
 qt5_add_dbus_interfaces( libcervisia_SRCS cvsservice/org.kde.cervisia5.cvsloginjob.xml )
 qt5_add_dbus_interfaces( libcervisia_SRCS cvsservice/org.kde.cervisia5.repository.xml )
 
 
 ki18n_wrap_ui(libcervisia_SRCS settingsdialog_advanced.ui )
 
 kconfig_add_kcfg_files(libcervisia_SRCS cervisiasettings.kcfgc )
 
 
 set(cervisia_KDEINIT_SRCS ${libcervisia_SRCS}
    main.cpp
    cervisiashell.cpp )
 
 kf5_add_kdeinit_executable(cervisia ${cervisia_KDEINIT_SRCS})
 
 target_link_libraries(kdeinit_cervisia KF5::Parts KF5::ItemViews)
 
 install(TARGETS kdeinit_cervisia ${INSTALL_TARGETS_DEFAULT_ARGS} )
 
 install(TARGETS cervisia  ${INSTALL_TARGETS_DEFAULT_ARGS} )
 
 ########### next target ###############
 
 set(cervisiapart_PART_SRCS ${libcervisia_SRCS}
    updateview.cpp
    protocolview.cpp
    watchdialog.cpp
    changelogdialog.cpp
    historydialog.cpp
    repositorydialog.cpp
    commitdialog.cpp
    checkoutdialog.cpp
    updatedialog.cpp
    tagdialog.cpp
    mergedialog.cpp
    cvsdir.cpp
    repositories.cpp
    cervisiapart.cpp
    addrepositorydialog.cpp
    addremovedialog.cpp
    watchersdialog.cpp
    watchersmodel.cpp
    updateview_items.cpp
    updateview_visitors.cpp
    entry.cpp
    entry_status.cpp
    stringmatcher.cpp
    cvsinitdialog.cpp
    ignorelistbase.cpp
    dirignorelist.cpp
    globalignorelist.cpp
    addignoremenu.cpp
    editwithmenu.cpp
    logmessageedit.cpp
    debug.cpp
 )
 
 
 qt5_add_dbus_adaptor(cervisiapart_PART_SRCS org.kde.cervisia5.protocolview.xml protocolview.h ProtocolView)
 
 add_library(cervisiapart5 MODULE ${cervisiapart_PART_SRCS})
 
 target_link_libraries(cervisiapart5 KF5::Parts KF5::Notifications KF5::ItemViews)
 
 install(TARGETS cervisiapart5  DESTINATION ${PLUGIN_INSTALL_DIR} )
 
 
 ########### next target ###############
 
 
 ########### install files ###############
 
 install(PROGRAMS org.kde.cervisia.desktop  DESTINATION  ${XDG_APPS_INSTALL_DIR} )
 install(FILES org.kde.cervisia.appdata.xml DESTINATION  ${KDE_INSTALL_METAINFODIR} )
 install(FILES org.kde.cervisiapart5.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
 install(FILES cervisiapart.kcfg  DESTINATION  ${KCFG_INSTALL_DIR} )
 install(FILES cervisiaui.rc  DESTINATION  ${KXMLGUI_INSTALL_DIR}/cervisiapart )
 install(FILES cervisiashellui.rc DESTINATION  ${KXMLGUI_INSTALL_DIR}/cervisia )
 install(FILES cervisia.notifyrc  DESTINATION  ${KDE_INSTALL_KNOTIFY5RCDIR} )
 
 ecm_install_icons(ICONS
     16-apps-cervisia.png
     22-apps-cervisia.png
     32-apps-cervisia.png
     48-apps-cervisia.png
     DESTINATION ${ICON_INSTALL_DIR}
     THEME hicolor
 )
 
 feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)