diff --git a/CMakeLists.txt b/CMakeLists.txt
index 741f4818..b68c91de 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,90 +1,90 @@
 project(lattedock)
 cmake_minimum_required(VERSION 3.0 FATAL_ERROR)
 
 set(CMAKE_CXX_STANDARD 14)
 set(VERSION 0.9.85)
 set(AUTHOR "Michail Vourlakos, Smith Ar")
 set(EMAIL "mvourlakos@gmail.com, audoban@openmailbox.org")
 set(WEBSITE "https://userbase.kde.org/LatteDock")
 set(BUG_ADDRESS "https://bugs.kde.org/enter_bug.cgi?product=lattedock")
 set(FAQS "https://userbase.kde.org/LatteDock/FAQ")
 
 set(QT_MIN_VERSION "5.9.0")
 set(KF5_MIN_VERSION "5.38.0")
 
 set(KF5_LOCALE_PREFIX "")
 
 find_package(ECM ${KF5_MIN_VER} REQUIRED NO_MODULE)
 set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
 
 find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED NO_MODULE COMPONENTS DBus Gui Qml Quick)
 
 find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS
     Activities Archive CoreAddons GuiAddons Crash DBusAddons Declarative GlobalAccel I18n 
     IconThemes NewStuff Notifications Plasma PlasmaQuick Wayland WindowSystem XmlGui)
 
 find_package(X11 REQUIRED)
 set_package_properties(X11 PROPERTIES DESCRIPTION "X11 libraries"
     URL "http://www.x.org"
     TYPE OPTIONAL
     PURPOSE "Required for building the X11 based workspace")
 
 if(X11_FOUND)
     find_package(XCB MODULE REQUIRED COMPONENTS XCB RANDR EVENT)
     set_package_properties(XCB PROPERTIES TYPE REQUIRED)
     find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS X11Extras)
 
     if(NOT X11_SM_FOUND)
         message(FATAL_ERROR "\nThe X11 Session Management (SM) development package could not be found.
                 \nPlease install libSM.\n")
     endif(NOT X11_SM_FOUND)
 
 endif()
 
 if(X11_FOUND AND XCB_XCB_FOUND)
     set(HAVE_X11 ON)
 endif()
 
 string(REGEX MATCH "\\.([^]]+)\\." KF5_VERSION_MINOR ${KF5_VERSION})
 string(REGEX REPLACE "\\." "" KF5_VERSION_MINOR ${KF5_VERSION_MINOR})
 
 message(STATUS "KF5 VERSION : ${KF5_VERSION}")
 message(STATUS "KF5 VERSION MINOR : ${KF5_VERSION_MINOR}")
 
 if(${KF5_VERSION_MINOR} LESS "62")
 find_package(KF5 REQUIRED COMPONENTS SysGuard)
 endif()
 
 include(ECMQMLModules)
 ecm_find_qmlmodule(QtQuick 2.7)
 ecm_find_qmlmodule(QtQuick.Layouts 1.3)
 ecm_find_qmlmodule(QtQuick.Controls 1.4)
 ecm_find_qmlmodule(QtQuick.Controls.Styles.Plasma 2.0)
 ecm_find_qmlmodule(QtGraphicalEffects 1.0)
 ecm_find_qmlmodule(org.kde.kquickcontrolsaddons 2.0)
 ecm_find_qmlmodule(org.kde.plasma.core 2.0)
 ecm_find_qmlmodule(org.kde.plasma.components 2.0)
 
 include(CheckIncludeFiles)
 include(CMakePackageConfigHelpers)
 include(ECMOptionalAddSubdirectory)
 include(ECMQtDeclareLoggingCategory)
 include(KDECMakeSettings)
-#include(KDECompilerSettings NO_POLICY_SCOPE)
+include(KDECompilerSettings NO_POLICY_SCOPE)
 include(KDEInstallDirs)
 include(KDEPackageAppTemplates)
 include(WriteBasicConfigVersionFile)
 
 include(Definitions.cmake)
 
 add_subdirectory(declarativeimports)
 add_subdirectory(liblatte2)
 add_subdirectory(indicators)
 add_subdirectory(app)
 add_subdirectory(containmentactions)
 add_subdirectory(containment)
 add_subdirectory(icons)
 add_subdirectory(plasmoid)
 add_subdirectory(shell)
 
 ki18n_install(po)
diff --git a/app/FakeTarget.cmake b/app/FakeTarget.cmake
index 96acf5a9..ebb82ee3 100644
--- a/app/FakeTarget.cmake
+++ b/app/FakeTarget.cmake
@@ -1,36 +1,34 @@
 execute_process(COMMAND find ../shell ../containment ../plasmoid -name "*.qml" -o -name "*.js"
     WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
     OUTPUT_VARIABLE QML_SRCS_STRING)
 
 string(REPLACE "\n" ";" QML_SRCS ${QML_SRCS_STRING})
 
 # fake target for QtCreator project
 add_custom_target(fake-target
     WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
     SOURCES ${QML_SRCS})
 
 # qmllint: qml static syntax checker
-if(${CMAKE_BUILD_TYPE} MATCHES "Debug")
-    if(NOT DEFINED ECM_ENABLE_SANITIZERS)
-        find_program(QMLLINT qmllint)
-        if(EXISTS "${QMLLINT}")
-            message("-- Found qmllint: ${QMLLINT}")
-            add_custom_command(TARGET latte-dock PRE_BUILD
-                COMMAND ${QMLLINT} ${QML_SRCS}
-                WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-                COMMENT "Running qmllint")
-        else()
-            message("-- qmllint: QML Syntax verifier not found")
-        endif()
+if(${CMAKE_BUILD_TYPE} MATCHES "Debug" AND NOT DEFINED ECM_ENABLE_SANITIZERS)
+    find_program(QMLLINT qmllint)
+
+    if(EXISTS "${QMLLINT}")
+        message("-- Found qmllint: ${QMLLINT}")
+        add_custom_command(TARGET latte-dock PRE_BUILD
+            COMMAND ${QMLLINT} ${QML_SRCS}
+            WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+            COMMENT "Running qmllint")
     else()
-        message("-- Disable qmllint because ECM_ENABLE_SANITIZERS is defined")
+        message("-- qmllint: QML Syntax verifier not found")
     endif()
+
     message("-- Enabling QML debugging and profiling")
     add_definitions(-DQT_QML_DEBUG)
     add_definitions(-DQT_FATAL_WARNINGS)
 
 elseif(${CMAKE_BUILD_TYPE} MATCHES "Release")
     message("-- Disabling debug info")
     add_definitions(-DQT_NO_DEBUG)
 
 endif()