diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7766958e8..d5a96c910 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -126,7 +126,7 @@ endif()
 # Optional: GnomeKeyring
 find_package(PkgConfig)
 if (PKG_CONFIG_FOUND)
-    option(BUILD_KEYRING "Gnome keyring password plugin" ON)
+    option(BUILD_KEYRING "Gnome keyring password plugin" OFF)
     if (BUILD_KEYRING)
         pkg_check_modules(GNOME_KEYRING IMPORTED_TARGET gnome-keyring-1 )
     endif()
diff --git a/src/lib/autofill/autofill.cpp b/src/lib/autofill/autofill.cpp
index d191a59ca..3f5bcc199 100644
--- a/src/lib/autofill/autofill.cpp
+++ b/src/lib/autofill/autofill.cpp
@@ -251,8 +251,6 @@ QByteArray AutoFill::exportPasswords()
     QXmlStreamWriter stream(&output);
 #if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
         stream.setCodec("UTF-8");
-#else
-        stream.setEncoding(QStringConverter::Utf8);
 #endif
     stream.setAutoFormatting(true);
 
diff --git a/src/lib/navigation/zoomlabel.cpp b/src/lib/navigation/zoomlabel.cpp
index cadc96177..0b5a893d7 100644
--- a/src/lib/navigation/zoomlabel.cpp
+++ b/src/lib/navigation/zoomlabel.cpp
@@ -22,6 +22,7 @@
 #include "qzsettings.h"
 
 #include <QApplication>
+#include <QPainter>
 
 ZoomLabel::ZoomLabel(LocationBar* parent)
     : ClickableLabel(parent)
diff --git a/src/plugins/KDEFrameworksIntegration/kioschemehandler.cpp b/src/plugins/KDEFrameworksIntegration/kioschemehandler.cpp
index 1a32196ac..0d680e03e 100644
--- a/src/plugins/KDEFrameworksIntegration/kioschemehandler.cpp
+++ b/src/plugins/KDEFrameworksIntegration/kioschemehandler.cpp
@@ -22,9 +22,15 @@
 #include <QNetworkReply>
 #include <QWebEngineUrlRequestJob>
 
-#include <KIO/AccessManager>
+#include <kio_version.h>
 
-Q_GLOBAL_STATIC_WITH_ARGS(KIO::Integration::AccessManager, s_knam, (nullptr))
+#if KIO_VERSION < QT_VERSION_CHECK(5, 240, 0)
+    #include <KIO/AccessManager>
+    Q_GLOBAL_STATIC_WITH_ARGS(KIO::Integration::AccessManager, s_knam, (nullptr))
+#else
+    #include <QNetworkAccessManager>
+    Q_GLOBAL_STATIC_WITH_ARGS(QNetworkAccessManager, s_knam, (nullptr))
+#endif
 
 KIOSchemeHandler::KIOSchemeHandler(const QString &protocol, QObject *parent)
     : QWebEngineUrlSchemeHandler(parent)