diff --git a/CMakeLists.txt b/CMakeLists.txt
index fe436d35..db97debc 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -245,6 +245,9 @@ macro(check_add_gcc_compiler_flag FLAG)
 endmacro(check_add_gcc_compiler_flag)
 
 add_definitions(-DQT_NO_EXCEPTIONS -DQT_STRICT_ITERATORS -DQT_NO_CAST_TO_ASCII)
+if(NOT IS_DEBUG_BUILD)
+    add_definitions(-DQT_NO_DEBUG_OUTPUT)
+endif()
 
 if(WITH_APP_BUNDLE)
     add_definitions(-DWITH_APP_BUNDLE)
diff --git a/src/autotype/AutoType.cpp b/src/autotype/AutoType.cpp
index 102cd95a..cdb68175 100644
--- a/src/autotype/AutoType.cpp
+++ b/src/autotype/AutoType.cpp
@@ -404,7 +404,6 @@ void AutoType::startGlobalAutoType(const QString& search)
                 tr("KeePassXC requires the Accessibility and Screen Recorder permission in order to perform global "
                    "Auto-Type. Screen Recording is necessary to use the window title to find entries. If you "
                    "already granted permission, you may have to restart KeePassXC."));
-            qDebug() << "Oh noes macOS.";
             return;
         }
     }
diff --git a/src/cli/Utils.cpp b/src/cli/Utils.cpp
index f90f38b0..265c6c26 100644
--- a/src/cli/Utils.cpp
+++ b/src/cli/Utils.cpp
@@ -313,7 +313,7 @@ namespace Utils
             // Other platforms understand UTF-8
             if (clipProcess->write(text.toUtf8()) == -1) {
 #endif
-                qDebug("Unable to write to process : %s", qPrintable(clipProcess->errorString()));
+                qWarning("Unable to write to process : %s", qPrintable(clipProcess->errorString()));
             }
             clipProcess->waitForBytesWritten();
             clipProcess->closeWriteChannel();
diff --git a/src/core/Merger.cpp b/src/core/Merger.cpp
index 65c1e8fb..fd30da7a 100644
--- a/src/core/Merger.cpp
+++ b/src/core/Merger.cpp
@@ -66,8 +66,6 @@ QStringList Merger::merge()
     changes << mergeDeletions(m_context);
     changes << mergeMetadata(m_context);
 
-    // qDebug("Merged %s", qPrintable(changes.join("\n\t")));
-
     // At this point we have a list of changes we may want to show the user
     if (!changes.isEmpty()) {
         m_context.m_targetDb->markAsModified();
diff --git a/src/keys/drivers/YubiKeyInterfacePCSC.cpp b/src/keys/drivers/YubiKeyInterfacePCSC.cpp
index 045db294..cb3c4f3b 100644
--- a/src/keys/drivers/YubiKeyInterfacePCSC.cpp
+++ b/src/keys/drivers/YubiKeyInterfacePCSC.cpp
@@ -197,7 +197,7 @@ namespace
                             rv = SCardBeginTransaction(handle);
                         }
 #endif
-                        qDebug("Smardcard was reset and had to be reconnected");
+                        qDebug("Smartcard was reset and had to be reconnected");
                     } else {
                         // This does not mean that the payload returned SCARD_S_SUCCESS
                         //  just that the card was not reset during communication.
@@ -208,7 +208,7 @@ namespace
                 }
                 if (i == 0) {
                     rv = SCARD_W_RESET_CARD;
-                    qDebug("Smardcard was reset and failed to reconnect after 3 tries");
+                    qDebug("Smartcard was reset and failed to reconnect after 3 tries");
                 }
             }
         }