diff --git a/CMakeLists.txt b/CMakeLists.txt
index 22295ba11..839f22d8c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -69,11 +69,6 @@ add_compile_options(${COMPILE_OPTIONS})
 if(${CMAKE_BUILD_TYPE} MATCHES "Release")
   add_definitions(-DNDEBUG)
   add_definitions(-DQT_NO_DEBUG_OUTPUT)
-  #add_definitions(-DQT_NO_WARNING_OUTPUT)
-endif()
-
-if(${CMAKE_BUILD_TYPE} MATCHES "Debug")
-  set(DEBUG ON)
 endif()
 
 if(APPLE)
diff --git a/src/config.h.in b/src/config.h.in
index 105df7bff..3b038d394 100644
--- a/src/config.h.in
+++ b/src/config.h.in
@@ -24,7 +24,6 @@
 #define CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}"
 #define CMAKE_EXECUTABLE_SUFFIX "${CMAKE_EXECUTABLE_SUFFIX}"
 
-#cmakedefine DEBUG
 #cmakedefine HAVE_BACKTRACE
 #cmakedefine HAVE_GIO
 #cmakedefine HAVE_DBUS
diff --git a/src/main.cpp b/src/main.cpp
index f2100594b..97e8cea2f 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -233,7 +233,7 @@ int main(int argc, char* argv[]) {
   Q_INIT_RESOURCE(translations);
 #endif
 
-#ifdef DEBUG
+#ifndef QT_NO_DEBUG_OUTPUT
   QLoggingCategory::defaultCategory()->setEnabled(QtDebugMsg, true);
 #endif