diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index 07d4104b71..202e9dddb0 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -37,11 +37,11 @@ jobs:
       run: |
         sudo apt update
         sudo apt install build-essential cmake g++
-        sudo apt install qtbase5-dev qtbase5-private-dev qttools5-dev qttools5-dev-tools libqt5svg5-dev libargon2-dev libkeyutils-dev libminizip-dev libbotan-2-dev libqrencode-dev zlib1g-dev asciidoctor libreadline-dev libpcsclite-dev libusb-1.0-0-dev libxi-dev libxtst-dev  libqt5x11extras5-dev
+        sudo apt install qt6-base-dev qt6-base-private-dev qt6-tools-dev qt6-base-dev-tools qt6-svg-dev qt6-5compat-dev libargon2-dev libkeyutils-dev libminizip-dev libbotan-2-dev libqrencode-dev zlib1g-dev asciidoctor libreadline-dev libpcsclite-dev libusb-1.0-0-dev libxi-dev libxtst-dev
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v3
+      uses: github/codeql-action/init@v4
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -62,9 +62,9 @@ jobs:
     # If this step fails, then you should remove it and run the build manually (see below)
     - if: matrix.language != 'cpp'
       name: Autobuild
-      uses: github/codeql-action/autobuild@v3
+      uses: github/codeql-action/autobuild@v4
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v3
+      uses: github/codeql-action/analyze@v4
       with:
         category: "/language:${{matrix.language}}"
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 95d6e0b967..7cdf83738f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,4 @@
-#  Copyright (C) 2018 KeePassXC Team <team@keepassxc.org>
+#  Copyright (C) 2026 KeePassXC Team <team@keepassxc.org>
 #  Copyright (C) 2010 Felix Geyer <debfx@fobos.de>
 #
 #  This program is free software: you can redistribute it and/or modify
@@ -14,126 +14,80 @@
 #  You should have received a copy of the GNU General Public License
 #  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-cmake_minimum_required(VERSION 3.10.0)
+cmake_minimum_required(VERSION 3.16.0)
 
 project(KeePassXC)
 set(APP_ID "org.keepassxc.${PROJECT_NAME}")
 
-if(NOT CMAKE_BUILD_TYPE)
-    set(CMAKE_BUILD_TYPE "RelWithDebInfo" CACHE STRING
-            "Choose the type of build, options are: Debug Release RelWithDebInfo Profile"
-            FORCE)
-endif()
+# Version Number
+set(KEEPASSXC_VERSION_MAJOR "2")
+set(KEEPASSXC_VERSION_MINOR "8")
+set(KEEPASSXC_VERSION_PATCH "0")
+set(KEEPASSXC_VERSION "${KEEPASSXC_VERSION_MAJOR}.${KEEPASSXC_VERSION_MINOR}.${KEEPASSXC_VERSION_PATCH}")
+
 string(TOLOWER "${CMAKE_BUILD_TYPE}" CMAKE_BUILD_TYPE_LOWER)
-if(CMAKE_BUILD_TYPE_LOWER STREQUAL "debug" OR CMAKE_BUILD_TYPE_LOWER STREQUAL "relwithdebinfo")
-    set(IS_DEBUG_BUILD TRUE)
-endif()
 
+# CMake Modules
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
 
-# Support Visual Studio Code
-include(CMakeToolsHelpers OPTIONAL)
+include(CMakeToolsHelpers OPTIONAL) # Support Visual Studio Code
 include(FeatureSummary)
 include(KPXCMacDeployHelpers)
+include(CLangFormat)
 
+include(CompilerFlags)
 include(CheckCCompilerFlag)
 include(CheckCXXCompilerFlag)
 include(CheckCXXSourceCompiles)
 
+# Build Scope
 option(WITH_TESTS "Enable building of unit tests" ON)
 option(WITH_GUI_TESTS "Enable building of GUI tests" OFF)
-option(WITH_DEV_BUILD "Use only for development. Disables/warns about deprecated methods." OFF)
+option(WITH_WARN_DEPRECATED "Development only: warn about deprecated methods, including Qt." OFF)
 option(WITH_ASAN "Enable address sanitizer checks (Linux / macOS only)" OFF)
 option(WITH_COVERAGE "Use to build with coverage tests (GCC only)." OFF)
 option(WITH_APP_BUNDLE "Enable Application Bundle for macOS" ON)
 option(WITH_CCACHE "Use ccache for build" OFF)
+option(WITH_X11 "Enable building with X11 dependencies" ON)
 
-set(WITH_XC_ALL OFF CACHE BOOL "Build in all available plugins")
+# Advanced Features Control
+option(KPXC_MINIMAL "Build KeePassXC with the minimal feature set required for basic usage" OFF)
+option(KPXC_FEATURE_BROWSER "Browser integration and passkeys support" ON)
+option(KPXC_FEATURE_SSHAGENT "SSH Agent integration" ON)
+option(KPXC_FEATURE_FDOSECRETS "freedesktop.org Secret Service integration; replace system keyring" ON)
 
-option(WITH_XC_AUTOTYPE "Include Auto-Type." ON)
-option(WITH_XC_NETWORKING "Include networking code (e.g. for downloading website icons)." OFF)
-option(WITH_XC_BROWSER "Include browser integration with keepassxc-browser." OFF)
-option(WITH_XC_BROWSER_PASSKEYS "Passkeys support for browser integration." OFF)
-option(WITH_XC_YUBIKEY "Include YubiKey support." OFF)
-option(WITH_XC_SSHAGENT "Include SSH agent support." OFF)
-option(WITH_XC_KEESHARE "Sharing integration with KeeShare" OFF)
-option(WITH_XC_UPDATECHECK "Include automatic update checks; disable for controlled distributions" ON)
-if(UNIX AND NOT APPLE)
-    option(WITH_XC_FDOSECRETS "Implement freedesktop.org Secret Storage Spec server side API." OFF)
-    set(WITH_XC_X11 ON CACHE BOOL "Enable building with X11 deps")
-endif()
-option(WITH_XC_DOCS "Enable building of documentation" ON)
-if(WIN32 OR APPLE)
-    set(WITH_XC_CODESIGN_IDENTITY "" CACHE STRING "Certificate to be used for signing binaries before packaging.")
-    if(WIN32)
-        set(WITH_XC_CODESIGN_TIMESTAMP_URL "http://timestamp.sectigo.com" CACHE STRING "Timestamp URL for Windows code signing.")
-    elseif(APPLE)
-        set(WITH_XC_NOTARY_KEYCHAIN_PROFILE "" CACHE STRING "Keychain profile name for stored Apple notarization credentials.")
-    endif()
+if(KPXC_MINIMAL)
+    # Disable advanced features in minimal mode
+    set(KPXC_FEATURE_BROWSER OFF)
+    set(KPXC_FEATURE_SSHAGENT OFF)
+    set(KPXC_FEATURE_FDOSECRETS OFF)
 endif()
 
-if(APPLE)
-    # Perform the platform checks before applying the stricter compiler flags.
-    # Otherwise the kSecAccessControlTouchIDCurrentSet deprecation warning will result in an error.
-    try_compile(XC_APPLE_COMPILER_SUPPORT_BIOMETRY
-       ${CMAKE_CURRENT_BINARY_DIR}/tiometry_test/
-       ${CMAKE_CURRENT_SOURCE_DIR}/cmake/compiler-checks/macos/control_biometry_support.mm)
-    message(STATUS "Biometry compiler support: ${XC_APPLE_COMPILER_SUPPORT_BIOMETRY}")
+# Minor Feature Flags
+option(KPXC_FEATURE_NETWORK "Include code that reaches out to external networks (e.g. downloading icons)" ON)
+option(KPXC_FEATURE_UPDATES "Include automatic update checks; disable for managed distributions" ON)
+option(KPXC_FEATURE_DOCS "Build offline documentation; requires asciidoctor tool" ON)
 
-    try_compile(XC_APPLE_COMPILER_SUPPORT_TOUCH_ID
-       ${CMAKE_CURRENT_BINARY_DIR}/touch_id_test/
-       ${CMAKE_CURRENT_SOURCE_DIR}/cmake/compiler-checks/macos/control_touch_id_support.mm)
-    message(STATUS "Touch ID compiler support: ${XC_APPLE_COMPILER_SUPPORT_TOUCH_ID}")
-
-    try_compile(XC_APPLE_COMPILER_SUPPORT_WATCH
-       ${CMAKE_CURRENT_BINARY_DIR}/tiometry_test/
-       ${CMAKE_CURRENT_SOURCE_DIR}/cmake/compiler-checks/macos/control_watch_support.mm)
-    message(STATUS "Apple watch compiler support: ${XC_APPLE_COMPILER_SUPPORT_WATCH}")
+# Reconcile update feature with overall network feature
+if(NOT KPXC_FEATURE_NETWORK AND KPXC_FEATURE_UPDATES)
+    message(STATUS "Disabling KPXC_FEATURE_UPDATES because KPXC_FEATURE_NETWORK is disabled")
+    set(KPXC_FEATURE_UPDATES OFF)
 endif()
 
-if(WITH_CCACHE)
-    # Use the Compiler Cache (ccache) program
-    # (install with: sudo apt get ccache)
-    find_program(CCACHE_FOUND ccache)
-    if(NOT CCACHE_FOUND)
-        message(FATAL_ERROR "ccache requested but cannot be found.")
-    endif()
-    set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ${CCACHE_FOUND})
-endif()
-
-if(WITH_XC_ALL)
-    # Enable all options (except update check and docs)
-    set(WITH_XC_AUTOTYPE ON)
-    set(WITH_XC_NETWORKING ON)
-    set(WITH_XC_BROWSER ON)
-    set(WITH_XC_BROWSER_PASSKEYS ON)
-    set(WITH_XC_YUBIKEY ON)
-    set(WITH_XC_SSHAGENT ON)
-    set(WITH_XC_KEESHARE ON)
-    if(UNIX AND NOT APPLE)
-        set(WITH_XC_FDOSECRETS ON)
-    endif()
-endif()
-
-# Prefer WITH_XC_NETWORKING setting over WITH_XC_UPDATECHECK
-if(NOT WITH_XC_NETWORKING AND WITH_XC_UPDATECHECK)
-    message(STATUS "Disabling WITH_XC_UPDATECHECK because WITH_XC_NETWORKING is disabled")
-    set(WITH_XC_UPDATECHECK OFF)
+# FDO Secrets is only available on Linux
+if(NOT UNIX OR APPLE OR HAIKU)
+	set(KPXC_FEATURE_FDOSECRETS OFF)
 endif()
 
-if(UNIX AND NOT APPLE AND NOT WITH_XC_X11)
-    message(STATUS "Disabling WITH_XC_AUTOTYPE because WITH_XC_X11 is disabled")
-    set(WITH_XC_AUTOTYPE OFF)
+# Define feature summaries
+add_feature_info("Browser" KPXC_FEATURE_BROWSER "Browser integration and passkeys support")
+add_feature_info("SSH Agent" KPXC_FEATURE_SSHAGENT "SSH Agent integration")
+if(UNIX AND NOT APPLE)
+    add_feature_info("Secret Service" KPXC_FEATURE_FDOSECRETS "Replace system keyring with freedesktop.org Secret Service integration")
 endif()
-
-set(KEEPASSXC_VERSION_MAJOR "2")
-set(KEEPASSXC_VERSION_MINOR "8")
-set(KEEPASSXC_VERSION_PATCH "0")
-set(KEEPASSXC_VERSION "${KEEPASSXC_VERSION_MAJOR}.${KEEPASSXC_VERSION_MINOR}.${KEEPASSXC_VERSION_PATCH}")
-set(OVERRIDE_VERSION "" CACHE STRING "Override the KeePassXC Version for Snapshot builds")
-
-set(KEEPASSXC_BUILD_TYPE "Snapshot" CACHE STRING "Set KeePassXC build type to distinguish between stable releases and snapshots")
-set_property(CACHE KEEPASSXC_BUILD_TYPE PROPERTY STRINGS Snapshot Release PreRelease)
+add_feature_info("Networking" KPXC_FEATURE_NETWORK "Code that can reach out to external networks is included (e.g. downloading icons)")
+add_feature_info("Update Checks" KPXC_FEATURE_UPDATES "Periodic update checks can be performed")
+add_feature_info("Documentation" KPXC_FEATURE_DOCS "Offline documentation")
 
 # Retrieve git HEAD revision hash
 set(GIT_HEAD_OVERRIDE "" CACHE STRING "Manually set the Git HEAD hash when missing (eg, when no .git folder exists)")
@@ -149,7 +103,12 @@ elseif(EXISTS ${CMAKE_SOURCE_DIR}/.gitrev)
 endif()
 message(STATUS "Found Git HEAD Revision: ${GIT_HEAD}\n")
 
-# Check if on a tag, if so build as a release
+# KeePassXC Versioning and Build Type
+set(OVERRIDE_VERSION "" CACHE STRING "Override the KeePassXC Version for Snapshot builds")
+set(KEEPASSXC_BUILD_TYPE "Snapshot" CACHE STRING "Set KeePassXC build type to distinguish between stable releases and snapshots")
+set_property(CACHE KEEPASSXC_BUILD_TYPE PROPERTY STRINGS Snapshot Release)
+
+# Check if on a tag or has .version file, if so build as a release
 execute_process(COMMAND git tag --points-at HEAD
         WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
         OUTPUT_VARIABLE GIT_TAG
@@ -164,66 +123,102 @@ endif()
 
 string(REGEX REPLACE "(\r?\n)+" "" OVERRIDE_VERSION "${OVERRIDE_VERSION}")
 if(OVERRIDE_VERSION)
-    if(OVERRIDE_VERSION MATCHES "^[\\.0-9]+-beta[0-9]*")
-        set(KEEPASSXC_BUILD_TYPE "PreRelease")
-        set(KEEPASSXC_VERSION ${OVERRIDE_VERSION})
-    elseif(OVERRIDE_VERSION MATCHES "^[\\.0-9]+$")
+    if(OVERRIDE_VERSION MATCHES "^[\\.0-9]+$")
         set(KEEPASSXC_BUILD_TYPE "Release")
         set(KEEPASSXC_VERSION ${OVERRIDE_VERSION})
     else()
         set(KEEPASSXC_BUILD_TYPE "Snapshot")
-        set(KEEPASSXC_VERSION ${OVERRIDE_VERSION})
-    endif()
-else()
-    if(KEEPASSXC_BUILD_TYPE STREQUAL "PreRelease")
-        set(KEEPASSXC_VERSION "${KEEPASSXC_VERSION}-preview")
-    elseif(KEEPASSXC_BUILD_TYPE STREQUAL "Snapshot")
-        set(KEEPASSXC_VERSION "${KEEPASSXC_VERSION}-snapshot")
     endif()
 endif()
 
 if(KEEPASSXC_BUILD_TYPE STREQUAL "Release")
     set(KEEPASSXC_BUILD_TYPE_RELEASE ON)
-elseif(KEEPASSXC_BUILD_TYPE STREQUAL "PreRelease")
-    set(KEEPASSXC_BUILD_TYPE_PRE_RELEASE ON)
 else()
     set(KEEPASSXC_BUILD_TYPE_SNAPSHOT ON)
+    set(KEEPASSXC_VERSION "${KEEPASSXC_VERSION}-snapshot")
 endif()
 
 message(STATUS "Setting up build for KeePassXC v${KEEPASSXC_VERSION}\n")
 
 # Distribution info
-set(KEEPASSXC_DIST ON)
-set(KEEPASSXC_DIST_TYPE "Other" CACHE STRING "KeePassXC Distribution Type")
-set_property(CACHE KEEPASSXC_DIST_TYPE PROPERTY STRINGS Snap AppImage Flatpak Other)
+set(KEEPASSXC_DIST_TYPE "Native" CACHE STRING "KeePassXC Distribution Type")
+set_property(CACHE KEEPASSXC_DIST_TYPE PROPERTY STRINGS Snap AppImage Flatpak Native)
 if(KEEPASSXC_DIST_TYPE STREQUAL "Snap")
     set(KEEPASSXC_DIST_SNAP ON)
 elseif(KEEPASSXC_DIST_TYPE STREQUAL "AppImage")
     set(KEEPASSXC_DIST_APPIMAGE ON)
 elseif(KEEPASSXC_DIST_TYPE STREQUAL "Flatpak")
     set(KEEPASSXC_DIST_FLATPAK ON)
-elseif(KEEPASSXC_DIST_TYPE STREQUAL "Other")
-    unset(KEEPASSXC_DIST)
 endif()
 
-if(${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.14.0")
-    cmake_policy(SET CMP0083 NEW)
-    include(CheckPIESupported)
-    check_pie_supported()
+# Standards
+set(CMAKE_C_STANDARD 99)
+set(CMAKE_CXX_STANDARD 20)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+
+# Compiler Features
+if(APPLE)
+    # Perform the platform checks before applying the stricter compiler flags.
+    # Otherwise the kSecAccessControlTouchIDCurrentSet deprecation warning will result in an error.
+    try_compile(XC_APPLE_COMPILER_SUPPORT_BIOMETRY
+       ${CMAKE_CURRENT_BINARY_DIR}/macos-trycompile/
+       ${CMAKE_CURRENT_SOURCE_DIR}/cmake/compiler-checks/macos/control_biometry_support.mm)
+    message(STATUS "Biometry compiler support: ${XC_APPLE_COMPILER_SUPPORT_BIOMETRY}")
+
+    try_compile(XC_APPLE_COMPILER_SUPPORT_TOUCH_ID
+       ${CMAKE_CURRENT_BINARY_DIR}/macos-trycompile/
+       ${CMAKE_CURRENT_SOURCE_DIR}/cmake/compiler-checks/macos/control_touch_id_support.mm)
+    message(STATUS "Touch ID compiler support: ${XC_APPLE_COMPILER_SUPPORT_TOUCH_ID}")
+
+    try_compile(XC_APPLE_COMPILER_SUPPORT_WATCH
+       ${CMAKE_CURRENT_BINARY_DIR}/macos-trycompile/
+       ${CMAKE_CURRENT_SOURCE_DIR}/cmake/compiler-checks/macos/control_watch_support.mm)
+    message(STATUS "Apple watch compiler support: ${XC_APPLE_COMPILER_SUPPORT_WATCH}")
+
+    try_compile(HAVE_PT_DENY_ATTACH
+	   ${CMAKE_BINARY_DIR}/macos-trycompile/
+	   ${CMAKE_SOURCE_DIR}/cmake/compiler-checks/ptrace_deny_attach.cpp)
 endif()
 
-# Find Botan early since the version affects subsequent compiler options
-find_package(Botan REQUIRED)
-if(BOTAN_VERSION VERSION_GREATER_EQUAL "3.0.0")
-    set(WITH_XC_BOTAN3 TRUE)
-elseif(BOTAN_VERSION VERSION_LESS "2.11.0")
-    # Check for minimum Botan version
-    message(FATAL_ERROR "Botan 2.11.0 or higher is required")   
+if(UNIX)
+    check_cxx_source_compiles("#include <sys/prctl.h>
+    int main() { prctl(PR_SET_DUMPABLE, 0); return 0; }"
+            HAVE_PR_SET_DUMPABLE)
+
+    check_cxx_source_compiles("#include <malloc.h>
+    int main() { return 0; }"
+            HAVE_MALLOC_H)
+
+    check_cxx_source_compiles("#include <malloc.h>
+    int main() { malloc_usable_size(NULL); return 0; }"
+            HAVE_MALLOC_USABLE_SIZE)
+
+    check_cxx_source_compiles("#include <sys/resource.h>
+    int main() {
+      struct rlimit limit;
+      limit.rlim_cur = 0;
+      limit.rlim_max = 0;
+      setrlimit(RLIMIT_CORE, &limit);
+      return 0;
+    }" HAVE_RLIMIT_CORE)
+endif()
+
+# ccache support
+if(WITH_CCACHE)
+    find_program(CCACHE_FOUND ccache)
+    if(NOT CCACHE_FOUND)
+        message(FATAL_ERROR "ccache requested but cannot be found.")
+    endif()
+    set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ${CCACHE_FOUND})
 endif()
-include_directories(SYSTEM ${BOTAN_INCLUDE_DIR})
 
 # Create position independent code for shared libraries and executables
 set(CMAKE_POSITION_INDEPENDENT_CODE ON)
+if(${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.14.0")
+    cmake_policy(SET CMP0083 NEW)
+    include(CheckPIESupported)
+    check_pie_supported()
+endif()
 
 if("${CMAKE_SIZEOF_VOID_P}" EQUAL "4")
     set(IS_32BIT TRUE)
@@ -231,7 +226,6 @@ endif()
 
 if("${CMAKE_CXX_COMPILER}" MATCHES "clang-cl(.exe)?$")
     # clang-cl uses MSVC compiler flags
-    set(MSVC 1)
     set(CMAKE_COMPILER_IS_CLANG_MSVC 1)
 else()
     set(CLANG_COMPILER_ID_REGEX "^(Apple)?[Cc]lang$")
@@ -248,66 +242,7 @@ else()
     endif()
 endif()
 
-macro(add_gcc_compiler_cxxflags FLAGS)
-    if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_COMPILER_IS_CLANGXX)
-        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${FLAGS}")
-    endif()
-endmacro(add_gcc_compiler_cxxflags)
-
-macro(add_gcc_compiler_cflags FLAGS)
-    if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_CLANG)
-        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${FLAGS}")
-    endif()
-endmacro(add_gcc_compiler_cflags)
-
-macro(add_gcc_compiler_flags FLAGS)
-    add_gcc_compiler_cxxflags("${FLAGS}")
-    add_gcc_compiler_cflags("${FLAGS}")
-endmacro(add_gcc_compiler_flags)
-
-# Copies of above macros that first ensure the compiler understands a given flag
-# Because check_*_compiler_flag() sets -D with name, need to provide "safe" FLAGNAME
-macro(check_add_gcc_compiler_cxxflag FLAG FLAGNAME)
-    check_cxx_compiler_flag("${FLAG}" CXX_HAS${FLAGNAME})
-    if(CXX_HAS${FLAGNAME})
-        add_gcc_compiler_cxxflags("${FLAG}")
-    endif()
-endmacro(check_add_gcc_compiler_cxxflag)
-
-macro(check_add_gcc_compiler_cflag FLAG FLAGNAME)
-    check_c_compiler_flag("${FLAG}" CC_HAS${FLAGNAME})
-    if(CC_HAS${FLAGNAME})
-        add_gcc_compiler_cflags("${FLAG}")
-    endif()
-endmacro(check_add_gcc_compiler_cflag)
-
-# This is the "front-end" for the above macros
-# Optionally takes additional parameter(s) with language to check (currently "C" or "CXX")
-macro(check_add_gcc_compiler_flag FLAG)
-    string(REGEX REPLACE "[-=]" "_" FLAGNAME "${FLAG}")
-    set(check_lang_spec ${ARGN})
-    list(LENGTH check_lang_spec num_extra_args)
-    set(langs C CXX)
-    if(num_extra_args GREATER 0)
-        set(langs "${check_lang_spec}")
-    endif()
-    if("C" IN_LIST langs)
-        check_add_gcc_compiler_cflag("${FLAG}" "${FLAGNAME}")
-    endif()
-    if("CXX" IN_LIST langs)
-        check_add_gcc_compiler_cxxflag("${FLAG}" "${FLAGNAME}")
-    endif()
-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)
-endif()
-
+# Compiler Flags
 add_gcc_compiler_flags("-fno-common")
 find_package(OpenMP)
 if(OpenMP_FOUND)
@@ -323,10 +258,8 @@ if(CMAKE_BUILD_TYPE_LOWER STREQUAL "debug")
     check_add_gcc_compiler_flag("-Wshadow-compatible-local")
     check_add_gcc_compiler_flag("-Wshadow-local")
     add_gcc_compiler_flags("-Werror")
-    # This is needed since compiling against Botan3 requires compiling against C++20
-    if(WITH_XC_BOTAN3)
-        add_gcc_compiler_cxxflags("-Wno-error=deprecated-enum-enum-conversion -Wno-error=deprecated")
-    endif()
+    # C++20 marks enum arithmetic as deprecated, but we use it in Botan and Qt6
+    add_gcc_compiler_cxxflags("-Wno-deprecated-enum-enum-conversion -Wno-error=deprecated ")
 endif()
 
 if (NOT HAIKU)
@@ -371,14 +304,6 @@ if(UNIX AND NOT APPLE)
     set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,-z,relro,-z,now")
 endif()
 
-set(CMAKE_C_STANDARD 99)
-if(WITH_XC_BOTAN3)
-    set(CMAKE_CXX_STANDARD 20)
-else()
-    set(CMAKE_CXX_STANDARD 17)
-endif()
-set(CMAKE_CXX_STANDARD_REQUIRED ON)
-
 check_cxx_compiler_flag("-fsized-deallocation" CXX_HAS_fsized_deallocation)
 if(CXX_HAS_fsized_deallocation)
     # Do additional check: the deallocation functions must be there too.
@@ -396,69 +321,53 @@ if(APPLE AND CMAKE_COMPILER_IS_CLANGXX)
     add_gcc_compiler_cxxflags("-stdlib=libc++")
 endif()
 
-if(WITH_DEV_BUILD)
+if(WITH_WARN_DEPRECATED)
     add_definitions(-DQT_DEPRECATED_WARNINGS)
 else()
     add_definitions(-DQT_NO_DEPRECATED_WARNINGS)
     add_gcc_compiler_cxxflags("-Wno-deprecated-declarations")
 endif()
 
-# MSVC specific options
-if (MSVC)
-    if(MSVC_TOOLSET_VERSION LESS 141)
-        message(FATAL_ERROR "Only Microsoft Visual Studio 17 and newer are supported!")
-    endif()
-    add_compile_options(/permissive- /utf-8)
-    # Clang-cl does not support /MP, /Zf, or /fsanitize=address
-    if (NOT CMAKE_COMPILER_IS_CLANG_MSVC)
-        add_compile_options(/MP)
-        if(IS_DEBUG_BUILD)
-            add_compile_options(/Zf)
-            if(MSVC_TOOLSET_VERSION GREATER 141)
-                add_compile_definitions(/fsanitize=address)
-            endif()
-        endif()
-    endif()
-endif()
-
 if(WIN32)
-    set(CMAKE_RC_COMPILER_INIT windres)
-    enable_language(RC)
-    if(MINGW)
-        set(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> <FLAGS> -O coff <DEFINES> -i <SOURCE> -o <OBJECT>")
-    endif()
-    if(NOT IS_DEBUG_BUILD)
-        if(MSVC)
-            # By default MSVC enables NXCOMPAT
-            add_compile_options(/guard:cf)
-            add_link_options(/DYNAMICBASE /HIGHENTROPYVA /GUARD:CF)
-        else()
-            set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--nxcompat -Wl,--dynamicbase")
-            set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,--nxcompat -Wl,--dynamicbase")
-            # Enable high entropy ASLR for 64-bit builds
-            if(NOT IS_32BIT)
-                set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--high-entropy-va")
-                set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,--high-entropy-va")
-            endif()
-        endif()
-    endif()
     # Determine if we can link against the Windows SDK, used for Windows Hello support
     find_library(WINSDK WindowsApp.lib)
-endif()
+    
+    # MSVC specific options
+    if(MSVC OR CMAKE_COMPILER_IS_CLANG_MSVC)
+        if(MSVC_TOOLSET_VERSION LESS 142)
+            message(FATAL_ERROR "Only Microsoft Visual Studio 2019 and newer are supported!")
+        endif()
+        add_compile_options(/permissive- /utf-8)
+        # Clang-cl does not support /MP, /Zf, or /fsanitize=address
+        if (NOT CMAKE_COMPILER_IS_CLANG_MSVC)
+            add_compile_options(/MP /Zf)
+            # Enable built-in ASAN
+            add_compile_definitions(/fsanitize=address)
+        endif()
 
-if(APPLE AND WITH_APP_BUNDLE OR WIN32)
-    set(PROGNAME KeePassXC)
-else()
-    set(PROGNAME keepassxc)
+        # Enable high entropy ASLR on release builds
+        if(CMAKE_BUILD_TYPE_LOWER STREQUAL "release")
+		    add_compile_options(/guard:cf)
+		    add_link_options(/DYNAMICBASE /HIGHENTROPYVA /GUARD:CF)
+        endif()
+    elseif(MINGW)
+        # Enable high entropy ASLR on release builds
+        if(CMAKE_BUILD_TYPE_LOWER STREQUAL "release")
+            set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--nxcompat -Wl,--dynamicbase -Wl,--high-entropy-va")
+            set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,--nxcompat -Wl,--dynamicbase -Wl,--high-entropy-va")
+        endif()
+    endif()
 endif()
 
 if(WIN32)
+    set(PROGNAME KeePassXC)
     set(CLI_INSTALL_DIR ".")
     set(PROXY_INSTALL_DIR ".")
     set(BIN_INSTALL_DIR ".")
     set(PLUGIN_INSTALL_DIR ".")
     set(DATA_INSTALL_DIR "share")
 elseif(APPLE AND WITH_APP_BUNDLE)
+    set(PROGNAME KeePassXC)
     set(BUNDLE_INSTALL_DIR "${PROGNAME}.app/Contents")
     set(CMAKE_INSTALL_MANDIR "${BUNDLE_INSTALL_DIR}/Resources/man")
     set(CLI_INSTALL_DIR "${BUNDLE_INSTALL_DIR}/MacOS")
@@ -466,9 +375,10 @@ elseif(APPLE AND WITH_APP_BUNDLE)
     set(BIN_INSTALL_DIR "${BUNDLE_INSTALL_DIR}/MacOS")
     set(PLUGIN_INSTALL_DIR "${BUNDLE_INSTALL_DIR}/PlugIns")
     set(DATA_INSTALL_DIR "${BUNDLE_INSTALL_DIR}/Resources")
+    add_definitions(-DWITH_APP_BUNDLE)
 else()
     include(GNUInstallDirs)
-
+    set(PROGNAME keepassxc)
     set(CLI_INSTALL_DIR "${CMAKE_INSTALL_BINDIR}")
     set(PROXY_INSTALL_DIR "${CMAKE_INSTALL_BINDIR}")
     set(BIN_INSTALL_DIR "${CMAKE_INSTALL_BINDIR}")
@@ -476,10 +386,6 @@ else()
     set(DATA_INSTALL_DIR "${CMAKE_INSTALL_DATADIR}/keepassxc")
 endif()
 
-if(WITH_TESTS)
-    enable_testing()
-endif(WITH_TESTS)
-
 if(WITH_COVERAGE)
     # Include code coverage, use with -DCMAKE_BUILD_TYPE=Debug
     include(CodeCoverage)
@@ -508,37 +414,23 @@ if(WITH_COVERAGE)
     endif()
 endif()
 
-include(CLangFormat)
-
+# Find Qt
 set(QT_COMPONENTS Core Network Concurrent Gui Svg Widgets Test LinguistTools)
 if(UNIX AND NOT APPLE)
-    if(WITH_XC_X11)
-        list(APPEND QT_COMPONENTS X11Extras)
-    endif()
-    find_package(Qt5 COMPONENTS ${QT_COMPONENTS} DBus REQUIRED)
+    find_package(Qt6 COMPONENTS ${QT_COMPONENTS} DBus REQUIRED)
 elseif(APPLE)
-    find_package(Qt5 COMPONENTS ${QT_COMPONENTS} REQUIRED HINTS
-            /usr/local/opt/qt@5/lib/cmake
-            /usr/local/Cellar/qt@5/*/lib/cmake
-            /opt/homebrew/opt/qt@5/lib/cmake
-            ENV PATH)
-    find_package(Qt5 COMPONENTS MacExtras HINTS
-            /usr/local/opt/qt@5/lib/cmake
-            /usr/local/Cellar/qt@5/*/lib/cmake
-            /opt/homebrew/opt/qt@5/lib/cmake
+    find_package(Qt6 COMPONENTS ${QT_COMPONENTS} REQUIRED HINTS
+            /usr/local/opt/qt/lib/cmake
+            /usr/local/Cellar/qt/*/lib/cmake
+            /opt/homebrew/opt/qt/lib/cmake
             ENV PATH)
 else()
-    find_package(Qt5 COMPONENTS ${QT_COMPONENTS} REQUIRED)
+    find_package(Qt6 COMPONENTS ${QT_COMPONENTS} REQUIRED)
 endif()
 
-if(Qt5Core_VERSION VERSION_LESS "5.12.0")
-    message(FATAL_ERROR "Qt version 5.12.0 or higher is required")
-endif()
-
-get_filename_component(Qt5_PREFIX ${Qt5_DIR}/../../.. REALPATH)
-if(APPLE)
-    # Add includes under Qt5 Prefix in case Qt6 is also installed
-    include_directories(SYSTEM ${Qt5_PREFIX}/include)
+# Minimum Qt version check
+if(Qt6Core_VERSION VERSION_LESS "6.2.4")
+    message(FATAL_ERROR "Qt version 6.2.4 or higher is required")
 endif()
 
 # Process moc automatically
@@ -548,25 +440,39 @@ set(CMAKE_AUTOUIC ON)
 # Process .qrc files automatically
 set(CMAKE_AUTORCC ON)
 
+add_definitions(-DQT_NO_EXCEPTIONS -DQT_STRICT_ITERATORS -DQT_NO_CAST_TO_ASCII)
+if(NOT CMAKE_BUILD_TYPE_LOWER STREQUAL "debug")
+    add_definitions(-DQT_NO_DEBUG_OUTPUT)
+endif()
+
+get_filename_component(Qt6_PREFIX ${Qt6_DIR}/../../.. REALPATH)
+
 if(APPLE)
     set(CMAKE_MACOSX_RPATH TRUE)
-    find_program(MACDEPLOYQT_EXE macdeployqt HINTS ${Qt5_PREFIX}/bin ${Qt5_PREFIX}/tools/qt5/bin ENV PATH)
+    find_program(MACDEPLOYQT_EXE macdeployqt HINTS ${Qt6_PREFIX}/bin ${Qt6_PREFIX}/tools/qt/bin ENV PATH)
     if(NOT MACDEPLOYQT_EXE)
         message(FATAL_ERROR "macdeployqt is required to build on macOS")
     endif()
     message(STATUS "Using macdeployqt: ${MACDEPLOYQT_EXE}")
     set(MACDEPLOYQT_EXTRA_BINARIES "")
 elseif(WIN32)
-    find_program(WINDEPLOYQT_EXE windeployqt HINTS ${Qt5_PREFIX}/bin ${Qt5_PREFIX}/tools/qt5/bin ENV PATH)
+    find_program(WINDEPLOYQT_EXE windeployqt HINTS ${Qt6_PREFIX}/bin ${Qt6_PREFIX}/tools/qt/bin ENV PATH)
     if(NOT WINDEPLOYQT_EXE)
         message(FATAL_ERROR "windeployqt is required to build on Windows")
     endif()
     message(STATUS "Using windeployqt: ${WINDEPLOYQT_EXE}")
 endif()
 
-# Debian sets the build type to None for package builds.
-# Make sure we don't enable asserts there.
-set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS_NONE QT_NO_DEBUG)
+# Find Botan
+# TODO: Increase minimum to 2.19.1 and drop Argon2 package
+find_package(Botan REQUIRED)
+if(BOTAN_VERSION VERSION_GREATER_EQUAL "3.0.0")
+    set(WITH_BOTAN3 TRUE)
+elseif(BOTAN_VERSION VERSION_LESS "2.12.0")
+    # Check for minimum Botan version
+    message(FATAL_ERROR "Botan 2.12.0 or higher is required")   
+endif()
+include_directories(SYSTEM ${BOTAN_INCLUDE_DIR})
 
 # Find Argon2 -- Botan 2.18 and below does not support threaded Argon2
 find_library(ARGON2_LIBRARIES NAMES argon2)
@@ -583,70 +489,40 @@ include_directories(SYSTEM ${ZLIB_INCLUDE_DIR})
 # Find Minizip
 find_package(Minizip REQUIRED)
 
-if(WITH_XC_YUBIKEY)
-    find_package(PCSC REQUIRED)
-    include_directories(SYSTEM ${PCSC_INCLUDE_DIRS})
-
-    if(UNIX AND NOT APPLE)
-        find_library(LIBUSB_LIBRARIES NAMES usb-1.0 REQUIRED)
-        find_path(LIBUSB_INCLUDE_DIR NAMES libusb.h PATH_SUFFIXES "libusb-1.0" "libusb" REQUIRED)
-        include_directories(SYSTEM ${LIBUSB_INCLUDE_DIR})
-    endif()
-endif()
-
-if(UNIX)
-    check_cxx_source_compiles("#include <sys/prctl.h>
-    int main() { prctl(PR_SET_DUMPABLE, 0); return 0; }"
-            HAVE_PR_SET_DUMPABLE)
-
-    check_cxx_source_compiles("#include <malloc.h>
-    int main() { return 0; }"
-            HAVE_MALLOC_H)
+# Find PCSC and LibUSB for hardware key support
+find_package(PCSC REQUIRED)
+include_directories(SYSTEM ${PCSC_INCLUDE_DIRS})
 
-    check_cxx_source_compiles("#include <malloc.h>
-    int main() { malloc_usable_size(NULL); return 0; }"
-            HAVE_MALLOC_USABLE_SIZE)
-
-    check_cxx_source_compiles("#include <sys/resource.h>
-    int main() {
-      struct rlimit limit;
-      limit.rlim_cur = 0;
-      limit.rlim_max = 0;
-      setrlimit(RLIMIT_CORE, &limit);
-      return 0;
-    }" HAVE_RLIMIT_CORE)
+if(UNIX AND NOT APPLE)
+    find_library(LIBUSB_LIBRARIES NAMES usb-1.0 REQUIRED)
+    find_path(LIBUSB_INCLUDE_DIR NAMES libusb.h PATH_SUFFIXES "libusb-1.0" "libusb" REQUIRED)
+    include_directories(SYSTEM ${LIBUSB_INCLUDE_DIR})
 
-    if(APPLE)
-        check_cxx_source_compiles("#include <sys/types.h>
-      #include <sys/ptrace.h>
-      int main() { ptrace(PT_DENY_ATTACH, 0, 0, 0); return 0; }"
-                HAVE_PT_DENY_ATTACH)
-    endif()
+    # For PolKit QuickUnlock
+    find_library(KEYUTILS_LIBRARIES NAMES keyutils REQUIRED)
 endif()
 
-include_directories(SYSTEM ${ZLIB_INCLUDE_DIR})
-
+# Find zxcvbn or use the bundled version
 find_library(ZXCVBN_LIBRARIES zxcvbn)
 if(NOT ZXCVBN_LIBRARIES)
     add_subdirectory(src/thirdparty/zxcvbn)
     set(ZXCVBN_LIBRARIES zxcvbn)
-endif(NOT ZXCVBN_LIBRARIES)
+endif()
 
+# Add KeePassXC sources and tests
 add_subdirectory(src)
 add_subdirectory(share)
+
 if(WITH_TESTS)
+    enable_testing()
     add_subdirectory(tests)
-endif(WITH_TESTS)
+endif()
 
-if(WITH_XC_DOCS)
+if(KPXC_FEATURE_DOCS)
     add_subdirectory(docs)
 endif()
 
-if(PRINT_SUMMARY)
-    # This will print ENABLED, REQUIRED and DISABLED
-    feature_summary(WHAT ALL)
-else()
-    # This will only print ENABLED and DISABLED feature
-    feature_summary(WHAT ENABLED_FEATURES DESCRIPTION "Enabled features:")
-    feature_summary(WHAT DISABLED_FEATURES DESCRIPTION "Disabled features:")
-endif()
+# Print out summary information
+message(STATUS "")
+feature_summary(QUIET_ON_EMPTY WHAT ENABLED_FEATURES DESCRIPTION "Enabled features:")
+feature_summary(QUIET_ON_EMPTY WHAT DISABLED_FEATURES DESCRIPTION "Disabled features:")
diff --git a/INSTALL.md b/INSTALL.md
index e83f064c04..8801900311 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -1,19 +1,17 @@
-Build and Install KeePassXC
-=================
+# Build and Install KeePassXC
 
 This document will guide you through the steps to build and install KeePassXC from source.
 For more information, see also the [_Building KeePassXC_](https://github.com/keepassxreboot/keepassxc/wiki/Building-KeePassXC) page on the wiki.
 
 The [QuickStart Guide](https://keepassxc.org/docs/KeePassXC_GettingStarted.html) gets you started using KeePassXC on your Windows, macOS, or Linux computer using pre-compiled binaries from the [downloads page](https://keepassxc.org/download).
 
-Toolchain and Build Dependencies
-================================
+## Toolchain and Build Dependencies
 
 The following build tools must exist within your PATH:
 
-* cmake (>= 3.10.0)
+* cmake (>= 3.16.0)
 * make (>= 4.2) or ninja (>= 1.10)
-* g++ (>= 4.9) or clang++ (>= 6.0)
+* g++ (>= 9.3.0) or clang++ (>= 10.0)
 * asciidoctor (>= 2.0)
 
 * Besides a working C++ toolchain, KeePassXC also has a number of direct build and runtime dependencies. For detailed information about how to install them, please refer to the GitHub wiki:
@@ -22,8 +20,8 @@ The following build tools must exist within your PATH:
 * [Set up Build Environment on Windows](https://github.com/keepassxreboot/keepassxc/wiki/Set-up-Build-Environment-on-Windows)
 * [Set up Build Environment on macOS](https://github.com/keepassxreboot/keepassxc/wiki/Set-up-Build-Environment-on-macOS)
 
-Build Steps
-===========
+## Build Steps
+
 We recommend using the release tool to perform builds, please read up-to-date instructions [on our wiki](https://github.com/keepassxreboot/keepassxc/wiki/Building-KeePassXC#building-using-the-release-tool).
 
 To compile from source, open a **Terminal (Linux/MacOS)**, the **MSVC Tools Command Prompt (Windows)**, or **MSYS2-MinGW shell (Windows)**. For code development on Windows, you can use Visual Studio 2022, Visual Studio Code, or CLion.
@@ -55,10 +53,10 @@ To compile from source, open a **Terminal (Linux/MacOS)**, the **MSVC Tools Comm
    ```
    mkdir build
    cd build
-   cmake -DWITH_XC_ALL=ON ..
+   cmake ..
    make
    ```
-      
+
 If you have `vcpkg` installed, add `-DCMAKE_TOOLCHAIN_FILE=${VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake` to the `cmake` command to automatically download and install all required build and runtime dependencies locally to your build directory before compiling KeePassXC. Using `vcpkg` is the preferred way to install dependencies on macOS and required on Windows if using the MSVC toolchain.
 
 For more detailed build instructions for each platform, please refer to the [GitHub wiki](https://github.com/keepassxreboot/keepassxc/wiki/Building-KeePassXC).
@@ -69,7 +67,7 @@ Note: These steps place the compiled KeePassXC binary inside the `./build/src/`
 
 If you installed Qt@5 via Homebrew and CMake fails to find your Qt installation, you can specify it manually by adding the following parameter:
 
-`-DCMAKE_PREFIX_PATH=$(brew --prefix qt@5)/lib/cmake`
+`-DCMAKE_PREFIX_PATH=$(brew --prefix qt)/lib/cmake`
 
 When building with ASAN support on macOS, you need to use `export ASAN_OPTIONS=detect_leaks=0` before running the tests (LSAN is no supported on macOS).
 
@@ -77,49 +75,39 @@ When building with ASAN support on macOS, you need to use `export ASAN_OPTIONS=d
 
 If you are using MSYS2, you have to add ```-G "MSYS Makefiles"``` at the beginning of the cmake command.
 
-CMake Configuration Options
-==========================
-
-## Recommended CMake Build Parameters
-
-```
--DCMAKE_VERBOSE_MAKEFILE=ON
--DCMAKE_BUILD_TYPE=<RelWithDebInfo/Debug/Release>
--DWITH_GUI_TESTS=ON
-```
-
 ## Additional CMake Parameters
 
-KeePassXC comes with a variety of build options that can turn on/off features. Most notably, we allow you to build the application with all TCP/IP networking code disabled. Please note that we still require and link against Qt5's network library in order to use local named pipes on all operating systems. Each of these build options are supplied at the time of calling cmake:
+KeePassXC comes with a variety of build options that can turn on/off features. Each of these build options are supplied at the time of calling cmake:
 
 ```
--DWITH_XC_AUTOTYPE=[ON|OFF] Enable/Disable Auto-Type (default: ON)
--DWITH_XC_YUBIKEY=[ON|OFF] Enable/Disable YubiKey HMAC-SHA1 authentication support (default: OFF)
--DWITH_XC_BROWSER=[ON|OFF] Enable/Disable KeePassXC-Browser extension support (default: OFF)
--DWITH_XC_BROWSER_PASSKEYS=[ON|OFF] Enable/Disable Passkeys support for browser integration (default: OFF)
--DWITH_XC_NETWORKING=[ON|OFF] Enable/Disable Networking support (e.g., favicon downloading) (default: OFF)
--DWITH_XC_SSHAGENT=[ON|OFF] Enable/Disable SSHAgent support (default: OFF)
--DWITH_XC_FDOSECRETS=[ON|OFF] (Linux Only) Enable/Disable Freedesktop.org Secrets Service support (default:OFF)
--DWITH_XC_KEESHARE=[ON|OFF] Enable/Disable KeeShare group synchronization extension (default: OFF)
--DWITH_XC_ALL=[ON|OFF] Enable/Disable compiling all plugins above (default: OFF)
-
--DWITH_XC_UPDATECHECK=[ON|OFF] Enable/Disable automatic updating checking (requires WITH_XC_NETWORKING) (default: ON)
+-DKPXC_MINIMAL=[ON|OFF] Build KeePassXC with the minimal feature set required for basic usage (default: OFF)
+-DKPXC_FEATURE_BROWSER=[ON|OFF] Browser integration and passkeys support (default: ON)
+-DKPXC_FEATURE_SSHAGENT=[ON|OFF] SSH Agent integration (default: ON)
+-DKPXC_FEATURE_FDOSECRETS=[ON|OFF] (Linux Only) freedesktop.org Secret Service integration; replace system keyring (default:ON)
+
+-DKPXC_FEATURE_NETWORK=[ON|OFF] Include code that reaches out to external networks (e.g. downloading icons) (default: ON)
+-DKPXC_FEATURE_UPDATES=[ON|OFF] Include automatic update checks; disable for managed distributions (requires networking) (default: ON)
+-DKPXC_FEATURE_DOCS=[ON|OFF] Build offline documentation; requires asciidoctor tool (default: ON)
 
 -DWITH_TESTS=[ON|OFF] Enable/Disable building of unit tests (default: ON)
 -DWITH_GUI_TESTS=[ON|OFF] Enable/Disable building of GUI tests (default: OFF)
--DWITH_DEV_BUILD=[ON|OFF] Enable/Disable deprecated method warnings (default: OFF)
+-DWITH_WARN_DEPRECATED=[ON|OFF] Development only: warn about deprecated methods, including Qt. (default: OFF)
 -DWITH_ASAN=[ON|OFF] Enable/Disable address sanitizer checks (Linux / macOS only) (default: OFF)
 -DWITH_COVERAGE=[ON|OFF] Enable/Disable coverage tests (GCC only) (default: OFF)
 -DWITH_APP_BUNDLE=[ON|OFF] Enable Application Bundle for macOS (default: ON)
+-DWITH_CCACHE=[ON|OFF] Use ccache for build speed optimization (default: OFF)
+-DWITH_X11=[ON|OFF] Enable building with X11 dependencies (default: ON)
 
--DKEEPASSXC_BUILD_TYPE=[Snapshot|PreRelease|Release] Set the build type to show/hide stability warnings (default: "Snapshot")
--DKEEPASSXC_DIST_TYPE=[Snap|AppImage|Other] Specify the distribution method (default: "Other")
+-DKEEPASSXC_BUILD_TYPE=[Snapshot|Release] Set the build type to show/hide stability warnings (default: "Snapshot")
+-DKEEPASSXC_DIST_TYPE=[Snap|AppImage|Flatpak|Native] Specify the distribution method (default: "Native")
 -DOVERRIDE_VERSION=[X.X.X] Specify a version number when building. Used with snapshot builds (default: "")
 -DGIT_HEAD_OVERRIDE=[XXXXXXX] Specify the 7 digit git commit ref for this build. Used with distribution builds (default: "")
 ```
 
-Installation
-============
+Note: Even though you can build the application with all TCP/IP networking code disabled, we still require and link against
+Qt6's network library to use local named pipes on all operating systems.
+
+## Installation
 
 After you have successfully built KeePassXC, install the binary by executing the following:
 
@@ -127,8 +115,7 @@ After you have successfully built KeePassXC, install the binary by executing the
 sudo make install
 ```
 
-Packaging
-=========
+## Packaging
 
 You can create a package to redistribute KeePassXC (zip, deb, rpm, dmg, etc..). Refer to [keepassxc-packaging](https://github.com/keepassxreboot/keepassxc-packaging) for packaging scripts.
 
@@ -138,21 +125,23 @@ To package using CMake, run the following command using whichever [generators](h
 cpack -G "ZIP;WIX"
 ```
 
-Testing
-=======
+## Testing
 
 You can perform tests on the built executables with:
+
 ```
 make test ARGS+="--output-on-failure"
 ```
 
 On Linux, if you are not currently running on an X Server or Wayland, run the tests as follows:
+
 ```
 make test ARGS+="-E test\(cli\|gui\) --output-on-failure"
 xvfb-run -e errors -a --server-args="-screen 0 1024x768x24" make test ARGS+="-R test\(cli\|gui\) --output-on-failure"
 ```
 
 Common parameters:
+
 ```
 CTEST_OUTPUT_ON_FAILURE=1
 ARGS+=-jX
diff --git a/README.md b/README.md
index c541afe80a..f7af472f50 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,5 @@
 # <img src="https://keepassxc.org/assets/img/keepassxc.svg" width="40" height="40"/> KeePassXC
+
 [![OpenSSF Best Practices](https://bestpractices.coreinfrastructure.org/projects/6326/badge)](https://bestpractices.coreinfrastructure.org/projects/6326)
 [![TeamCity Build Status](https://ci.keepassxc.org/app/rest/builds/buildType:\(project:KeepassXC\)/statusIcon)](https://ci.keepassxc.org/?guest=1)
 [![codecov](https://codecov.io/gh/keepassxreboot/keepassxc/branch/develop/graph/badge.svg)](https://codecov.io/gh/keepassxreboot/keepassxc)
@@ -10,16 +11,22 @@
 [KeePassXC](https://keepassxc.org) is a modern, secure, and open-source password manager that stores and manages your most sensitive information. You can run KeePassXC on Windows, macOS, and Linux systems. KeePassXC is for people with extremely high demands of secure personal data management. It saves many different types of information, such as usernames, passwords, URLs, attachments, and notes in an offline, encrypted file that can be stored in any location, including private and public cloud solutions. For easy identification and management, user-defined titles and icons can be specified for entries. In addition, entries are sorted into customizable groups. An integrated search function allows you to use advanced patterns to easily find any entry in your database. A customizable, fast, and easy-to-use password generator utility allows you to create passwords with any combination of characters or easy to remember passphrases.
 
 ## Quick Start
+
 The [QuickStart Guide](https://keepassxc.org/docs/KeePassXC_GettingStarted.html) gets you started using KeePassXC on your Windows, macOS, or Linux computer using pre-compiled binaries from the [downloads page](https://keepassxc.org/download). Additionally, individual Linux distributions may ship their own versions, so please check your distribution's package list to see if KeePassXC is available. Detailed documentation is available in the [User Guide](https://keepassxc.org/docs/KeePassXC_UserGuide.html).
 
 ## Features List
+
 KeePassXC has numerous features for novice and power users alike. Our goal is to create an application that can be used by anyone while still offering advanced features to those that need them.
 
-### Basic
+### Core Features
+
 * Create, open, and save databases in the KDBX format (KeePass-compatible with KDBX4 and KDBX3)
+* All information is encrypted at rest and never exposed outside the program
 * Store sensitive information in entries that are organized by groups
-* Search for entries
 * Password generator
+* Search for entries
+* TOTP storage and generation
+* YubiKey/OnlyKey challenge-response support
 * Auto-Type passwords into applications
 * Browser integration with Google Chrome, Mozilla Firefox, Microsoft Edge, Chromium, Vivaldi, Brave, and Tor-Browser
 * Support for passkeys using the browser integration
@@ -33,10 +40,7 @@ KeePassXC has numerous features for novice and power users alike. Our goal is to
 * Field references between entries
 * File attachments and custom attributes
 * Entry history and data restoration
-* YubiKey/OnlyKey challenge-response support
 * Command line interface (keepassxc-cli)
-* Auto-Open databases
-* KeeShare shared databases (import, export, and synchronize)
 * SSH Agent integration
 * FreeDesktop.org Secret Service (replace Gnome keyring, etc.)
 * Additional encryption choices: Twofish and ChaCha20
diff --git a/cmake/CompilerFlags.cmake b/cmake/CompilerFlags.cmake
new file mode 100644
index 0000000000..0ab8718fc2
--- /dev/null
+++ b/cmake/CompilerFlags.cmake
@@ -0,0 +1,65 @@
+#  Copyright (C) 2024 KeePassXC Team <team@keepassxc.org>
+#
+#  This program is free software: you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation, either version 2 or (at your option)
+#  version 3 of the License.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+macro(add_gcc_compiler_cxxflags FLAGS)
+    if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_COMPILER_IS_CLANGXX)
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${FLAGS}")
+    endif()
+endmacro()
+
+macro(add_gcc_compiler_cflags FLAGS)
+    if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_CLANG)
+        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${FLAGS}")
+    endif()
+endmacro()
+
+macro(add_gcc_compiler_flags FLAGS)
+    add_gcc_compiler_cxxflags("${FLAGS}")
+    add_gcc_compiler_cflags("${FLAGS}")
+endmacro()
+
+# Copies of above macros that first ensure the compiler understands a given flag
+# Because check_*_compiler_flag() sets -D with name, need to provide "safe" FLAGNAME
+macro(check_add_gcc_compiler_cxxflag FLAG FLAGNAME)
+    check_cxx_compiler_flag("${FLAG}" CXX_HAS${FLAGNAME})
+    if(CXX_HAS${FLAGNAME})
+        add_gcc_compiler_cxxflags("${FLAG}")
+    endif()
+endmacro()
+
+macro(check_add_gcc_compiler_cflag FLAG FLAGNAME)
+    check_c_compiler_flag("${FLAG}" CC_HAS${FLAGNAME})
+    if(CC_HAS${FLAGNAME})
+        add_gcc_compiler_cflags("${FLAG}")
+    endif()
+endmacro()
+
+# This is the "front-end" for the above macros
+# Optionally takes additional parameter(s) with language to check (currently "C" or "CXX")
+macro(check_add_gcc_compiler_flag FLAG)
+    string(REGEX REPLACE "[-=]" "_" FLAGNAME "${FLAG}")
+    set(check_lang_spec ${ARGN})
+    list(LENGTH check_lang_spec num_extra_args)
+    set(langs C CXX)
+    if(num_extra_args GREATER 0)
+        set(langs "${check_lang_spec}")
+    endif()
+    if("C" IN_LIST langs)
+        check_add_gcc_compiler_cflag("${FLAG}" "${FLAGNAME}")
+    endif()
+    if("CXX" IN_LIST langs)
+        check_add_gcc_compiler_cxxflag("${FLAG}" "${FLAGNAME}")
+    endif()
+endmacro()
diff --git a/cmake/compiler-checks/ptrace_deny_attach.cpp b/cmake/compiler-checks/ptrace_deny_attach.cpp
new file mode 100644
index 0000000000..bf4646f287
--- /dev/null
+++ b/cmake/compiler-checks/ptrace_deny_attach.cpp
@@ -0,0 +1,8 @@
+#include <sys/ptrace.h>
+#include <sys/types.h>
+
+int main()
+{
+    ptrace(PT_DENY_ATTACH, 0, 0, 0);
+    return 0;
+}
diff --git a/release-tool.py b/release-tool.py
index acde1b012f..f5f28d9b81 100755
--- a/release-tool.py
+++ b/release-tool.py
@@ -644,6 +644,7 @@ def setup_arg_parser(cls, parser: argparse.ArgumentParser):
                             help='Build parallelism (default: %(default)s).')
         parser.add_argument('-y', '--yes', help='Bypass confirmation prompts.', action='store_true')
         parser.add_argument('--with-tests', help='Build and run tests.', action='store_true')
+        parser.add_argument('--minimal', help='Build with minimal feature set.', action='store_true')
 
         if sys.platform == 'darwin':
             parser.add_argument('--macos-target', default=12, metavar='MACOSX_DEPLOYMENT_TARGET',
@@ -665,6 +666,7 @@ def setup_arg_parser(cls, parser: argparse.ArgumentParser):
         elif sys.platform == 'win32':
             parser.add_argument('-p', '--platform-target', help='Build target platform (default: %(default)s).',
                                 choices=['amd64', 'arm64'], default='amd64')
+            parser.add_argument('--mingw', help='Build using MinGW-w64 toolchain.', action='store_true')
             parser.add_argument('--sign', help='Sign binaries prior to packaging.', action='store_true')
             parser.add_argument('--sign-identity', help='SHA1 fingerprint of the signing certificate.')
             parser.add_argument('--sign-timestamp-url', help='Timestamp URL for signing binaries.',
@@ -689,12 +691,13 @@ def run(self, version, src_dir, output_dir, tag_name, snapshot, cmake_generator,
         tag_name = tag_name or version
         kwargs['with_tests'] = with_tests
         with_tests = 'ON' if with_tests else 'OFF'
+        minimal = 'ON' if kwargs['minimal'] else 'OFF'
         cmake_opts = [
-            '-DWITH_XC_ALL=ON',
             '-DCMAKE_BUILD_TYPE=Release',
             '-DCMAKE_INSTALL_PREFIX=' + kwargs['install_prefix'],
             '-DWITH_TESTS=' + with_tests,
             '-DWITH_GUI_TESTS=' + with_tests,
+            '-DKPXC_MINIMAL=' + minimal
         ]
 
         if not kwargs['use_system_deps'] and not kwargs.get('docker_image'):
@@ -748,11 +751,7 @@ def _run_tests(cwd, ctest_cmd='ctest', parallelism=4):
 
     # noinspection PyMethodMayBeStatic
     def build_windows(self, version, src_dir, output_dir, *, parallelism, cmake_opts, platform_target,
-                      sign, sign_identity, sign_timestamp_url, with_tests, **_):
-        # Check for required tools
-        if not _cmd_exists('candle.exe') or not _cmd_exists('light.exe') or not _cmd_exists('heat.exe'):
-            raise Error('WiX Toolset not found on the PATH (candle.exe, light.exe, heat.exe).')
-
+                      sign, sign_identity, sign_timestamp_url, with_tests, mingw, **_):
         # Setup build signing if requested
         if sign:
             cmake_opts.append(f'-DWITH_XC_CODESIGN_IDENTITY={sign_identity}')
@@ -760,13 +759,22 @@ def build_windows(self, version, src_dir, output_dir, *, parallelism, cmake_opts
         # Use vcpkg for dependency deployment
         cmake_opts.append('-DX_VCPKG_APPLOCAL_DEPS_INSTALL=ON')
 
-        # Find Visual Studio and capture build environment
-        vs_env = _capture_vs_env(arch=platform_target)
+        if mingw:
+            vs_env = os.environ.copy()
+        else:
+            # Find Visual Studio and capture build environment
+            vs_env = _capture_vs_env(arch=platform_target)
 
         # Use vs_env to resolve common tools
         cmake_cmd = shutil.which('cmake', path=vs_env.get('PATH'))
         cpack_cmd = shutil.which('cpack', path=vs_env.get('PATH'))
         ctest_cmd = shutil.which('ctest', path=vs_env.get('PATH'))
+        
+        if not cmake_cmd or not cpack_cmd or not ctest_cmd:
+            raise Error('CMake tools (cmake, cpack, ctest) not found on PATH!')
+        if not _cmd_exists('candle.exe', path=vs_env.get('PATH')) or not _cmd_exists('light.exe', path=vs_env.get('PATH')) \
+            or not _cmd_exists('heat.exe', path=vs_env.get('PATH')):
+            raise Error('WiX Toolset (candle.exe, light.exe, heat.exe) not found on the PATH!')
 
         # Start the build
         with tempfile.TemporaryDirectory() as build_dir:
diff --git a/share/translations/CMakeLists.txt b/share/translations/CMakeLists.txt
index bf18700421..b4a14f4aa2 100644
--- a/share/translations/CMakeLists.txt
+++ b/share/translations/CMakeLists.txt
@@ -1,4 +1,4 @@
-#  Copyright (C) 2017 KeePassXC Team <team@keepassxc.org>
+#  Copyright (C) 2025 KeePassXC Team <team@keepassxc.org>
 #  Copyright (C) 2014 Felix Geyer <debfx@fobos.de>
 #
 #  This program is free software: you can redistribute it and/or modify
@@ -20,15 +20,14 @@ list(REMOVE_ITEM TRANSLATION_FILES keepassxc_en.ts)
 list(REMOVE_ITEM TRANSLATION_FILES ${TRANSLATION_EN_ABS})
 message(STATUS "Including translations...\n")
 
-qt5_add_translation(QM_FILES ${TRANSLATION_FILES})
+qt6_add_translation(QM_FILES ${TRANSLATION_FILES})
 
 if(WIN32)
-    file(GLOB QTBASE_TRANSLATIONS ${Qt5_PREFIX}/share/qt5/translations/qtbase_*.qm)
+    file(GLOB QTBASE_TRANSLATIONS ${Qt6_PREFIX}/share/qt/translations/qtbase_*.qm)
 elseif(APPLE OR KEEPASSXC_DIST_APPIMAGE)
     file(GLOB QTBASE_TRANSLATIONS
             /usr/share/qt/translations/qtbase_*.qm
-            /usr/share/qt5/translations/qtbase_*.qm
-            ${Qt5_PREFIX}/translations/qtbase_*.qm)
+            ${Qt6_PREFIX}/translations/qtbase_*.qm)
 endif()
 set(QM_FILES ${QM_FILES} ${QTBASE_TRANSLATIONS})
 
diff --git a/share/translations/keepassxc_en.ts b/share/translations/keepassxc_en.ts
index f974db170b..574dc39671 100644
--- a/share/translations/keepassxc_en.ts
+++ b/share/translations/keepassxc_en.ts
@@ -6033,17 +6033,6 @@ Are you sure you want to continue with this file?</source>
         <source>Don&apos;t show again for this version</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>WARNING: You are using an unstable build of KeePassXC.
-There is a high risk of corruption, maintain a backup of your databases.
-This version is not meant for production use.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>NOTE: You are using a pre-release version of KeePassXC.
-Expect some bugs and minor issues, this version is meant for testing purposes.</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>No Tags</source>
         <translation type="unfinished"></translation>
@@ -6387,7 +6376,9 @@ Expect some bugs and minor issues, this version is meant for testing purposes.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Password Generator</source>
+        <source>WARNING: You are using a development snapshot build of KeePassXC.
+Maintain a backup of your databases in the event of unknown bugs.
+This version is not meant for production use.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -6402,6 +6393,10 @@ Expect some bugs and minor issues, this version is meant for testing purposes.</
         <source>New Entry</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Password Generator</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Edit Entry…</source>
         <translation type="unfinished"></translation>
@@ -8748,10 +8743,6 @@ Kernel: %3 %4</source>
         <source>KeeShare</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>YubiKey</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Quick Unlock</source>
         <translation type="unfinished"></translation>
@@ -8760,10 +8751,6 @@ Kernel: %3 %4</source>
         <source>Secret Service Integration</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>None</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Enabled extensions:</source>
         <translation type="unfinished"></translation>
@@ -9316,6 +9303,14 @@ This option is deprecated, use --set-key-file instead.</source>
         <source>Only PBKDF and Argon2 are supported, cannot decrypt json file</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Hardware Keys</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Passkey</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Reset Shortcuts</source>
         <translation type="unfinished"></translation>
@@ -9337,39 +9332,35 @@ This option is deprecated, use --set-key-file instead.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Encrypted files are not supported.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Proton Pass Import</source>
+        <source>Format to use when exporting. Available choices are &apos;xml&apos;, &apos;csv&apos; or &apos;html&apos;. Defaults to &apos;xml&apos;.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Passkey</source>
+        <source>malformed string, possible unescaped delimiter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Format to use when exporting. Available choices are &apos;xml&apos;, &apos;csv&apos; or &apos;html&apos;. Defaults to &apos;xml&apos;.</source>
+        <source>missing closing delimiter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>start minimized to the system tray</source>
+        <source>%1, row: %2, column: %3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>malformed string, possible unescaped delimiter</source>
+        <source>Encrypted files are not supported.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>missing closing delimiter</source>
+        <source>Proton Pass Import</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>%1, row: %2, column: %3</source>
+        <source>Tags</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Tags</source>
+        <source>start minimized to the system tray</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 6a5eb5d801..8768832d37 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,4 +1,4 @@
-#  Copyright (C) 2023 KeePassXC Team <team@keepassxc.org>
+#  Copyright (C) 2026 KeePassXC Team <team@keepassxc.org>
 #  Copyright (C) 2010 Felix Geyer <debfx@fobos.de>
 #
 #  This program is free software: you can redistribute it and/or modify
@@ -16,18 +16,6 @@
 
 include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
 
-add_feature_info(Auto-Type WITH_XC_AUTOTYPE "Automatic password typing")
-add_feature_info(Networking WITH_XC_NETWORKING "Compile KeePassXC with network access code (e.g. for downloading website icons)")
-add_feature_info(KeePassXC-Browser WITH_XC_BROWSER "Browser integration with KeePassXC-Browser")
-add_feature_info(Passkeys WITH_XC_BROWSER_PASSKEYS "Passkeys support for browser integration")
-add_feature_info(SSHAgent WITH_XC_SSHAGENT "SSH agent integration compatible with KeeAgent")
-add_feature_info(KeeShare WITH_XC_KEESHARE "Sharing integration with KeeShare")
-add_feature_info(YubiKey WITH_XC_YUBIKEY "YubiKey HMAC-SHA1 challenge-response")
-add_feature_info(UpdateCheck WITH_XC_UPDATECHECK "Automatic update checking")
-if(UNIX AND NOT APPLE)
-    add_feature_info(FdoSecrets WITH_XC_FDOSECRETS "Implement freedesktop.org Secret Storage Spec server side API.")
-endif()
-
 set(core_SOURCES
         core/Alloc.cpp
         core/AutoTypeAssociations.cpp
@@ -96,6 +84,11 @@ set(core_SOURCES
         keys/FileKey.cpp
         keys/PasswordKey.cpp
         keys/ChallengeResponseKey.cpp
+        keys/drivers/YubiKey.h
+        keys/drivers/YubiKey.cpp
+        keys/drivers/YubiKeyInterface.cpp
+        keys/drivers/YubiKeyInterfaceUSB.cpp
+        keys/drivers/YubiKeyInterfacePCSC.cpp
         streams/HashedBlockStream.cpp
         streams/HashingStream.cpp
         streams/HmacBlockStream.cpp
@@ -201,6 +194,7 @@ set(gui_SOURCES
         gui/reports/ReportsPageHibp.cpp
         gui/reports/ReportsWidgetStatistics.cpp
         gui/reports/ReportsPageStatistics.cpp
+        gui/osutils/DeviceListener.cpp
         gui/osutils/OSUtilsBase.cpp
         gui/osutils/ScreenLockListener.cpp
         gui/osutils/ScreenLockListenerPrivate.cpp
@@ -222,6 +216,7 @@ set(gui_SOURCES
 
 if(APPLE)
     list(APPEND gui_SOURCES
+            gui/osutils/macutils/DeviceListenerMac.cpp
             gui/osutils/macutils/MacPasteboard.cpp
             gui/osutils/macutils/MacUtils.cpp
             gui/osutils/macutils/ScreenLockListenerMac.cpp
@@ -235,18 +230,20 @@ endif()
 
 if(UNIX AND NOT APPLE)
     list(APPEND gui_SOURCES
+            gui/osutils/nixutils/DeviceListenerLibUsb.cpp
+            gui/osutils/nixutils/NixUtils.cpp
             gui/osutils/nixutils/ScreenLockListenerDBus.cpp
-            gui/osutils/nixutils/NixUtils.cpp)
+    )
     if("${CMAKE_SYSTEM}" MATCHES "Linux")
         list(APPEND core_SOURCES
                 quickunlock/Polkit.cpp
                 quickunlock/PolkitDbusTypes.cpp)
     endif()
-    if(WITH_XC_X11)
+    if(WITH_X11)
         list(APPEND gui_SOURCES
             gui/osutils/nixutils/X11Funcs.cpp)
     endif()
-    qt5_add_dbus_adaptor(gui_SOURCES
+    qt6_add_dbus_adaptor(gui_SOURCES
             gui/org.keepassxc.KeePassXC.MainWindow.xml
             gui/MainWindow.h
             MainWindow)
@@ -256,19 +253,15 @@ if(UNIX AND NOT APPLE)
         PROPERTIES
         INCLUDE "quickunlock/PolkitDbusTypes.h"
         )
-    qt5_add_dbus_interface(core_SOURCES
+    qt6_add_dbus_interface(core_SOURCES
         quickunlock/dbus/org.freedesktop.PolicyKit1.Authority.xml
         polkit_dbus
     )
-
-    find_library(KEYUTILS_LIBRARIES NAMES keyutils)
-    if(NOT KEYUTILS_LIBRARIES)
-		message(FATAL_ERROR "Could not find libkeyutils")
-    endif()
 endif()
 
 if(WIN32)
     list(APPEND gui_SOURCES
+            gui/osutils/winutils/DeviceListenerWin.cpp
             gui/osutils/winutils/ScreenLockListenerWin.cpp
             gui/osutils/winutils/WinUtils.cpp)
     if (WINSDK)
@@ -276,105 +269,70 @@ if(WIN32)
     endif()
 endif()
 
-if(WITH_XC_YUBIKEY)
-    list(APPEND gui_SOURCES gui/osutils/DeviceListener.cpp)
-    if(APPLE)
-        list(APPEND gui_SOURCES gui/osutils/macutils/DeviceListenerMac.cpp)
-    elseif(UNIX)
-        list(APPEND gui_SOURCES gui/osutils/nixutils/DeviceListenerLibUsb.cpp)
-    elseif(WIN32)
-        list(APPEND gui_SOURCES gui/osutils/winutils/DeviceListenerWin.cpp)
-    endif()
-endif()
-
 add_subdirectory(browser)
 add_subdirectory(proxy)
-if(WITH_XC_BROWSER)
+if(KPXC_FEATURE_BROWSER)
     set(browser_LIB browser)
     list(APPEND gui_SOURCES
             gui/dbsettings/DatabaseSettingsWidgetBrowser.cpp
             gui/entry/EntryURLModel.cpp
+            gui/reports/ReportsPageBrowserStatistics.cpp
+            gui/reports/ReportsPagePasskeys.cpp
             gui/reports/ReportsWidgetBrowserStatistics.cpp
-            gui/reports/ReportsPageBrowserStatistics.cpp)
-endif()
-
-if(WITH_XC_BROWSER_PASSKEYS)
-    list(APPEND gui_SOURCES
             gui/reports/ReportsWidgetPasskeys.cpp
-            gui/reports/ReportsPagePasskeys.cpp
             gui/passkeys/PasskeyExporter.cpp
             gui/passkeys/PasskeyExportDialog.cpp
             gui/passkeys/PasskeyImporter.cpp
             gui/passkeys/PasskeyImportDialog.cpp)
 endif()
 
-add_subdirectory(autotype)
+if(KPXC_FEATURE_NETWORK)
+    list(APPEND gui_SOURCES
+            networking/HibpDownloader.cpp
+            networking/NetworkManager.cpp
+            networking/UpdateChecker.cpp
+            gui/UpdateCheckDialog.cpp
+            gui/IconDownloader.cpp
+            gui/IconDownloaderDialog.cpp)
+endif()
+
 add_subdirectory(cli)
+add_subdirectory(thirdparty)
+
+add_subdirectory(autotype)
+set(autotype_LIB autotype)
+
+# TODO: Refactor to gui sources
 add_subdirectory(qrcode)
 set(qrcode_LIB qrcode)
 
+# TODO: Move to gui sources on refactor
 add_subdirectory(keeshare)
-if(WITH_XC_KEESHARE)
-    set(keeshare_LIB keeshare)
-endif()
+set(keeshare_LIB keeshare)
 
 add_subdirectory(sshagent)
-if(WITH_XC_SSHAGENT)
+if(KPXC_FEATURE_SSHAGENT)
     set(sshagent_LIB sshagent)
 endif()
 
 add_subdirectory(fdosecrets)
-if(WITH_XC_FDOSECRETS)
+if(KPXC_FEATURE_FDOSECRETS)
     set(fdosecrets_LIB fdosecrets)
 endif()
 
-add_subdirectory(thirdparty)
-
-set(autotype_SOURCES
-        autotype/AutoType.cpp
-        autotype/AutoTypeAction.cpp
-        autotype/AutoTypeMatchModel.cpp
-        autotype/AutoTypeMatchView.cpp
-        autotype/AutoTypeSelectDialog.cpp
-        autotype/PickcharsDialog.cpp
-        autotype/WindowSelectComboBox.cpp)
-
-add_library(autotype STATIC ${autotype_SOURCES})
-target_link_libraries(autotype Qt5::Core Qt5::Widgets)
-
-if(WITH_XC_YUBIKEY)
-    list(APPEND core_SOURCES
-        keys/drivers/YubiKey.h
-        keys/drivers/YubiKey.cpp
-        keys/drivers/YubiKeyInterface.cpp
-        keys/drivers/YubiKeyInterfaceUSB.cpp
-        keys/drivers/YubiKeyInterfacePCSC.cpp)
-else()
-    list(APPEND core_SOURCES
-        keys/drivers/YubiKey.h
-        keys/drivers/YubiKeyStub.cpp)
-endif()
-
-if(WITH_XC_NETWORKING)
-    list(APPEND gui_SOURCES
-            networking/HibpDownloader.cpp
-            networking/NetworkManager.cpp
-            networking/UpdateChecker.cpp
-            gui/UpdateCheckDialog.cpp
-            gui/IconDownloader.cpp
-            gui/IconDownloaderDialog.cpp)
-endif()
-
 configure_file(config-keepassx.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-keepassx.h)
 configure_file(git-info.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/git-info.h)
 
+# SVG Widgets
+find_package(Qt6 REQUIRED COMPONENTS SvgWidgets)
+
 # Core Library Definition
 add_library(keepassxc_core STATIC ${core_SOURCES})
-set_target_properties(keepassxc_core PROPERTIES COMPILE_DEFINITIONS KEEPASSX_BUILDING_CORE)
+set_target_properties(keepassxc_core PROPERTIES COMPILE_DEFINITIONS KPXC_BUILDING_CORE)
 target_link_libraries(keepassxc_core 
         ${qrcode_LIB}
-        Qt5::Core
-        Qt5::Concurrent
+        Qt6::Core
+        Qt6::Concurrent
         ${BOTAN_LIBRARIES}
         ${PCSC_LIBRARIES}
         ${ZXCVBN_LIBRARIES}
@@ -386,12 +344,13 @@ target_link_libraries(keepassxc_core
 
 # GUI Library Definition
 add_library(keepassxc_gui STATIC ${gui_SOURCES})
-set_target_properties(keepassxc_gui PROPERTIES COMPILE_DEFINITIONS KEEPASSX_BUILDING_CORE)
+set_target_properties(keepassxc_gui PROPERTIES COMPILE_DEFINITIONS KPXC_BUILDING_CORE)
 target_link_libraries(keepassxc_gui
         keepassxc_core
-        Qt5::Network
-        Qt5::Widgets
-        autotype
+        Qt6::Network
+        Qt6::SvgWidgets
+        Qt6::Widgets
+        ${autotype_LIB}
         ${browser_LIB}
         ${fdosecrets_LIB}
         ${keeshare_LIB}
@@ -399,19 +358,19 @@ target_link_libraries(keepassxc_gui
 
 if(APPLE)
     target_link_libraries(keepassxc_gui "-framework Foundation -framework AppKit -framework Carbon -framework Security -framework LocalAuthentication -framework ScreenCaptureKit")
-    if(Qt5MacExtras_FOUND)
-        target_link_libraries(keepassxc_gui Qt5::MacExtras)
+    if(Qt6MacExtras_FOUND)
+        target_link_libraries(keepassxc_gui Qt6::MacExtras)
     endif()
 endif()
 if(HAIKU)
     target_link_libraries(keepassxc_gui network)
 endif()
 if(UNIX AND NOT APPLE)
-    target_link_libraries(keepassxc_core Qt5::DBus ${LIBUSB_LIBRARIES})
-    if(WITH_XC_X11)
-        target_link_libraries(keepassxc_gui Qt5::X11Extras X11)
+    target_link_libraries(keepassxc_core Qt6::DBus ${LIBUSB_LIBRARIES})
+    include_directories(${Qt6Gui_PRIVATE_INCLUDE_DIRS})
+    if(WITH_X11)
+        target_link_libraries(keepassxc_gui X11)
     endif()
-    include_directories(${Qt5Gui_PRIVATE_INCLUDE_DIRS})
 endif()
 if(WIN32)
     target_link_libraries(keepassxc_gui Wtsapi32.lib Ws2_32.lib)
@@ -491,11 +450,9 @@ install(TARGETS ${PROGNAME}
 
 # Windows Installer Definition
 if(WIN32)
-    if(${CMAKE_SIZEOF_VOID_P} EQUAL "8")
-        set(OUTPUT_FILE_POSTFIX "Win64")
-    else()
-        set(OUTPUT_FILE_POSTFIX "Win32")
-    endif()
+    # Deploy used libraries into build directory for debugging
+    add_custom_command(TARGET ${PROGNAME} POST_BUILD
+        COMMAND ${WINDEPLOYQT_EXE} --dir $<TARGET_FILE_DIR:${PROGNAME}> $<TARGET_FILE:${PROGNAME}>)
 
     # We have to copy the license file in the configuration phase.
     # CMake checks that CPACK_RESOURCE_FILE_LICENSE actually exists and
@@ -559,18 +516,11 @@ if(WIN32)
                 COMPONENT Runtime)
 
         # Use windeployqt.exe to setup Qt dependencies
-        if(Qt5Core_VERSION VERSION_LESS "5.14.1")
-            set(WINDEPLOYQT_MODE "--release")
-            if(CMAKE_BUILD_TYPE_LOWER STREQUAL "debug")
-                set(WINDEPLOYQT_MODE "--debug")
-            endif()
-        endif()
-
         install(CODE "execute_process(COMMAND ${WINDEPLOYQT_EXE} ${PROGNAME}.exe ${WINDEPLOYQT_MODE} WORKING_DIRECTORY \${CMAKE_INSTALL_PREFIX} OUTPUT_QUIET)"
                 COMPONENT Runtime)
 
         # install OpenSSL library
-        if(WITH_XC_NETWORKING)
+        if(KPXC_FEATURE_NETWORK)
             find_file(OPENSSL_DLL
                     NAMES libssl-3.dll libssl-3-x64.dll
                     HINTS "${OPENSSL_ROOT_DIR}/bin"
@@ -592,7 +542,7 @@ if(WIN32)
     endif()
 
     # install CA cert chains
-    find_file(SSL_CA_BUNDLE ca-bundle.crt PATHS "${Qt5_PREFIX}/ssl/certs")
+    find_file(SSL_CA_BUNDLE ca-bundle.crt PATHS "${Qt6_PREFIX}/ssl/certs")
     if(SSL_CA_BUNDLE)
         install(FILES ${SSL_CA_BUNDLE} DESTINATION "ssl/certs")
     else()
diff --git a/src/autotype/AutoType.cpp b/src/autotype/AutoType.cpp
index 9ed838117d..7bbd59aff6 100644
--- a/src/autotype/AutoType.cpp
+++ b/src/autotype/AutoType.cpp
@@ -151,9 +151,7 @@ AutoType::AutoType(QObject* parent, bool test)
     QString pluginPath = resources()->pluginPath(pluginName);
 
     if (!pluginPath.isEmpty()) {
-#ifdef WITH_XC_AUTOTYPE
         loadPlugin(pluginPath);
-#endif
     }
 
     connect(this, SIGNAL(autotypeFinished()), SLOT(resetAutoTypeState()));
diff --git a/src/autotype/AutoType.h b/src/autotype/AutoType.h
index 4708a70932..174f956222 100644
--- a/src/autotype/AutoType.h
+++ b/src/autotype/AutoType.h
@@ -28,9 +28,10 @@
 #include "AutoTypeAction.h"
 #include "AutoTypeMatch.h"
 
+#include "core/Database.h"
+#include "core/Entry.h"
+
 class AutoTypePlatformInterface;
-class Database;
-class Entry;
 class QPluginLoader;
 
 class AutoType : public QObject
diff --git a/src/autotype/AutoTypeMatch.h b/src/autotype/AutoTypeMatch.h
index 1b8f2c740f..97917b3e58 100644
--- a/src/autotype/AutoTypeMatch.h
+++ b/src/autotype/AutoTypeMatch.h
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2021 KeePassXC Team <team@keepassxc.org>
+ *  Copyright (C) 2025 KeePassXC Team <team@keepassxc.org>
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -18,6 +18,8 @@
 #ifndef KPXC_AUTOTYPEMATCH_H
 #define KPXC_AUTOTYPEMATCH_H
 
+#include "core/Entry.h"
+
 #include <QPair>
 #include <QPointer>
 
diff --git a/src/autotype/AutoTypeMatchView.cpp b/src/autotype/AutoTypeMatchView.cpp
index 91f9ce0838..0e3c722a2f 100644
--- a/src/autotype/AutoTypeMatchView.cpp
+++ b/src/autotype/AutoTypeMatchView.cpp
@@ -1,6 +1,6 @@
 /*
+ *  Copyright (C) 2025 KeePassXC Team <team@keepassxc.org>
  *  Copyright (C) 2015 David Wu <lightvector@gmail.com>
- *  Copyright (C) 2017 KeePassXC Team <team@keepassxc.org>
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -38,9 +38,9 @@ class CustomSortFilterProxyModel : public QSortFilterProxyModel
         auto index1 = sourceModel()->index(sourceRow, 1, sourceParent);
         auto index2 = sourceModel()->index(sourceRow, 2, sourceParent);
 
-        return sourceModel()->data(index0).toString().contains(filterRegExp())
-               || sourceModel()->data(index1).toString().contains(filterRegExp())
-               || sourceModel()->data(index2).toString().contains(filterRegExp());
+        return sourceModel()->data(index0).toString().contains(filterRegularExpression())
+               || sourceModel()->data(index1).toString().contains(filterRegularExpression())
+               || sourceModel()->data(index2).toString().contains(filterRegularExpression());
     }
 };
 
diff --git a/src/autotype/AutoTypeSelectDialog.cpp b/src/autotype/AutoTypeSelectDialog.cpp
index 3810418b5b..f3f7a96bc3 100644
--- a/src/autotype/AutoTypeSelectDialog.cpp
+++ b/src/autotype/AutoTypeSelectDialog.cpp
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2021 KeePassXC Team <team@keepassxc.org>
+ *  Copyright (C) 2025 KeePassXC Team <team@keepassxc.org>
  *  Copyright (C) 2012 Felix Geyer <debfx@fobos.de>
  *
  *  This program is free software: you can redistribute it and/or modify
@@ -309,7 +309,7 @@ void AutoTypeSelectDialog::buildActionMenu()
     m_actionMenu->addAction(copyTotpAction);
     m_actionMenu->addAction(copyUrlAction);
 
-    typeUsernameAction->setShortcut(Qt::CTRL + Qt::Key_1);
+    typeUsernameAction->setShortcut(Qt::CTRL | Qt::Key_1);
     typeUsernameAction->setProperty(MENU_FIELD_PROP_NAME, MENU_FIELD::USERNAME);
     connect(typeUsernameAction, &QAction::triggered, this, [&] {
         auto match = m_ui->view->currentMatch();
@@ -317,7 +317,7 @@ void AutoTypeSelectDialog::buildActionMenu()
         submitAutoTypeMatch(match);
     });
 
-    typePasswordAction->setShortcut(Qt::CTRL + Qt::Key_2);
+    typePasswordAction->setShortcut(Qt::CTRL | Qt::Key_2);
     typePasswordAction->setProperty(MENU_FIELD_PROP_NAME, MENU_FIELD::PASSWORD);
     connect(typePasswordAction, &QAction::triggered, this, [&] {
         auto match = m_ui->view->currentMatch();
@@ -325,7 +325,7 @@ void AutoTypeSelectDialog::buildActionMenu()
         submitAutoTypeMatch(match);
     });
 
-    typeTotpAction->setShortcut(Qt::CTRL + Qt::Key_3);
+    typeTotpAction->setShortcut(Qt::CTRL | Qt::Key_3);
     typeTotpAction->setProperty(MENU_FIELD_PROP_NAME, MENU_FIELD::TOTP);
     connect(typeTotpAction, &QAction::triggered, this, [&] {
         auto match = m_ui->view->currentMatch();
@@ -333,7 +333,7 @@ void AutoTypeSelectDialog::buildActionMenu()
         submitAutoTypeMatch(match);
     });
 
-    typeUrlAction->setShortcut(Qt::CTRL + Qt::Key_4);
+    typeUrlAction->setShortcut(Qt::CTRL | Qt::Key_4);
     typeUrlAction->setProperty(MENU_FIELD_PROP_NAME, MENU_FIELD::URL);
     connect(typeUrlAction, &QAction::triggered, this, [&] {
         auto match = m_ui->view->currentMatch();
@@ -344,14 +344,14 @@ void AutoTypeSelectDialog::buildActionMenu()
 #if defined(Q_OS_WIN) || defined(Q_OS_MAC)
     auto typeVirtualAction = new QAction(icons()->icon("auto-type"), tr("Use Virtual Keyboard"), nullptr);
     m_actionMenu->insertAction(copyUsernameAction, typeVirtualAction);
-    typeVirtualAction->setShortcut(Qt::CTRL + Qt::Key_5);
+    typeVirtualAction->setShortcut(Qt::CTRL | Qt::Key_5);
     connect(typeVirtualAction, &QAction::triggered, this, [&] {
         m_virtualMode = true;
         activateCurrentMatch();
     });
 #endif
 
-    copyUsernameAction->setShortcut(Qt::CTRL + Qt::SHIFT + Qt::Key_1);
+    copyUsernameAction->setShortcut(Qt::CTRL | Qt::SHIFT | Qt::Key_1);
     copyUsernameAction->setProperty(MENU_FIELD_PROP_NAME, MENU_FIELD::USERNAME);
     connect(copyUsernameAction, &QAction::triggered, this, [&] {
         auto entry = m_ui->view->currentMatch().first;
@@ -361,7 +361,7 @@ void AutoTypeSelectDialog::buildActionMenu()
         }
     });
 
-    copyPasswordAction->setShortcut(Qt::CTRL + Qt::SHIFT + Qt::Key_2);
+    copyPasswordAction->setShortcut(Qt::CTRL | Qt::SHIFT | Qt::Key_2);
     copyPasswordAction->setProperty(MENU_FIELD_PROP_NAME, MENU_FIELD::PASSWORD);
     connect(copyPasswordAction, &QAction::triggered, this, [&] {
         auto entry = m_ui->view->currentMatch().first;
@@ -371,7 +371,7 @@ void AutoTypeSelectDialog::buildActionMenu()
         }
     });
 
-    copyTotpAction->setShortcut(Qt::CTRL + Qt::SHIFT + Qt::Key_3);
+    copyTotpAction->setShortcut(Qt::CTRL | Qt::SHIFT | Qt::Key_3);
     copyTotpAction->setProperty(MENU_FIELD_PROP_NAME, MENU_FIELD::TOTP);
     connect(copyTotpAction, &QAction::triggered, this, [&] {
         auto entry = m_ui->view->currentMatch().first;
@@ -381,7 +381,7 @@ void AutoTypeSelectDialog::buildActionMenu()
         }
     });
 
-    copyUrlAction->setShortcut(Qt::CTRL + Qt::SHIFT + Qt::Key_4);
+    copyUrlAction->setShortcut(Qt::CTRL | Qt::SHIFT | Qt::Key_4);
     copyUrlAction->setProperty(MENU_FIELD_PROP_NAME, MENU_FIELD::URL);
     connect(copyUrlAction, &QAction::triggered, this, [&] {
         auto entry = m_ui->view->currentMatch().first;
diff --git a/src/autotype/CMakeLists.txt b/src/autotype/CMakeLists.txt
index 79bb503722..c00bbde34f 100644
--- a/src/autotype/CMakeLists.txt
+++ b/src/autotype/CMakeLists.txt
@@ -1,21 +1,35 @@
-if(WITH_XC_AUTOTYPE)
-    if(UNIX AND NOT APPLE AND NOT HAIKU)
+# Main auto-type static library
+set(autotype_SOURCES
+        AutoType.cpp
+        AutoTypeAction.cpp
+        AutoTypeMatchModel.cpp
+        AutoTypeMatchView.cpp
+        AutoTypeSelectDialog.cpp
+        PickcharsDialog.cpp
+        WindowSelectComboBox.cpp)
+
+add_library(autotype STATIC ${autotype_SOURCES})
+target_link_libraries(autotype Qt6::Core Qt6::Widgets)
+
+# Platform specific auto-type implementations
+if(UNIX AND NOT APPLE AND NOT HAIKU)
+    if(WITH_X11)
         find_package(X11 REQUIRED COMPONENTS Xi XTest)
-        find_package(Qt5X11Extras 5.2 REQUIRED)
         if(PRINT_SUMMARY)
             add_feature_info(libXi X11_Xi_FOUND "The X11 Xi Protocol library is required for auto-type")
             add_feature_info(libXtst X11_XTest_FOUND "The X11 XTEST Protocol library is required for auto-type")
-            add_feature_info(Qt5X11Extras Qt5X11Extras_FOUND "The Qt5X11Extras library is required for auto-type")
+            add_feature_info(Qt6X11Extras Qt6X11Extras_FOUND "The Qt6X11Extras library is required for auto-type")
         endif()
 
         add_subdirectory(xcb)
-    elseif(APPLE)
-        add_subdirectory(mac)
-    elseif(WIN32)
-        add_subdirectory(windows)
     endif()
+elseif(APPLE)
+    add_subdirectory(mac)
+elseif(WIN32)
+    add_subdirectory(windows)
+endif()
 
-    if(WITH_TESTS)
-        add_subdirectory(test)
-    endif()
+# Auto-type tests
+if(WITH_TESTS)
+    add_subdirectory(test)
 endif()
diff --git a/src/autotype/mac/AutoTypeMac.h b/src/autotype/mac/AutoTypeMac.h
index 54805a4e98..36f09747b8 100644
--- a/src/autotype/mac/AutoTypeMac.h
+++ b/src/autotype/mac/AutoTypeMac.h
@@ -1,6 +1,6 @@
 /*
+ *  Copyright (C) 2025 KeePassXC Team <team@keepassxc.org>
  *  Copyright (C) 2016 Lennart Glauer <mail@lennart-glauer.de>
- *  Copyright (C) 2017 KeePassXC Team <team@keepassxc.org>
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -16,8 +16,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef KEEPASSX_AUTOTYPEMAC_H
-#define KEEPASSX_AUTOTYPEMAC_H
+#ifndef KEEPASSXC_AUTOTYPEMAC_H
+#define KEEPASSXC_AUTOTYPEMAC_H
 
 #include <Carbon/Carbon.h>
 #include <QtPlugin>
@@ -45,7 +45,7 @@ class AutoTypePlatformMac : public QObject, public AutoTypePlatformInterface
     bool raiseOwnWindow() override;
 
     void sendChar(const QChar& ch, bool isKeyDown);
-    void sendKey(Qt::Key key, bool isKeyDown, Qt::KeyboardModifiers modifiers = 0);
+    void sendKey(Qt::Key key, bool isKeyDown, Qt::KeyboardModifiers modifiers = Qt::NoModifier);
 
 private:
     static int windowLayer(CFDictionaryRef window);
@@ -65,4 +65,4 @@ class AutoTypeExecutorMac : public AutoTypeExecutor
     AutoTypePlatformMac* const m_platform;
 };
 
-#endif  // KEEPASSX_AUTOTYPEMAC_H
+#endif  // KEEPASSXC_AUTOTYPEMAC_H
diff --git a/src/autotype/mac/CMakeLists.txt b/src/autotype/mac/CMakeLists.txt
index ae1f5187f5..656502271b 100644
--- a/src/autotype/mac/CMakeLists.txt
+++ b/src/autotype/mac/CMakeLists.txt
@@ -2,7 +2,7 @@ set(autotype_mac_SOURCES AutoTypeMac.cpp)
 
 add_library(keepassxc-autotype-cocoa MODULE ${autotype_mac_SOURCES})
 set_target_properties(keepassxc-autotype-cocoa PROPERTIES LINK_FLAGS "-framework Foundation -framework AppKit -framework Carbon -framework ScreenCaptureKit")
-target_link_libraries(keepassxc-autotype-cocoa ${PROGNAME} Qt5::Core Qt5::Widgets)
+target_link_libraries(keepassxc-autotype-cocoa ${PROGNAME} Qt6::Core Qt6::Widgets)
 
 install(TARGETS keepassxc-autotype-cocoa
         LIBRARY DESTINATION ${PLUGIN_INSTALL_DIR} COMPONENT Runtime)
diff --git a/src/autotype/test/CMakeLists.txt b/src/autotype/test/CMakeLists.txt
index e27f2b1d98..36e6b9e6d9 100644
--- a/src/autotype/test/CMakeLists.txt
+++ b/src/autotype/test/CMakeLists.txt
@@ -1,4 +1,4 @@
 set(autotype_test_SOURCES AutoTypeTest.cpp)
 
 add_library(keepassxc-autotype-test MODULE ${autotype_test_SOURCES})
-target_link_libraries(keepassxc-autotype-test keepassxc_gui ${autotype_LIB} Qt5::Core Qt5::Widgets)
+target_link_libraries(keepassxc-autotype-test keepassxc_gui ${autotype_LIB} Qt6::Core Qt6::Widgets)
diff --git a/src/autotype/windows/AutoTypeWindows.h b/src/autotype/windows/AutoTypeWindows.h
index 29e98ab353..80041a9f18 100644
--- a/src/autotype/windows/AutoTypeWindows.h
+++ b/src/autotype/windows/AutoTypeWindows.h
@@ -1,6 +1,6 @@
 /*
+ *  Copyright (C) 2025 KeePassXC Team <team@keepassxc.org>
  *  Copyright (C) 2016 Lennart Glauer <mail@lennart-glauer.de>
- *  Copyright (C) 2017 KeePassXC Team <team@keepassxc.org>
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -16,8 +16,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef KEEPASSX_AUTOTYPEWINDOWS_H
-#define KEEPASSX_AUTOTYPEWINDOWS_H
+#ifndef KEEPASSXC_AUTOTYPEWINDOWS_H
+#define KEEPASSXC_AUTOTYPEWINDOWS_H
 
 #include <QtPlugin>
 
@@ -67,4 +67,4 @@ class AutoTypeExecutorWin : public AutoTypeExecutor
     AutoTypePlatformWin* const m_platform;
 };
 
-#endif // KEEPASSX_AUTOTYPEWINDOWS_H
+#endif // KEEPASSXC_AUTOTYPEWINDOWS_H
diff --git a/src/autotype/windows/CMakeLists.txt b/src/autotype/windows/CMakeLists.txt
index 5b9cbecff9..6ed316e2d5 100644
--- a/src/autotype/windows/CMakeLists.txt
+++ b/src/autotype/windows/CMakeLists.txt
@@ -1,7 +1,7 @@
 set(autotype_win_SOURCES AutoTypeWindows.cpp)
 
 add_library(keepassxc-autotype-windows MODULE ${autotype_win_SOURCES})
-target_link_libraries(keepassxc-autotype-windows keepassxc_gui ${autotype_LIB} Qt5::Core Qt5::Widgets)
+target_link_libraries(keepassxc-autotype-windows keepassxc_gui ${autotype_LIB} Qt6::Core Qt6::Widgets)
 install(TARGETS keepassxc-autotype-windows
         BUNDLE DESTINATION . COMPONENT Runtime
         LIBRARY DESTINATION ${PLUGIN_INSTALL_DIR} COMPONENT Runtime)
diff --git a/src/autotype/xcb/AutoTypeXCB.cpp b/src/autotype/xcb/AutoTypeXCB.cpp
index af9c463ee1..165fd48134 100644
--- a/src/autotype/xcb/AutoTypeXCB.cpp
+++ b/src/autotype/xcb/AutoTypeXCB.cpp
@@ -1,7 +1,7 @@
 /*
+ *  Copyright (C) 2026 KeePassXC Team <team@keepassxc.org>
  *  Copyright (C) 2012 Felix Geyer <debfx@fobos.de>
  *  Copyright (C) 2000-2008 Tom Sato <VEF00200@nifty.ne.jp>
- *  Copyright (C) 2017 KeePassXC Team <team@keepassxc.org>
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -21,8 +21,9 @@
 #include "core/Tools.h"
 #include "gui/osutils/nixutils/X11Funcs.h"
 
-#include <QX11Info>
+#include <QGuiApplication>
 #include <X11/XKBlib.h>
+#include <X11/Xatom.h>
 #include <X11/Xutil.h>
 #include <X11/extensions/XTest.h>
 
@@ -38,8 +39,10 @@ static const QPair<KeySym, KeySym> deadMap[] = {
 AutoTypePlatformX11::AutoTypePlatformX11()
 {
     // Qt handles XCB slightly differently so we open our own connection
-    m_dpy = XOpenDisplay(XDisplayString(QX11Info::display()));
-    m_rootWindow = QX11Info::appRootWindow();
+    if (auto* native = qGuiApp->nativeInterface<QNativeInterface::QX11Application>()) {
+        m_dpy = XOpenDisplay(XDisplayString(native->display()));
+        m_rootWindow = DefaultRootWindow(native->display());
+    }
 
     m_atomWmState = XInternAtom(m_dpy, "WM_STATE", True);
     m_atomWmName = XInternAtom(m_dpy, "WM_NAME", True);
@@ -49,6 +52,7 @@ AutoTypePlatformX11::AutoTypePlatformX11()
     m_atomNetActiveWindow = XInternAtom(m_dpy, "_NET_ACTIVE_WINDOW", True);
     m_atomTransientFor = XInternAtom(m_dpy, "WM_TRANSIENT_FOR", True);
     m_atomWindow = XInternAtom(m_dpy, "WINDOW", True);
+    m_appUserTime = XInternAtom(m_dpy, "_NET_WM_USER_TIME", False);
 
     m_classBlacklist << "desktop_window" << "gnome-panel"; // Gnome
     m_classBlacklist << "kdesktop" << "kicker"; // KDE 3
@@ -289,6 +293,31 @@ bool AutoTypePlatformX11::isTopLevelWindow(Window window)
     return result;
 }
 
+unsigned long AutoTypePlatformX11::appUserTime(Window window)
+{
+    auto appUserTime = 0;
+
+    Atom type = None;
+    int format;
+    unsigned long nitems;
+    unsigned long after;
+    unsigned char* data = nullptr;
+
+    if (XGetWindowProperty(
+            m_dpy, window, m_appUserTime, 0, 1, False, XA_CARDINAL, &type, &format, &nitems, &after, &data)
+        == Success) {
+        if (data && nitems == 1) {
+            appUserTime = *reinterpret_cast<unsigned long*>(data);
+        }
+
+        if (data) {
+            XFree(data);
+        }
+    }
+
+    return appUserTime;
+}
+
 /*
  * Update the keyboard and modifier mapping.
  * We need the KeyboardMapping for AddKeysym.
@@ -625,7 +654,7 @@ bool AutoTypePlatformX11::raiseWindow(WId window)
     event.xclient.message_type = m_atomNetActiveWindow;
     event.xclient.format = 32;
     event.xclient.data.l[0] = 1; // FromApplication
-    event.xclient.data.l[1] = QX11Info::appUserTime();
+    event.xclient.data.l[1] = appUserTime(window);
     QWidget* activeWindow = QApplication::activeWindow();
     if (activeWindow) {
         event.xclient.data.l[2] = activeWindow->internalWinId();
diff --git a/src/autotype/xcb/AutoTypeXCB.h b/src/autotype/xcb/AutoTypeXCB.h
index 7b743a4715..91a3c1adf6 100644
--- a/src/autotype/xcb/AutoTypeXCB.h
+++ b/src/autotype/xcb/AutoTypeXCB.h
@@ -1,7 +1,7 @@
 /*
+ *  Copyright (C) 2026 KeePassXC Team <team@keepassxc.org>
  *  Copyright (C) 2012 Felix Geyer <debfx@fobos.de>
  *  Copyright (C) 2000-2008 Tom Sato <VEF00200@nifty.ne.jp>
- *  Copyright (C) 2017 KeePassXC Team <team@keepassxc.org>
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -17,8 +17,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef KEEPASSX_AUTOTYPEXCB_H
-#define KEEPASSX_AUTOTYPEXCB_H
+#ifndef KEEPASSXC_AUTOTYPEXCB_H
+#define KEEPASSXC_AUTOTYPEXCB_H
 
 #include <QApplication>
 #include <QSet>
@@ -48,7 +48,7 @@ class AutoTypePlatformX11 : public QObject, public AutoTypePlatformInterface
     AutoTypeExecutor* createExecutor() override;
     void updateKeymap();
 
-    AutoTypeAction::Result sendKey(KeySym keysym, unsigned int modifiers = 0);
+    AutoTypeAction::Result sendKey(KeySym keysym, unsigned int modifiers = Qt::NoModifier);
 
 private:
     QString windowTitle(Window window, bool useBlacklist);
@@ -56,6 +56,7 @@ class AutoTypePlatformX11 : public QObject, public AutoTypePlatformInterface
     QString windowClassName(Window window);
     QList<Window> widgetsToX11Windows(const QWidgetList& widgetList);
     bool isTopLevelWindow(Window window);
+    unsigned long appUserTime(Window window);
 
     XkbDescPtr getKeyboard();
     bool RemapKeycode(KeySym keysym);
@@ -75,6 +76,7 @@ class AutoTypePlatformX11 : public QObject, public AutoTypePlatformInterface
     Atom m_atomNetActiveWindow;
     Atom m_atomTransientFor;
     Atom m_atomWindow;
+    Atom m_appUserTime;
     QSet<QString> m_classBlacklist;
 
     typedef struct
@@ -105,4 +107,4 @@ class AutoTypeExecutorX11 : public AutoTypeExecutor
     AutoTypePlatformX11* const m_platform;
 };
 
-#endif // KEEPASSX_AUTOTYPEXCB_H
+#endif // KEEPASSXC_AUTOTYPEXCB_H
diff --git a/src/autotype/xcb/CMakeLists.txt b/src/autotype/xcb/CMakeLists.txt
index f14017f63a..b4d3fdaf0a 100644
--- a/src/autotype/xcb/CMakeLists.txt
+++ b/src/autotype/xcb/CMakeLists.txt
@@ -3,7 +3,7 @@ include_directories(SYSTEM ${X11_X11_INCLUDE_PATH})
 set(autotype_XCB_SOURCES AutoTypeXCB.cpp)
 
 add_library(keepassxc-autotype-xcb MODULE ${autotype_XCB_SOURCES})
-target_link_libraries(keepassxc-autotype-xcb keepassxc_gui Qt5::Core Qt5::Widgets Qt5::X11Extras ${X11_X11_LIB} ${X11_Xi_LIB} ${X11_XTest_LIB})
+target_link_libraries(keepassxc-autotype-xcb keepassxc_gui Qt6::Core Qt6::Widgets ${X11_X11_LIB} ${X11_Xi_LIB} ${X11_XTest_LIB})
 install(TARGETS keepassxc-autotype-xcb
         BUNDLE DESTINATION . COMPONENT Runtime
         LIBRARY DESTINATION ${PLUGIN_INSTALL_DIR} COMPONENT Runtime)
diff --git a/src/browser/BrowserAction.cpp b/src/browser/BrowserAction.cpp
index 67cf7f0dfd..1e6db64da4 100644
--- a/src/browser/BrowserAction.cpp
+++ b/src/browser/BrowserAction.cpp
@@ -17,11 +17,9 @@
 
 #include "BrowserAction.h"
 #include "BrowserMessageBuilder.h"
-#ifdef WITH_XC_BROWSER_PASSKEYS
 #include "BrowserPasskeys.h"
-#include "PasskeyUtils.h"
-#endif
 #include "BrowserSettings.h"
+#include "PasskeyUtils.h"
 #include "core/Global.h"
 #include "core/Tools.h"
 
@@ -110,12 +108,10 @@ QJsonObject BrowserAction::handleAction(QLocalSocket* socket, const QJsonObject&
         return handleGlobalAutoType(json, action);
     } else if (action.compare("get-database-entries", Qt::CaseSensitive) == 0) {
         return handleGetDatabaseEntries(json, action);
-#ifdef WITH_XC_BROWSER_PASSKEYS
     } else if (action.compare(BROWSER_REQUEST_PASSKEYS_GET) == 0) {
         return handlePasskeysGet(json, action);
     } else if (action.compare(BROWSER_REQUEST_PASSKEYS_REGISTER) == 0) {
         return handlePasskeysRegister(json, action);
-#endif
     }
 
     // Action was not recognized
@@ -519,7 +515,6 @@ QJsonObject BrowserAction::handleGlobalAutoType(const QJsonObject& json, const Q
     return buildResponse(action, browserRequest.incrementedNonce);
 }
 
-#ifdef WITH_XC_BROWSER_PASSKEYS
 QJsonObject BrowserAction::handlePasskeysGet(const QJsonObject& json, const QString& action)
 {
     if (!m_associated) {
@@ -586,7 +581,6 @@ QJsonObject BrowserAction::handlePasskeysRegister(const QJsonObject& json, const
     const Parameters params{{"response", response}};
     return buildResponse(action, browserRequest.incrementedNonce, params);
 }
-#endif
 
 QJsonObject BrowserAction::decryptMessage(const QString& message, const QString& nonce)
 {
diff --git a/src/browser/BrowserAction.h b/src/browser/BrowserAction.h
index 5c115f5f15..1ad25c8a0f 100644
--- a/src/browser/BrowserAction.h
+++ b/src/browser/BrowserAction.h
@@ -84,19 +84,15 @@ class BrowserAction
     QJsonObject handleGetTotp(const QJsonObject& json, const QString& action);
     QJsonObject handleDeleteEntry(const QJsonObject& json, const QString& action);
     QJsonObject handleGlobalAutoType(const QJsonObject& json, const QString& action);
-#ifdef WITH_XC_BROWSER_PASSKEYS
     QJsonObject handlePasskeysGet(const QJsonObject& json, const QString& action);
     QJsonObject handlePasskeysRegister(const QJsonObject& json, const QString& action);
-#endif
 
-private:
     QJsonObject buildResponse(const QString& action, const QString& nonce, const Parameters& params = {});
     QJsonObject getErrorReply(const QString& action, const int errorCode) const;
     QJsonObject decryptMessage(const QString& message, const QString& nonce);
     BrowserRequest decodeRequest(const QJsonObject& json);
     StringPairList getConnectionKeys(const BrowserRequest& browserRequest);
 
-private:
     static const int MaxUrlLength;
 
     QString m_clientPublicKey;
diff --git a/src/browser/BrowserPasskeys.cpp b/src/browser/BrowserPasskeys.cpp
index 361bed7ddc..2ea8140415 100644
--- a/src/browser/BrowserPasskeys.cpp
+++ b/src/browser/BrowserPasskeys.cpp
@@ -298,7 +298,7 @@ AttestationKeyPair BrowserPasskeys::buildCredentialPrivateKey(int alg, const Tes
             try {
                 Botan::Ed25519_PrivateKey privateKey(*randomGen()->getRng());
                 auto publicKeyBits = privateKey.get_public_key();
-#ifdef WITH_XC_BOTAN3
+#ifdef WITH_BOTAN3
                 auto privateKeyBits = privateKey.raw_private_key_bits();
 #else
                 auto privateKeyBits = privateKey.get_private_key();
@@ -353,7 +353,7 @@ QByteArray BrowserPasskeys::buildSignature(const QByteArray& authenticatorData,
         std::vector<uint8_t> rawSignature;
         if (algName == "ECDSA") {
             Botan::ECDSA_PrivateKey privateKey(algId, privateKeyBytes);
-#ifdef WITH_XC_BOTAN3
+#ifdef WITH_BOTAN3
             Botan::PK_Signer signer(
                 privateKey, *randomGen()->getRng(), "EMSA1(SHA-256)", Botan::Signature_Format::DerSequence);
 #else
diff --git a/src/browser/BrowserService.cpp b/src/browser/BrowserService.cpp
index f5da1df667..3540c93812 100644
--- a/src/browser/BrowserService.cpp
+++ b/src/browser/BrowserService.cpp
@@ -23,20 +23,18 @@
 #include "BrowserEntrySaveDialog.h"
 #include "BrowserHost.h"
 #include "BrowserMessageBuilder.h"
+#include "BrowserPasskeys.h"
+#include "BrowserPasskeysClient.h"
+#include "BrowserPasskeysConfirmationDialog.h"
 #include "BrowserSettings.h"
+#include "PasskeyUtils.h"
 #include "core/EntryAttributes.h"
 #include "core/Tools.h"
 #include "gui/MainWindow.h"
 #include "gui/MessageBox.h"
 #include "gui/UrlTools.h"
 #include "gui/osutils/OSUtils.h"
-#ifdef WITH_XC_BROWSER_PASSKEYS
-#include "BrowserPasskeys.h"
-#include "BrowserPasskeysClient.h"
-#include "BrowserPasskeysConfirmationDialog.h"
-#include "PasskeyUtils.h"
 #include "gui/passkeys/PasskeyImporter.h"
-#endif
 #ifdef Q_OS_MACOS
 #include "gui/osutils/macutils/MacUtils.h"
 #endif
@@ -57,11 +55,9 @@
 const QString BrowserService::KEEPASSXCBROWSER_NAME = QStringLiteral("KeePassXC-Browser Settings");
 const QString BrowserService::KEEPASSXCBROWSER_OLD_NAME = QStringLiteral("keepassxc-browser Settings");
 static const QString KEEPASSXCBROWSER_GROUP_NAME = QStringLiteral("KeePassXC-Browser Passwords");
+static const QString PASSKEYS_DEFAULT_GROUP_NAME = QStringLiteral("KeePassXC-Browser Passkeys");
 static int KEEPASSXCBROWSER_DEFAULT_ICON = 1;
-#ifdef WITH_XC_BROWSER_PASSKEYS
 static int KEEPASSXCBROWSER_PASSKEY_ICON = 13;
-static const QString PASSKEYS_DEFAULT_GROUP_NAME = QStringLiteral("KeePassXC-Browser Passkeys");
-#endif
 // These are for the settings and password conversion
 static const QString KEEPASSHTTP_NAME = QStringLiteral("KeePassHttp Settings");
 static const QString KEEPASSHTTP_GROUP_NAME = QStringLiteral("KeePassHttp Passwords");
@@ -324,11 +320,11 @@ QJsonObject BrowserService::createNewGroup(const QString& groupName, bool isPass
             newGroup->setName(groups[i]);
             newGroup->setUuid(QUuid::createUuid());
             newGroup->setParent(previousGroup);
-#ifdef WITH_XC_BROWSER_PASSKEYS
+
             if (isPasskeysGroup && i == groups.length() - 1) {
                 newGroup->setIcon(KEEPASSXCBROWSER_PASSKEY_ICON);
             }
-#endif
+
             name = newGroup->name();
             newGroup->setCustomDataTriState(BrowserService::OPTION_HIDE_ENTRY, Group::Disable);
             uuid = Tools::uuidToHex(newGroup->uuid());
@@ -634,7 +630,6 @@ QString BrowserService::getKey(const QString& id)
     return db->metadata()->customData()->value(CustomData::getKeyWithPrefix(CustomData::BrowserKeyPrefix, id));
 }
 
-#ifdef WITH_XC_BROWSER_PASSKEYS
 // Passkey registration
 QJsonObject BrowserService::showPasskeysRegisterPrompt(const QJsonObject& publicKeyOptions,
                                                        const QString& origin,
@@ -874,7 +869,6 @@ void BrowserService::addPasskeyToEntry(Entry* entry,
 
     entry->endUpdate();
 }
-#endif
 
 void BrowserService::addEntry(const EntryParameters& entryParameters,
                               const QString& group,
@@ -1053,12 +1047,10 @@ QList<Entry*> BrowserService::searchEntries(const QSharedPointer<Database>& db,
                 continue;
             }
 
-#ifdef WITH_XC_BROWSER_PASSKEYS
             // With Passkeys, check for the Relying Party instead of URL
             if (passkey && entry->attributes()->value(EntryAttributes::KPEX_PASSKEY_RELYING_PARTY) != siteUrl) {
                 continue;
             }
-#endif
 
             // Additional URL check may have already inserted the entry to the list
             if (!entries.contains(entry)) {
@@ -1398,7 +1390,6 @@ bool BrowserService::shouldIncludeEntry(Entry* entry,
     return false;
 }
 
-#ifdef WITH_XC_BROWSER_PASSKEYS
 // Returns all Passkey entries for the current Relying Party
 QList<Entry*> BrowserService::getPasskeyEntries(const QString& rpId, const StringPairList& keyList)
 {
@@ -1460,7 +1451,7 @@ bool BrowserService::isPasskeyCredentialExcluded(const QJsonArray& excludeCreden
 {
     QStringList allIds;
     for (const auto& cred : excludeCredentials) {
-        allIds << cred["id"].toString();
+        allIds << cred.toObject().value("id").toString();
     }
 
     const auto passkeyEntries = getPasskeyEntries(rpId, keyList);
@@ -1473,7 +1464,6 @@ QJsonObject BrowserService::getPasskeyError(int errorCode) const
 {
     return QJsonObject({{"errorCode", errorCode}});
 }
-#endif
 
 bool BrowserService::handleURL(const QString& entryUrl,
                                const QString& siteUrl,
@@ -1781,7 +1771,7 @@ void BrowserService::processClientMessage(QLocalSocket* socket, const QJsonObjec
         m_browserClients.insert(clientID, QSharedPointer<BrowserAction>::create());
     }
 
-    auto& action = m_browserClients.value(clientID);
+    const auto& action = m_browserClients.value(clientID);
     auto response = action->processClientMessage(socket, message);
     m_browserHost->sendClientMessage(socket, response);
 }
diff --git a/src/browser/BrowserService.h b/src/browser/BrowserService.h
index c59f9303d6..1db8fd50f4 100644
--- a/src/browser/BrowserService.h
+++ b/src/browser/BrowserService.h
@@ -87,7 +87,7 @@ class BrowserService : public QObject
     QSharedPointer<Database> getDatabase(const QUuid& rootGroupUuid = {});
     QSharedPointer<Database> selectedDatabase();
     QList<QSharedPointer<Database>> getOpenDatabases();
-#ifdef WITH_XC_BROWSER_PASSKEYS
+
     QJsonObject showPasskeysRegisterPrompt(const QJsonObject& publicKeyOptions,
                                            const QString& origin,
                                            const QString& groupName,
@@ -111,7 +111,7 @@ class BrowserService : public QObject
                            const QString& credentialId,
                            const QString& userHandle,
                            const QString& privateKey);
-#endif
+
     void addEntry(const EntryParameters& entryParameters,
                   const QString& group,
                   const QString& groupUuid,
@@ -186,7 +186,7 @@ private slots:
     bool removeFirstDomain(QString& hostname);
     bool
     shouldIncludeEntry(Entry* entry, const QString& url, const QString& submitUrl, const bool omitWwwSubdomain = false);
-#ifdef WITH_XC_BROWSER_PASSKEYS
+
     QList<Entry*> getPasskeyEntries(const QString& rpId, const StringPairList& keyList);
     QList<Entry*>
     getPasskeyEntriesWithUserHandle(const QString& rpId, const QString& userId, const StringPairList& keyList);
@@ -196,7 +196,7 @@ private slots:
                                      const QString& rpId,
                                      const StringPairList& keyList);
     QJsonObject getPasskeyError(int errorCode) const;
-#endif
+
     bool handleURL(const QString& entryUrl,
                    const QString& siteUrl,
                    const QString& formUrl,
@@ -223,9 +223,7 @@ private slots:
     Q_DISABLE_COPY(BrowserService);
 
     friend class TestBrowser;
-#ifdef WITH_XC_BROWSER_PASSKEYS
     friend class TestPasskeys;
-#endif
 };
 
 static inline BrowserService* browserService()
diff --git a/src/browser/CMakeLists.txt b/src/browser/CMakeLists.txt
index 7942be430e..7bfd2e047b 100644
--- a/src/browser/CMakeLists.txt
+++ b/src/browser/CMakeLists.txt
@@ -1,4 +1,4 @@
-#  Copyright (C) 2024 KeePassXC Team <team@keepassxc.org>
+#  Copyright (C) 2025 KeePassXC Team <team@keepassxc.org>
 #
 #  This program is free software: you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -13,33 +13,29 @@
 #  You should have received a copy of the GNU General Public License
 #  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-if(WITH_XC_BROWSER)
+if(KPXC_FEATURE_BROWSER)
     include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
 
     set(browser_SOURCES
             BrowserAccessControlDialog.cpp
             BrowserAction.cpp
+            BrowserCbor.cpp
             BrowserEntryConfig.cpp
             BrowserEntrySaveDialog.cpp
             BrowserHost.cpp
             BrowserMessageBuilder.cpp
+            BrowserPasskeys.cpp
+            BrowserPasskeysClient.cpp
+            BrowserPasskeysConfirmationDialog.cpp
             BrowserSettingsPage.cpp
             BrowserSettingsWidget.cpp
             BrowserService.cpp
             BrowserSettings.cpp
             BrowserShared.cpp
             CustomTableWidget.cpp
-            NativeMessageInstaller.cpp)
-
-    if(WITH_XC_BROWSER_PASSKEYS)
-        list(APPEND browser_SOURCES
-                BrowserCbor.cpp
-                BrowserPasskeys.cpp
-                BrowserPasskeysClient.cpp
-                BrowserPasskeysConfirmationDialog.cpp
-                PasskeyUtils.cpp)
-    endif()
+            NativeMessageInstaller.cpp
+            PasskeyUtils.cpp)
 
     add_library(browser STATIC ${browser_SOURCES})
-    target_link_libraries(browser Qt5::Core Qt5::Concurrent Qt5::Widgets Qt5::Network ${BOTAN_LIBRARIES})
+    target_link_libraries(browser Qt6::Core Qt6::Concurrent Qt6::Widgets Qt6::Network ${BOTAN_LIBRARIES})
 endif()
diff --git a/src/browser/NativeMessageInstaller.cpp b/src/browser/NativeMessageInstaller.cpp
index bf0ad5abad..21a6626b48 100644
--- a/src/browser/NativeMessageInstaller.cpp
+++ b/src/browser/NativeMessageInstaller.cpp
@@ -212,7 +212,7 @@ QString NativeMessageInstaller::getNativeMessagePath(SupportedBrowsers browser)
     if (Config::isPortable()) {
         basePath = Config::portableConfigDir();
     } else {
-        basePath = QStandardPaths::writableLocation(QStandardPaths::DataLocation);
+        basePath = QStandardPaths::writableLocation(QStandardPaths::AppLocalDataLocation);
     }
     return QStringLiteral("%1/%2_%3.json").arg(basePath, HOST_NAME, getBrowserName(browser));
 #elif defined(KEEPASSXC_DIST_FLATPAK)
diff --git a/src/browser/PasskeyUtils.cpp b/src/browser/PasskeyUtils.cpp
index b28c94dbbc..52063232b2 100644
--- a/src/browser/PasskeyUtils.cpp
+++ b/src/browser/PasskeyUtils.cpp
@@ -158,18 +158,19 @@ QJsonArray PasskeyUtils::parseCredentialTypes(const QJsonArray& credentialTypes)
         }));
     } else {
         for (const auto current : credentialTypes) {
-            if (current["type"] != BrowserPasskeys::PUBLIC_KEY || current["alg"].isUndefined()) {
+            const auto currentObject = current.toObject();
+            if (currentObject["type"] != BrowserPasskeys::PUBLIC_KEY || currentObject["alg"].isUndefined()) {
                 continue;
             }
 
-            const auto currentAlg = current["alg"].toInt();
+            const auto currentAlg = currentObject["alg"].toInt();
             if (currentAlg != WebAuthnAlgorithms::ES256 && currentAlg != WebAuthnAlgorithms::RS256
                 && currentAlg != WebAuthnAlgorithms::EDDSA) {
                 continue;
             }
 
             credTypesAndPubKeyAlgs.push_back(QJsonObject({
-                {"type", current["type"]},
+                {"type", currentObject["type"]},
                 {"alg", currentAlg},
             }));
         }
diff --git a/src/cli/CMakeLists.txt b/src/cli/CMakeLists.txt
index ecd5da2847..70b59bc4e5 100644
--- a/src/cli/CMakeLists.txt
+++ b/src/cli/CMakeLists.txt
@@ -1,4 +1,4 @@
-#  Copyright (C) 2019 KeePassXC Team
+#  Copyright (C) 2025 KeePassXC Team
 #
 #  This program is free software: you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -45,7 +45,7 @@ set(cli_SOURCES
         Show.cpp)
 
 add_library(cli STATIC ${cli_SOURCES})
-target_link_libraries(cli ${ZXCVBN_LIBRARIES} Qt5::Core)
+target_link_libraries(cli ${ZXCVBN_LIBRARIES} Qt6::Core)
 
 find_package(Readline)
 
diff --git a/src/cli/DatabaseCommand.cpp b/src/cli/DatabaseCommand.cpp
index d3d3c641d4..e587a934a2 100644
--- a/src/cli/DatabaseCommand.cpp
+++ b/src/cli/DatabaseCommand.cpp
@@ -27,9 +27,7 @@ DatabaseCommand::DatabaseCommand()
     positionalArguments.append({QString("database"), QObject::tr("Path of the database."), QString("")});
     options.append(Command::KeyFileOption);
     options.append(Command::NoPasswordOption);
-#ifdef WITH_XC_YUBIKEY
     options.append(Command::YubiKeyOption);
-#endif
 }
 
 int DatabaseCommand::execute(const QStringList& arguments)
@@ -55,11 +53,7 @@ int DatabaseCommand::execute(const QStringList& arguments)
         db = Utils::unlockDatabase(args.at(0),
                                    !parser->isSet(Command::NoPasswordOption),
                                    parser->value(Command::KeyFileOption),
-#ifdef WITH_XC_YUBIKEY
                                    parser->value(Command::YubiKeyOption),
-#else
-                                   "",
-#endif
                                    parser->isSet(Command::QuietOption));
         if (!db) {
             return EXIT_FAILURE;
diff --git a/src/cli/Merge.cpp b/src/cli/Merge.cpp
index 312edf8c32..cc7e3721a7 100644
--- a/src/cli/Merge.cpp
+++ b/src/cli/Merge.cpp
@@ -51,9 +51,8 @@ Merge::Merge()
     options.append(Merge::KeyFileFromOption);
     options.append(Merge::NoPasswordFromOption);
     options.append(Merge::DryRunOption);
-#ifdef WITH_XC_YUBIKEY
     options.append(Merge::YubiKeyFromOption);
-#endif
+
     positionalArguments.append({QString("database2"), QObject::tr("Path of the database to merge from."), QString("")});
 }
 
diff --git a/src/cli/TextStream.cpp b/src/cli/TextStream.cpp
index e2e6e15f46..157ddca728 100644
--- a/src/cli/TextStream.cpp
+++ b/src/cli/TextStream.cpp
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2018 KeePassXC Team <team@keepassxc.org>
+ *  Copyright (C) 2025 KeePassXC Team <team@keepassxc.org>
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -18,7 +18,7 @@
 #include "TextStream.h"
 
 #include <QProcessEnvironment>
-#include <QTextCodec>
+#include <QStringConverter>
 #ifdef Q_OS_WIN
 #include <windows.h>
 #endif
@@ -87,13 +87,44 @@ void TextStream::detectCodec()
         // Only override codec if LANG is set, otherwise Qt will assume
         // US-ASCII, which is almost always wrong and results in
         // Unicode passwords being displayed as question marks.
-        codecName = QTextCodec::codecForLocale()->name();
+        codecName = "System";
     }
 #endif
 
     codecName = env.value("ENCODING_OVERRIDE", codecName);
-    auto* codec = QTextCodec::codecForName(codecName.toLatin1());
-    if (codec) {
-        setCodec(codec);
+
+    QStringConverter::Encoding codec = QStringConverter::Utf8;
+    if (codecName.toLatin1().compare(QByteArray("UTF-8"), Qt::CaseInsensitive) == 0
+        || codecName.toLatin1().compare(QByteArray("Utf8"), Qt::CaseInsensitive) == 0) {
+        codec = QStringConverter::Utf8;
+    } else if (codecName.toLatin1().compare(QByteArray("UTF-16"), Qt::CaseInsensitive) == 0
+               || codecName.toLatin1().compare(QByteArray("Utf16"), Qt::CaseInsensitive) == 0) {
+        codec = QStringConverter::Utf16;
+    } else if (codecName.toLatin1().compare(QByteArray("UTF-16BE"), Qt::CaseInsensitive) == 0
+               || codecName.toLatin1().compare(QByteArray("Utf16BE"), Qt::CaseInsensitive) == 0) {
+        codec = QStringConverter::Utf16BE;
+    } else if (codecName.toLatin1().compare(QByteArray("UTF-16LE"), Qt::CaseInsensitive) == 0
+               || codecName.toLatin1().compare(QByteArray("Utf16LE"), Qt::CaseInsensitive) == 0) {
+        codec = QStringConverter::Utf16LE;
+    } else if (codecName.toLatin1().compare(QByteArray("UTF-32"), Qt::CaseInsensitive) == 0
+               || codecName.toLatin1().compare(QByteArray("Utf32"), Qt::CaseInsensitive) == 0) {
+        codec = QStringConverter::Utf32;
+    } else if (codecName.toLatin1().compare(QByteArray("UTF-32BE"), Qt::CaseInsensitive) == 0
+               || codecName.toLatin1().compare(QByteArray("Utf32BE"), Qt::CaseInsensitive) == 0) {
+        codec = QStringConverter::Utf32BE;
+    } else if (codecName.toLatin1().compare(QByteArray("UTF-32LE"), Qt::CaseInsensitive) == 0
+               || codecName.toLatin1().compare(QByteArray("Utf32LE"), Qt::CaseInsensitive) == 0) {
+        codec = QStringConverter::Utf32LE;
+    } else if (codecName.toLatin1().compare(QByteArray("ISO 8859-1"), Qt::CaseInsensitive) == 0
+               || codecName.toLatin1().compare(QByteArray("Latin1"), Qt::CaseInsensitive) == 0) {
+        codec = QStringConverter::Latin1;
+    } else if (codecName.toLatin1().compare(QByteArray("Windows-850"), Qt::CaseInsensitive) == 0
+               || codecName.toLatin1().compare(QByteArray("Windows-1252"), Qt::CaseInsensitive) == 0
+               || codecName.toLatin1().compare(QByteArray("System"), Qt::CaseInsensitive) == 0) {
+        codec = QStringConverter::System;
+    } else {
+        return;
     }
+
+    setEncoding(codec);
 }
diff --git a/src/cli/TextStream.h b/src/cli/TextStream.h
index 0091ec1087..1ac37acbdb 100644
--- a/src/cli/TextStream.h
+++ b/src/cli/TextStream.h
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2018 KeePassXC Team <team@keepassxc.org>
+ *  Copyright (C) 2025 KeePassXC Team <team@keepassxc.org>
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -18,6 +18,7 @@
 #ifndef KEEPASSXC_TEXTSTREAM_H
 #define KEEPASSXC_TEXTSTREAM_H
 
+#include <QIODevice>
 #include <QTextStream>
 
 /**
diff --git a/src/cli/Utils.cpp b/src/cli/Utils.cpp
index eb7b3fc2d4..4029b7c77b 100644
--- a/src/cli/Utils.cpp
+++ b/src/cli/Utils.cpp
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2017 KeePassXC Team <team@keepassxc.org>
+ *  Copyright (C) 2026 KeePassXC Team <team@keepassxc.org>
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -21,10 +21,8 @@
 #include "core/Entry.h"
 #include "core/EntryAttributes.h"
 #include "core/Global.h"
-#include "keys/FileKey.h"
-#ifdef WITH_XC_YUBIKEY
 #include "keys/ChallengeResponseKey.h"
-#endif
+#include "keys/FileKey.h"
 
 #ifdef Q_OS_WIN
 #include <windows.h>
@@ -51,24 +49,28 @@ namespace Utils
     void setDefaultTextStreams()
     {
         auto fd = new QFile();
-        fd->open(stdout, QIODevice::WriteOnly);
-        STDOUT.setDevice(fd);
+        if (fd->open(stdout, QIODevice::WriteOnly)) {
+            STDOUT.setDevice(fd);
+        }
 
         fd = new QFile();
-        fd->open(stderr, QIODevice::WriteOnly);
-        STDERR.setDevice(fd);
+        if (fd->open(stderr, QIODevice::WriteOnly)) {
+            STDERR.setDevice(fd);
+        }
 
         fd = new QFile();
-        fd->open(stdin, QIODevice::ReadOnly);
-        STDIN.setDevice(fd);
+        if (fd->open(stdin, QIODevice::ReadOnly)) {
+            STDIN.setDevice(fd);
+        }
 
         fd = new QFile();
 #ifdef Q_OS_WIN
-        fd->open(fopen("nul", "w"), QIODevice::WriteOnly);
+        if (fd->open(fopen("nul", "w"), QIODevice::WriteOnly)) {
 #else
-        fd->open(fopen("/dev/null", "w"), QIODevice::WriteOnly);
+        if (fd->open(fopen("/dev/null", "w"), QIODevice::WriteOnly)) {
 #endif
-        DEVNULL.setDevice(fd);
+            DEVNULL.setDevice(fd);
+        }
 
 #ifdef Q_OS_WIN
         origCodePage = GetConsoleCP();
@@ -172,7 +174,6 @@ namespace Utils
             compositeKey->addKey(fileKey);
         }
 
-#ifdef WITH_XC_YUBIKEY
         if (!yubiKeySlot.isEmpty()) {
             unsigned int serial = 0;
             int slot;
@@ -203,18 +204,14 @@ namespace Utils
 
             YubiKey::instance()->findValidKeys();
         }
-#else
-        Q_UNUSED(yubiKeySlot);
-#endif // WITH_XC_YUBIKEY
 
         auto db = QSharedPointer<Database>::create();
         QString error;
-        if (db->open(databaseFilename, compositeKey, &error)) {
-            return db;
-        } else {
+        if (!db->open(databaseFilename, compositeKey, &error)) {
             err << error << Qt::endl;
             return {};
         }
+        return db;
     }
 
     /**
diff --git a/src/cli/Utils.h b/src/cli/Utils.h
index 6a272fc620..6977683a02 100644
--- a/src/cli/Utils.h
+++ b/src/cli/Utils.h
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2017 KeePassXC Team <team@keepassxc.org>
+ *  Copyright (C) 2025 KeePassXC Team <team@keepassxc.org>
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -18,6 +18,9 @@
 #ifndef KEEPASSXC_UTILS_H
 #define KEEPASSXC_UTILS_H
 
+#include <QSharedPointer>
+#include <QString>
+#include <QStringList>
 #include <QTextStream>
 
 class CompositeKey;
diff --git a/src/config-keepassx.h.cmake b/src/config-keepassx.h.cmake
index 1b45315f68..51d2403892 100644
--- a/src/config-keepassx.h.cmake
+++ b/src/config-keepassx.h.cmake
@@ -12,34 +12,36 @@
 #define KEEPASSX_PLUGIN_DIR "@PLUGIN_INSTALL_DIR@"
 #define KEEPASSX_DATA_DIR "@DATA_INSTALL_DIR@"
 
-#cmakedefine WITH_XC_AUTOTYPE
-#cmakedefine WITH_XC_NETWORKING
-#cmakedefine WITH_XC_BROWSER
-#cmakedefine WITH_XC_BROWSER_PASSKEYS
-#cmakedefine WITH_XC_YUBIKEY
-#cmakedefine WITH_XC_SSHAGENT
-#cmakedefine WITH_XC_KEESHARE
-#cmakedefine WITH_XC_UPDATECHECK
-#cmakedefine WITH_XC_FDOSECRETS
-#cmakedefine WITH_XC_DOCS
-#cmakedefine WITH_XC_X11
-#cmakedefine WITH_XC_BOTAN3
+/* Build Scope */
+#cmakedefine WITH_X11
+#cmakedefine WITH_BOTAN3
 
+/* Advanced Features */
+#cmakedefine KPXC_FEATURE_BROWSER
+#cmakedefine KPXC_FEATURE_SSHAGENT
+#cmakedefine KPXC_FEATURE_FDOSECRETS
+
+/* Minor Features */
+#cmakedefine KPXC_FEATURE_NETWORK
+#cmakedefine KPXC_FEATURE_UPDATES
+#cmakedefine KPXC_FEATURE_DOCS
+
+/* Distribution */
 #cmakedefine KEEPASSXC_BUILD_TYPE "@KEEPASSXC_BUILD_TYPE@"
 #cmakedefine KEEPASSXC_BUILD_TYPE_RELEASE
-#cmakedefine KEEPASSXC_BUILD_TYPE_PRE_RELEASE
 #cmakedefine KEEPASSXC_BUILD_TYPE_SNAPSHOT
 
-#cmakedefine KEEPASSXC_DIST
 #cmakedefine KEEPASSXC_DIST_TYPE "@KEEPASSXC_DIST_TYPE@"
 #cmakedefine KEEPASSXC_DIST_SNAP
 #cmakedefine KEEPASSXC_DIST_APPIMAGE
 #cmakedefine KEEPASSXC_DIST_FLATPAK
 
+/* Security Test Results */
 #cmakedefine HAVE_PR_SET_DUMPABLE 1
 #cmakedefine HAVE_RLIMIT_CORE 1
 #cmakedefine HAVE_PT_DENY_ATTACH 1
 
+/* macOS Feature Support */
 #cmakedefine01 XC_APPLE_COMPILER_SUPPORT_BIOMETRY()
 #cmakedefine01 XC_APPLE_COMPILER_SUPPORT_TOUCH_ID()
 #cmakedefine01 XC_APPLE_COMPILER_SUPPORT_WATCH()
diff --git a/src/core/Base32.cpp b/src/core/Base32.cpp
index d0a148eec6..7907f99312 100644
--- a/src/core/Base32.cpp
+++ b/src/core/Base32.cpp
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2017 KeePassXC Team <team@keepassxc.org>
+ *  Copyright (C) 2025 KeePassXC Team <team@keepassxc.org>
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -43,10 +43,10 @@ constexpr quint8 ASCII_a = static_cast<quint8>('a');
 constexpr quint8 ASCII_z = static_cast<quint8>('z');
 constexpr quint8 ASCII_EQ = static_cast<quint8>('=');
 
-QVariant Base32::decode(const QByteArray& encodedData)
+QByteArray Base32::decode(const QByteArray& encodedData)
 {
     if (encodedData.size() <= 0) {
-        return QVariant::fromValue(QByteArray(""));
+        return {};
     }
 
     if (encodedData.size() % 8 != 0) {
@@ -139,7 +139,7 @@ QVariant Base32::decode(const QByteArray& encodedData)
     Q_ASSERT(encodedData.size() == i);
     Q_ASSERT(nBytes == o);
 
-    return QVariant::fromValue(data);
+    return data;
 }
 
 QByteArray Base32::encode(const QByteArray& data)
diff --git a/src/core/Base32.h b/src/core/Base32.h
index 07b16a0cc7..75ab28e2fa 100644
--- a/src/core/Base32.h
+++ b/src/core/Base32.h
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2017 KeePassXC Team <team@keepassxc.org>
+ *  Copyright (C) 2025 KeePassXC Team <team@keepassxc.org>
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -31,7 +31,7 @@ class Base32
 {
 public:
     Base32() = default;
-    Q_REQUIRED_RESULT static QVariant decode(const QByteArray&);
+    Q_REQUIRED_RESULT static QByteArray decode(const QByteArray&);
     Q_REQUIRED_RESULT static QByteArray encode(const QByteArray&);
     Q_REQUIRED_RESULT static QByteArray addPadding(const QByteArray&);
     Q_REQUIRED_RESULT static QByteArray removePadding(const QByteArray&);
diff --git a/src/core/Bootstrap.cpp b/src/core/Bootstrap.cpp
index e1b60fe3e2..096b0c586d 100644
--- a/src/core/Bootstrap.cpp
+++ b/src/core/Bootstrap.cpp
@@ -209,7 +209,7 @@ namespace Bootstrap
             goto Cleanup;
         }
 
-#ifdef WITH_XC_SSHAGENT
+#ifdef KPXC_FEATURE_SSHAGENT
         // OpenSSH for Windows ssh-agent service is running as LocalSystem
         if (!AddAccessAllowedAce(pACL,
                                  ACL_REVISION,
diff --git a/src/core/Clock.cpp b/src/core/Clock.cpp
index f501daee73..efca447ad4 100644
--- a/src/core/Clock.cpp
+++ b/src/core/Clock.cpp
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2018 KeePassXC Team <team@keepassxc.org>
+ *  Copyright (C) 2025 KeePassXC Team <team@keepassxc.org>
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -32,8 +32,7 @@ QDateTime Clock::currentDateTime()
 
 uint Clock::currentSecondsSinceEpoch()
 {
-    // TODO: change to toSecsSinceEpoch() when min Qt >= 5.8
-    return instance().currentDateTimeImpl().toTime_t();
+    return instance().currentDateTimeImpl().toSecsSinceEpoch();
 }
 
 qint64 Clock::currentMilliSecondsSinceEpoch()
diff --git a/src/core/Database.cpp b/src/core/Database.cpp
index 95f4f1e153..2964bc8d40 100644
--- a/src/core/Database.cpp
+++ b/src/core/Database.cpp
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2018 KeePassXC Team <team@keepassxc.org>
+ *  Copyright (C) 2026 KeePassXC Team <team@keepassxc.org>
  *  Copyright (C) 2010 Felix Geyer <debfx@fobos.de>
  *
  *  This program is free software: you can redistribute it and/or modify
@@ -336,7 +336,7 @@ bool Database::saveAs(const QString& filePath, SaveAction action, const QString&
 
 #ifdef Q_OS_WIN
         if (isHidden) {
-            SetFileAttributes(realFilePath.toStdString().c_str(), FILE_ATTRIBUTE_HIDDEN);
+            SetFileAttributes(realFilePath.toStdWString().c_str(), FILE_ATTRIBUTE_HIDDEN);
         }
 #endif
         m_ignoreFileChangesUntilSaved = false;
@@ -520,7 +520,9 @@ bool Database::import(const QString& xmlExportPath, QString* error)
 {
     KdbxXmlReader reader(KeePass2::FILE_VERSION_4);
     QFile file(xmlExportPath);
-    file.open(QIODevice::ReadOnly);
+    if (!file.open(QIODevice::ReadOnly)) {
+        return false;
+    }
 
     reader.readDatabase(&file, this);
 
diff --git a/src/core/Entry.cpp b/src/core/Entry.cpp
index 235bcc6f7e..92404ab3dc 100644
--- a/src/core/Entry.cpp
+++ b/src/core/Entry.cpp
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2024 KeePassXC Team <team@keepassxc.org>
+ *  Copyright (C) 2025 KeePassXC Team <team@keepassxc.org>
  *  Copyright (C) 2010 Felix Geyer <debfx@fobos.de>
  *
  *  This program is free software: you can redistribute it and/or modify
@@ -30,6 +30,7 @@
 #include <QDir>
 #include <QRegularExpression>
 #include <QStringBuilder>
+#include <QStringView>
 #include <QUrl>
 
 const int Entry::DefaultIconNumber = 0;
@@ -1152,11 +1153,11 @@ QString Entry::resolveMultiplePlaceholdersRecursive(const QString& str, int maxD
     int capEnd = 0;
     while (matches.hasNext()) {
         const auto match = matches.next();
-        result += str.midRef(capEnd, match.capturedStart() - capEnd);
+        result += QStringView{str}.mid(capEnd, match.capturedStart() - capEnd);
         result += resolvePlaceholderRecursive(match.captured(), maxDepth);
         capEnd = match.capturedEnd();
     }
-    result += str.rightRef(str.length() - capEnd);
+    result += QStringView{str}.right(str.length() - capEnd);
     return result;
 }
 
diff --git a/src/core/EntryAttachments.cpp b/src/core/EntryAttachments.cpp
index 110d1e52b2..0326dd62f1 100644
--- a/src/core/EntryAttachments.cpp
+++ b/src/core/EntryAttachments.cpp
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2012 Felix Geyer <debfx@fobos.de>
+ *  Copyright (C) 2025 Felix Geyer <debfx@fobos.de>
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -40,7 +40,7 @@ EntryAttachments::~EntryAttachments()
     clear();
 }
 
-QList<QString> EntryAttachments::keys() const
+QStringList EntryAttachments::keys() const
 {
     return m_attachments.keys();
 }
diff --git a/src/core/EntryAttachments.h b/src/core/EntryAttachments.h
index c07c9cbf7d..10e0addf52 100644
--- a/src/core/EntryAttachments.h
+++ b/src/core/EntryAttachments.h
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2012 Felix Geyer <debfx@fobos.de>
+ *  Copyright (C) 2025 Felix Geyer <debfx@fobos.de>
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -25,8 +25,7 @@
 #include <QMap>
 #include <QObject>
 #include <QSharedPointer>
-
-class QStringList;
+#include <QStringList>
 
 class EntryAttachments : public ModifiableObject
 {
@@ -35,7 +34,7 @@ class EntryAttachments : public ModifiableObject
 public:
     explicit EntryAttachments(QObject* parent = nullptr);
     ~EntryAttachments() override;
-    QList<QString> keys() const;
+    QStringList keys() const;
     bool hasKey(const QString& key) const;
     QSet<QByteArray> values() const;
     QByteArray value(const QString& key) const;
diff --git a/src/core/Global.h b/src/core/Global.h
index 9630f2f73a..edd6d88a09 100644
--- a/src/core/Global.h
+++ b/src/core/Global.h
@@ -24,7 +24,7 @@
 #include <QTextStream>
 
 #if defined(Q_OS_WIN)
-#if defined(KEEPASSX_BUILDING_CORE)
+#if defined(KPXC_BUILDING_CORE)
 #define KEEPASSXC_EXPORT Q_DECL_IMPORT
 #else
 #define KEEPASSXC_EXPORT Q_DECL_EXPORT
diff --git a/src/core/Group.cpp b/src/core/Group.cpp
index 8b6cd75c51..4b74413541 100644
--- a/src/core/Group.cpp
+++ b/src/core/Group.cpp
@@ -17,14 +17,8 @@
  */
 
 #include "Group.h"
-#include "config-keepassx.h"
 
 #include "core/Config.h"
-
-#ifdef WITH_XC_KEESHARE
-#include "keeshare/KeeShare.h"
-#endif
-
 #include "core/Global.h"
 #include "core/Metadata.h"
 #include "core/Tools.h"
@@ -876,7 +870,7 @@ QList<QString> Group::usernamesRecursive(int topN) const
 
     // Take first topN usernames if set
     QList<QString> usernames;
-    int actualUsernames = topN < 0 ? sortedUsernames.size() : std::min(topN, sortedUsernames.size());
+    int actualUsernames = topN < 0 ? sortedUsernames.size() : qMin(topN, sortedUsernames.size());
     for (int i = 0; i < actualUsernames; i++) {
         usernames.append(sortedUsernames[i].first);
     }
diff --git a/src/core/Merger.cpp b/src/core/Merger.cpp
index f4828f8e6a..1f762120c7 100644
--- a/src/core/Merger.cpp
+++ b/src/core/Merger.cpp
@@ -662,7 +662,7 @@ Merger::ChangeList Merger::mergeDeletions(const MergeContext& context)
 
     while (!groups.isEmpty()) {
         auto* group = groups.takeFirst();
-        if (!(group->children().toSet() & groups.toSet()).isEmpty()) {
+        if (Tools::asSet(group->children()).intersects(Tools::asSet(groups))) {
             // we need to finish all children before we are able to determine if the group can be removed
             groups << group;
             continue;
diff --git a/src/core/Metadata.cpp b/src/core/Metadata.cpp
index 8e714e0f22..81a70b6b03 100644
--- a/src/core/Metadata.cpp
+++ b/src/core/Metadata.cpp
@@ -1,6 +1,6 @@
 /*
+ *  Copyright (C) 2025 KeePassXC Team <team@keepassxc.org>
  *  Copyright (C) 2010 Felix Geyer <debfx@fobos.de>
- *  Copyright (C) 2021 KeePassXC Team <team@keepassxc.org>
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -19,10 +19,8 @@
 #include "Metadata.h"
 
 #include "core/Clock.h"
-#include "core/Entry.h"
 #include "core/Group.h"
 
-#include <QApplication>
 #include <QCryptographicHash>
 #include <QJsonDocument>
 
diff --git a/src/core/PassphraseGenerator.cpp b/src/core/PassphraseGenerator.cpp
index 07e7a31bf7..6a4c5a1819 100644
--- a/src/core/PassphraseGenerator.cpp
+++ b/src/core/PassphraseGenerator.cpp
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2017 KeePassXC Team <team@keepassxc.org>
+ *  Copyright (C) 2025 KeePassXC Team <team@keepassxc.org>
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -18,6 +18,7 @@
 #include "PassphraseGenerator.h"
 
 #include <QFile>
+#include <QRegularExpression>
 #include <QSet>
 #include <QTextStream>
 #include <cmath>
@@ -72,7 +73,6 @@ void PassphraseGenerator::setWordList(const QString& path)
     }
 
     QTextStream in(&file);
-    in.setCodec("UTF-8");
     QString line = in.readLine();
     bool isSigned = line.startsWith("-----BEGIN PGP SIGNED MESSAGE-----");
     if (isSigned) {
@@ -80,7 +80,7 @@ void PassphraseGenerator::setWordList(const QString& path)
             line = in.readLine();
         }
     }
-    QRegExp rx("^[0-9]+(-[0-9]+)*\\s+([^\\s]+)$");
+    QRegularExpression rx("^[0-9]+(-[0-9]+)*\\s+([^\\s]+)$");
     while (!line.isNull()) {
         if (isSigned && line.startsWith("-----BEGIN PGP SIGNATURE-----")) {
             break;
@@ -97,7 +97,7 @@ void PassphraseGenerator::setWordList(const QString& path)
         line = in.readLine();
     }
 
-    m_wordlist = wordset.toList();
+    m_wordlist = wordset.values();
 
     if (!isWordListValid()) {
         qWarning("Wordlist is less than minimum acceptable size: %s", qPrintable(path));
diff --git a/src/core/PasswordGenerator.cpp b/src/core/PasswordGenerator.cpp
index aa0f3e7172..538b741e5d 100644
--- a/src/core/PasswordGenerator.cpp
+++ b/src/core/PasswordGenerator.cpp
@@ -132,7 +132,7 @@ QVector<PasswordGroup> PasswordGenerator::passwordGroups() const
                 continue;
             }
 
-            group.append(i);
+            group.append(QChar(i));
         }
 
         passwordGroups.append(group);
@@ -146,7 +146,7 @@ QVector<PasswordGroup> PasswordGenerator::passwordGroups() const
                 continue;
             }
 
-            group.append(i);
+            group.append(QChar(i));
         }
 
         passwordGroups.append(group);
@@ -159,7 +159,7 @@ QVector<PasswordGroup> PasswordGenerator::passwordGroups() const
                 continue;
             }
 
-            group.append(i);
+            group.append(QChar(i));
         }
 
         passwordGroups.append(group);
@@ -168,12 +168,12 @@ QVector<PasswordGroup> PasswordGenerator::passwordGroups() const
         PasswordGroup group;
 
         // ()[]{}
-        group.append(40);
-        group.append(41);
-        group.append(91);
-        group.append(93);
-        group.append(123);
-        group.append(125);
+        group.append(QChar(40));
+        group.append(QChar(41));
+        group.append(QChar(91));
+        group.append(QChar(93));
+        group.append(QChar(123));
+        group.append(QChar(125));
 
         passwordGroups.append(group);
     }
@@ -181,10 +181,10 @@ QVector<PasswordGroup> PasswordGenerator::passwordGroups() const
         PasswordGroup group;
 
         // .,:;
-        group.append(44);
-        group.append(46);
-        group.append(58);
-        group.append(59);
+        group.append(QChar(44));
+        group.append(QChar(46));
+        group.append(QChar(58));
+        group.append(QChar(59));
 
         passwordGroups.append(group);
     }
@@ -192,8 +192,8 @@ QVector<PasswordGroup> PasswordGenerator::passwordGroups() const
         PasswordGroup group;
 
         // "'
-        group.append(34);
-        group.append(39);
+        group.append(QChar(34));
+        group.append(QChar(39));
 
         passwordGroups.append(group);
     }
@@ -201,12 +201,12 @@ QVector<PasswordGroup> PasswordGenerator::passwordGroups() const
         PasswordGroup group;
 
         // -/\_|
-        group.append(45);
-        group.append(47);
-        group.append(92);
-        group.append(95);
+        group.append(QChar(45));
+        group.append(QChar(47));
+        group.append(QChar(92));
+        group.append(QChar(95));
         if (!(m_flags & ExcludeLookAlike)) {
-            group.append(124); // "|"
+            group.append(QChar(124)); // "|"
         }
 
         passwordGroups.append(group);
@@ -215,13 +215,13 @@ QVector<PasswordGroup> PasswordGenerator::passwordGroups() const
         PasswordGroup group;
 
         // !*+<=>?
-        group.append(33);
-        group.append(42);
-        group.append(43);
-        group.append(60);
-        group.append(61);
-        group.append(62);
-        group.append(63);
+        group.append(QChar(33));
+        group.append(QChar(42));
+        group.append(QChar(43));
+        group.append(QChar(60));
+        group.append(QChar(61));
+        group.append(QChar(62));
+        group.append(QChar(63));
 
         passwordGroups.append(group);
     }
@@ -230,13 +230,13 @@ QVector<PasswordGroup> PasswordGenerator::passwordGroups() const
 
         // #$%&
         for (int i = 35; i <= 38; i++) {
-            group.append(i);
+            group.append(QChar(i));
         }
         // @^`~
-        group.append(64);
-        group.append(94);
-        group.append(96);
-        group.append(126);
+        group.append(QChar(64));
+        group.append(QChar(94));
+        group.append(QChar(96));
+        group.append(QChar(126));
 
         passwordGroups.append(group);
     }
@@ -246,14 +246,14 @@ QVector<PasswordGroup> PasswordGenerator::passwordGroups() const
         // [U+0080, U+009F] are C1 control characters,
         // U+00A0 is non-breaking space
         for (int i = 161; i <= 172; i++) {
-            group.append(i);
+            group.append(QChar(i));
         }
         // U+00AD is soft hyphen (format character)
         for (int i = 174; i <= 255; i++) {
             if ((m_flags & ExcludeLookAlike) && (i == 249)) { // "﹒"
                 continue;
             }
-            group.append(i);
+            group.append(QChar(i));
         }
 
         passwordGroups.append(group);
diff --git a/src/core/SignalMultiplexer.h b/src/core/SignalMultiplexer.h
index 727c4a3a35..3ce4b33b18 100644
--- a/src/core/SignalMultiplexer.h
+++ b/src/core/SignalMultiplexer.h
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2012 Felix Geyer <debfx@fobos.de>
+ *  Copyright (C) 2015 Felix Geyer <debfx@fobos.de>
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -18,6 +18,8 @@
 #ifndef KEEPASSX_SIGNALMULTIPLEXER_H
 #define KEEPASSX_SIGNALMULTIPLEXER_H
 
+#include <QList>
+#include <QObject>
 #include <QPointer>
 
 class SignalMultiplexer
diff --git a/src/core/Tools.cpp b/src/core/Tools.cpp
index 37a544c517..72a5d0c0e9 100644
--- a/src/core/Tools.cpp
+++ b/src/core/Tools.cpp
@@ -1,11 +1,11 @@
 /*
- *  Copyright (C) 2012 Felix Geyer <debfx@fobos.de>
- *  Copyright (C) 2017 Lennart Glauer <mail@lennart-glauer.de>
- *  Copyright (C) 2020 Giuseppe D'Angelo <dangelog@gmail.com>.
+ *  Copyright (C) 2025 KeePassXC Team <team@keepassxc.org>
+ *  Copyright (C) 2021 The Qt Company Ltd.
  *  Copyright (C) 2020 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com,
  *  author Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
- *  Copyright (C) 2021 The Qt Company Ltd.
- *  Copyright (C) 2023 KeePassXC Team <team@keepassxc.org>
+ *  Copyright (C) 2020 Giuseppe D'Angelo <dangelog@gmail.com>
+ *  Copyright (C) 2017 Lennart Glauer <mail@lennart-glauer.de>
+ *  Copyright (C) 2012 Felix Geyer <debfx@fobos.de>
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -52,9 +52,7 @@ namespace Tools
     {
         QString debugInfo = "KeePassXC - ";
         debugInfo.append(QObject::tr("Version %1").arg(KEEPASSXC_VERSION).append("\n"));
-#ifndef KEEPASSXC_BUILD_TYPE_RELEASE
         debugInfo.append(QObject::tr("Build Type: %1").arg(KEEPASSXC_BUILD_TYPE).append("\n"));
-#endif
 
         QString commitHash;
         if (!QString(GIT_HEAD).isEmpty()) {
@@ -64,9 +62,7 @@ namespace Tools
             debugInfo.append(QObject::tr("Revision: %1").arg(commitHash.left(7)).append("\n"));
         }
 
-#ifdef KEEPASSXC_DIST
         debugInfo.append(QObject::tr("Distribution: %1").arg(KEEPASSXC_DIST_TYPE).append("\n"));
-#endif
 
         // Qt related debugging information.
         debugInfo.append("\n");
@@ -87,35 +83,23 @@ namespace Tools
         debugInfo.append("\n\n");
 
         QString extensions;
-#ifdef WITH_XC_AUTOTYPE
         extensions += "\n- " + QObject::tr("Auto-Type");
+        extensions += "\n- " + QObject::tr("KeeShare");
+        extensions += "\n- " + QObject::tr("Hardware Keys");
+#if defined(Q_OS_MACOS) || defined(Q_CC_MSVC)
+        extensions += "\n- " + QObject::tr("Quick Unlock");
 #endif
-#ifdef WITH_XC_BROWSER
+#ifdef KPXC_FEATURE_BROWSER
         extensions += "\n- " + QObject::tr("Browser Integration");
-#endif
-#ifdef WITH_XC_BROWSER_PASSKEYS
         extensions += "\n- " + QObject::tr("Passkeys");
 #endif
-#ifdef WITH_XC_SSHAGENT
+#ifdef KPXC_FEATURE_SSHAGENT
         extensions += "\n- " + QObject::tr("SSH Agent");
 #endif
-#ifdef WITH_XC_KEESHARE
-        extensions += "\n- " + QObject::tr("KeeShare");
-#endif
-#ifdef WITH_XC_YUBIKEY
-        extensions += "\n- " + QObject::tr("YubiKey");
-#endif
-#if defined(Q_OS_MACOS) || defined(Q_CC_MSVC)
-        extensions += "\n- " + QObject::tr("Quick Unlock");
-#endif
-#ifdef WITH_XC_FDOSECRETS
+#ifdef KPXC_FEATURE_FDOSECRETS
         extensions += "\n- " + QObject::tr("Secret Service Integration");
 #endif
 
-        if (extensions.isEmpty()) {
-            extensions = " " + QObject::tr("None");
-        }
-
         debugInfo.append(QObject::tr("Enabled extensions:").append(extensions).append("\n"));
         return debugInfo;
     }
@@ -221,11 +205,11 @@ namespace Tools
     bool isBase64(const QByteArray& ba)
     {
         constexpr auto pattern = R"(^(?:[a-z0-9+/]{4})*(?:[a-z0-9+/]{3}=|[a-z0-9+/]{2}==)?$)";
-        QRegExp regexp(pattern, Qt::CaseInsensitive, QRegExp::RegExp2);
+        QRegularExpression regexp(pattern, QRegularExpression::CaseInsensitiveOption);
 
         QString base64 = QString::fromLatin1(ba.constData(), ba.size());
 
-        return regexp.exactMatch(base64);
+        return regexp.match(base64).hasMatch();
     }
 
     bool isAsciiString(const QString& str)
diff --git a/src/core/Translator.cpp b/src/core/Translator.cpp
index 125424c132..d636dc58ae 100644
--- a/src/core/Translator.cpp
+++ b/src/core/Translator.cpp
@@ -77,7 +77,7 @@ bool Translator::installTranslator(const QStringList& languages, const QString&
 }
 
 /**
- * Install Qt5 base translator from the specified local search path or the default system path
+ * Install Qt6 base translator from the specified local search path or the default system path
  * if no qtbase_* translations were found at the local path.
  *
  * @param languages priority-ordered list of languages
diff --git a/src/crypto/Crypto.cpp b/src/crypto/Crypto.cpp
index 233c89907a..ed90fec861 100644
--- a/src/crypto/Crypto.cpp
+++ b/src/crypto/Crypto.cpp
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2021 KeePassXC Team <team@keepassxc.org>
+ *  Copyright (C) 2025 KeePassXC Team <team@keepassxc.org>
  *  Copyright (C) 2010 Felix Geyer <debfx@fobos.de>
  *
  *  This program is free software: you can redistribute it and/or modify
@@ -23,6 +23,7 @@
 #include "crypto/CryptoHash.h"
 #include "crypto/SymmetricCipher.h"
 
+#include <QObject>
 #include <botan/version.h>
 
 namespace
@@ -239,7 +240,7 @@ namespace Crypto
 {
     bool init()
     {
-#ifdef WITH_XC_BOTAN3
+#ifdef WITH_BOTAN3
         unsigned int version_major = 3, min_version_minor = 0;
         QString versionString = "3.x";
 #else
diff --git a/src/crypto/SymmetricCipher.cpp b/src/crypto/SymmetricCipher.cpp
index 33e61aa4f7..61ba8fb29f 100644
--- a/src/crypto/SymmetricCipher.cpp
+++ b/src/crypto/SymmetricCipher.cpp
@@ -1,4 +1,5 @@
 /*
+ *  Copyright (C) 2025 KeePassXC Team <team@keepassxc.org>
  *  Copyright (C) 2010 Felix Geyer <debfx@fobos.de>
  *
  *  This program is free software: you can redistribute it and/or modify
@@ -34,7 +35,7 @@ bool SymmetricCipher::init(Mode mode, Direction direction, const QByteArray& key
     try {
         auto botanMode = modeToString(mode);
         auto botanDirection =
-#ifdef WITH_XC_BOTAN3
+#ifdef WITH_BOTAN3
             (direction == SymmetricCipher::Encrypt ? Botan::Cipher_Dir::Encryption : Botan::Cipher_Dir::Decryption);
 #else
             (direction == SymmetricCipher::Encrypt ? Botan::Cipher_Dir::ENCRYPTION : Botan::Cipher_Dir::DECRYPTION);
@@ -65,7 +66,7 @@ bool SymmetricCipher::init(Mode mode, Direction direction, const QByteArray& key
 
 bool SymmetricCipher::isInitialized() const
 {
-    return m_cipher;
+    return !m_cipher.isNull();
 }
 
 bool SymmetricCipher::process(char* data, int len)
diff --git a/src/fdosecrets/CMakeLists.txt b/src/fdosecrets/CMakeLists.txt
index 7489debef2..27ecb06809 100644
--- a/src/fdosecrets/CMakeLists.txt
+++ b/src/fdosecrets/CMakeLists.txt
@@ -1,4 +1,4 @@
-if(WITH_XC_FDOSECRETS)
+if(KPXC_FEATURE_FDOSECRETS)
     include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
 
     add_library(fdosecrets STATIC
@@ -30,5 +30,5 @@ if(WITH_XC_FDOSECRETS)
         objects/Prompt.cpp
         dbus/DBusTypes.cpp
     )
-    target_link_libraries(fdosecrets Qt5::Core Qt5::Widgets Qt5::DBus ${BOTAN_LIBRARIES})
+    target_link_libraries(fdosecrets Qt6::Core Qt6::Widgets Qt6::DBus ${BOTAN_LIBRARIES})
 endif()
diff --git a/src/fdosecrets/FdoSecretsPlugin.h b/src/fdosecrets/FdoSecretsPlugin.h
index ad4e7003aa..c06e347d96 100644
--- a/src/fdosecrets/FdoSecretsPlugin.h
+++ b/src/fdosecrets/FdoSecretsPlugin.h
@@ -1,4 +1,5 @@
 /*
+ *  Copyright (C) 2025 KeePassXC Team <team@keepassxc.org>
  *  Copyright (C) 2018 Aetf <aetf@unlimitedcodeworks.xyz>
  *
  *  This program is free software: you can redistribute it and/or modify
@@ -18,6 +19,7 @@
 #ifndef KEEPASSXC_FDOSECRETSPLUGIN_H
 #define KEEPASSXC_FDOSECRETSPLUGIN_H
 
+#include "core/Entry.h"
 #include "gui/ApplicationSettingsWidget.h"
 #include "gui/Icons.h"
 
diff --git a/src/fdosecrets/FdoSecretsSettings.cpp b/src/fdosecrets/FdoSecretsSettings.cpp
index d24bc69a12..8d3ca13a39 100644
--- a/src/fdosecrets/FdoSecretsSettings.cpp
+++ b/src/fdosecrets/FdoSecretsSettings.cpp
@@ -1,4 +1,5 @@
 /*
+ *  Copyright (C) 2025 KeePassXC Team <team@keepassxc.org>
  *  Copyright (C) 2018 Aetf <aetf@unlimitedcodeworks.xyz>
  *
  *  This program is free software: you can redistribute it and/or modify
@@ -96,7 +97,7 @@ namespace FdoSecrets
 
     QUuid FdoSecretsSettings::exposedGroup(Database* db) const
     {
-        return {db->metadata()->customData()->value(CustomData::FdoSecretsExposedGroup)};
+        return QUuid(db->metadata()->customData()->value(CustomData::FdoSecretsExposedGroup));
     }
 
     void FdoSecretsSettings::setExposedGroup(Database* db, const QUuid& group)
diff --git a/src/fdosecrets/dbus/DBusDispatch.cpp b/src/fdosecrets/dbus/DBusDispatch.cpp
index 4912f13407..aea709933e 100644
--- a/src/fdosecrets/dbus/DBusDispatch.cpp
+++ b/src/fdosecrets/dbus/DBusDispatch.cpp
@@ -1,4 +1,5 @@
 /*
+ *  Copyright (C) 2025 KeePassXC Team <team@keepassxc.org>
  *  Copyright (C) 2020 Aetf <aetf@unlimitedcode.works>
  *
  *  This program is free software: you can redistribute it and/or modify
@@ -18,6 +19,7 @@
 #include "fdosecrets/dbus/DBusObject.h"
 
 #include <QDBusMetaType>
+#include <QMetaType>
 #include <QThread>
 #include <QtDBus>
 
@@ -36,6 +38,9 @@ namespace FdoSecrets
                             QVarLengthArray<void*, 10>& params,
                             QVariantList& auxParams)
     {
+        // Qt6 QList/QVariantList growth may relocate elements; reserve to keep data() pointers stable.
+        auxParams.reserve(auxParams.size() + inputTypes.size());
+
         // prepare params
         for (int count = 0; count != inputTypes.size(); ++count) {
             const auto& id = inputTypes.at(count);
@@ -48,17 +53,17 @@ namespace FdoSecrets
             }
 
             // we need at least one conversion, allocate a slot in auxParams
-            auxParams.append(QVariant(id, nullptr));
+            auxParams.append(QVariant(id));
             auto& out = auxParams.last();
             // first handle QDBusArgument to wire types
             if (arg.userType() == qMetaTypeId<QDBusArgument>()) {
-                auto wireId = typeToWireType(id).dbusTypeId;
+                QMetaType wireId(typeToWireType(id).dbusTypeId);
                 out = QVariant(wireId, nullptr);
 
                 const auto& in = arg.value<QDBusArgument>();
                 if (!QDBusMetaType::demarshall(in, wireId, out.data())) {
                     qDebug() << "Internal error: failed QDBusArgument conversion from" << arg << "to type"
-                             << QMetaType::typeName(wireId) << wireId;
+                             << wireId.name();
                     return false;
                 }
             } else {
@@ -339,13 +344,14 @@ namespace FdoSecrets
     {
         QVarLengthArray<void*, 10> params;
         QVariantList auxParams;
+        auxParams.reserve((method.needsCallingClient ? 1 : 0) + method.inputTypes.size());
 
         // the first one is for return type
         params.append(&ret);
 
         if (method.needsCallingClient) {
             auxParams.append(QVariant::fromValue(client));
-            params.append(const_cast<void*>(auxParams.last().constData()));
+            params.append(auxParams.last().data());
         }
 
         // prepare input
@@ -357,8 +363,9 @@ namespace FdoSecrets
         // prepare output args
         outputArgs.reserve(outputArgs.size() + method.outputTypes.size());
         for (const auto& outputType : asConst(method.outputTypes)) {
-            outputArgs.append(QVariant(outputType, nullptr));
-            params.append(const_cast<void*>(outputArgs.last().constData()));
+            QMetaType mtype(outputType);
+            outputArgs.append(QVariant(mtype, nullptr));
+            params.append(outputArgs.last().data());
         }
 
         // call it
@@ -377,7 +384,8 @@ namespace FdoSecrets
         // output args need to be converted before they can be directly sent out:
         for (int i = 0; i != outputArgs.size(); ++i) {
             auto& outputArg = outputArgs[i];
-            if (!outputArg.convert(method.outputTargetTypes.at(i))) {
+            QMetaType mtype(method.outputTargetTypes.at(i));
+            if (!outputArg.convert(mtype)) {
                 qWarning() << "Internal error: Failed to convert message output to type"
                            << method.outputTargetTypes.at(i);
                 return false;
diff --git a/src/fdosecrets/objects/Item.cpp b/src/fdosecrets/objects/Item.cpp
index 3737352057..2cc0a577ab 100644
--- a/src/fdosecrets/objects/Item.cpp
+++ b/src/fdosecrets/objects/Item.cpp
@@ -1,4 +1,5 @@
 /*
+ *  Copyright (C) 2025 KeePassXC Team <team@keepassxc.org>
  *  Copyright (C) 2019 Aetf <aetf@unlimitedcodeworks.xyz>
  *
  *  This program is free software: you can redistribute it and/or modify
@@ -28,7 +29,7 @@
 
 #include <QMimeDatabase>
 #include <QSet>
-#include <QTextCodec>
+#include <QStringDecoder>
 
 namespace FdoSecrets
 {
@@ -400,7 +401,7 @@ namespace FdoSecrets
         Q_ASSERT(group);
 
         // root group is represented by a single slash, thus adding an empty component.
-        pathComponents.prepend(QLatin1Literal(""));
+        pathComponents.prepend("");
 
         return pathComponents.join('/');
     }
@@ -414,16 +415,18 @@ namespace FdoSecrets
         auto mimeType = db.mimeTypeForName(mimeName);
 
         // find a suitable codec
-        QTextCodec* codec = nullptr;
+        QStringDecoder decoder(QStringDecoder::Utf8);
         static const QRegularExpression charsetPattern(QStringLiteral(R"re(charset=(?<encode>.+)$)re"));
         auto match = charsetPattern.match(contentType);
         if (match.hasMatch()) {
-            codec = QTextCodec::codecForName(match.captured(QStringLiteral("encode")).toLatin1());
-        } else {
-            codec = QTextCodec::codecForName(QByteArrayLiteral("utf-8"));
+            auto codecName = match.captured(QStringLiteral("encode")).toUtf8();
+            auto encoding = QStringDecoder::encodingForName(codecName);
+            if (encoding != std::nullopt) {
+                decoder = QStringDecoder(encoding.value());
+            }
         }
 
-        if (!mimeType.isValid() || !mimeType.inherits(QStringLiteral("text/plain")) || !codec) {
+        if (!mimeType.isValid() || !mimeType.inherits(QStringLiteral("text/plain"))) {
             if (EntryAttributes::matchReference(contentType).hasMatch()) {
                 return QDBusError::InvalidArgs;
             }
@@ -432,7 +435,7 @@ namespace FdoSecrets
             entry->attachments()->set(FDO_SECRETS_DATA, data);
             entry->attributes()->set(FDO_SECRETS_CONTENT_TYPE, contentType);
         } else {
-            auto password = codec->toUnicode(data);
+            auto password = decoder.decode(data);
             if (EntryAttributes::matchReference(password).hasMatch()) {
                 return QDBusError::InvalidArgs;
             }
diff --git a/src/fdosecrets/objects/SessionCipher.cpp b/src/fdosecrets/objects/SessionCipher.cpp
index 182fc771c2..b81653999f 100644
--- a/src/fdosecrets/objects/SessionCipher.cpp
+++ b/src/fdosecrets/objects/SessionCipher.cpp
@@ -25,7 +25,7 @@
 #include <QDebug>
 #include <botan/dh.h>
 
-#ifdef WITH_XC_BOTAN3
+#ifdef WITH_BOTAN3
 #include <botan/dl_group.h>
 #include <botan/pubkey.h>
 #else
@@ -58,7 +58,7 @@ namespace FdoSecrets
 
         try {
             Botan::secure_vector<uint8_t> salt(32, '\0');
-#ifdef WITH_XC_BOTAN3
+#ifdef WITH_BOTAN3
             Botan::PK_Key_Agreement dhka(*m_privateKey, *randomGen()->getRng(), "HKDF(SHA-256)", "");
             auto aesKey = dhka.derive_key(16,
                                           reinterpret_cast<const uint8_t*>(clientPublicKey.constData()),
diff --git a/src/format/BitwardenReader.cpp b/src/format/BitwardenReader.cpp
index 37e3619292..084fb7e206 100644
--- a/src/format/BitwardenReader.cpp
+++ b/src/format/BitwardenReader.cpp
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2024 KeePassXC Team <team@keepassxc.org>
+ *  Copyright (C) 2025 KeePassXC Team <team@keepassxc.org>
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -91,8 +91,7 @@ namespace
                     // Change from UUID to base64 byte array
                     const auto credentialIdValue = passkey.value("credentialId").toString();
                     if (!credentialIdValue.isEmpty()) {
-                        const auto credentialUuid = Tools::uuidToHex(credentialIdValue);
-                        const auto credentialIdArray = QByteArray::fromHex(credentialUuid.toUtf8());
+                        const auto credentialIdArray = QByteArray::fromHex(credentialIdValue.toUtf8());
                         const auto credentialId =
                             credentialIdArray.toBase64(QByteArray::Base64UrlEncoding | QByteArray::OmitTrailingEquals);
                         entry->attributes()->set(EntryAttributes::KPEX_PASSKEY_CREDENTIAL_ID, credentialId, true);
diff --git a/src/format/CsvParser.cpp b/src/format/CsvParser.cpp
index d5d3b319a0..16b0bf25cb 100644
--- a/src/format/CsvParser.cpp
+++ b/src/format/CsvParser.cpp
@@ -1,6 +1,6 @@
 /*
+ *  Copyright (C) 2025 KeePassXC Team <team@keepassxc.org>
  *  Copyright (C) 2016 Enrico Mariotti <enricomariotti@yahoo.it>
- *  Copyright (C) 2017 KeePassXC Team <team@keepassxc.org>
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -19,7 +19,6 @@
 #include "CsvParser.h"
 
 #include <QFile>
-#include <QTextCodec>
 
 #include "core/Tools.h"
 
@@ -34,7 +33,6 @@ CsvParser::CsvParser()
     m_csv.setBuffer(&m_array);
     m_ts.setDevice(&m_csv);
     m_csv.open(QIODevice::ReadOnly);
-    m_ts.setCodec("UTF-8");
 }
 
 CsvParser::~CsvParser()
@@ -92,7 +90,7 @@ bool CsvParser::readFile(QIODevice* device)
 
 void CsvParser::reset()
 {
-    m_ch = 0;
+    m_ch = QChar(0);
     m_currCol = 1;
     m_currRow = 1;
     m_isEof = false;
@@ -349,7 +347,15 @@ void CsvParser::setComment(const QChar& c)
 
 void CsvParser::setCodec(const QString& s)
 {
-    m_ts.setCodec(QTextCodec::codecForName(s.toLocal8Bit()));
+    if (s.toLocal8Bit().compare(QByteArray("UTF-8"), Qt::CaseInsensitive) == 0) {
+        m_ts.setEncoding(QStringConverter::Utf8);
+    } else if (s.toLocal8Bit().compare(QByteArray("Windows-1252"), Qt::CaseInsensitive) == 0) {
+        m_ts.setEncoding(QStringConverter::System);
+    } else if (s.toLocal8Bit().compare(QByteArray("UTF-16"), Qt::CaseInsensitive) == 0) {
+        m_ts.setEncoding(QStringConverter::Utf16);
+    } else if (s.toLocal8Bit().compare(QByteArray("UTF-16LE"), Qt::CaseInsensitive) == 0) {
+        m_ts.setEncoding(QStringConverter::Utf16LE);
+    }
 }
 
 void CsvParser::setFieldSeparator(const QChar& c)
diff --git a/src/format/Kdbx4Writer.cpp b/src/format/Kdbx4Writer.cpp
index 1c728ac81c..6d93d2cc87 100644
--- a/src/format/Kdbx4Writer.cpp
+++ b/src/format/Kdbx4Writer.cpp
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2017 KeePassXC Team <team@keepassxc.org>
+ *  Copyright (C) 2025 KeePassXC Team <team@keepassxc.org>
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -225,7 +225,6 @@ KdbxXmlWriter::BinaryIdxMap Kdbx4Writer::writeAttachments(QIODevice* device, Dat
             data.append(entry->attachments()->value(key));
 
             CryptoHash hash(CryptoHash::Sha256);
-#ifdef WITH_XC_KEESHARE
             // Namespace KeeShare attachments so they don't get deduplicated together with attachments
             // from other databases. Prevents potential filesize side channels.
             auto group = entry->group();
@@ -237,7 +236,6 @@ KdbxXmlWriter::BinaryIdxMap Kdbx4Writer::writeAttachments(QIODevice* device, Dat
             } else {
                 hash.addData(db->uuid().toByteArray());
             }
-#endif
             hash.addData(data);
 
             // Deduplicate attachments with the same hash
@@ -312,8 +310,8 @@ bool Kdbx4Writer::serializeVariantMap(const QVariantMap& map, QByteArray& output
         QByteArray typeBytes;
         typeBytes.append(static_cast<char>(fieldType));
         QByteArray nameBytes = k.toUtf8();
-        QByteArray nameLenBytes = Endian::sizedIntToBytes(nameBytes.size(), KeePass2::BYTEORDER);
-        QByteArray dataLenBytes = Endian::sizedIntToBytes(data.size(), KeePass2::BYTEORDER);
+        QByteArray nameLenBytes = Endian::sizedIntToBytes<quint32>(nameBytes.size(), KeePass2::BYTEORDER);
+        QByteArray dataLenBytes = Endian::sizedIntToBytes<quint32>(data.size(), KeePass2::BYTEORDER);
 
         CHECK_RETURN_FALSE(buf.write(typeBytes) == 1);
         CHECK_RETURN_FALSE(buf.write(nameLenBytes) == 4);
diff --git a/src/format/KdbxXmlReader.cpp b/src/format/KdbxXmlReader.cpp
index e6c212bbcf..8506a7a256 100644
--- a/src/format/KdbxXmlReader.cpp
+++ b/src/format/KdbxXmlReader.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018 KeePassXC Team <team@keepassxc.org>
+ * Copyright (C) 2026 KeePassXC Team <team@keepassxc.org>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -56,7 +56,9 @@ KdbxXmlReader::KdbxXmlReader(quint32 version, QHash<QString, QByteArray> binaryP
 QSharedPointer<Database> KdbxXmlReader::readDatabase(const QString& filename)
 {
     QFile file(filename);
-    file.open(QIODevice::ReadOnly);
+    if (!file.open(QIODeviceBase::ReadOnly)) {
+        return nullptr;
+    }
     return readDatabase(&file);
 }
 
@@ -104,7 +106,7 @@ void KdbxXmlReader::readDatabase(QIODevice* device, Database* db, KeePass2Random
         return;
     }
 
-    if (m_xml.readNextStartElement() && m_xml.name() == "KeePassFile") {
+    if (m_xml.readNextStartElement() && m_xml.name().toString() == "KeePassFile") {
         rootGroupParsed = parseKeePassFile();
     }
 
@@ -114,11 +116,13 @@ void KdbxXmlReader::readDatabase(QIODevice* device, Database* db, KeePass2Random
     }
 
     if (!m_tmpParent->children().isEmpty()) {
-        qWarning("KdbxXmlReader::readDatabase: found %d invalid group reference(s)", m_tmpParent->children().size());
+        qWarning("KdbxXmlReader::readDatabase: found %" PRIdQSIZETYPE " invalid group reference(s)",
+                 m_tmpParent->children().size());
     }
 
     if (!m_tmpParent->entries().isEmpty()) {
-        qWarning("KdbxXmlReader::readDatabase: found %d invalid entry reference(s)", m_tmpParent->children().size());
+        qWarning("KdbxXmlReader::readDatabase: found %" PRIdQSIZETYPE " invalid entry reference(s)",
+                 m_tmpParent->children().size());
     }
 
     const QSet<QString> poolKeys = Tools::asSet(m_binaryPool.keys());
@@ -187,9 +191,9 @@ QString KdbxXmlReader::errorString() const
     return {};
 }
 
-bool KdbxXmlReader::isTrueValue(const QStringRef& value)
+bool KdbxXmlReader::isTrueValue(const QStringView value)
 {
-    return value.compare(QLatin1String("true"), Qt::CaseInsensitive) == 0 || value == "1";
+    return value.compare(QLatin1String("true"), Qt::CaseInsensitive) == 0 || value.toString() == "1";
 }
 
 void KdbxXmlReader::raiseError(const QString& errorMessage)
@@ -205,18 +209,18 @@ QByteArray KdbxXmlReader::headerHash() const
 
 bool KdbxXmlReader::parseKeePassFile()
 {
-    Q_ASSERT(m_xml.isStartElement() && m_xml.name() == "KeePassFile");
+    Q_ASSERT(m_xml.isStartElement() && m_xml.name().toString() == "KeePassFile");
 
     bool rootElementFound = false;
     bool rootParsedSuccessfully = false;
 
     while (!m_xml.hasError() && m_xml.readNextStartElement()) {
-        if (m_xml.name() == "Meta") {
+        if (m_xml.name().toString() == "Meta") {
             parseMeta();
             continue;
         }
 
-        if (m_xml.name() == "Root") {
+        if (m_xml.name().toString() == "Root") {
             if (rootElementFound) {
                 rootParsedSuccessfully = false;
                 qWarning("Multiple root elements");
@@ -235,72 +239,72 @@ bool KdbxXmlReader::parseKeePassFile()
 
 void KdbxXmlReader::parseMeta()
 {
-    Q_ASSERT(m_xml.isStartElement() && m_xml.name() == "Meta");
+    Q_ASSERT(m_xml.isStartElement() && m_xml.name().toString() == "Meta");
 
     while (!m_xml.hasError() && m_xml.readNextStartElement()) {
-        if (m_xml.name() == "Generator") {
+        if (m_xml.name().toString() == "Generator") {
             m_meta->setGenerator(readString());
-        } else if (m_xml.name() == "HeaderHash") {
+        } else if (m_xml.name().toString() == "HeaderHash") {
             m_headerHash = readBinary();
-        } else if (m_xml.name() == "DatabaseName") {
+        } else if (m_xml.name().toString() == "DatabaseName") {
             m_meta->setName(readString());
-        } else if (m_xml.name() == "DatabaseNameChanged") {
+        } else if (m_xml.name().toString() == "DatabaseNameChanged") {
             m_meta->setNameChanged(readDateTime());
-        } else if (m_xml.name() == "DatabaseDescription") {
+        } else if (m_xml.name().toString() == "DatabaseDescription") {
             m_meta->setDescription(readString());
-        } else if (m_xml.name() == "DatabaseDescriptionChanged") {
+        } else if (m_xml.name().toString() == "DatabaseDescriptionChanged") {
             m_meta->setDescriptionChanged(readDateTime());
-        } else if (m_xml.name() == "DefaultUserName") {
+        } else if (m_xml.name().toString() == "DefaultUserName") {
             m_meta->setDefaultUserName(readString());
-        } else if (m_xml.name() == "DefaultUserNameChanged") {
+        } else if (m_xml.name().toString() == "DefaultUserNameChanged") {
             m_meta->setDefaultUserNameChanged(readDateTime());
-        } else if (m_xml.name() == "MaintenanceHistoryDays") {
+        } else if (m_xml.name().toString() == "MaintenanceHistoryDays") {
             m_meta->setMaintenanceHistoryDays(readNumber());
-        } else if (m_xml.name() == "Color") {
+        } else if (m_xml.name().toString() == "Color") {
             m_meta->setColor(readColor());
-        } else if (m_xml.name() == "MasterKeyChanged") {
+        } else if (m_xml.name().toString() == "MasterKeyChanged") {
             m_meta->setDatabaseKeyChanged(readDateTime());
-        } else if (m_xml.name() == "MasterKeyChangeRec") {
+        } else if (m_xml.name().toString() == "MasterKeyChangeRec") {
             m_meta->setMasterKeyChangeRec(readNumber());
-        } else if (m_xml.name() == "MasterKeyChangeForce") {
+        } else if (m_xml.name().toString() == "MasterKeyChangeForce") {
             m_meta->setMasterKeyChangeForce(readNumber());
-        } else if (m_xml.name() == "MemoryProtection") {
+        } else if (m_xml.name().toString() == "MemoryProtection") {
             parseMemoryProtection();
-        } else if (m_xml.name() == "CustomIcons") {
+        } else if (m_xml.name().toString() == "CustomIcons") {
             parseCustomIcons();
-        } else if (m_xml.name() == "RecycleBinEnabled") {
+        } else if (m_xml.name().toString() == "RecycleBinEnabled") {
             m_meta->setRecycleBinEnabled(readBool());
-        } else if (m_xml.name() == "RecycleBinUUID") {
+        } else if (m_xml.name().toString() == "RecycleBinUUID") {
             m_meta->setRecycleBin(getGroup(readUuid()));
-        } else if (m_xml.name() == "RecycleBinChanged") {
+        } else if (m_xml.name().toString() == "RecycleBinChanged") {
             m_meta->setRecycleBinChanged(readDateTime());
-        } else if (m_xml.name() == "EntryTemplatesGroup") {
+        } else if (m_xml.name().toString() == "EntryTemplatesGroup") {
             m_meta->setEntryTemplatesGroup(getGroup(readUuid()));
-        } else if (m_xml.name() == "EntryTemplatesGroupChanged") {
+        } else if (m_xml.name().toString() == "EntryTemplatesGroupChanged") {
             m_meta->setEntryTemplatesGroupChanged(readDateTime());
-        } else if (m_xml.name() == "LastSelectedGroup") {
+        } else if (m_xml.name().toString() == "LastSelectedGroup") {
             m_meta->setLastSelectedGroup(getGroup(readUuid()));
-        } else if (m_xml.name() == "LastTopVisibleGroup") {
+        } else if (m_xml.name().toString() == "LastTopVisibleGroup") {
             m_meta->setLastTopVisibleGroup(getGroup(readUuid()));
-        } else if (m_xml.name() == "HistoryMaxItems") {
+        } else if (m_xml.name().toString() == "HistoryMaxItems") {
             int value = readNumber();
             if (value >= -1) {
                 m_meta->setHistoryMaxItems(value);
             } else {
                 qWarning("HistoryMaxItems invalid number");
             }
-        } else if (m_xml.name() == "HistoryMaxSize") {
+        } else if (m_xml.name().toString() == "HistoryMaxSize") {
             int value = readNumber();
             if (value >= -1) {
                 m_meta->setHistoryMaxSize(value);
             } else {
                 qWarning("HistoryMaxSize invalid number");
             }
-        } else if (m_xml.name() == "Binaries") {
+        } else if (m_xml.name().toString() == "Binaries") {
             parseBinaries();
-        } else if (m_xml.name() == "CustomData") {
+        } else if (m_xml.name().toString() == "CustomData") {
             parseCustomData(m_meta->customData());
-        } else if (m_xml.name() == "SettingsChanged") {
+        } else if (m_xml.name().toString() == "SettingsChanged") {
             m_meta->setSettingsChanged(readDateTime());
         } else {
             skipCurrentElement();
@@ -310,18 +314,18 @@ void KdbxXmlReader::parseMeta()
 
 void KdbxXmlReader::parseMemoryProtection()
 {
-    Q_ASSERT(m_xml.isStartElement() && m_xml.name() == "MemoryProtection");
+    Q_ASSERT(m_xml.isStartElement() && m_xml.name().toString() == "MemoryProtection");
 
     while (!m_xml.hasError() && m_xml.readNextStartElement()) {
-        if (m_xml.name() == "ProtectTitle") {
+        if (m_xml.name().toString() == "ProtectTitle") {
             m_meta->setProtectTitle(readBool());
-        } else if (m_xml.name() == "ProtectUserName") {
+        } else if (m_xml.name().toString() == "ProtectUserName") {
             m_meta->setProtectUsername(readBool());
-        } else if (m_xml.name() == "ProtectPassword") {
+        } else if (m_xml.name().toString() == "ProtectPassword") {
             m_meta->setProtectPassword(readBool());
-        } else if (m_xml.name() == "ProtectURL") {
+        } else if (m_xml.name().toString() == "ProtectURL") {
             m_meta->setProtectUrl(readBool());
-        } else if (m_xml.name() == "ProtectNotes") {
+        } else if (m_xml.name().toString() == "ProtectNotes") {
             m_meta->setProtectNotes(readBool());
         } else {
             skipCurrentElement();
@@ -331,10 +335,10 @@ void KdbxXmlReader::parseMemoryProtection()
 
 void KdbxXmlReader::parseCustomIcons()
 {
-    Q_ASSERT(m_xml.isStartElement() && m_xml.name() == "CustomIcons");
+    Q_ASSERT(m_xml.isStartElement() && m_xml.name().toString() == "CustomIcons");
 
     while (!m_xml.hasError() && m_xml.readNextStartElement()) {
-        if (m_xml.name() == "Icon") {
+        if (m_xml.name().toString() == "Icon") {
             parseIcon();
         } else {
             skipCurrentElement();
@@ -344,7 +348,7 @@ void KdbxXmlReader::parseCustomIcons()
 
 void KdbxXmlReader::parseIcon()
 {
-    Q_ASSERT(m_xml.isStartElement() && m_xml.name() == "Icon");
+    Q_ASSERT(m_xml.isStartElement() && m_xml.name().toString() == "Icon");
 
     QUuid uuid;
     QByteArray iconData;
@@ -354,15 +358,15 @@ void KdbxXmlReader::parseIcon()
     bool iconSet = false;
 
     while (!m_xml.hasError() && m_xml.readNextStartElement()) {
-        if (m_xml.name() == "UUID") {
+        if (m_xml.name().toString() == "UUID") {
             uuid = readUuid();
             uuidSet = !uuid.isNull();
-        } else if (m_xml.name() == "Data") {
+        } else if (m_xml.name().toString() == "Data") {
             iconData = readBinary();
             iconSet = true;
-        } else if (m_xml.name() == "Name") {
+        } else if (m_xml.name().toString() == "Name") {
             name = readString();
-        } else if (m_xml.name() == "LastModificationTime") {
+        } else if (m_xml.name().toString() == "LastModificationTime") {
             lastModified = readDateTime();
         } else {
             skipCurrentElement();
@@ -383,10 +387,10 @@ void KdbxXmlReader::parseIcon()
 
 void KdbxXmlReader::parseBinaries()
 {
-    Q_ASSERT(m_xml.isStartElement() && m_xml.name() == "Binaries");
+    Q_ASSERT(m_xml.isStartElement() && m_xml.name().toString() == "Binaries");
 
     while (!m_xml.hasError() && m_xml.readNextStartElement()) {
-        if (m_xml.name() != "Binary") {
+        if (m_xml.name().toString() != "Binary") {
             skipCurrentElement();
             continue;
         }
@@ -405,10 +409,10 @@ void KdbxXmlReader::parseBinaries()
 
 void KdbxXmlReader::parseCustomData(CustomData* customData)
 {
-    Q_ASSERT(m_xml.isStartElement() && m_xml.name() == "CustomData");
+    Q_ASSERT(m_xml.isStartElement() && m_xml.name().toString() == "CustomData");
 
     while (!m_xml.hasError() && m_xml.readNextStartElement()) {
-        if (m_xml.name() == "Item") {
+        if (m_xml.name().toString() == "Item") {
             parseCustomDataItem(customData);
             continue;
         }
@@ -418,7 +422,7 @@ void KdbxXmlReader::parseCustomData(CustomData* customData)
 
 void KdbxXmlReader::parseCustomDataItem(CustomData* customData)
 {
-    Q_ASSERT(m_xml.isStartElement() && m_xml.name() == "Item");
+    Q_ASSERT(m_xml.isStartElement() && m_xml.name().toString() == "Item");
 
     QString key;
     CustomData::CustomDataItem item;
@@ -426,13 +430,13 @@ void KdbxXmlReader::parseCustomDataItem(CustomData* customData)
     bool valueSet = false;
 
     while (!m_xml.hasError() && m_xml.readNextStartElement()) {
-        if (m_xml.name() == "Key") {
+        if (m_xml.name().toString() == "Key") {
             key = readString();
             keySet = true;
-        } else if (m_xml.name() == "Value") {
+        } else if (m_xml.name().toString() == "Value") {
             item.value = readString();
             valueSet = true;
-        } else if (m_xml.name() == "LastModificationTime") {
+        } else if (m_xml.name().toString() == "LastModificationTime") {
             item.lastModified = readDateTime();
         } else {
             skipCurrentElement();
@@ -449,13 +453,13 @@ void KdbxXmlReader::parseCustomDataItem(CustomData* customData)
 
 bool KdbxXmlReader::parseRoot()
 {
-    Q_ASSERT(m_xml.isStartElement() && m_xml.name() == "Root");
+    Q_ASSERT(m_xml.isStartElement() && m_xml.name().toString() == "Root");
 
     bool groupElementFound = false;
     bool groupParsedSuccessfully = false;
 
     while (!m_xml.hasError() && m_xml.readNextStartElement()) {
-        if (m_xml.name() == "Group") {
+        if (m_xml.name().toString() == "Group") {
             if (groupElementFound) {
                 groupParsedSuccessfully = false;
                 raiseError(tr("Multiple group elements"));
@@ -470,7 +474,7 @@ bool KdbxXmlReader::parseRoot()
             }
 
             groupElementFound = true;
-        } else if (m_xml.name() == "DeletedObjects") {
+        } else if (m_xml.name().toString() == "DeletedObjects") {
             parseDeletedObjects();
         } else {
             skipCurrentElement();
@@ -482,14 +486,14 @@ bool KdbxXmlReader::parseRoot()
 
 Group* KdbxXmlReader::parseGroup()
 {
-    Q_ASSERT(m_xml.isStartElement() && m_xml.name() == "Group");
+    Q_ASSERT(m_xml.isStartElement() && m_xml.name().toString() == "Group");
 
     auto group = new Group();
     group->setUpdateTimeinfo(false);
     QList<Group*> children;
     QList<Entry*> entries;
     while (!m_xml.hasError() && m_xml.readNextStartElement()) {
-        if (m_xml.name() == "UUID") {
+        if (m_xml.name().toString() == "UUID") {
             QUuid uuid = readUuid();
             if (uuid.isNull()) {
                 if (m_strictMode) {
@@ -502,19 +506,19 @@ Group* KdbxXmlReader::parseGroup()
             }
             continue;
         }
-        if (m_xml.name() == "Name") {
+        if (m_xml.name().toString() == "Name") {
             group->setName(readString());
             continue;
         }
-        if (m_xml.name() == "Notes") {
+        if (m_xml.name().toString() == "Notes") {
             group->setNotes(readString());
             continue;
         }
-        if (m_xml.name() == "Tags") {
+        if (m_xml.name().toString() == "Tags") {
             group->setTags(readString());
             continue;
         }
-        if (m_xml.name() == "IconID") {
+        if (m_xml.name().toString() == "IconID") {
             int iconId = readNumber();
             if (iconId < 0) {
                 if (m_strictMode) {
@@ -526,26 +530,26 @@ Group* KdbxXmlReader::parseGroup()
             group->setIcon(iconId);
             continue;
         }
-        if (m_xml.name() == "CustomIconUUID") {
+        if (m_xml.name().toString() == "CustomIconUUID") {
             QUuid uuid = readUuid();
             if (!uuid.isNull()) {
                 group->setIcon(uuid);
             }
             continue;
         }
-        if (m_xml.name() == "Times") {
+        if (m_xml.name().toString() == "Times") {
             group->setTimeInfo(parseTimes());
             continue;
         }
-        if (m_xml.name() == "IsExpanded") {
+        if (m_xml.name().toString() == "IsExpanded") {
             group->setExpanded(readBool());
             continue;
         }
-        if (m_xml.name() == "DefaultAutoTypeSequence") {
+        if (m_xml.name().toString() == "DefaultAutoTypeSequence") {
             group->setDefaultAutoTypeSequence(readString());
             continue;
         }
-        if (m_xml.name() == "EnableAutoType") {
+        if (m_xml.name().toString() == "EnableAutoType") {
             QString str = readString();
 
             if (str.compare("null", Qt::CaseInsensitive) == 0) {
@@ -559,7 +563,7 @@ Group* KdbxXmlReader::parseGroup()
             }
             continue;
         }
-        if (m_xml.name() == "EnableSearching") {
+        if (m_xml.name().toString() == "EnableSearching") {
             QString str = readString();
 
             if (str.compare("null", Qt::CaseInsensitive) == 0) {
@@ -573,29 +577,29 @@ Group* KdbxXmlReader::parseGroup()
             }
             continue;
         }
-        if (m_xml.name() == "LastTopVisibleEntry") {
+        if (m_xml.name().toString() == "LastTopVisibleEntry") {
             group->setLastTopVisibleEntry(getEntry(readUuid()));
             continue;
         }
-        if (m_xml.name() == "Group") {
+        if (m_xml.name().toString() == "Group") {
             Group* newGroup = parseGroup();
             if (newGroup) {
                 children.append(newGroup);
             }
             continue;
         }
-        if (m_xml.name() == "Entry") {
+        if (m_xml.name().toString() == "Entry") {
             Entry* newEntry = parseEntry(false);
             if (newEntry) {
                 entries.append(newEntry);
             }
             continue;
         }
-        if (m_xml.name() == "CustomData") {
+        if (m_xml.name().toString() == "CustomData") {
             parseCustomData(group->customData());
             continue;
         }
-        if (m_xml.name() == "PreviousParentGroup") {
+        if (m_xml.name().toString() == "PreviousParentGroup") {
             group->setPreviousParentGroupUuid(readUuid());
             continue;
         }
@@ -630,10 +634,10 @@ Group* KdbxXmlReader::parseGroup()
 
 void KdbxXmlReader::parseDeletedObjects()
 {
-    Q_ASSERT(m_xml.isStartElement() && m_xml.name() == "DeletedObjects");
+    Q_ASSERT(m_xml.isStartElement() && m_xml.name().toString() == "DeletedObjects");
 
     while (!m_xml.hasError() && m_xml.readNextStartElement()) {
-        if (m_xml.name() == "DeletedObject") {
+        if (m_xml.name().toString() == "DeletedObject") {
             parseDeletedObject();
         } else {
             skipCurrentElement();
@@ -643,12 +647,12 @@ void KdbxXmlReader::parseDeletedObjects()
 
 void KdbxXmlReader::parseDeletedObject()
 {
-    Q_ASSERT(m_xml.isStartElement() && m_xml.name() == "DeletedObject");
+    Q_ASSERT(m_xml.isStartElement() && m_xml.name().toString() == "DeletedObject");
 
     DeletedObject delObj{{}, {}};
 
     while (!m_xml.hasError() && m_xml.readNextStartElement()) {
-        if (m_xml.name() == "UUID") {
+        if (m_xml.name().toString() == "UUID") {
             QUuid uuid = readUuid();
             if (uuid.isNull()) {
                 if (m_strictMode) {
@@ -660,7 +664,7 @@ void KdbxXmlReader::parseDeletedObject()
             delObj.uuid = uuid;
             continue;
         }
-        if (m_xml.name() == "DeletionTime") {
+        if (m_xml.name().toString() == "DeletionTime") {
             delObj.deletionTime = readDateTime();
             continue;
         }
@@ -679,7 +683,7 @@ void KdbxXmlReader::parseDeletedObject()
 
 Entry* KdbxXmlReader::parseEntry(bool history)
 {
-    Q_ASSERT(m_xml.isStartElement() && m_xml.name() == "Entry");
+    Q_ASSERT(m_xml.isStartElement() && m_xml.name().toString() == "Entry");
 
     auto entry = new Entry();
     entry->setUpdateTimeinfo(false);
@@ -687,7 +691,7 @@ Entry* KdbxXmlReader::parseEntry(bool history)
     QList<StringPair> binaryRefs;
 
     while (!m_xml.hasError() && m_xml.readNextStartElement()) {
-        if (m_xml.name() == "UUID") {
+        if (m_xml.name().toString() == "UUID") {
             QUuid uuid = readUuid();
             if (uuid.isNull()) {
                 if (m_strictMode) {
@@ -700,7 +704,7 @@ Entry* KdbxXmlReader::parseEntry(bool history)
             }
             continue;
         }
-        if (m_xml.name() == "IconID") {
+        if (m_xml.name().toString() == "IconID") {
             int iconId = readNumber();
             if (iconId < 0) {
                 if (m_strictMode) {
@@ -711,53 +715,53 @@ Entry* KdbxXmlReader::parseEntry(bool history)
             entry->setIcon(iconId);
             continue;
         }
-        if (m_xml.name() == "CustomIconUUID") {
+        if (m_xml.name().toString() == "CustomIconUUID") {
             QUuid uuid = readUuid();
             if (!uuid.isNull()) {
                 entry->setIcon(uuid);
             }
             continue;
         }
-        if (m_xml.name() == "ForegroundColor") {
+        if (m_xml.name().toString() == "ForegroundColor") {
             entry->setForegroundColor(readColor());
             continue;
         }
-        if (m_xml.name() == "BackgroundColor") {
+        if (m_xml.name().toString() == "BackgroundColor") {
             entry->setBackgroundColor(readColor());
             continue;
         }
-        if (m_xml.name() == "OverrideURL") {
+        if (m_xml.name().toString() == "OverrideURL") {
             entry->setOverrideUrl(readString());
             continue;
         }
-        if (m_xml.name() == "Tags") {
+        if (m_xml.name().toString() == "Tags") {
             entry->setTags(readString());
             continue;
         }
-        if (m_xml.name() == "Times") {
+        if (m_xml.name().toString() == "Times") {
             entry->setTimeInfo(parseTimes());
             continue;
         }
-        if (m_xml.name() == "String") {
+        if (m_xml.name().toString() == "String") {
             parseEntryString(entry);
             continue;
         }
-        if (m_xml.name() == "QualityCheck") {
+        if (m_xml.name().toString() == "QualityCheck") {
             entry->setExcludeFromReports(!readBool());
             continue;
         }
-        if (m_xml.name() == "Binary") {
+        if (m_xml.name().toString() == "Binary") {
             QPair<QString, QString> ref = parseEntryBinary(entry);
             if (!ref.first.isEmpty() && !ref.second.isEmpty()) {
                 binaryRefs.append(ref);
             }
             continue;
         }
-        if (m_xml.name() == "AutoType") {
+        if (m_xml.name().toString() == "AutoType") {
             parseAutoType(entry);
             continue;
         }
-        if (m_xml.name() == "History") {
+        if (m_xml.name().toString() == "History") {
             if (history) {
                 raiseError(tr("History element in history entry"));
             } else {
@@ -765,7 +769,7 @@ Entry* KdbxXmlReader::parseEntry(bool history)
             }
             continue;
         }
-        if (m_xml.name() == "CustomData") {
+        if (m_xml.name().toString() == "CustomData") {
             parseCustomData(entry->customData());
 
             // Upgrade pre-KDBX-4.1 password report exclude flag
@@ -776,7 +780,7 @@ Entry* KdbxXmlReader::parseEntry(bool history)
             }
             continue;
         }
-        if (m_xml.name() == "PreviousParentGroup") {
+        if (m_xml.name().toString() == "PreviousParentGroup") {
             entry->setPreviousParentGroupUuid(readUuid());
             continue;
         }
@@ -823,7 +827,7 @@ Entry* KdbxXmlReader::parseEntry(bool history)
 
 void KdbxXmlReader::parseEntryString(Entry* entry)
 {
-    Q_ASSERT(m_xml.isStartElement() && m_xml.name() == "String");
+    Q_ASSERT(m_xml.isStartElement() && m_xml.name().toString() == "String");
 
     QString key;
     QString value;
@@ -832,13 +836,13 @@ void KdbxXmlReader::parseEntryString(Entry* entry)
     bool valueSet = false;
 
     while (!m_xml.hasError() && m_xml.readNextStartElement()) {
-        if (m_xml.name() == "Key") {
+        if (m_xml.name().toString() == "Key") {
             key = readString();
             keySet = true;
             continue;
         }
 
-        if (m_xml.name() == "Value") {
+        if (m_xml.name().toString() == "Value") {
             QXmlStreamAttributes attr = m_xml.attributes();
             bool isProtected;
             bool protectInMemory;
@@ -866,7 +870,7 @@ void KdbxXmlReader::parseEntryString(Entry* entry)
 
 QPair<QString, QString> KdbxXmlReader::parseEntryBinary(Entry* entry)
 {
-    Q_ASSERT(m_xml.isStartElement() && m_xml.name() == "Binary");
+    Q_ASSERT(m_xml.isStartElement() && m_xml.name().toString() == "Binary");
 
     QPair<QString, QString> poolRef;
 
@@ -876,12 +880,12 @@ QPair<QString, QString> KdbxXmlReader::parseEntryBinary(Entry* entry)
     bool valueSet = false;
 
     while (!m_xml.hasError() && m_xml.readNextStartElement()) {
-        if (m_xml.name() == "Key") {
+        if (m_xml.name().toString() == "Key") {
             key = readString();
             keySet = true;
             continue;
         }
-        if (m_xml.name() == "Value") {
+        if (m_xml.name().toString() == "Value") {
             QXmlStreamAttributes attr = m_xml.attributes();
 
             if (attr.hasAttribute("Ref")) {
@@ -915,16 +919,16 @@ QPair<QString, QString> KdbxXmlReader::parseEntryBinary(Entry* entry)
 
 void KdbxXmlReader::parseAutoType(Entry* entry)
 {
-    Q_ASSERT(m_xml.isStartElement() && m_xml.name() == "AutoType");
+    Q_ASSERT(m_xml.isStartElement() && m_xml.name().toString() == "AutoType");
 
     while (!m_xml.hasError() && m_xml.readNextStartElement()) {
-        if (m_xml.name() == "Enabled") {
+        if (m_xml.name().toString() == "Enabled") {
             entry->setAutoTypeEnabled(readBool());
-        } else if (m_xml.name() == "DataTransferObfuscation") {
+        } else if (m_xml.name().toString() == "DataTransferObfuscation") {
             entry->setAutoTypeObfuscation(readNumber());
-        } else if (m_xml.name() == "DefaultSequence") {
+        } else if (m_xml.name().toString() == "DefaultSequence") {
             entry->setDefaultAutoTypeSequence(readString());
-        } else if (m_xml.name() == "Association") {
+        } else if (m_xml.name().toString() == "Association") {
             parseAutoTypeAssoc(entry);
         } else {
             skipCurrentElement();
@@ -934,17 +938,17 @@ void KdbxXmlReader::parseAutoType(Entry* entry)
 
 void KdbxXmlReader::parseAutoTypeAssoc(Entry* entry)
 {
-    Q_ASSERT(m_xml.isStartElement() && m_xml.name() == "Association");
+    Q_ASSERT(m_xml.isStartElement() && m_xml.name().toString() == "Association");
 
     AutoTypeAssociations::Association assoc;
     bool windowSet = false;
     bool sequenceSet = false;
 
     while (!m_xml.hasError() && m_xml.readNextStartElement()) {
-        if (m_xml.name() == "Window") {
+        if (m_xml.name().toString() == "Window") {
             assoc.window = readString();
             windowSet = true;
-        } else if (m_xml.name() == "KeystrokeSequence") {
+        } else if (m_xml.name().toString() == "KeystrokeSequence") {
             assoc.sequence = readString();
             sequenceSet = true;
         } else {
@@ -961,12 +965,12 @@ void KdbxXmlReader::parseAutoTypeAssoc(Entry* entry)
 
 QList<Entry*> KdbxXmlReader::parseEntryHistory()
 {
-    Q_ASSERT(m_xml.isStartElement() && m_xml.name() == "History");
+    Q_ASSERT(m_xml.isStartElement() && m_xml.name().toString() == "History");
 
     QList<Entry*> historyItems;
 
     while (!m_xml.hasError() && m_xml.readNextStartElement()) {
-        if (m_xml.name() == "Entry") {
+        if (m_xml.name().toString() == "Entry") {
             historyItems.append(parseEntry(true));
         } else {
             skipCurrentElement();
@@ -978,23 +982,23 @@ QList<Entry*> KdbxXmlReader::parseEntryHistory()
 
 TimeInfo KdbxXmlReader::parseTimes()
 {
-    Q_ASSERT(m_xml.isStartElement() && m_xml.name() == "Times");
+    Q_ASSERT(m_xml.isStartElement() && m_xml.name().toString() == "Times");
 
     TimeInfo timeInfo;
     while (!m_xml.hasError() && m_xml.readNextStartElement()) {
-        if (m_xml.name() == "LastModificationTime") {
+        if (m_xml.name().toString() == "LastModificationTime") {
             timeInfo.setLastModificationTime(readDateTime());
-        } else if (m_xml.name() == "CreationTime") {
+        } else if (m_xml.name().toString() == "CreationTime") {
             timeInfo.setCreationTime(readDateTime());
-        } else if (m_xml.name() == "LastAccessTime") {
+        } else if (m_xml.name().toString() == "LastAccessTime") {
             timeInfo.setLastAccessTime(readDateTime());
-        } else if (m_xml.name() == "ExpiryTime") {
+        } else if (m_xml.name().toString() == "ExpiryTime") {
             timeInfo.setExpiryTime(readDateTime());
-        } else if (m_xml.name() == "Expires") {
+        } else if (m_xml.name().toString() == "Expires") {
             timeInfo.setExpires(readBool());
-        } else if (m_xml.name() == "UsageCount") {
+        } else if (m_xml.name().toString() == "UsageCount") {
             timeInfo.setUsageCount(readNumber());
-        } else if (m_xml.name() == "LocationChanged") {
+        } else if (m_xml.name().toString() == "LocationChanged") {
             timeInfo.setLocationChanged(readDateTime());
         } else {
             skipCurrentElement();
diff --git a/src/format/KdbxXmlReader.h b/src/format/KdbxXmlReader.h
index 1b6305eeaf..50950df7ed 100644
--- a/src/format/KdbxXmlReader.h
+++ b/src/format/KdbxXmlReader.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018 KeePassXC Team <team@keepassxc.org>
+ * Copyright (C) 2025 KeePassXC Team <team@keepassxc.org>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -23,6 +23,7 @@
 
 #include <QCoreApplication>
 #include <QMultiHash>
+#include <QStringView>
 #include <QXmlStreamReader>
 
 class QIODevice;
@@ -93,7 +94,7 @@ class KdbxXmlReader
     virtual Group* getGroup(const QUuid& uuid);
     virtual Entry* getEntry(const QUuid& uuid);
 
-    virtual bool isTrueValue(const QStringRef& value);
+    virtual bool isTrueValue(const QStringView value);
     virtual void raiseError(const QString& errorMessage);
 
     const quint32 m_kdbxVersion;
diff --git a/src/format/KdbxXmlWriter.cpp b/src/format/KdbxXmlWriter.cpp
index 142f4b7e37..8a921afa7b 100644
--- a/src/format/KdbxXmlWriter.cpp
+++ b/src/format/KdbxXmlWriter.cpp
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2017 KeePassXC Team <team@keepassxc.org>
+ *  Copyright (C) 2026 KeePassXC Team <team@keepassxc.org>
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -55,7 +55,6 @@ void KdbxXmlWriter::writeDatabase(QIODevice* device,
 
     m_xml.setAutoFormatting(true);
     m_xml.setAutoFormattingIndent(-1); // 1 tab
-    m_xml.setCodec("UTF-8");
 
     if (m_kdbxVersion < KeePass2::FILE_VERSION_4) {
         fillBinaryIdxMap();
@@ -79,8 +78,9 @@ void KdbxXmlWriter::writeDatabase(QIODevice* device,
 void KdbxXmlWriter::writeDatabase(const QString& filename, Database* db)
 {
     QFile file(filename);
-    file.open(QIODevice::WriteOnly | QIODevice::Truncate);
-    writeDatabase(&file, db);
+    if (file.open(QIODevice::WriteOnly | QIODevice::Truncate)) {
+        writeDatabase(&file, db);
+    }
 }
 
 bool KdbxXmlWriter::hasError()
@@ -109,7 +109,6 @@ void KdbxXmlWriter::fillBinaryIdxMap()
         for (const QString& key : attachmentKeys) {
             QByteArray data = entry->attachments()->value(key);
             CryptoHash hash(CryptoHash::Sha256);
-#ifdef WITH_XC_KEESHARE
             // Namespace KeeShare attachments so they don't get deduplicated together with attachments
             // from other databases. Prevents potential filesize side channels.
             auto group = entry->group();
@@ -121,7 +120,6 @@ void KdbxXmlWriter::fillBinaryIdxMap()
             } else {
                 hash.addData(m_db->uuid().toByteArray());
             }
-#endif
             hash.addData(data);
 
             const auto hashResult = hash.result();
diff --git a/src/format/KeePass1Reader.cpp b/src/format/KeePass1Reader.cpp
index a7d8038dfb..4eeecf1ef8 100644
--- a/src/format/KeePass1Reader.cpp
+++ b/src/format/KeePass1Reader.cpp
@@ -1,4 +1,5 @@
 /*
+ *  Copyright (C) 2025 KeePassXC Team <team@keepassxc.org>
  *  Copyright (C) 2012 Felix Geyer <debfx@fobos.de>
  *
  *  This program is free software: you can redistribute it and/or modify
@@ -19,7 +20,8 @@
 
 #include <QFile>
 #include <QFileInfo>
-#include <QTextCodec>
+#include <QRegularExpression>
+#include <QStringConverter>
 
 #include "core/Endian.h"
 #include "core/Group.h"
@@ -300,8 +302,10 @@ KeePass1Reader::testKeys(const QString& password, const QByteArray& keyfileData,
 
     QScopedPointer<SymmetricCipherStream> cipherStream;
     QByteArray passwordData;
-    QTextCodec* codec = QTextCodec::codecForName("Windows-1252");
-    QByteArray passwordDataCorrect = codec->fromUnicode(password);
+
+    const auto currentEncoding = QStringConverter::encodingForName("Windows-1252");
+    QStringEncoder encoder(currentEncoding.value_or(QStringConverter::System));
+    QByteArray passwordDataCorrect = encoder.encode(password);
 
     for (PasswordEncoding encoding : encodings) {
         if (encoding == Windows1252) {
@@ -701,8 +705,8 @@ Entry* KeePass1Reader::readEntry(QIODevice* cipherStream)
 
 void KeePass1Reader::parseNotes(const QString& rawNotes, Entry* entry)
 {
-    QRegExp sequenceRegexp("Auto-Type(?:-(\\d+))?: (.+)", Qt::CaseInsensitive, QRegExp::RegExp2);
-    QRegExp windowRegexp("Auto-Type-Window(?:-(\\d+))?: (.+)", Qt::CaseInsensitive, QRegExp::RegExp2);
+    QRegularExpression sequenceRegexp("Auto-Type(?:-(\\d+))?: (.+)", QRegularExpression::CaseInsensitiveOption);
+    QRegularExpression windowRegexp("Auto-Type-Window(?:-(\\d+))?: (.+)", QRegularExpression::CaseInsensitiveOption);
     QHash<int, QString> sequences;
     QMap<int, QStringList> windows;
 
@@ -713,23 +717,25 @@ void KeePass1Reader::parseNotes(const QString& rawNotes, Entry* entry)
     for (QString line : rawNotesLines) {
         line.remove("\r");
 
-        if (sequenceRegexp.exactMatch(line)) {
-            if (sequenceRegexp.cap(1).isEmpty()) {
-                entry->setDefaultAutoTypeSequence(sequenceRegexp.cap(2));
+        auto sequenceMatch = sequenceRegexp.match(line);
+        auto windowMatch = windowRegexp.match(line);
+        if (sequenceMatch.hasMatch()) {
+            if (sequenceMatch.captured(1).isEmpty()) {
+                entry->setDefaultAutoTypeSequence(sequenceMatch.captured(2));
             } else {
-                sequences[sequenceRegexp.cap(1).toInt()] = sequenceRegexp.cap(2);
+                sequences[sequenceMatch.captured(1).toInt()] = sequenceMatch.captured(2);
             }
 
             lastLineAutoType = true;
-        } else if (windowRegexp.exactMatch(line)) {
+        } else if (windowMatch.hasMatch()) {
             int nr;
-            if (windowRegexp.cap(1).isEmpty()) {
+            if (windowMatch.captured(1).isEmpty()) {
                 nr = -1; // special number that matches no other sequence
             } else {
-                nr = windowRegexp.cap(1).toInt();
+                nr = windowMatch.captured(1).toInt();
             }
 
-            windows[nr].append(windowRegexp.cap(2));
+            windows[nr].append(windowMatch.captured(2));
 
             lastLineAutoType = true;
         } else {
diff --git a/src/format/KeePass1Reader.h b/src/format/KeePass1Reader.h
index 2cb3589cce..746280fecd 100644
--- a/src/format/KeePass1Reader.h
+++ b/src/format/KeePass1Reader.h
@@ -19,6 +19,7 @@
 #define KEEPASSX_KEEPASS1READER_H
 
 #include <QCoreApplication>
+#include <QHash>
 #include <QSharedPointer>
 
 class Database;
diff --git a/src/format/OpVaultReader.cpp b/src/format/OpVaultReader.cpp
index 779e25fda1..4b04b6013d 100644
--- a/src/format/OpVaultReader.cpp
+++ b/src/format/OpVaultReader.cpp
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2019 KeePassXC Team <team@keepassxc.org>
+ *  Copyright (C) 2025 KeePassXC Team <team@keepassxc.org>
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -158,9 +158,9 @@ bool OpVaultReader::processProfileJson(QJsonObject& profileJson, const QString&
     }
     auto rootGroupTime = rootGroup->timeInfo();
     auto createdAt = static_cast<uint>(profileJson["createdAt"].toInt());
-    rootGroupTime.setCreationTime(QDateTime::fromTime_t(createdAt, Qt::UTC));
+    rootGroupTime.setCreationTime(QDateTime::fromSecsSinceEpoch(createdAt, Qt::UTC));
     auto updatedAt = static_cast<uint>(profileJson["updatedAt"].toInt());
-    rootGroupTime.setLastModificationTime(QDateTime::fromTime_t(updatedAt, Qt::UTC));
+    rootGroupTime.setLastModificationTime(QDateTime::fromSecsSinceEpoch(updatedAt, Qt::UTC));
     rootGroup->setUuid(Tools::hexToUuid(profileJson["uuid"].toString()));
 
     QScopedPointer derivedKeys(deriveKeysFromPassPhrase(salt, password, iterations));
@@ -238,12 +238,12 @@ bool OpVaultReader::processFolderJson(QJsonObject& foldersJson, Group* rootGroup
         bool timeInfoOk = false;
         if (folder.contains("created")) {
             auto createdTime = static_cast<uint>(folder["created"].toInt());
-            ti.setCreationTime(QDateTime::fromTime_t(createdTime, Qt::UTC));
+            ti.setCreationTime(QDateTime::fromSecsSinceEpoch(createdTime, Qt::UTC));
             timeInfoOk = true;
         }
         if (folder.contains("updated")) {
             auto updateTime = static_cast<uint>(folder["updated"].toInt());
-            ti.setLastModificationTime(QDateTime::fromTime_t(updateTime, Qt::UTC));
+            ti.setLastModificationTime(QDateTime::fromSecsSinceEpoch(updateTime, Qt::UTC));
             timeInfoOk = true;
         }
         // "tx" is modified by sync, not by user; maybe a custom attribute?
diff --git a/src/format/OpVaultReaderBandEntry.cpp b/src/format/OpVaultReaderBandEntry.cpp
index 3a9774b68a..7d6088e322 100644
--- a/src/format/OpVaultReaderBandEntry.cpp
+++ b/src/format/OpVaultReaderBandEntry.cpp
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2023 KeePassXC Team <team@keepassxc.org>
+ *  Copyright (C) 2025 KeePassXC Team <team@keepassxc.org>
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -61,7 +61,7 @@ bool OpVaultReader::decryptBandEntry(const QJsonObject& bandEntry,
     QByteArray kBA = QByteArray::fromBase64(entKStr.toUtf8());
     const int wantKsize = 16 + 32 + 32 + 32;
     if (kBA.size() != wantKsize) {
-        qCritical("Malformed \"k\" size; expected %d got %d\n", wantKsize, kBA.size());
+        qCritical("Malformed \"k\" size; expected %d got %" PRIdQPTRDIFF "\n", wantKsize, kBA.size());
         return false;
     }
 
@@ -150,12 +150,12 @@ Entry* OpVaultReader::processBandEntry(const QJsonObject& bandEntry, const QDir&
     bool timeInfoOk = false;
     if (bandEntry.contains("created")) {
         auto createdTime = static_cast<uint>(bandEntry["created"].toInt());
-        ti.setCreationTime(QDateTime::fromTime_t(createdTime, Qt::UTC));
+        ti.setCreationTime(QDateTime::fromSecsSinceEpoch(createdTime, Qt::UTC));
         timeInfoOk = true;
     }
     if (bandEntry.contains("updated")) {
         auto updateTime = static_cast<uint>(bandEntry["updated"].toInt());
-        ti.setLastModificationTime(QDateTime::fromTime_t(updateTime, Qt::UTC));
+        ti.setLastModificationTime(QDateTime::fromSecsSinceEpoch(updateTime, Qt::UTC));
         timeInfoOk = true;
     }
     // "tx" is modified by sync, not by user; maybe a custom attribute?
diff --git a/src/format/OpVaultReaderSections.cpp b/src/format/OpVaultReaderSections.cpp
index 02566a5426..ecaaf99346 100644
--- a/src/format/OpVaultReaderSections.cpp
+++ b/src/format/OpVaultReaderSections.cpp
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2019 KeePassXC Team <team@keepassxc.org>
+ *  Copyright (C) 2025 KeePassXC Team <team@keepassxc.org>
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -37,9 +37,9 @@ namespace
             date = QDateTime::fromString(dateValue, "yyyyMM");
             date.setTimeSpec(Qt::UTC);
         } else if (value.isString()) {
-            date = QDateTime::fromTime_t(value.toString().toUInt(), Qt::UTC);
+            date = QDateTime::fromSecsSinceEpoch(value.toString().toUInt(), Qt::UTC);
         } else {
-            date = QDateTime::fromTime_t(value.toInt(), Qt::UTC);
+            date = QDateTime::fromSecsSinceEpoch(value.toInt(), Qt::UTC);
         }
         return date;
     }
diff --git a/src/gui/ApplicationSettingsWidget.cpp b/src/gui/ApplicationSettingsWidget.cpp
index c262e6a04c..bb66b2aa95 100644
--- a/src/gui/ApplicationSettingsWidget.cpp
+++ b/src/gui/ApplicationSettingsWidget.cpp
@@ -36,7 +36,7 @@
 
 #include "FileDialog.h"
 #include "MessageBox.h"
-#ifdef WITH_XC_BROWSER
+#ifdef KPXC_FEATURE_BROWSER
 #include "browser/BrowserSettingsPage.h"
 #endif
 
@@ -80,7 +80,7 @@ ApplicationSettingsWidget::ApplicationSettingsWidget(QWidget* parent)
     m_generalUi->setupUi(m_generalWidget);
     addPage(tr("General"), icons()->icon("preferences-other"), m_generalWidget);
     addPage(tr("Security"), icons()->icon("security-high"), m_secWidget);
-#ifdef WITH_XC_BROWSER
+#ifdef KPXC_FEATURE_BROWSER
     addSettingsPage(new BrowserSettingsPage());
 #endif
 
@@ -162,7 +162,7 @@ ApplicationSettingsWidget::ApplicationSettingsWidget(QWidget* parent)
     m_generalUi->menubarShowCheckBox->setVisible(false);
 #endif
 
-#ifdef WITH_XC_UPDATECHECK
+#ifdef KPXC_FEATURE_UPDATES
     connect(m_generalUi->checkForUpdatesOnStartupCheckBox, SIGNAL(toggled(bool)), SLOT(checkUpdatesToggled(bool)));
 #else
     m_generalUi->checkForUpdatesOnStartupCheckBox->setVisible(false);
@@ -170,7 +170,7 @@ ApplicationSettingsWidget::ApplicationSettingsWidget(QWidget* parent)
     m_generalUi->checkUpdatesSpacer->changeSize(0, 0, QSizePolicy::Fixed, QSizePolicy::Fixed);
 #endif
 
-#ifndef WITH_XC_NETWORKING
+#ifndef KPXC_FEATURE_NETWORK
     m_secUi->privacy->setVisible(false);
     m_generalUi->faviconTimeoutLabel->setVisible(false);
     m_generalUi->faviconTimeoutSpinBox->setVisible(false);
diff --git a/src/gui/DatabaseIcons.h b/src/gui/DatabaseIcons.h
index 38d1590c79..ddcdc2568a 100644
--- a/src/gui/DatabaseIcons.h
+++ b/src/gui/DatabaseIcons.h
@@ -1,4 +1,5 @@
 /*
+ *  Copyright (C) 2025 KeePassXC Team <team@keepassxc.org>
  *  Copyright (C) 2010 Felix Geyer <debfx@fobos.de>
  *
  *  This program is free software: you can redistribute it and/or modify
@@ -18,6 +19,7 @@
 #ifndef KEEPASSX_DATABASEICONS_H
 #define KEEPASSX_DATABASEICONS_H
 
+#include <QHash>
 #include <QIcon>
 
 enum IconSize
diff --git a/src/gui/DatabaseOpenDialog.cpp b/src/gui/DatabaseOpenDialog.cpp
index 881db40876..db83d35027 100644
--- a/src/gui/DatabaseOpenDialog.cpp
+++ b/src/gui/DatabaseOpenDialog.cpp
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2018 KeePassXC Team <team@keepassxc.org>
+ *  Copyright (C) 2025 KeePassXC Team <team@keepassxc.org>
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -25,10 +25,6 @@
 #include <QLayout>
 #include <QShortcut>
 
-#ifdef Q_OS_WIN
-#include <QtPlatformHeaders/QWindowsWindowFunctions>
-#endif
-
 DatabaseOpenDialog::DatabaseOpenDialog(QWidget* parent)
     : QDialog(parent)
     , m_view(new DatabaseOpenWidget(this))
@@ -43,9 +39,7 @@ DatabaseOpenDialog::DatabaseOpenDialog(QWidget* parent)
 #endif
     // block input to the main window/application while the dialog is open
     setWindowModality(Qt::ApplicationModal);
-#ifdef Q_OS_WIN
-    QWindowsWindowFunctions::setWindowActivationBehavior(QWindowsWindowFunctions::AlwaysActivateWindow);
-#endif
+
     connect(m_view, &DatabaseOpenWidget::dialogFinished, this, &DatabaseOpenDialog::complete);
 
     m_tabBar->setAutoHide(true);
@@ -66,16 +60,16 @@ DatabaseOpenDialog::DatabaseOpenDialog(QWidget* parent)
 #ifdef Q_OS_MACOS
     dbTabModifier = Qt::ALT;
 #endif
-    auto* shortcut = new QShortcut(Qt::CTRL + Qt::Key_PageUp, this);
+    auto* shortcut = new QShortcut(Qt::CTRL | Qt::Key_PageUp, this);
     shortcut->setContext(Qt::WidgetWithChildrenShortcut);
     connect(shortcut, &QShortcut::activated, this, [this]() { selectTabOffset(-1); });
-    shortcut = new QShortcut(dbTabModifier + Qt::SHIFT + Qt::Key_Tab, this);
+    shortcut = new QShortcut(dbTabModifier | Qt::SHIFT | Qt::Key_Tab, this);
     shortcut->setContext(Qt::WidgetWithChildrenShortcut);
     connect(shortcut, &QShortcut::activated, this, [this]() { selectTabOffset(-1); });
-    shortcut = new QShortcut(Qt::CTRL + Qt::Key_PageDown, this);
+    shortcut = new QShortcut(Qt::CTRL | Qt::Key_PageDown, this);
     shortcut->setContext(Qt::WidgetWithChildrenShortcut);
     connect(shortcut, &QShortcut::activated, this, [this]() { selectTabOffset(1); });
-    shortcut = new QShortcut(dbTabModifier + Qt::Key_Tab, this);
+    shortcut = new QShortcut(dbTabModifier | Qt::Key_Tab, this);
     shortcut->setContext(Qt::WidgetWithChildrenShortcut);
     connect(shortcut, &QShortcut::activated, this, [this]() { selectTabOffset(1); });
 }
@@ -142,7 +136,7 @@ void DatabaseOpenDialog::tabChanged(int index)
         setTarget(dbWidget, dbWidget->database()->filePath());
     } else {
         // if these list sizes don't match, there's a bug somewhere nearby
-        qWarning("DatabaseOpenDialog: mismatch between tab count %d and DB count %d",
+        qWarning("DatabaseOpenDialog: mismatch between tab count %d and DB count %" PRIdQSIZETYPE "",
                  m_tabBar->count(),
                  m_tabDbWidgets.count());
     }
diff --git a/src/gui/DatabaseOpenWidget.cpp b/src/gui/DatabaseOpenWidget.cpp
index 7cf5dcb151..8d3d0b45c1 100644
--- a/src/gui/DatabaseOpenWidget.cpp
+++ b/src/gui/DatabaseOpenWidget.cpp
@@ -25,9 +25,7 @@
 #include "gui/MessageBox.h"
 #include "keys/ChallengeResponseKey.h"
 #include "keys/FileKey.h"
-#ifdef WITH_XC_YUBIKEY
 #include "keys/drivers/YubiKeyInterfaceUSB.h"
-#endif
 #include "quickunlock/QuickUnlockInterface.h"
 
 #include <QCheckBox>
@@ -52,9 +50,7 @@ DatabaseOpenWidget::DatabaseOpenWidget(QWidget* parent)
     : DialogyWidget(parent)
     , m_ui(new Ui::DatabaseOpenWidget())
     , m_db(nullptr)
-#ifdef WITH_XC_YUBIKEY
     , m_deviceListener(new DeviceListener(this))
-#endif
 {
     m_ui->setupUi(this);
 
@@ -101,7 +97,6 @@ DatabaseOpenWidget::DatabaseOpenWidget(QWidget* parent)
     sp.setRetainSizeWhenHidden(true);
     m_ui->hardwareKeyProgress->setSizePolicy(sp);
 
-#ifdef WITH_XC_YUBIKEY
     connect(m_deviceListener, &DeviceListener::devicePlugged, this, [this] { pollHardwareKey(false, 500); });
     connect(YubiKey::instance(), SIGNAL(detectComplete(bool)), SLOT(hardwareKeyResponse(bool)), Qt::QueuedConnection);
 
@@ -122,10 +117,6 @@ DatabaseOpenWidget::DatabaseOpenWidget(QWidget* parent)
     connect(&m_hideNoHardwareKeysFoundTimer, &QTimer::timeout, this, [this] {
         m_ui->noHardwareKeysFoundLabel->setVisible(false);
     });
-#else
-    m_ui->noHardwareKeysFoundLabel->setVisible(false);
-    m_ui->refreshHardwareKeys->setVisible(false);
-#endif
 
     // QuickUnlock actions
     connect(m_ui->quickUnlockButton, &QPushButton::pressed, this, [this] { openDatabase(); });
@@ -195,7 +186,6 @@ bool DatabaseOpenWidget::event(QEvent* event)
         toggleQuickUnlockScreen();
 
         if (type == QEvent::Show) {
-#ifdef WITH_XC_YUBIKEY
 #ifdef Q_OS_WIN
             m_deviceListener->registerHotplugCallback(true,
                                                       true,
@@ -210,7 +200,6 @@ bool DatabaseOpenWidget::event(QEvent* event)
 #else
             m_deviceListener->registerHotplugCallback(true, true, YubiKeyInterfaceUSB::YUBICO_USB_VID);
             m_deviceListener->registerHotplugCallback(true, true, YubiKeyInterfaceUSB::ONLYKEY_USB_VID);
-#endif
 #endif
         }
 
@@ -226,11 +215,9 @@ bool DatabaseOpenWidget::event(QEvent* event)
             m_hideTimer.start();
         }
 
-#ifdef WITH_XC_YUBIKEY
         if (type == QEvent::Hide) {
             m_deviceListener->deregisterAllHotplugCallbacks();
         }
-#endif
 
         ret = true;
     }
@@ -295,10 +282,8 @@ void DatabaseOpenWidget::load(const QString& filename)
 
     toggleQuickUnlockScreen();
 
-#ifdef WITH_XC_YUBIKEY
     // Do initial auto-poll
     pollHardwareKey();
-#endif
 }
 
 void DatabaseOpenWidget::clearForms()
@@ -489,7 +474,6 @@ QSharedPointer<CompositeKey> DatabaseOpenWidget::buildDatabaseKey()
         config()->set(Config::LastKeyFiles, lastKeyFiles);
     }
 
-#ifdef WITH_XC_YUBIKEY
     auto lastChallengeResponse = config()->get(Config::LastChallengeResponse).toHash();
     lastChallengeResponse.remove(m_filename);
 
@@ -506,7 +490,6 @@ QSharedPointer<CompositeKey> DatabaseOpenWidget::buildDatabaseKey()
     if (config()->get(Config::RememberLastKeyFiles).toBool()) {
         config()->set(Config::LastChallengeResponse, lastChallengeResponse);
     }
-#endif
 
     return databaseKey;
 }
diff --git a/src/gui/DatabaseOpenWidget.h b/src/gui/DatabaseOpenWidget.h
index d730634b30..c0287fd5f8 100644
--- a/src/gui/DatabaseOpenWidget.h
+++ b/src/gui/DatabaseOpenWidget.h
@@ -23,12 +23,9 @@
 #include <QScopedPointer>
 #include <QTimer>
 
-#include "config-keepassx.h"
 #include "gui/DialogyWidget.h"
 #include "gui/MessageWidget.h"
-#ifdef WITH_XC_YUBIKEY
 #include "osutils/DeviceListener.h"
-#endif
 
 class CompositeKey;
 class Database;
@@ -87,9 +84,7 @@ private slots:
     void hardwareKeyResponse(bool found);
 
 private:
-#ifdef WITH_XC_YUBIKEY
     QPointer<DeviceListener> m_deviceListener;
-#endif
     bool m_pollingHardwareKey = false;
     bool m_manualHardwareKeyRefresh = false;
     bool m_blockQuickUnlock = false;
diff --git a/src/gui/DatabaseTabWidget.cpp b/src/gui/DatabaseTabWidget.cpp
index 2bf18071dc..cb4999ea5c 100644
--- a/src/gui/DatabaseTabWidget.cpp
+++ b/src/gui/DatabaseTabWidget.cpp
@@ -576,7 +576,7 @@ void DatabaseTabWidget::showDatabaseSecurity()
     currentDatabaseWidget()->switchToDatabaseSecurity();
 }
 
-#ifdef WITH_XC_BROWSER_PASSKEYS
+#ifdef KPXC_FEATURE_BROWSER
 void DatabaseTabWidget::showPasskeys()
 {
     currentDatabaseWidget()->switchToPasskeys();
diff --git a/src/gui/DatabaseTabWidget.h b/src/gui/DatabaseTabWidget.h
index a5074a84c4..010ea621e4 100644
--- a/src/gui/DatabaseTabWidget.h
+++ b/src/gui/DatabaseTabWidget.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2024 KeePassXC Team <team@keepassxc.org>
+ * Copyright (C) 2025 KeePassXC Team <team@keepassxc.org>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -15,8 +15,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef KEEPASSX_DATABASETABWIDGET_H
-#define KEEPASSX_DATABASETABWIDGET_H
+#ifndef KEEPASSXC_DATABASETABWIDGET_H
+#define KEEPASSXC_DATABASETABWIDGET_H
 
 #include "DatabaseOpenDialog.h"
 #include "config-keepassx.h"
@@ -86,7 +86,7 @@ public slots:
     void showDatabaseReports(bool state);
     void showDatabaseSettings(bool state);
     void showDatabaseSecurity();
-#ifdef WITH_XC_BROWSER_PASSKEYS
+#ifdef KPXC_FEATURE_BROWSER
     void showPasskeys();
     void importPasskey();
     void importPasskeyToEntry();
@@ -129,4 +129,4 @@ private slots:
     bool m_databaseOpenInProgress;
 };
 
-#endif // KEEPASSX_DATABASETABWIDGET_H
+#endif // KEEPASSXC_DATABASETABWIDGET_H
diff --git a/src/gui/DatabaseWidget.cpp b/src/gui/DatabaseWidget.cpp
index 2afde49fee..6fcfea27e5 100644
--- a/src/gui/DatabaseWidget.cpp
+++ b/src/gui/DatabaseWidget.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2024 KeePassXC Team <team@keepassxc.org>
+ * Copyright (C) 2025 KeePassXC Team <team@keepassxc.org>
  * Copyright (C) 2010 Felix Geyer <debfx@fobos.de>
  *
  * This program is free software: you can redistribute it and/or modify
@@ -60,15 +60,15 @@
 #include "remote/RemoteHandler.h"
 #include "remote/RemoteSettings.h"
 
-#ifdef WITH_XC_NETWORKING
+#ifdef KPXC_FEATURE_NETWORK
 #include "gui/IconDownloaderDialog.h"
 #endif
 
-#ifdef WITH_XC_SSHAGENT
+#ifdef KPXC_FEATURE_SSHAGENT
 #include "sshagent/SSHAgent.h"
 #endif
 
-#ifdef WITH_XC_BROWSER_PASSKEYS
+#ifdef KPXC_FEATURE_BROWSER
 #include "gui/passkeys/PasskeyImporter.h"
 #endif
 
@@ -125,7 +125,7 @@ DatabaseWidget::DatabaseWidget(QSharedPointer<Database> db, QWidget* parent)
     tagsWidget->setLayout(tagsLayout);
     tagsLayout->addWidget(tagsTitle);
     tagsLayout->addWidget(m_tagView);
-    tagsLayout->setMargin(0);
+    tagsLayout->setContentsMargins(0, 0, 0, 0);
 
     m_groupSplitter->setOrientation(Qt::Vertical);
     m_groupSplitter->setChildrenCollapsible(true);
@@ -139,11 +139,9 @@ DatabaseWidget::DatabaseWidget(QSharedPointer<Database> db, QWidget* parent)
 
     auto rightHandSideWidget = new QWidget(m_mainSplitter);
     auto rightHandSideVBox = new QVBoxLayout();
-    rightHandSideVBox->setMargin(0);
+    rightHandSideVBox->setContentsMargins(0, 0, 0, 0);
     rightHandSideVBox->addWidget(m_searchingLabel);
-#ifdef WITH_XC_KEESHARE
     rightHandSideVBox->addWidget(m_shareLabel);
-#endif
     rightHandSideVBox->addWidget(m_previewSplitter);
     rightHandSideWidget->setLayout(rightHandSideVBox);
     m_entryView = new EntryView(rightHandSideWidget);
@@ -173,12 +171,10 @@ DatabaseWidget::DatabaseWidget(QSharedPointer<Database> db, QWidget* parent)
     m_searchingLabel->setAlignment(Qt::AlignCenter);
     m_searchingLabel->setVisible(false);
 
-#ifdef WITH_XC_KEESHARE
     m_shareLabel->setObjectName("KeeShareBanner");
     m_shareLabel->setRawText(tr("Shared group…"));
     m_shareLabel->setAlignment(Qt::AlignCenter);
     m_shareLabel->setVisible(false);
-#endif
 
     m_previewView->setObjectName("previewWidget");
     m_previewView->hide();
@@ -239,11 +235,9 @@ DatabaseWidget::DatabaseWidget(QSharedPointer<Database> db, QWidget* parent)
 
     m_searchLimitGroup = config()->get(Config::SearchLimitGroup).toBool();
 
-#ifdef WITH_XC_KEESHARE
     // We need to reregister the database to allow exports
     // from a newly created database
     KeeShare::instance()->connectDatabase(m_db, {});
-#endif
 
     if (m_db->isInitialized()) {
         switchToMainView();
@@ -508,12 +502,7 @@ void DatabaseWidget::replaceDatabase(QSharedPointer<Database> db)
 
     emit databaseReplaced(oldDb, m_db);
 
-#if defined(WITH_XC_KEESHARE)
     KeeShare::instance()->connectDatabase(m_db, oldDb);
-#else
-    // Keep the instance active till the end of this function
-    Q_UNUSED(oldDb);
-#endif
 
     oldDb->releaseData();
 }
@@ -831,7 +820,7 @@ void DatabaseWidget::setClipboardTextAndMinimize(const QString& text)
     }
 }
 
-#ifdef WITH_XC_SSHAGENT
+#ifdef KPXC_FEATURE_SSHAGENT
 void DatabaseWidget::addToAgent()
 {
     Entry* currentEntry = m_entryView->currentEntry();
@@ -952,7 +941,7 @@ void DatabaseWidget::openUrl()
 
 void DatabaseWidget::downloadSelectedFavicons()
 {
-#ifdef WITH_XC_NETWORKING
+#ifdef KPXC_FEATURE_NETWORK
     QList<Entry*> selectedEntries;
     for (const auto& index : m_entryView->selectionModel()->selectedRows()) {
         selectedEntries.append(m_entryView->entryFromIndex(index));
@@ -965,7 +954,7 @@ void DatabaseWidget::downloadSelectedFavicons()
 
 void DatabaseWidget::downloadAllFavicons()
 {
-#ifdef WITH_XC_NETWORKING
+#ifdef KPXC_FEATURE_NETWORK
     auto currentGroup = m_groupView->currentGroup();
     if (currentGroup) {
         performIconDownloads(currentGroup->entries());
@@ -975,7 +964,7 @@ void DatabaseWidget::downloadAllFavicons()
 
 void DatabaseWidget::downloadFaviconInBackground(Entry* entry)
 {
-#ifdef WITH_XC_NETWORKING
+#ifdef KPXC_FEATURE_NETWORK
     performIconDownloads({entry}, true, true);
 #else
     Q_UNUSED(entry);
@@ -984,7 +973,7 @@ void DatabaseWidget::downloadFaviconInBackground(Entry* entry)
 
 void DatabaseWidget::performIconDownloads(const QList<Entry*>& entries, bool force, bool downloadInBackground)
 {
-#ifdef WITH_XC_NETWORKING
+#ifdef KPXC_FEATURE_NETWORK
     auto* iconDownloaderDialog = new IconDownloaderDialog(this);
     connect(this, SIGNAL(databaseLockRequested()), iconDownloaderDialog, SLOT(close()));
 
@@ -1360,7 +1349,7 @@ void DatabaseWidget::loadDatabase(bool accepted)
         m_entryBeforeLock = QUuid();
         m_saveAttempts = 0;
         emit databaseUnlocked();
-#ifdef WITH_XC_SSHAGENT
+#ifdef KPXC_FEATURE_SSHAGENT
         sshAgent()->databaseUnlocked(m_db);
 #endif
         if (config()->get(Config::MinimizeAfterUnlock).toBool()) {
@@ -1523,7 +1512,7 @@ void DatabaseWidget::unlockDatabase(bool accepted)
     processAutoOpen();
     emit databaseUnlocked();
 
-#ifdef WITH_XC_SSHAGENT
+#ifdef KPXC_FEATURE_SSHAGENT
     sshAgent()->databaseUnlocked(m_db);
 #endif
 
@@ -1680,7 +1669,7 @@ void DatabaseWidget::switchToRemoteSettings()
     m_databaseSettingDialog->showRemoteSettings();
 }
 
-#ifdef WITH_XC_BROWSER_PASSKEYS
+#ifdef KPXC_FEATURE_BROWSER
 void DatabaseWidget::switchToPasskeys()
 {
     switchToDatabaseReports();
@@ -1777,9 +1766,7 @@ void DatabaseWidget::search(const QString& searchtext)
     m_lastSearchText = searchtext;
 
     m_searchingLabel->setVisible(true);
-#ifdef WITH_XC_KEESHARE
     m_shareLabel->setVisible(false);
-#endif
 
     emit searchModeActivated();
 }
@@ -1844,7 +1831,6 @@ void DatabaseWidget::onGroupChanged()
 
     m_previewView->setGroup(group);
 
-#ifdef WITH_XC_KEESHARE
     auto shareLabel = KeeShare::sharingLabel(group);
     if (!shareLabel.isEmpty()) {
         m_shareLabel->setRawText(shareLabel);
@@ -1852,7 +1838,6 @@ void DatabaseWidget::onGroupChanged()
     } else {
         m_shareLabel->setVisible(false);
     }
-#endif
 
     emit groupChanged();
 }
@@ -2136,7 +2121,7 @@ bool DatabaseWidget::lock()
         m_entryBeforeLock = currentEntry->uuid();
     }
 
-#ifdef WITH_XC_SSHAGENT
+#ifdef KPXC_FEATURE_SSHAGENT
     sshAgent()->databaseLocked(m_db);
 #endif
 
@@ -2434,7 +2419,7 @@ bool DatabaseWidget::currentEntryHasTotp()
     return currentEntry->hasValidTotp();
 }
 
-#ifdef WITH_XC_SSHAGENT
+#ifdef KPXC_FEATURE_SSHAGENT
 bool DatabaseWidget::currentEntryHasSshKey()
 {
     Entry* currentEntry = m_entryView->currentEntry();
@@ -2447,7 +2432,7 @@ bool DatabaseWidget::currentEntryHasSshKey()
 }
 #endif
 
-#ifdef WITH_XC_BROWSER_PASSKEYS
+#ifdef KPXC_FEATURE_BROWSER
 bool DatabaseWidget::currentEntryHasPasskey()
 {
     auto currentEntry = m_entryView->currentEntry();
diff --git a/src/gui/DatabaseWidget.h b/src/gui/DatabaseWidget.h
index d624a7e613..82a261e465 100644
--- a/src/gui/DatabaseWidget.h
+++ b/src/gui/DatabaseWidget.h
@@ -117,7 +117,7 @@ class DatabaseWidget : public QStackedWidget
     bool currentEntryHasUrl();
     bool currentEntryHasNotes();
     bool currentEntryHasTotp();
-#ifdef WITH_XC_SSHAGENT
+#ifdef KPXC_FEATURE_SSHAGENT
     bool currentEntryHasSshKey();
 #endif
     bool currentEntryHasAutoTypeEnabled();
@@ -205,7 +205,7 @@ public slots:
     void copyTotp();
     void copyPasswordTotp();
     void setupTotp();
-#ifdef WITH_XC_SSHAGENT
+#ifdef KPXC_FEATURE_SSHAGENT
     void addToAgent();
     void removeFromAgent();
 #endif
@@ -235,7 +235,7 @@ public slots:
     void switchToDatabaseReports();
     void switchToDatabaseSettings();
     void switchToRemoteSettings();
-#ifdef WITH_XC_BROWSER_PASSKEYS
+#ifdef KPXC_FEATURE_BROWSER
     void switchToPasskeys();
     void showImportPasskeyDialog(bool isEntry = false);
     void removePasskeyFromEntry();
diff --git a/src/gui/EditWidgetIcons.cpp b/src/gui/EditWidgetIcons.cpp
index f23d14ce77..8e885a6a0b 100644
--- a/src/gui/EditWidgetIcons.cpp
+++ b/src/gui/EditWidgetIcons.cpp
@@ -28,7 +28,7 @@
 #include "gui/IconModels.h"
 #include "gui/Icons.h"
 #include "gui/MessageBox.h"
-#ifdef WITH_XC_NETWORKING
+#ifdef KPXC_FEATURE_NETWORK
 #include "gui/IconDownloader.h"
 #endif
 
@@ -48,7 +48,7 @@ EditWidgetIcons::EditWidgetIcons(QWidget* parent)
     , m_applyIconTo(ApplyIconToOptions::THIS_ONLY)
     , m_defaultIconModel(new DefaultIconModel(this))
     , m_customIconModel(new CustomIconModel(this))
-#ifdef WITH_XC_NETWORKING
+#ifdef KPXC_FEATURE_NETWORK
     , m_downloader(new IconDownloader())
 #endif
 {
@@ -73,14 +73,14 @@ EditWidgetIcons::EditWidgetIcons(QWidget* parent)
             this, SIGNAL(widgetUpdated()));
     connect(m_ui->customIconsView->selectionModel(), SIGNAL(selectionChanged(QItemSelection,QItemSelection)),
             this, SIGNAL(widgetUpdated()));
-#ifdef WITH_XC_NETWORKING
+#ifdef KPXC_FEATURE_NETWORK
     connect(m_downloader.data(),
             SIGNAL(finished(const QString&, const QImage&)),
             SLOT(iconReceived(const QString&, const QImage&)));
 #endif
     // clang-format on
 
-#ifndef WITH_XC_NETWORKING
+#ifndef KPXC_FEATURE_NETWORK
     m_ui->faviconButton->setVisible(false);
     m_ui->faviconURL->setVisible(false);
 #endif
@@ -188,7 +188,7 @@ void EditWidgetIcons::keyPressEvent(QKeyEvent* event)
 
 void EditWidgetIcons::setUrl(const QString& url)
 {
-#ifdef WITH_XC_NETWORKING
+#ifdef KPXC_FEATURE_NETWORK
     QUrl urlCheck(url);
     if (urlCheck.scheme().startsWith("http")) {
         m_ui->faviconURL->setText(urlCheck.url(QUrl::RemovePath | QUrl::RemoveQuery | QUrl::RemoveFragment));
@@ -203,7 +203,7 @@ void EditWidgetIcons::setUrl(const QString& url)
 
 void EditWidgetIcons::downloadFavicon()
 {
-#ifdef WITH_XC_NETWORKING
+#ifdef KPXC_FEATURE_NETWORK
     auto url = m_ui->faviconURL->text();
     if (!url.isEmpty()) {
         m_downloader->setUrl(url);
@@ -214,7 +214,7 @@ void EditWidgetIcons::downloadFavicon()
 
 void EditWidgetIcons::iconReceived(const QString& url, const QImage& icon)
 {
-#ifdef WITH_XC_NETWORKING
+#ifdef KPXC_FEATURE_NETWORK
     Q_UNUSED(url);
     if (icon.isNull()) {
         QString message(tr("Unable to fetch favicon."));
@@ -237,7 +237,7 @@ void EditWidgetIcons::iconReceived(const QString& url, const QImage& icon)
 
 void EditWidgetIcons::abortRequests()
 {
-#ifdef WITH_XC_NETWORKING
+#ifdef KPXC_FEATURE_NETWORK
     if (m_downloader) {
         m_downloader->abortDownload();
     }
diff --git a/src/gui/EditWidgetIcons.h b/src/gui/EditWidgetIcons.h
index 3b40fae41b..2657245dd9 100644
--- a/src/gui/EditWidgetIcons.h
+++ b/src/gui/EditWidgetIcons.h
@@ -28,7 +28,7 @@
 class Database;
 class DefaultIconModel;
 class CustomIconModel;
-#ifdef WITH_XC_NETWORKING
+#ifdef KPXC_FEATURE_NETWORK
 class IconDownloader;
 #endif
 
@@ -104,7 +104,7 @@ private slots:
     ApplyIconToOptions m_applyIconTo;
     DefaultIconModel* const m_defaultIconModel;
     CustomIconModel* const m_customIconModel;
-#ifdef WITH_XC_NETWORKING
+#ifdef KPXC_FEATURE_NETWORK
     QSharedPointer<IconDownloader> m_downloader;
 #endif
 
diff --git a/src/gui/EntryPreviewWidget.cpp b/src/gui/EntryPreviewWidget.cpp
index ad29bed0c8..eb8a0a5e28 100644
--- a/src/gui/EntryPreviewWidget.cpp
+++ b/src/gui/EntryPreviewWidget.cpp
@@ -25,10 +25,8 @@
 #include "core/Totp.h"
 #include "gui/Font.h"
 #include "gui/Icons.h"
-#if defined(WITH_XC_KEESHARE)
 #include "keeshare/KeeShare.h"
 #include "keeshare/KeeShareSettings.h"
-#endif
 
 #include <QScrollBar>
 #include <QTabWidget>
@@ -106,10 +104,6 @@ EntryPreviewWidget::EntryPreviewWidget(QWidget* parent)
     connect(m_ui->groupTabWidget, SIGNAL(tabBarClicked(int)), SLOT(updateTabIndexes()), Qt::QueuedConnection);
 
     setFocusProxy(m_ui->entryTabWidget);
-
-#if !defined(WITH_XC_KEESHARE)
-    removeTab(m_ui->groupTabWidget, m_ui->groupShareTab);
-#endif
 }
 
 EntryPreviewWidget::~EntryPreviewWidget() = default;
@@ -207,10 +201,7 @@ void EntryPreviewWidget::refresh()
     } else if (m_currentGroup) {
         updateGroupHeaderLine();
         updateGroupGeneralTab();
-
-#if defined(WITH_XC_KEESHARE)
         updateGroupSharingTab();
-#endif
 
         setVisible(!config()->get(Config::GUI_HidePreviewPanel).toBool());
 
@@ -536,7 +527,6 @@ void EntryPreviewWidget::updateGroupGeneralTab()
     }
 }
 
-#if defined(WITH_XC_KEESHARE)
 void EntryPreviewWidget::updateGroupSharingTab()
 {
     Q_ASSERT(m_currentGroup);
@@ -545,7 +535,6 @@ void EntryPreviewWidget::updateGroupSharingTab()
     m_ui->groupShareTypeLabel->setText(KeeShare::referenceTypeLabel(reference));
     m_ui->groupSharePathLabel->setText(reference.path);
 }
-#endif
 
 void EntryPreviewWidget::updateTotpLabel()
 {
diff --git a/src/gui/EntryPreviewWidget.h b/src/gui/EntryPreviewWidget.h
index b5c497a769..b16f43fc8d 100644
--- a/src/gui/EntryPreviewWidget.h
+++ b/src/gui/EntryPreviewWidget.h
@@ -65,9 +65,7 @@ private slots:
 
     void updateGroupHeaderLine();
     void updateGroupGeneralTab();
-#if defined(WITH_XC_KEESHARE)
     void updateGroupSharingTab();
-#endif
 
     void updateTotpLabel();
     void updateTabIndexes();
diff --git a/src/gui/Icons.cpp b/src/gui/Icons.cpp
index bae6ba4cdf..53a1a5b48f 100644
--- a/src/gui/Icons.cpp
+++ b/src/gui/Icons.cpp
@@ -24,16 +24,12 @@
 #include <QPaintDevice>
 #include <QPainter>
 
-#include "config-keepassx.h"
 #include "core/Config.h"
 #include "core/Database.h"
 #include "gui/DatabaseIcons.h"
 #include "gui/MainWindow.h"
 #include "gui/osutils/OSUtils.h"
-
-#ifdef WITH_XC_KEESHARE
 #include "keeshare/KeeShare.h"
-#endif
 
 class AdaptiveIconEngine : public QIconEngine
 {
@@ -265,12 +261,9 @@ QPixmap Icons::groupIconPixmap(const Group* group, IconSize size)
 
     if (group->isExpired()) {
         icon = databaseIcons()->applyBadge(icon, DatabaseIcons::Badges::Expired);
-    }
-#ifdef WITH_XC_KEESHARE
-    else if (KeeShare::isShared(group)) {
+    } else if (KeeShare::isShared(group)) {
         icon = KeeShare::indicatorBadge(group, icon);
     }
-#endif
 
     return icon;
 }
diff --git a/src/gui/MainWindow.cpp b/src/gui/MainWindow.cpp
index 8ef9ede40f..30fe8fa666 100644
--- a/src/gui/MainWindow.cpp
+++ b/src/gui/MainWindow.cpp
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2024 KeePassXC Team <team@keepassxc.org>
+ *  Copyright (C) 2025 KeePassXC Team <team@keepassxc.org>
  *  Copyright (C) 2010 Felix Geyer <debfx@fobos.de>
  *
  *  This program is free software: you can redistribute it and/or modify
@@ -48,30 +48,25 @@
 #include "gui/entry/EntryView.h"
 #include "gui/osutils/OSUtils.h"
 #include "gui/remote/RemoteSettings.h"
+#include "keeshare/KeeShare.h"
+#include "keeshare/SettingsPageKeeShare.h"
+#include "keys/drivers/YubiKey.h"
 
-#ifdef WITH_XC_UPDATECHECK
+#ifdef KPXC_FEATURE_UPDATES
 #include "gui/UpdateCheckDialog.h"
 #include "networking/UpdateChecker.h"
 #endif
 
-#ifdef WITH_XC_SSHAGENT
+#ifdef KPXC_FEATURE_SSHAGENT
 #include "sshagent/AgentSettingsPage.h"
 #include "sshagent/SSHAgent.h"
 #endif
-#ifdef WITH_XC_KEESHARE
-#include "keeshare/KeeShare.h"
-#include "keeshare/SettingsPageKeeShare.h"
-#endif
 
-#ifdef WITH_XC_FDOSECRETS
+#ifdef KPXC_FEATURE_FDOSECRETS
 #include "fdosecrets/FdoSecretsPlugin.h"
 #endif
 
-#ifdef WITH_XC_YUBIKEY
-#include "keys/drivers/YubiKey.h"
-#endif
-
-#ifdef WITH_XC_BROWSER
+#ifdef KPXC_FEATURE_BROWSER
 #include "browser/BrowserService.h"
 #endif
 
@@ -143,7 +138,7 @@ MainWindow::MainWindow()
     m_entryContextMenu->addSeparator();
     m_entryContextMenu->addAction(m_ui->actionEntryAutoType);
     m_entryContextMenu->addSeparator();
-#ifdef WITH_XC_BROWSER_PASSKEYS
+#ifdef KPXC_FEATURE_BROWSER
     m_entryContextMenu->addAction(m_ui->actionEntryImportPasskey);
     m_entryContextMenu->addAction(m_ui->actionEntryRemovePasskey);
     m_entryContextMenu->addSeparator();
@@ -207,12 +202,12 @@ MainWindow::MainWindow()
 
     m_ui->settingsWidget->addSettingsPage(new ShortcutSettingsPage());
 
-#ifdef WITH_XC_BROWSER
+#ifdef KPXC_FEATURE_BROWSER
     connect(
         browserService(), &BrowserService::requestUnlock, m_ui->tabWidget, &DatabaseTabWidget::performBrowserUnlock);
 #endif
 
-#ifdef WITH_XC_SSHAGENT
+#ifdef KPXC_FEATURE_SSHAGENT
     connect(sshAgent(), SIGNAL(error(QString)), this, SLOT(showErrorMessage(QString)));
     connect(sshAgent(), SIGNAL(enabledChanged(bool)), this, SLOT(agentEnabled(bool)));
     connect(m_ui->actionClearSSHAgent, SIGNAL(triggered()), SLOT(clearSSHAgent()));
@@ -221,15 +216,13 @@ MainWindow::MainWindow()
     agentEnabled(false);
 #endif
 
-#if defined(WITH_XC_KEESHARE)
     KeeShare::init(this);
     m_ui->settingsWidget->addSettingsPage(new SettingsPageKeeShare(m_ui->tabWidget));
     connect(KeeShare::instance(),
             SIGNAL(sharingMessage(QString, MessageWidget::MessageType)),
             SLOT(displayGlobalMessage(QString, MessageWidget::MessageType)));
-#endif
 
-#ifdef WITH_XC_FDOSECRETS
+#ifdef KPXC_FEATURE_FDOSECRETS
     auto fdoSS = new FdoSecretsPlugin(m_ui->tabWidget);
     connect(fdoSS, &FdoSecretsPlugin::error, this, &MainWindow::showErrorMessage);
     connect(fdoSS, &FdoSecretsPlugin::requestSwitchToDatabases, this, &MainWindow::switchToDatabases);
@@ -238,10 +231,8 @@ MainWindow::MainWindow()
     m_ui->settingsWidget->addSettingsPage(fdoSS);
 #endif
 
-#ifdef WITH_XC_YUBIKEY
     connect(YubiKey::instance(), SIGNAL(userInteractionRequest()), SLOT(showYubiKeyPopup()), Qt::QueuedConnection);
     connect(YubiKey::instance(), SIGNAL(challengeCompleted()), SLOT(hideYubiKeyPopup()), Qt::QueuedConnection);
-#endif
 
     setWindowIcon(icons()->applicationIcon());
     m_ui->globalMessageWidget->hideMessage();
@@ -313,18 +304,18 @@ MainWindow::MainWindow()
     connect(m_ui->menuGroups, SIGNAL(aboutToHide()), SLOT(releaseContextFocusLock()));
 
     // Control window state
-    new QShortcut(Qt::CTRL + Qt::Key_M, this, SLOT(minimizeOrHide()));
-    new QShortcut(Qt::CTRL + Qt::SHIFT + Qt::Key_M, this, SLOT(hideWindow()));
+    new QShortcut(Qt::CTRL | Qt::Key_M, this, SLOT(minimizeOrHide()));
+    new QShortcut(Qt::CTRL | Qt::SHIFT | Qt::Key_M, this, SLOT(hideWindow()));
     // Control database tabs
     // Ctrl+Tab is broken on Mac, so use Alt (i.e. the Option key) - https://bugreports.qt.io/browse/QTBUG-8596
     auto dbTabModifier2 = Qt::CTRL;
 #ifdef Q_OS_MACOS
     dbTabModifier2 = Qt::ALT;
 #endif
-    new QShortcut(dbTabModifier2 + Qt::Key_Tab, this, SLOT(selectNextDatabaseTab()));
-    new QShortcut(Qt::CTRL + Qt::Key_PageDown, this, SLOT(selectNextDatabaseTab()));
-    new QShortcut(dbTabModifier2 + Qt::SHIFT + Qt::Key_Tab, this, SLOT(selectPreviousDatabaseTab()));
-    new QShortcut(Qt::CTRL + Qt::Key_PageUp, this, SLOT(selectPreviousDatabaseTab()));
+    new QShortcut(dbTabModifier2 | Qt::Key_Tab, this, SLOT(selectNextDatabaseTab()));
+    new QShortcut(Qt::CTRL | Qt::Key_PageDown, this, SLOT(selectNextDatabaseTab()));
+    new QShortcut(dbTabModifier2 | Qt::SHIFT | Qt::Key_Tab, this, SLOT(selectPreviousDatabaseTab()));
+    new QShortcut(Qt::CTRL | Qt::Key_PageUp, this, SLOT(selectPreviousDatabaseTab()));
 
     // Tab selection by number, Windows uses Ctrl, macOS uses Command,
     // and Linux uses Alt to emulate a browser-like experience
@@ -332,23 +323,23 @@ MainWindow::MainWindow()
 #ifdef Q_OS_LINUX
     dbTabModifier = Qt::ALT;
 #endif
-    auto shortcut = new QShortcut(dbTabModifier + Qt::Key_1, this);
+    auto shortcut = new QShortcut(dbTabModifier | Qt::Key_1, this);
     connect(shortcut, &QShortcut::activated, [this]() { selectDatabaseTab(0); });
-    shortcut = new QShortcut(dbTabModifier + Qt::Key_2, this);
+    shortcut = new QShortcut(dbTabModifier | Qt::Key_2, this);
     connect(shortcut, &QShortcut::activated, [this]() { selectDatabaseTab(1); });
-    shortcut = new QShortcut(dbTabModifier + Qt::Key_3, this);
+    shortcut = new QShortcut(dbTabModifier | Qt::Key_3, this);
     connect(shortcut, &QShortcut::activated, [this]() { selectDatabaseTab(2); });
-    shortcut = new QShortcut(dbTabModifier + Qt::Key_4, this);
+    shortcut = new QShortcut(dbTabModifier | Qt::Key_4, this);
     connect(shortcut, &QShortcut::activated, [this]() { selectDatabaseTab(3); });
-    shortcut = new QShortcut(dbTabModifier + Qt::Key_5, this);
+    shortcut = new QShortcut(dbTabModifier | Qt::Key_5, this);
     connect(shortcut, &QShortcut::activated, [this]() { selectDatabaseTab(4); });
-    shortcut = new QShortcut(dbTabModifier + Qt::Key_6, this);
+    shortcut = new QShortcut(dbTabModifier | Qt::Key_6, this);
     connect(shortcut, &QShortcut::activated, [this]() { selectDatabaseTab(5); });
-    shortcut = new QShortcut(dbTabModifier + Qt::Key_7, this);
+    shortcut = new QShortcut(dbTabModifier | Qt::Key_7, this);
     connect(shortcut, &QShortcut::activated, [this]() { selectDatabaseTab(6); });
-    shortcut = new QShortcut(dbTabModifier + Qt::Key_8, this);
+    shortcut = new QShortcut(dbTabModifier | Qt::Key_8, this);
     connect(shortcut, &QShortcut::activated, [this]() { selectDatabaseTab(7); });
-    shortcut = new QShortcut(dbTabModifier + Qt::Key_9, this);
+    shortcut = new QShortcut(dbTabModifier | Qt::Key_9, this);
     connect(shortcut, &QShortcut::activated, [this]() { selectDatabaseTab(m_ui->tabWidget->count() - 1); });
 
     m_ui->actionDatabaseNew->setIcon(icons()->icon("document-new"));
@@ -372,7 +363,7 @@ MainWindow::MainWindow()
     m_ui->actionImport->setIcon(icons()->icon("document-import"));
     m_ui->menuExport->setIcon(icons()->icon("document-export"));
 
-#ifndef WITH_XC_BROWSER_PASSKEYS
+#ifndef KPXC_FEATURE_BROWSER
     m_ui->actionPasskeys->setVisible(false);
     m_ui->actionImportPasskey->setVisible(false);
     m_ui->actionEntryImportPasskey->setVisible(false);
@@ -434,7 +425,7 @@ MainWindow::MainWindow()
     m_ui->actionKeyboardShortcuts->setIcon(icons()->icon("keyboard-shortcuts"));
     m_ui->actionCheckForUpdates->setIcon(icons()->icon("system-software-update"));
 
-#ifdef WITH_XC_BROWSER_PASSKEYS
+#ifdef KPXC_FEATURE_BROWSER
     m_ui->actionPasskeys->setIcon(icons()->icon("passkey"));
     m_ui->actionImportPasskey->setIcon(icons()->icon("document-import"));
     m_ui->actionEntryImportPasskey->setIcon(icons()->icon("document-import"));
@@ -485,7 +476,7 @@ MainWindow::MainWindow()
     connect(m_ui->actionDatabaseSettings, SIGNAL(toggled(bool)), m_ui->tabWidget, SLOT(showDatabaseSettings(bool)));
     connect(m_ui->actionDatabaseSecurity, SIGNAL(triggered()), m_ui->tabWidget, SLOT(showDatabaseSecurity()));
     connect(m_ui->actionReports, SIGNAL(toggled(bool)), m_ui->tabWidget, SLOT(showDatabaseReports(bool)));
-#ifdef WITH_XC_BROWSER_PASSKEYS
+#ifdef KPXC_FEATURE_BROWSER
     connect(m_ui->actionPasskeys, SIGNAL(triggered()), m_ui->tabWidget, SLOT(showPasskeys()));
     connect(m_ui->actionImportPasskey, SIGNAL(triggered()), m_ui->tabWidget, SLOT(importPasskey()));
     connect(m_ui->actionEntryImportPasskey, SIGNAL(triggered()), m_ui->tabWidget, SLOT(importPasskeyToEntry()));
@@ -537,7 +528,7 @@ MainWindow::MainWindow()
         m_ui->actionEntryAutoTypeURLEnter, SIGNAL(triggered()), SLOT(performAutoTypeURLEnter()));
     m_actionMultiplexer.connect(m_ui->actionEntryOpenUrl, SIGNAL(triggered()), SLOT(openUrl()));
     m_actionMultiplexer.connect(m_ui->actionEntryDownloadIcon, SIGNAL(triggered()), SLOT(downloadSelectedFavicons()));
-#ifdef WITH_XC_SSHAGENT
+#ifdef KPXC_FEATURE_SSHAGENT
     m_actionMultiplexer.connect(m_ui->actionEntryAddToAgent, SIGNAL(triggered()), SLOT(addToAgent()));
     m_actionMultiplexer.connect(m_ui->actionEntryRemoveFromAgent, SIGNAL(triggered()), SLOT(removeFromAgent()));
 #endif
@@ -585,7 +576,7 @@ MainWindow::MainWindow()
     setUnifiedTitleAndToolBarOnMac(true);
 #endif
 
-#ifdef WITH_XC_UPDATECHECK
+#ifdef KPXC_FEATURE_UPDATES
     connect(m_ui->actionCheckForUpdates, SIGNAL(triggered()), SLOT(showUpdateCheckDialog()));
     connect(UpdateChecker::instance(),
             SIGNAL(updateCheckFinished(bool, QString, bool)),
@@ -599,11 +590,11 @@ MainWindow::MainWindow()
     m_ui->actionCheckForUpdates->setVisible(false);
 #endif
 
-#ifndef WITH_XC_NETWORKING
+#ifndef KPXC_FEATURE_NETWORK
     m_ui->actionGroupDownloadFavicons->setVisible(false);
     m_ui->actionEntryDownloadIcon->setVisible(false);
 #endif
-#ifndef WITH_XC_DOCS
+#ifndef KPXC_FEATURE_DOCS
     m_ui->actionGettingStarted->setVisible(false);
     m_ui->actionUserGuide->setVisible(false);
     m_ui->actionKeyboardShortcuts->setVisible(false);
@@ -635,7 +626,7 @@ MainWindow::MainWindow()
     // Properly shutdown on logoff, restart, and shutdown
     connect(qApp, &QGuiApplication::commitDataRequest, this, [this] { m_appExitCalled = true; });
 
-#if defined(KEEPASSXC_BUILD_TYPE_SNAPSHOT) || defined(KEEPASSXC_BUILD_TYPE_PRE_RELEASE)
+#ifdef KEEPASSXC_BUILD_TYPE_SNAPSHOT
     auto* hidePreRelWarn = new QAction(tr("Don't show again for this version"), m_ui->globalMessageWidget);
     m_ui->globalMessageWidget->addAction(hidePreRelWarn);
     auto hidePreRelWarnConn = QSharedPointer<QMetaObject::Connection>::create();
@@ -649,23 +640,13 @@ MainWindow::MainWindow()
         m_ui->globalMessageWidget->animatedHide();
         config()->set(Config::Messages_HidePreReleaseWarning, KEEPASSXC_VERSION);
     });
-#endif
-#if defined(KEEPASSXC_BUILD_TYPE_SNAPSHOT)
-    if (config()->get(Config::Messages_HidePreReleaseWarning) != KEEPASSXC_VERSION) {
-        m_ui->globalMessageWidget->showMessage(
-            tr("WARNING: You are using an unstable build of KeePassXC.\n"
-               "There is a high risk of corruption, maintain a backup of your databases.\n"
-               "This version is not meant for production use."),
-            MessageWidget::Warning,
-            -1);
-    }
-#elif defined(KEEPASSXC_BUILD_TYPE_PRE_RELEASE)
+
     if (config()->get(Config::Messages_HidePreReleaseWarning) != KEEPASSXC_VERSION) {
-        m_ui->globalMessageWidget->showMessage(
-            tr("NOTE: You are using a pre-release version of KeePassXC.\n"
-               "Expect some bugs and minor issues, this version is meant for testing purposes."),
-            MessageWidget::Information,
-            -1);
+        m_ui->globalMessageWidget->showMessage(tr("WARNING: You are using a development snapshot build of KeePassXC.\n"
+                                                  "Maintain a backup of your databases in the event of unknown bugs.\n"
+                                                  "This version is not meant for production use."),
+                                               MessageWidget::Warning,
+                                               -1);
     }
 #endif
 
@@ -701,7 +682,7 @@ MainWindow::MainWindow()
 
 MainWindow::~MainWindow()
 {
-#ifdef WITH_XC_SSHAGENT
+#ifdef KPXC_FEATURE_SSHAGENT
     sshAgent()->removeAllIdentities();
 #endif
 }
@@ -753,11 +734,7 @@ void MainWindow::appExit()
  */
 bool MainWindow::isHardwareKeySupported()
 {
-#ifdef WITH_XC_YUBIKEY
     return true;
-#else
-    return false;
-#endif
 }
 
 /**
@@ -769,7 +746,6 @@ bool MainWindow::isHardwareKeySupported()
  */
 bool MainWindow::refreshHardwareKeys()
 {
-#ifdef WITH_XC_YUBIKEY
     auto yk = YubiKey::instance();
     // find keys sync to allow returning if any key was found
     bool found = yk->findValidKeys();
@@ -777,9 +753,6 @@ bool MainWindow::refreshHardwareKeys()
     // emit here manually because sync findValidKeys() cannot do that properly
     emit yk->detectComplete(found);
     return found;
-#else
-    return false;
-#endif
 }
 
 void MainWindow::updateLastDatabasesMenu()
@@ -1009,13 +982,13 @@ void MainWindow::updateMenuActionState()
     m_ui->actionEntryTotpQRCode->setEnabled(singleEntrySelected && dbWidget->currentEntryHasTotp());
     m_ui->actionEntryDownloadIcon->setEnabled((multiEntrySelected && !singleEntrySelected)
                                               || (singleEntrySelected && dbWidget->currentEntryHasUrl()));
-#ifdef WITH_XC_BROWSER_PASSKEYS
+#ifdef KPXC_FEATURE_BROWSER
     m_ui->actionEntryImportPasskey->setVisible(singleEntrySelected);
     m_ui->actionEntryImportPasskey->setEnabled(singleEntrySelected);
     m_ui->actionEntryRemovePasskey->setVisible(singleEntrySelected && dbWidget->currentEntryHasPasskey());
     m_ui->actionEntryRemovePasskey->setEnabled(singleEntrySelected && dbWidget->currentEntryHasPasskey());
 #endif
-#ifdef WITH_XC_SSHAGENT
+#ifdef KPXC_FEATURE_SSHAGENT
     bool hasSSHKey = singleEntrySelected && sshAgent()->isEnabled() && dbWidget->currentEntryHasSshKey();
     m_ui->actionEntryAddToAgent->setVisible(hasSSHKey);
     m_ui->actionEntryAddToAgent->setEnabled(hasSSHKey);
@@ -1035,7 +1008,7 @@ void MainWindow::updateMenuActionState()
     m_ui->actionGroupSortDesc->setEnabled(groupHasChildren);
     m_ui->actionGroupEmptyRecycleBin->setVisible(inRecycleBin);
     m_ui->actionGroupEmptyRecycleBin->setEnabled(inRecycleBin);
-#ifdef WITH_XC_NETWORKING
+#ifdef KPXC_FEATURE_NETWORK
     m_ui->actionGroupDownloadFavicons->setVisible(!inRecycleBin);
 #endif
     m_ui->actionGroupDownloadFavicons->setEnabled(groupSelected && groupHasEntries && !inRecycleBin);
@@ -1054,7 +1027,7 @@ void MainWindow::updateMenuActionState()
     m_ui->menuRemoteSync->setEnabled(inDatabase || inDatabaseSettings);
     m_ui->menuExport->setEnabled(inDatabase);
     m_ui->actionDatabaseMerge->setEnabled(inDatabase);
-#ifdef WITH_XC_BROWSER_PASSKEYS
+#ifdef KPXC_FEATURE_BROWSER
     m_ui->actionPasskeys->setEnabled(inDatabase || inReports);
     m_ui->actionImportPasskey->setEnabled(inDatabase);
 #endif
@@ -1129,7 +1102,7 @@ void MainWindow::showAboutDialog()
 
 void MainWindow::performUpdateCheck()
 {
-#ifdef WITH_XC_UPDATECHECK
+#ifdef KPXC_FEATURE_UPDATES
     if (!config()->get(Config::UpdateCheckMessageShown).toBool()) {
         auto result =
             MessageBox::question(this,
@@ -1152,7 +1125,7 @@ void MainWindow::performUpdateCheck()
 
 void MainWindow::hasUpdateAvailable(bool hasUpdate, const QString& version, bool isManuallyRequested)
 {
-#ifdef WITH_XC_UPDATECHECK
+#ifdef KPXC_FEATURE_UPDATES
     if (hasUpdate && !isManuallyRequested) {
         auto* updateCheckDialog = new UpdateCheckDialog(this);
         updateCheckDialog->showUpdateCheckResponse(hasUpdate, version);
@@ -1167,7 +1140,7 @@ void MainWindow::hasUpdateAvailable(bool hasUpdate, const QString& version, bool
 
 void MainWindow::showUpdateCheckDialog()
 {
-#ifdef WITH_XC_UPDATECHECK
+#ifdef KPXC_FEATURE_UPDATES
     updateCheck()->checkForUpdates(true);
     auto* updateCheckDialog = new UpdateCheckDialog(this);
     updateCheckDialog->show();
@@ -2206,8 +2179,8 @@ void MainWindow::initActionCollection()
     // Prevent conflicts with global Mac shortcuts (force Control on all platforms)
     // Note: Qt::META means Ctrl on Mac.
 #ifdef Q_OS_MAC
-    ac->setDefaultShortcut(m_ui->actionEntryAddToAgent, Qt::META + Qt::Key_H);
-    ac->setDefaultShortcut(m_ui->actionEntryRemoveFromAgent, Qt::META + Qt::SHIFT + Qt::Key_H);
+    ac->setDefaultShortcut(m_ui->actionEntryAddToAgent, Qt::META | Qt::Key_H);
+    ac->setDefaultShortcut(m_ui->actionEntryRemoveFromAgent, Qt::META | Qt::SHIFT | Qt::Key_H);
 #endif
 
     QTimer::singleShot(1, ac, &ActionCollection::restoreShortcuts);
diff --git a/src/gui/MergeDialog.cpp b/src/gui/MergeDialog.cpp
index ed8ab3c16b..0467340aae 100644
--- a/src/gui/MergeDialog.cpp
+++ b/src/gui/MergeDialog.cpp
@@ -184,7 +184,7 @@ void MergeDialog::performMerge()
 {
     auto changes = Merger(m_sourceDatabase.data(), m_targetDatabase.data()).merge();
     if (changes != m_changes) {
-        qWarning("Merge results differed from the expected changes. Expected: %d, Actual: %d",
+        qWarning("Merge results differed from the expected changes. Expected: %lld, Actual: %lld",
                  m_changes.size(),
                  changes.size());
     }
diff --git a/src/gui/PasswordGeneratorWidget.cpp b/src/gui/PasswordGeneratorWidget.cpp
index d3dd7d6992..0bc2d7d1e3 100644
--- a/src/gui/PasswordGeneratorWidget.cpp
+++ b/src/gui/PasswordGeneratorWidget.cpp
@@ -77,7 +77,7 @@ PasswordGeneratorWidget::PasswordGeneratorWidget(QWidget* parent)
 
     connect(m_ui->editWordSeparator, SIGNAL(textChanged(QString)), SLOT(updateGenerator()));
     connect(m_ui->comboBoxWordList, SIGNAL(currentIndexChanged(int)), SLOT(updateGenerator()));
-    connect(m_ui->optionButtons, SIGNAL(buttonClicked(int)), SLOT(updateGenerator()));
+    connect(m_ui->optionButtons, SIGNAL(buttonClicked(QAbstractButton*)), SLOT(updateGenerator()));
     connect(m_ui->tabWidget, SIGNAL(currentChanged(int)), SLOT(updateGenerator()));
     connect(m_ui->wordCaseComboBox, SIGNAL(currentIndexChanged(int)), SLOT(updateGenerator()));
 
diff --git a/src/gui/UrlTools.cpp b/src/gui/UrlTools.cpp
index 917f2048c6..5fda8ed1dc 100644
--- a/src/gui/UrlTools.cpp
+++ b/src/gui/UrlTools.cpp
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2025 KeePassXC Team <team@keepassxc.org>
+ *  Copyright (C) 2026 KeePassXC Team <team@keepassxc.org>
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -16,7 +16,7 @@
  */
 
 #include "UrlTools.h"
-#if defined(WITH_XC_NETWORKING) || defined(WITH_XC_BROWSER)
+#if defined(KPXC_FEATURE_NETWORK) || defined(KPXC_FEATURE_BROWSER)
 #include <QHostAddress>
 #include <QNetworkCookie>
 #include <QNetworkCookieJar>
@@ -42,7 +42,7 @@ QUrl UrlTools::convertVariantToUrl(const QVariant& var) const
     return url;
 }
 
-#if defined(WITH_XC_NETWORKING) || defined(WITH_XC_BROWSER)
+#if defined(KPXC_FEATURE_NETWORK) || defined(KPXC_FEATURE_BROWSER)
 QUrl UrlTools::getRedirectTarget(QNetworkReply* reply) const
 {
     QVariant var = reply->attribute(QNetworkRequest::RedirectionTargetAttribute);
@@ -191,7 +191,7 @@ bool UrlTools::isUrlValid(const QString& urlField, bool looseComparison) const
         return false;
     }
 
-#if defined(WITH_XC_NETWORKING) || defined(WITH_XC_BROWSER)
+#if defined(KPXC_FEATURE_BROWSER)
     // Prevent TLD wildcards
     if (looseComparison && url.contains(UrlTools::URL_WILDCARD)) {
         const auto tld = getTopLevelDomainFromUrl(url);
diff --git a/src/gui/UrlTools.h b/src/gui/UrlTools.h
index 5cadb45d8c..4b601d3497 100644
--- a/src/gui/UrlTools.h
+++ b/src/gui/UrlTools.h
@@ -22,7 +22,7 @@
 #include <QObject>
 #include <QUrl>
 #include <QVariant>
-#if defined(WITH_XC_NETWORKING) || defined(WITH_XC_BROWSER)
+#if defined(KPXC_FEATURE_NETWORK) || defined(KPXC_FEATURE_BROWSER)
 #include <QNetworkReply>
 #endif
 
@@ -34,7 +34,7 @@ class UrlTools : public QObject
     explicit UrlTools() = default;
     static UrlTools* instance();
 
-#if defined(WITH_XC_NETWORKING) || defined(WITH_XC_BROWSER)
+#if defined(KPXC_FEATURE_NETWORK) || defined(KPXC_FEATURE_BROWSER)
     QUrl getRedirectTarget(QNetworkReply* reply) const;
     QString getBaseDomainFromUrl(const QString& url) const;
     QString getTopLevelDomainFromUrl(const QString& url) const;
diff --git a/src/gui/databasekey/YubiKeyEditWidget.cpp b/src/gui/databasekey/YubiKeyEditWidget.cpp
index edac12af0a..38a18032bf 100644
--- a/src/gui/databasekey/YubiKeyEditWidget.cpp
+++ b/src/gui/databasekey/YubiKeyEditWidget.cpp
@@ -24,22 +24,16 @@
 #include "gui/Icons.h"
 #include "keys/ChallengeResponseKey.h"
 #include "keys/CompositeKey.h"
-#ifdef WITH_XC_YUBIKEY
 #include "keys/drivers/YubiKeyInterfaceUSB.h"
-#endif
 
 YubiKeyEditWidget::YubiKeyEditWidget(QWidget* parent)
     : KeyComponentWidget(parent)
     , m_compUi(new Ui::YubiKeyEditWidget())
-#ifdef WITH_XC_YUBIKEY
     , m_deviceListener(new DeviceListener(this))
-#endif
 {
     initComponent();
-#ifdef WITH_XC_YUBIKEY
     connect(YubiKey::instance(), SIGNAL(detectComplete(bool)), SLOT(hardwareKeyResponse(bool)), Qt::QueuedConnection);
     connect(m_deviceListener, &DeviceListener::devicePlugged, this, [&](bool, void*, void*) { pollYubikey(); });
-#endif
 }
 
 YubiKeyEditWidget::~YubiKeyEditWidget() = default;
@@ -90,7 +84,6 @@ void YubiKeyEditWidget::showEvent(QShowEvent* event)
 {
     KeyComponentWidget::showEvent(event);
 
-#ifdef WITH_XC_YUBIKEY
 #ifdef Q_OS_WIN
     m_deviceListener->registerHotplugCallback(true,
                                               true,
@@ -106,15 +99,12 @@ void YubiKeyEditWidget::showEvent(QShowEvent* event)
     m_deviceListener->registerHotplugCallback(true, true, YubiKeyInterfaceUSB::YUBICO_USB_VID);
     m_deviceListener->registerHotplugCallback(true, true, YubiKeyInterfaceUSB::ONLYKEY_USB_VID);
 #endif
-#endif
 }
 
 void YubiKeyEditWidget::hideEvent(QHideEvent* event)
 {
     KeyComponentWidget::hideEvent(event);
-#ifdef WITH_XC_YUBIKEY
     m_deviceListener->deregisterAllHotplugCallbacks();
-#endif
 }
 
 void YubiKeyEditWidget::initComponentEditWidget(QWidget* widget)
@@ -146,7 +136,6 @@ void YubiKeyEditWidget::initComponent()
 
 void YubiKeyEditWidget::pollYubikey()
 {
-#ifdef WITH_XC_YUBIKEY
     if (!m_compEditWidget) {
         return;
     }
@@ -159,7 +148,6 @@ void YubiKeyEditWidget::pollYubikey()
     m_compUi->refreshHardwareKeys->setEnabled(false);
 
     YubiKey::instance()->findValidKeysAsync();
-#endif
 }
 
 void YubiKeyEditWidget::hardwareKeyResponse(bool found)
diff --git a/src/gui/databasekey/YubiKeyEditWidget.h b/src/gui/databasekey/YubiKeyEditWidget.h
index fc63f1946a..aafd866a68 100644
--- a/src/gui/databasekey/YubiKeyEditWidget.h
+++ b/src/gui/databasekey/YubiKeyEditWidget.h
@@ -19,10 +19,7 @@
 #define KEEPASSXC_YUBIKEYEDITWIDGET_H
 
 #include "KeyComponentWidget.h"
-#include "config-keepassx.h"
-#ifdef WITH_XC_YUBIKEY
 #include "gui/osutils/DeviceListener.h"
-#endif
 
 namespace Ui
 {
@@ -57,9 +54,7 @@ private slots:
 private:
     const QScopedPointer<Ui::YubiKeyEditWidget> m_compUi;
     QPointer<QWidget> m_compEditWidget;
-#ifdef WITH_XC_YUBIKEY
     QPointer<DeviceListener> m_deviceListener;
-#endif
     bool m_isDetected = false;
 };
 
diff --git a/src/gui/dbsettings/DatabaseSettingsDialog.cpp b/src/gui/dbsettings/DatabaseSettingsDialog.cpp
index fd772c2919..15ff24c295 100644
--- a/src/gui/dbsettings/DatabaseSettingsDialog.cpp
+++ b/src/gui/dbsettings/DatabaseSettingsDialog.cpp
@@ -20,15 +20,13 @@
 #include "DatabaseSettingsWidgetDatabaseKey.h"
 #include "DatabaseSettingsWidgetEncryption.h"
 #include "DatabaseSettingsWidgetGeneral.h"
-#ifdef WITH_XC_BROWSER
+#ifdef KPXC_FEATURE_BROWSER
 #include "DatabaseSettingsWidgetBrowser.h"
 #endif
 #include "../remote/DatabaseSettingsWidgetRemote.h"
 #include "DatabaseSettingsWidgetMaintenance.h"
-#ifdef WITH_XC_KEESHARE
 #include "keeshare/DatabaseSettingsWidgetKeeShare.h"
-#endif
-#ifdef WITH_XC_FDOSECRETS
+#ifdef KPXC_FEATURE_FDOSECRETS
 #include "fdosecrets/widgets/DatabaseSettingsWidgetFdoSecrets.h"
 #endif
 
@@ -44,13 +42,11 @@ DatabaseSettingsDialog::DatabaseSettingsDialog(QWidget* parent)
     , m_securityTabWidget(new QTabWidget(this))
     , m_databaseKeyWidget(new DatabaseSettingsWidgetDatabaseKey(this))
     , m_encryptionWidget(new DatabaseSettingsWidgetEncryption(this))
-#ifdef WITH_XC_BROWSER
+#ifdef KPXC_FEATURE_BROWSER
     , m_browserWidget(new DatabaseSettingsWidgetBrowser(this))
 #endif
-#ifdef WITH_XC_KEESHARE
     , m_keeShareWidget(new DatabaseSettingsWidgetKeeShare(this))
-#endif
-#ifdef WITH_XC_FDOSECRETS
+#ifdef KPXC_FEATURE_FDOSECRETS
     , m_fdoSecretsWidget(new DatabaseSettingsWidgetFdoSecrets(this))
 #endif
     , m_maintenanceWidget(new DatabaseSettingsWidgetMaintenance(this))
@@ -78,15 +74,13 @@ DatabaseSettingsDialog::DatabaseSettingsDialog(QWidget* parent)
 
     addPage(tr("Remote Sync"), icons()->icon("remote-sync"), m_remoteWidget);
 
-#ifdef WITH_XC_BROWSER
+#ifdef KPXC_FEATURE_BROWSER
     addPage(tr("Browser Integration"), icons()->icon("internet-web-browser"), m_browserWidget);
 #endif
 
-#ifdef WITH_XC_KEESHARE
     addPage(tr("KeeShare"), icons()->icon("preferences-system-network-sharing"), m_keeShareWidget);
-#endif
 
-#ifdef WITH_XC_FDOSECRETS
+#ifdef KPXC_FEATURE_FDOSECRETS
     addPage(tr("Secret Service Integration"), icons()->icon(QStringLiteral("freedesktop")), m_fdoSecretsWidget);
 #endif
 
@@ -107,13 +101,11 @@ void DatabaseSettingsDialog::load(const QSharedPointer<Database>& db)
     m_databaseKeyWidget->loadSettings(db);
     m_encryptionWidget->loadSettings(db);
     m_remoteWidget->loadSettings(db);
-#ifdef WITH_XC_BROWSER
+#ifdef KPXC_FEATURE_BROWSER
     m_browserWidget->loadSettings(db);
 #endif
-#ifdef WITH_XC_KEESHARE
     m_keeShareWidget->loadSettings(db);
-#endif
-#ifdef WITH_XC_FDOSECRETS
+#ifdef KPXC_FEATURE_FDOSECRETS
     m_fdoSecretsWidget->loadSettings(db);
 #endif
     m_maintenanceWidget->loadSettings(db);
@@ -161,10 +153,8 @@ void DatabaseSettingsDialog::save()
 
     // Browser settings don't have anything to save
 
-#ifdef WITH_XC_KEESHARE
     m_keeShareWidget->saveSettings();
-#endif
-#ifdef WITH_XC_FDOSECRETS
+#ifdef KPXC_FEATURE_FDOSECRETS
     m_fdoSecretsWidget->saveSettings();
 #endif
 
@@ -177,7 +167,7 @@ void DatabaseSettingsDialog::reject()
     m_databaseKeyWidget->discard();
     m_encryptionWidget->discard();
     m_remoteWidget->discard();
-#ifdef WITH_XC_BROWSER
+#ifdef KPXC_FEATURE_BROWSER
     m_browserWidget->discard();
 #endif
 
diff --git a/src/gui/dbsettings/DatabaseSettingsDialog.h b/src/gui/dbsettings/DatabaseSettingsDialog.h
index 83bc56abec..057452ba61 100644
--- a/src/gui/dbsettings/DatabaseSettingsDialog.h
+++ b/src/gui/dbsettings/DatabaseSettingsDialog.h
@@ -28,13 +28,11 @@ class Database;
 class DatabaseSettingsWidgetGeneral;
 class DatabaseSettingsWidgetEncryption;
 class DatabaseSettingsWidgetDatabaseKey;
-#ifdef WITH_XC_BROWSER
+#ifdef KPXC_FEATURE_BROWSER
 class DatabaseSettingsWidgetBrowser;
 #endif
-#ifdef WITH_XC_KEESHARE
 class DatabaseSettingsWidgetKeeShare;
-#endif
-#ifdef WITH_XC_FDOSECRETS
+#ifdef KPXC_FEATURE_FDOSECRETS
 class DatabaseSettingsWidgetFdoSecrets;
 #endif
 class DatabaseSettingsWidgetMaintenance;
@@ -67,13 +65,11 @@ private slots:
     QPointer<QTabWidget> m_securityTabWidget;
     QPointer<DatabaseSettingsWidgetDatabaseKey> m_databaseKeyWidget;
     QPointer<DatabaseSettingsWidgetEncryption> m_encryptionWidget;
-#ifdef WITH_XC_BROWSER
+#ifdef KPXC_FEATURE_BROWSER
     QPointer<DatabaseSettingsWidgetBrowser> m_browserWidget;
 #endif
-#ifdef WITH_XC_KEESHARE
     QPointer<DatabaseSettingsWidgetKeeShare> m_keeShareWidget;
-#endif
-#ifdef WITH_XC_FDOSECRETS
+#ifdef KPXC_FEATURE_FDOSECRETS
     QPointer<DatabaseSettingsWidgetFdoSecrets> m_fdoSecretsWidget;
 #endif
     QPointer<DatabaseSettingsWidgetMaintenance> m_maintenanceWidget;
diff --git a/src/gui/dbsettings/DatabaseSettingsWidgetDatabaseKey.cpp b/src/gui/dbsettings/DatabaseSettingsWidgetDatabaseKey.cpp
index a74b20ead6..b41ca1fe2b 100644
--- a/src/gui/dbsettings/DatabaseSettingsWidgetDatabaseKey.cpp
+++ b/src/gui/dbsettings/DatabaseSettingsWidgetDatabaseKey.cpp
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2023 KeePassXC Team <team@keepassxc.org>
+ *  Copyright (C) 2025 KeePassXC Team <team@keepassxc.org>
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -38,9 +38,7 @@ DatabaseSettingsWidgetDatabaseKey::DatabaseSettingsWidgetDatabaseKey(QWidget* pa
     , m_additionalKeyOptions(new QWidget(this))
     , m_passwordEditWidget(new PasswordEditWidget(this))
     , m_keyFileEditWidget(new KeyFileEditWidget(this))
-#ifdef WITH_XC_YUBIKEY
     , m_yubiKeyEditWidget(new YubiKeyEditWidget(this))
-#endif
 {
     auto* vbox = new QVBoxLayout(this);
     vbox->setSizeConstraint(QLayout::SetMinimumSize);
@@ -55,12 +53,10 @@ DatabaseSettingsWidgetDatabaseKey::DatabaseSettingsWidgetDatabaseKey(QWidget* pa
     vbox->addWidget(m_additionalKeyOptions);
     vbox->setSizeConstraint(QLayout::SetMinimumSize);
     m_additionalKeyOptions->setLayout(new QVBoxLayout());
-    m_additionalKeyOptions->layout()->setMargin(0);
+    m_additionalKeyOptions->layout()->setContentsMargins(0, 0, 0, 0);
     m_additionalKeyOptions->layout()->setSpacing(20);
     m_additionalKeyOptions->layout()->addWidget(m_keyFileEditWidget);
-#ifdef WITH_XC_YUBIKEY
     m_additionalKeyOptions->layout()->addWidget(m_yubiKeyEditWidget);
-#endif
     m_additionalKeyOptions->setVisible(false);
 
     connect(m_additionalKeyOptionsToggle, SIGNAL(clicked()), SLOT(showAdditionalKeyOptions()));
@@ -91,23 +87,19 @@ void DatabaseSettingsWidgetDatabaseKey::loadSettings(QSharedPointer<Database> db
             }
         }
 
-#ifdef WITH_XC_YUBIKEY
         for (const auto& key : m_db->key()->challengeResponseKeys()) {
             if (key->uuid() == ChallengeResponseKey::UUID) {
                 m_yubiKeyEditWidget->setComponentAdded(true);
                 hasAdditionalKeys = true;
             }
         }
-#endif
 
         setAdditionalKeyOptionsVisible(hasAdditionalKeys);
     }
 
     connect(m_passwordEditWidget->findChild<QPushButton*>("removeButton"), SIGNAL(clicked()), SLOT(markDirty()));
     connect(m_keyFileEditWidget->findChild<QPushButton*>("removeButton"), SIGNAL(clicked()), SLOT(markDirty()));
-#ifdef WITH_XC_YUBIKEY
     connect(m_yubiKeyEditWidget->findChild<QPushButton*>("removeButton"), SIGNAL(clicked()), SLOT(markDirty()));
-#endif
 }
 
 void DatabaseSettingsWidgetDatabaseKey::initialize()
@@ -115,9 +107,7 @@ void DatabaseSettingsWidgetDatabaseKey::initialize()
     bool blocked = blockSignals(true);
     m_passwordEditWidget->setComponentAdded(false);
     m_keyFileEditWidget->setComponentAdded(false);
-#ifdef WITH_XC_YUBIKEY
     m_yubiKeyEditWidget->setComponentAdded(false);
-#endif
     blockSignals(blocked);
 }
 
@@ -129,9 +119,7 @@ bool DatabaseSettingsWidgetDatabaseKey::saveSettings()
 {
     m_isDirty |= (m_passwordEditWidget->visiblePage() == KeyComponentWidget::Page::Edit);
     m_isDirty |= (m_keyFileEditWidget->visiblePage() == KeyComponentWidget::Page::Edit);
-#ifdef WITH_XC_YUBIKEY
     m_isDirty |= (m_yubiKeyEditWidget->visiblePage() == KeyComponentWidget::Page::Edit);
-#endif
 
     if (m_db->key() && !m_db->key()->keys().isEmpty() && !m_isDirty) {
         // Key unchanged
@@ -212,11 +200,9 @@ bool DatabaseSettingsWidgetDatabaseKey::saveSettings()
         return false;
     }
 
-#ifdef WITH_XC_YUBIKEY
     if (!addToCompositeKey(m_yubiKeyEditWidget, newKey, oldChallengeResponse)) {
         return false;
     }
-#endif
 
     if (newKey->keys().isEmpty() && newKey->challengeResponseKeys().isEmpty()) {
         MessageBox::critical(this,
diff --git a/src/gui/dbsettings/DatabaseSettingsWidgetDatabaseKey.h b/src/gui/dbsettings/DatabaseSettingsWidgetDatabaseKey.h
index 3e4bcdc73b..d9541bb36d 100644
--- a/src/gui/dbsettings/DatabaseSettingsWidgetDatabaseKey.h
+++ b/src/gui/dbsettings/DatabaseSettingsWidgetDatabaseKey.h
@@ -19,7 +19,6 @@
 #define KEEPASSXC_DATABASESETTINGSWIDGETDATABASEKEY_H
 
 #include "DatabaseSettingsWidget.h"
-#include "config-keepassx.h"
 
 #include <QPointer>
 
@@ -72,9 +71,7 @@ private slots:
     const QPointer<QWidget> m_additionalKeyOptions;
     const QPointer<PasswordEditWidget> m_passwordEditWidget;
     const QPointer<KeyFileEditWidget> m_keyFileEditWidget;
-#ifdef WITH_XC_YUBIKEY
     const QPointer<YubiKeyEditWidget> m_yubiKeyEditWidget;
-#endif
 };
 
 #endif // KEEPASSXC_DATABASESETTINGSWIDGETDATABASEKEY_H
diff --git a/src/gui/entry/EditEntryWidget.cpp b/src/gui/entry/EditEntryWidget.cpp
index e8a72db1a1..751ded2877 100644
--- a/src/gui/entry/EditEntryWidget.cpp
+++ b/src/gui/entry/EditEntryWidget.cpp
@@ -40,12 +40,12 @@
 #include "core/Metadata.h"
 #include "core/PasswordGenerator.h"
 #include "core/TimeDelta.h"
-#ifdef WITH_XC_SSHAGENT
+#ifdef KPXC_FEATURE_SSHAGENT
 #include "sshagent/OpenSSHKey.h"
 #include "sshagent/OpenSSHKeyGenDialog.h"
 #include "sshagent/SSHAgent.h"
 #endif
-#ifdef WITH_XC_BROWSER
+#ifdef KPXC_FEATURE_BROWSER
 #include "EntryURLModel.h"
 #include "browser/BrowserService.h"
 #endif
@@ -76,10 +76,10 @@ EditEntryWidget::EditEntryWidget(QWidget* parent)
     , m_advancedWidget(new QWidget(this))
     , m_iconsWidget(new EditWidgetIcons(this))
     , m_autoTypeWidget(new QWidget(this))
-#ifdef WITH_XC_SSHAGENT
+#ifdef KPXC_FEATURE_SSHAGENT
     , m_sshAgentWidget(new QWidget(this))
 #endif
-#ifdef WITH_XC_BROWSER
+#ifdef KPXC_FEATURE_BROWSER
     , m_browserSettingsChanged(false)
     , m_browserWidget(new QWidget(this))
     , m_additionalURLsDataModel(new EntryURLModel(this))
@@ -102,11 +102,11 @@ EditEntryWidget::EditEntryWidget(QWidget* parent)
     setupIcon();
     setupAutoType();
 
-#ifdef WITH_XC_SSHAGENT
+#ifdef KPXC_FEATURE_SSHAGENT
     setupSSHAgent();
 #endif
 
-#ifdef WITH_XC_BROWSER
+#ifdef KPXC_FEATURE_BROWSER
     setupBrowser();
 #endif
 
@@ -163,7 +163,7 @@ QWidget* EditEntryWidget::widgetForPage(Page page) const
     case Page::AutoType:
         return m_autoTypeWidget;
     case Page::Browser:
-#ifdef WITH_XC_BROWSER
+#ifdef KPXC_FEATURE_BROWSER
         return m_browserWidget;
 #else
         return nullptr;
@@ -196,19 +196,19 @@ void EditEntryWidget::setupMain()
     m_usernameCompleter->setModel(m_usernameCompleterModel);
     m_mainUi->usernameComboBox->setCompleter(m_usernameCompleter);
 
-#ifdef WITH_XC_NETWORKING
+#ifdef KPXC_FEATURE_NETWORK
     m_mainUi->fetchFaviconButton->setIcon(icons()->icon("favicon-download"));
     m_mainUi->fetchFaviconButton->setDisabled(true);
 #else
     m_mainUi->fetchFaviconButton->setVisible(false);
 #endif
 
-#ifdef WITH_XC_NETWORKING
+#ifdef KPXC_FEATURE_NETWORK
     connect(m_mainUi->fetchFaviconButton, SIGNAL(clicked()), m_iconsWidget, SLOT(downloadFavicon()));
     connect(m_mainUi->urlEdit, SIGNAL(textChanged(QString)), m_iconsWidget, SLOT(setUrl(QString)));
     m_mainUi->urlEdit->enableVerifyMode();
 #endif
-#ifdef WITH_XC_BROWSER
+#ifdef KPXC_FEATURE_BROWSER
     connect(m_mainUi->urlEdit, SIGNAL(textChanged(QString)), this, SLOT(entryURLEdited(const QString&)));
 #endif
     connect(m_mainUi->expireCheck, &QCheckBox::toggled, [&](bool enabled) {
@@ -303,7 +303,7 @@ void EditEntryWidget::setupAutoType()
     // clang-format on
 }
 
-#ifdef WITH_XC_BROWSER
+#ifdef KPXC_FEATURE_BROWSER
 void EditEntryWidget::setupBrowser()
 {
     if (config()->get(Config::Browser_Enabled).toBool()) {
@@ -500,7 +500,7 @@ void EditEntryWidget::setupEntryUpdate()
     connect(m_mainUi->usernameComboBox->lineEdit(), SIGNAL(textChanged(QString)), this, SLOT(setModified()));
     connect(m_mainUi->passwordEdit, SIGNAL(textChanged(QString)), this, SLOT(setModified()));
     connect(m_mainUi->urlEdit, SIGNAL(textChanged(QString)), this, SLOT(setModified()));
-#ifdef WITH_XC_NETWORKING
+#ifdef KPXC_FEATURE_NETWORK
     connect(m_mainUi->urlEdit, SIGNAL(textChanged(QString)), this, SLOT(updateFaviconButtonEnable(QString)));
 #endif
     connect(m_mainUi->tagsList, SIGNAL(tagsEdited()), this, SLOT(setModified()));
@@ -531,7 +531,7 @@ void EditEntryWidget::setupEntryUpdate()
 
     // Properties and History tabs don't need extra connections
 
-#ifdef WITH_XC_SSHAGENT
+#ifdef KPXC_FEATURE_SSHAGENT
     // SSH Agent tab
     if (sshAgent()->isEnabled()) {
         connect(m_sshAgentUi->attachmentRadioButton, SIGNAL(toggled(bool)), this, SLOT(setModified()));
@@ -547,7 +547,7 @@ void EditEntryWidget::setupEntryUpdate()
     }
 #endif
 
-#ifdef WITH_XC_BROWSER
+#ifdef KPXC_FEATURE_BROWSER
     if (config()->get(Config::Browser_Enabled).toBool()) {
         connect(m_browserUi->skipAutoSubmitCheckbox, SIGNAL(toggled(bool)), SLOT(setModified()));
         connect(m_browserUi->hideEntryCheckbox, SIGNAL(toggled(bool)), SLOT(setModified()));
@@ -595,7 +595,7 @@ void EditEntryWidget::updateHistoryButtons(const QModelIndex& current, const QMo
     }
 }
 
-#ifdef WITH_XC_SSHAGENT
+#ifdef KPXC_FEATURE_SSHAGENT
 void EditEntryWidget::setupSSHAgent()
 {
     m_pendingPrivateKey = "";
@@ -948,7 +948,7 @@ void EditEntryWidget::loadEntry(Entry* entry,
 
     switchToPage(Page::Main);
     setPageHidden(m_historyWidget, m_history || m_entry->historyItems().count() < 1);
-#ifdef WITH_XC_SSHAGENT
+#ifdef KPXC_FEATURE_SSHAGENT
     setPageHidden(m_sshAgentWidget, !sshAgent()->isEnabled());
 #endif
 
@@ -1074,13 +1074,13 @@ void EditEntryWidget::setForms(Entry* entry, bool restore)
     }
     updateAutoTypeEnabled();
 
-#ifdef WITH_XC_SSHAGENT
+#ifdef KPXC_FEATURE_SSHAGENT
     if (sshAgent()->isEnabled()) {
         updateSSHAgent();
     }
 #endif
 
-#ifdef WITH_XC_BROWSER
+#ifdef KPXC_FEATURE_BROWSER
     if (config()->get(Config::Browser_Enabled).toBool()) {
         if (!hasPage(m_browserWidget)) {
             setupBrowser();
@@ -1207,7 +1207,7 @@ bool EditEntryWidget::commitEntry()
 
     m_autoTypeAssoc->removeEmpty();
 
-#ifdef WITH_XC_SSHAGENT
+#ifdef KPXC_FEATURE_SSHAGENT
     toKeeAgentSettings(m_sshAgentSettings);
 #endif
 
@@ -1216,7 +1216,7 @@ bool EditEntryWidget::commitEntry()
         m_entry->beginUpdate();
     }
 
-#ifdef WITH_XC_BROWSER
+#ifdef KPXC_FEATURE_BROWSER
     if (config()->get(Config::Browser_Enabled).toBool()) {
         updateBrowser();
     }
@@ -1304,7 +1304,7 @@ void EditEntryWidget::updateEntryData(Entry* entry) const
 
     entry->autoTypeAssociations()->copyDataFrom(m_autoTypeAssoc);
 
-#ifdef WITH_XC_SSHAGENT
+#ifdef KPXC_FEATURE_SSHAGENT
     if (sshAgent()->isEnabled()) {
         m_sshAgentSettings.toEntry(entry);
     }
@@ -1390,7 +1390,7 @@ void EditEntryWidget::clear()
     hideMessage();
 }
 
-#ifdef WITH_XC_NETWORKING
+#ifdef KPXC_FEATURE_NETWORK
 void EditEntryWidget::updateFaviconButtonEnable(const QString& url)
 {
     m_mainUi->fetchFaviconButton->setDisabled(url.isEmpty());
diff --git a/src/gui/entry/EditEntryWidget.h b/src/gui/entry/EditEntryWidget.h
index 3fce4d56d0..fef2d1cfc6 100644
--- a/src/gui/entry/EditEntryWidget.h
+++ b/src/gui/entry/EditEntryWidget.h
@@ -44,11 +44,11 @@ class QMenu;
 class QScrollArea;
 class QSortFilterProxyModel;
 class QStringListModel;
-#ifdef WITH_XC_SSHAGENT
+#ifdef KPXC_FEATURE_SSHAGENT
 #include "sshagent/KeeAgentSettings.h"
 class OpenSSHKey;
 #endif
-#ifdef WITH_XC_BROWSER
+#ifdef KPXC_FEATURE_BROWSER
 class EntryURLModel;
 #endif
 
@@ -98,7 +98,7 @@ private slots:
     void acceptEntry();
     bool commitEntry();
     void cancel();
-#ifdef WITH_XC_NETWORKING
+#ifdef KPXC_FEATURE_NETWORK
     void updateFaviconButtonEnable(const QString& url);
 #endif
     void insertAttribute();
@@ -124,7 +124,7 @@ private slots:
     void useExpiryPreset(QAction* action);
     void toggleHideNotes(bool visible);
     void pickColor();
-#ifdef WITH_XC_SSHAGENT
+#ifdef KPXC_FEATURE_SSHAGENT
     void toKeeAgentSettings(KeeAgentSettings& settings) const;
     void setSSHAgentSettings();
     void updateSSHAgent();
@@ -140,7 +140,7 @@ private slots:
     void copyPublicKey();
     void generatePrivateKey();
 #endif
-#ifdef WITH_XC_BROWSER
+#ifdef KPXC_FEATURE_BROWSER
     void updateBrowserModified();
     void updateBrowser();
     void insertURL();
@@ -155,10 +155,10 @@ private slots:
     void setupAdvanced();
     void setupIcon();
     void setupAutoType();
-#ifdef WITH_XC_BROWSER
+#ifdef KPXC_FEATURE_BROWSER
     void setupBrowser();
 #endif
-#ifdef WITH_XC_SSHAGENT
+#ifdef KPXC_FEATURE_SSHAGENT
     void setupSSHAgent();
 #endif
     void setupProperties();
@@ -170,7 +170,7 @@ private slots:
     QMenu* createPresetsMenu();
     void updateEntryData(Entry* entry) const;
     void updateBrowserIntegrationCheckbox(QCheckBox* checkBox, bool enabled, bool value, const QString& option);
-#ifdef WITH_XC_SSHAGENT
+#ifdef KPXC_FEATURE_SSHAGENT
     bool getOpenSSHKey(OpenSSHKey& key, bool decrypt = false);
 #endif
 
@@ -183,7 +183,7 @@ private slots:
 
     bool m_create;
     bool m_history;
-#ifdef WITH_XC_SSHAGENT
+#ifdef KPXC_FEATURE_SSHAGENT
     KeeAgentSettings m_sshAgentSettings;
     QString m_pendingPrivateKey;
 #endif
@@ -200,10 +200,10 @@ private slots:
     QWidget* const m_advancedWidget;
     EditWidgetIcons* const m_iconsWidget;
     QWidget* const m_autoTypeWidget;
-#ifdef WITH_XC_SSHAGENT
+#ifdef KPXC_FEATURE_SSHAGENT
     QWidget* const m_sshAgentWidget;
 #endif
-#ifdef WITH_XC_BROWSER
+#ifdef KPXC_FEATURE_BROWSER
     bool m_browserSettingsChanged;
     QWidget* const m_browserWidget;
     EntryURLModel* const m_additionalURLsDataModel;
diff --git a/src/gui/entry/EntryAttachmentsWidget.cpp b/src/gui/entry/EntryAttachmentsWidget.cpp
index d13074f037..494b9f54d4 100644
--- a/src/gui/entry/EntryAttachmentsWidget.cpp
+++ b/src/gui/entry/EntryAttachmentsWidget.cpp
@@ -27,7 +27,7 @@
 #include <QLineEdit>
 #include <QMenu>
 #include <QMimeData>
-#include <QRegExp>
+#include <QRegularExpression>
 #include <QStandardPaths>
 #include <QTemporaryFile>
 
@@ -368,7 +368,7 @@ void EntryAttachmentsWidget::saveSelectedAttachments()
     QStringList errors;
     for (const QModelIndex& index : indexes) {
         QString attachmentKey = m_attachmentsModel->keyByIndex(index);
-        const QString fileNameSanitized = attachmentKey.replace(QRegExp("[/\\\\]"), "");
+        const QString fileNameSanitized = attachmentKey.replace(QRegularExpression("[/\\\\]"), "");
         const QString attachmentPath = saveDir.absoluteFilePath(fileNameSanitized);
 
         if (QFileInfo::exists(attachmentPath)) {
diff --git a/src/gui/entry/EntryModel.cpp b/src/gui/entry/EntryModel.cpp
index 9ae51743d2..434c54bd4a 100644
--- a/src/gui/entry/EntryModel.cpp
+++ b/src/gui/entry/EntryModel.cpp
@@ -1,4 +1,5 @@
 /*
+ *  Copyright (C) 2025 KeePassXC Team <team@keepassxc.org>
  *  Copyright (C) 2010 Felix Geyer <debfx@fobos.de>
  *
  *  This program is free software: you can redistribute it and/or modify
@@ -18,6 +19,7 @@
 #include "EntryModel.h"
 
 #include <QFont>
+#include <QIODevice>
 #include <QMimeData>
 #include <QPalette>
 
@@ -26,7 +28,6 @@
 #include "core/Group.h"
 #include "core/Metadata.h"
 #include "core/PasswordHealth.h"
-#include "gui/DatabaseIcons.h"
 #include "gui/Icons.h"
 #include "gui/styles/StateColorPalette.h"
 #ifdef Q_OS_MACOS
diff --git a/src/gui/entry/EntryView.cpp b/src/gui/entry/EntryView.cpp
index 2c176eccf6..2f7a0aeff2 100644
--- a/src/gui/entry/EntryView.cpp
+++ b/src/gui/entry/EntryView.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018 KeePassXC Team <team@keepassxc.org>
+ * Copyright (C) 2025 KeePassXC Team <team@keepassxc.org>
  * Copyright (C) 2010 Felix Geyer <debfx@fobos.de>
  *
  * This program is free software: you can redistribute it and/or modify
@@ -19,13 +19,13 @@
 #include "EntryView.h"
 
 #include <QAccessible>
+#include <QActionGroup>
 #include <QDrag>
 #include <QGuiApplication>
 #include <QHeaderView>
 #include <QListWidget>
 #include <QMenu>
 #include <QPainter>
-#include <QScreen>
 #include <QShortcut>
 #include <QStyledItemDelegate>
 #include <QWindow>
@@ -94,8 +94,8 @@ EntryView::EntryView(QWidget* parent)
         emit entrySelectionChanged(currentEntry());
     });
 
-    new QShortcut(Qt::CTRL + Qt::Key_F10, this, SLOT(contextMenuShortcutPressed()), nullptr, Qt::WidgetShortcut);
-    new QShortcut(Qt::CTRL + Qt::SHIFT + Qt::Key_J, this, SLOT(jumpToGroupShortcut()), nullptr, Qt::WidgetShortcut);
+    new QShortcut(Qt::CTRL | Qt::Key_F10, this, SLOT(contextMenuShortcutPressed()), nullptr, Qt::WidgetShortcut);
+    new QShortcut(Qt::CTRL | Qt::SHIFT | Qt::Key_J, this, SLOT(jumpToGroupShortcut()), nullptr, Qt::WidgetShortcut);
 
     resetViewToDefaults();
 
diff --git a/src/gui/group/EditGroupWidget.cpp b/src/gui/group/EditGroupWidget.cpp
index 4e406b0d0a..43d20da076 100644
--- a/src/gui/group/EditGroupWidget.cpp
+++ b/src/gui/group/EditGroupWidget.cpp
@@ -18,7 +18,7 @@
 
 #include "EditGroupWidget.h"
 #include "ui_EditGroupWidgetMain.h"
-#if defined(WITH_XC_BROWSER)
+#if defined(KPXC_FEATURE_BROWSER)
 #include "browser/BrowserService.h"
 #include "ui_EditGroupWidgetBrowser.h"
 #endif
@@ -30,10 +30,7 @@
 #include "gui/Font.h"
 #include "gui/Icons.h"
 #include "gui/MessageBox.h"
-
-#if defined(WITH_XC_KEESHARE)
 #include "keeshare/group/EditGroupPageKeeShare.h"
-#endif
 
 class EditGroupWidget::ExtraPage
 {
@@ -70,7 +67,7 @@ EditGroupWidget::EditGroupWidget(QWidget* parent)
     , m_editGroupWidgetMain(new QScrollArea())
     , m_editGroupWidgetIcons(new EditWidgetIcons())
     , m_editWidgetProperties(new EditWidgetProperties())
-#if defined(WITH_XC_BROWSER)
+#if defined(KPXC_FEATURE_BROWSER)
     , m_browserSettingsChanged(false)
     , m_browserUi(new Ui::EditGroupWidgetBrowser())
     , m_browserWidget(new QWidget(this))
@@ -81,14 +78,12 @@ EditGroupWidget::EditGroupWidget(QWidget* parent)
 
     addPage(tr("Group"), icons()->icon("document-edit"), m_editGroupWidgetMain);
     addPage(tr("Icon"), icons()->icon("preferences-desktop-icons"), m_editGroupWidgetIcons);
-#if defined(WITH_XC_BROWSER)
+#if defined(KPXC_FEATURE_BROWSER)
     if (config()->get(Config::Browser_Enabled).toBool()) {
         initializeBrowserPage();
     }
 #endif
-#if defined(WITH_XC_KEESHARE)
     addEditPage(new EditGroupPageKeeShare(this));
-#endif
     addPage(tr("Properties"), icons()->icon("document-properties"), m_editWidgetProperties);
 
     connect(m_mainUi->expireCheck, SIGNAL(toggled(bool)), m_mainUi->expireDatePicker, SLOT(setEnabled(bool)));
@@ -130,7 +125,7 @@ void EditGroupWidget::setupModifiedTracking()
     // Icon tab
     connect(m_editGroupWidgetIcons, SIGNAL(widgetUpdated()), SLOT(setModified()));
 
-#if defined(WITH_XC_BROWSER)
+#if defined(KPXC_FEATURE_BROWSER)
     if (config()->get(Config::Browser_Enabled).toBool()) {
         setupBrowserModifiedTracking();
     }
@@ -189,7 +184,7 @@ void EditGroupWidget::loadGroup(Group* group, bool create, const QSharedPointer<
         page.set(m_temporaryGroup.data(), m_db);
     }
 
-#ifdef WITH_XC_BROWSER
+#ifdef KPXC_FEATURE_BROWSER
     if (config()->get(Config::Browser_Enabled).toBool()) {
         auto inheritHideEntries = false;
         auto inheritSkipSubmit = false;
@@ -286,7 +281,7 @@ void EditGroupWidget::apply()
         page.assign();
     }
 
-#ifdef WITH_XC_BROWSER
+#ifdef KPXC_FEATURE_BROWSER
     if (config()->get(Config::Browser_Enabled).toBool()) {
         if (!m_browserSettingsChanged) {
             return;
@@ -353,7 +348,7 @@ void EditGroupWidget::cancel()
     emit editFinished(false);
 }
 
-#ifdef WITH_XC_BROWSER
+#ifdef KPXC_FEATURE_BROWSER
 void EditGroupWidget::initializeBrowserPage()
 {
     addPage(tr("Browser Integration"), icons()->icon("internet-web-browser"), m_browserWidget);
@@ -450,7 +445,7 @@ Group::TriState EditGroupWidget::triStateFromIndex(int index)
     }
 }
 
-#ifdef WITH_XC_BROWSER
+#ifdef KPXC_FEATURE_BROWSER
 void EditGroupWidget::addRestrictKeyComboBoxItems(QStringList const& keyList, QString inheritValue)
 {
     auto comboBox = m_browserUi->browserIntegrationRestrictKeyCombobox;
diff --git a/src/gui/group/EditGroupWidget.h b/src/gui/group/EditGroupWidget.h
index 35a84d7683..f62e1482c8 100644
--- a/src/gui/group/EditGroupWidget.h
+++ b/src/gui/group/EditGroupWidget.h
@@ -69,7 +69,7 @@ private slots:
     void apply();
     void save();
     void cancel();
-#ifdef WITH_XC_BROWSER
+#ifdef KPXC_FEATURE_BROWSER
     void initializeBrowserPage();
     void setupBrowserModifiedTracking();
     void updateBrowserModified();
@@ -90,7 +90,7 @@ private slots:
     QPointer<QScrollArea> m_editGroupWidgetMain;
     QPointer<EditWidgetIcons> m_editGroupWidgetIcons;
     QPointer<EditWidgetProperties> m_editWidgetProperties;
-#ifdef WITH_XC_BROWSER
+#ifdef KPXC_FEATURE_BROWSER
     bool m_browserSettingsChanged;
     const QScopedPointer<Ui::EditGroupWidgetBrowser> m_browserUi;
     QWidget* const m_browserWidget;
diff --git a/src/gui/group/GroupModel.cpp b/src/gui/group/GroupModel.cpp
index 18b926dc20..9cba501d69 100644
--- a/src/gui/group/GroupModel.cpp
+++ b/src/gui/group/GroupModel.cpp
@@ -125,9 +125,7 @@ QVariant GroupModel::data(const QModelIndex& index, int role) const
 
     if (role == Qt::DisplayRole) {
         QString nameTemplate = "%1";
-#if defined(WITH_XC_KEESHARE)
         nameTemplate = KeeShare::indicatorSuffix(group, nameTemplate);
-#endif
         return nameTemplate.arg(group->name());
     } else if (role == Qt::DecorationRole) {
         return Icons::groupIconPixmap(group);
diff --git a/src/gui/group/GroupView.cpp b/src/gui/group/GroupView.cpp
index 46cc0af6af..d088c55dbe 100644
--- a/src/gui/group/GroupView.cpp
+++ b/src/gui/group/GroupView.cpp
@@ -1,4 +1,5 @@
 /*
+ *  Copyright (C) 2025 KeePassXC Team <team@keepassxc.org>
  *  Copyright (C) 2010 Felix Geyer <debfx@fobos.de>
  *
  *  This program is free software: you can redistribute it and/or modify
@@ -44,16 +45,16 @@ GroupView::GroupView(Database* db, QWidget* parent)
     connect(selectionModel(), SIGNAL(currentChanged(QModelIndex,QModelIndex)), SIGNAL(groupSelectionChanged()));
     // clang-format on
 
-    new QShortcut(Qt::CTRL + Qt::Key_F10, this, SLOT(contextMenuShortcutPressed()), nullptr, Qt::WidgetShortcut);
+    new QShortcut(Qt::CTRL | Qt::Key_F10, this, SLOT(contextMenuShortcutPressed()), nullptr, Qt::WidgetShortcut);
     new QShortcut(
-        Qt::CTRL + Qt::SHIFT + Qt::Key_PageUp, this, SLOT(selectPreviousGroup()), nullptr, Qt::WindowShortcut);
-    new QShortcut(Qt::CTRL + Qt::SHIFT + Qt::Key_PageDown, this, SLOT(selectNextGroup()), nullptr, Qt::WindowShortcut);
+        Qt::CTRL | Qt::SHIFT | Qt::Key_PageUp, this, SLOT(selectPreviousGroup()), nullptr, Qt::WindowShortcut);
+    new QShortcut(Qt::CTRL | Qt::SHIFT | Qt::Key_PageDown, this, SLOT(selectNextGroup()), nullptr, Qt::WindowShortcut);
 
     // keyboard shortcuts to sort children of a group
-    auto shortcut = new QShortcut(Qt::CTRL + Qt::Key_Down, this, nullptr, nullptr, Qt::WidgetShortcut);
+    auto shortcut = new QShortcut(Qt::CTRL | Qt::Key_Down, this, nullptr, nullptr, Qt::WidgetShortcut);
     connect(shortcut, &QShortcut::activated, this, [this]() { sortGroups(false); });
 
-    shortcut = new QShortcut(Qt::CTRL + Qt::Key_Up, this, nullptr, nullptr, Qt::WidgetShortcut);
+    shortcut = new QShortcut(Qt::CTRL | Qt::Key_Up, this, nullptr, nullptr, Qt::WidgetShortcut);
     connect(shortcut, &QShortcut::activated, this, [this]() { sortGroups(true); });
 
     modelReset();
diff --git a/src/gui/osutils/macutils/MacPasteboard.cpp b/src/gui/osutils/macutils/MacPasteboard.cpp
index ae63ea4e49..a219c7b5e3 100644
--- a/src/gui/osutils/macutils/MacPasteboard.cpp
+++ b/src/gui/osutils/macutils/MacPasteboard.cpp
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2017 KeePassXC Team <team@keepassxc.org>
+ *  Copyright (C) 2025 KeePassXC Team <team@keepassxc.org>
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -17,23 +17,18 @@
 
 #include "MacPasteboard.h"
 
-QString MacPasteboard::convertorName()
+QString MacPasteboard::utiForMime(const QString& mime) const
 {
-    return QLatin1String("MacPasteboard");
-}
-
-QString MacPasteboard::flavorFor(const QString& mimetype)
-{
-    if (mimetype == QLatin1String("text/plain")) {
+    if (mime == QLatin1String("text/plain")) {
         return QLatin1String("public.utf8-plain-text");
-    } else if (mimetype == QLatin1String("application/x-nspasteboard-concealed-type")) {
+    } else if (mime == QLatin1String("application/x-nspasteboard-concealed-type")) {
         return QLatin1String("org.nspasteboard.ConcealedType");
     }
 
-    int i = mimetype.indexOf(QLatin1String("charset="));
+    int i = mime.indexOf(QLatin1String("charset="));
 
     if (i >= 0) {
-        QString cs(mimetype.mid(i + 8).toLower());
+        QString cs(mime.mid(i + 8).toLower());
         i = cs.indexOf(QLatin1Char(';'));
 
         if (i >= 0) {
@@ -46,54 +41,61 @@ QString MacPasteboard::flavorFor(const QString& mimetype)
             return QLatin1String("public.utf16-plain-text");
         }
     }
-    return QString();
+    return {};
 }
 
-QString MacPasteboard::mimeFor(QString flavor)
+QString MacPasteboard::mimeForUti(const QString& uti) const
 {
-    if (flavor == QLatin1String("public.utf8-plain-text"))
+    if (uti == QLatin1String("public.utf8-plain-text"))
         return QLatin1String("text/plain");
-    if (flavor == QLatin1String("org.nspasteboard.ConcealedType"))
+    if (uti == QLatin1String("org.nspasteboard.ConcealedType"))
         return QLatin1String("application/x-nspasteboard-concealed-type");
-    if (flavor == QLatin1String("public.utf16-plain-text"))
+    if (uti == QLatin1String("public.utf16-plain-text"))
         return QLatin1String("text/plain;charset=utf16");
-    return QString();
+    return {};
 }
 
-bool MacPasteboard::canConvert(const QString& mimetype, QString flavor)
+bool MacPasteboard::canConvert(const QString& mime, const QString& uti) const
 {
-    Q_UNUSED(mimetype);
-    Q_UNUSED(flavor);
+    Q_UNUSED(mime);
+    Q_UNUSED(uti);
     return true;
 }
 
-QVariant MacPasteboard::convertToMime(const QString& mimetype, QList<QByteArray> data, QString flavor)
+QVariant MacPasteboard::convertToMime(const QString& mime, const QList<QByteArray>& data, const QString& uti) const
 {
     if (data.count() > 1)
         qWarning("QMime::convertToMime: Cannot handle multiple member data");
     const QByteArray& firstData = data.first();
     QVariant ret;
-    if (flavor == QLatin1String("public.utf8-plain-text")) {
+    if (uti == QLatin1String("public.utf8-plain-text")) {
         ret = QString::fromUtf8(firstData);
-    } else if (flavor == QLatin1String("org.nspasteboard.ConcealedType")) {
+    } else if (uti == QLatin1String("org.nspasteboard.ConcealedType")) {
         ret = QString::fromUtf8(firstData);
-    } else if (flavor == QLatin1String("public.utf16-plain-text")) {
-        ret = QTextCodec::codecForName("UTF-16")->toUnicode(firstData);
+    } else if (uti == QLatin1String("public.utf16-plain-text")) {
+        auto toUtf16 = QStringDecoder(QStringDecoder::Utf16);
+        QVariant var{toUtf16(firstData)};
+        return var;
     } else {
-        qWarning("QMime::convertToMime: unhandled mimetype: %s", qPrintable(mimetype));
+        qWarning("QMime::convertToMime: unhandled mimetype: %s", qPrintable(mime));
     }
     return ret;
 }
 
-QList<QByteArray> MacPasteboard::convertFromMime(const QString&, QVariant data, QString flavor)
+QList<QByteArray> MacPasteboard::convertFromMime(const QString& mime, const QVariant& data, const QString& uti) const
 {
+    Q_UNUSED(mime);
+
     QList<QByteArray> ret;
-    QString string = data.toString();
-    if (flavor == QLatin1String("public.utf8-plain-text"))
-        ret.append(string.toUtf8());
-    else if (flavor == QLatin1String("org.nspasteboard.ConcealedType"))
-        ret.append(string.toUtf8());
-    else if (flavor == QLatin1String("public.utf16-plain-text"))
-        ret.append(QTextCodec::codecForName("UTF-16")->fromUnicode(string));
+    QString dataString = data.toString();
+    if (uti == QLatin1String("public.utf8-plain-text")) {
+        ret.append(dataString.toUtf8());
+    } else if (uti == QLatin1String("org.nspasteboard.ConcealedType")) {
+        ret.append(dataString.toUtf8());
+    } else if (uti == QLatin1String("public.utf16-plain-text")) {
+        auto toUtf16 = QStringEncoder(QStringDecoder::Utf16);
+        QByteArray baUtf16 = toUtf16(dataString);
+        ret.append(baUtf16);
+    }
     return ret;
 }
diff --git a/src/gui/osutils/macutils/MacPasteboard.h b/src/gui/osutils/macutils/MacPasteboard.h
index 503741ca88..3faea3d549 100644
--- a/src/gui/osutils/macutils/MacPasteboard.h
+++ b/src/gui/osutils/macutils/MacPasteboard.h
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2017 KeePassXC Team <team@keepassxc.org>
+ *  Copyright (C) 2025 KeePassXC Team <team@keepassxc.org>
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -19,23 +19,23 @@
 #define KEEPASSXC_MACPASTEBOARD_H
 
 #include <QObject>
-#include <QTextCodec>
-#include <QtMacExtras/QMacPasteboardMime>
+#include <QStringConverter>
+#include <QUtiMimeConverter>
+#include <QVariant>
 
-class MacPasteboard : public QObject, public QMacPasteboardMime
+class MacPasteboard : public QObject, public QUtiMimeConverter
 {
 public:
     explicit MacPasteboard()
-        : QMacPasteboardMime(MIME_ALL)
+        : QUtiMimeConverter()
     {
     }
 
-    QString convertorName() override;
-    bool canConvert(const QString& mime, QString flav) override;
-    QString mimeFor(QString flav) override;
-    QString flavorFor(const QString& mime) override;
-    QVariant convertToMime(const QString& mime, QList<QByteArray> data, QString flav) override;
-    QList<QByteArray> convertFromMime(const QString& mime, QVariant data, QString flav) override;
+    bool canConvert(const QString& mime, const QString& uti) const;
+    QString mimeForUti(const QString& uti) const override;
+    QString utiForMime(const QString& mime) const override;
+    QVariant convertToMime(const QString& mime, const QList<QByteArray>& data, const QString& uti) const override;
+    QList<QByteArray> convertFromMime(const QString& mime, const QVariant& data, const QString& uti) const override;
 };
 
 #endif // KEEPASSXC_MACPASTEBOARD_H
diff --git a/src/gui/osutils/macutils/MacUtils.h b/src/gui/osutils/macutils/MacUtils.h
index 4034193013..1527e7ff40 100644
--- a/src/gui/osutils/macutils/MacUtils.h
+++ b/src/gui/osutils/macutils/MacUtils.h
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2023 KeePassXC Team <team@keepassxc.org>
+ *  Copyright (C) 2025 KeePassXC Team <team@keepassxc.org>
  *  Copyright (C) 2012 Felix Geyer <debfx@fobos.de>
  *
  *  This program is free software: you can redistribute it and/or modify
@@ -24,6 +24,7 @@
 #include <Carbon/Carbon.h>
 
 #include <QColor>
+#include <QHash>
 #include <QPointer>
 #include <QScopedPointer>
 #include <qwindowdefs.h>
diff --git a/src/gui/osutils/nixutils/NixUtils.cpp b/src/gui/osutils/nixutils/NixUtils.cpp
index 225d6a05ea..dbdc7bd176 100644
--- a/src/gui/osutils/nixutils/NixUtils.cpp
+++ b/src/gui/osutils/nixutils/NixUtils.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020 KeePassXC Team <team@keepassxc.org>
+ * Copyright (C) 2025 KeePassXC Team <team@keepassxc.org>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -30,10 +30,8 @@
 #include <QStandardPaths>
 #include <QStyle>
 #include <QTextStream>
-#ifdef WITH_XC_X11
-#include <QX11Info>
-
-#include <qpa/qplatformnativeinterface.h>
+#ifdef WITH_X11
+#include <QGuiApplication>
 
 #include "X11Funcs.h"
 #include <X11/XKBlib.h>
@@ -67,9 +65,11 @@ NixUtils* NixUtils::instance()
 NixUtils::NixUtils(QObject* parent)
     : OSUtilsBase(parent)
 {
-#ifdef WITH_XC_X11
-    dpy = QX11Info::display();
-    rootWindow = QX11Info::appRootWindow();
+#ifdef WITH_X11
+    if (auto* native = qGuiApp->nativeInterface<QNativeInterface::QX11Application>()) {
+        dpy = native->display();
+        rootWindow = DefaultRootWindow(dpy);
+    }
 #endif
 
     // notify about system color scheme changes
@@ -148,7 +148,6 @@ void NixUtils::setLaunchAtStartup(bool enable)
         const QString executeablePathOrName = isAppImage ? appImagePath : QApplication::applicationName().toLower();
 
         QTextStream stream(&desktopFile);
-        stream.setCodec("UTF-8");
         stream << QStringLiteral("[Desktop Entry]") << '\n'
                << QStringLiteral("Name=") << QApplication::applicationDisplayName() << '\n'
                << QStringLiteral("GenericName=") << tr("Password Manager") << '\n'
@@ -214,18 +213,19 @@ void NixUtils::launchAtStartupRequested(uint response, const QVariantMap& result
 
 bool NixUtils::isCapslockEnabled()
 {
-#ifdef WITH_XC_X11
-    QPlatformNativeInterface* native = QGuiApplication::platformNativeInterface();
-    auto* display = native->nativeResourceForWindow("display", nullptr);
-    if (!display) {
-        return false;
-    }
+#ifdef WITH_X11
+    if (auto* native = qGuiApp->nativeInterface<QNativeInterface::QX11Application>()) {
+        auto* display = native->display();
+        if (!display) {
+            return false;
+        }
 
-    QString platform = QGuiApplication::platformName();
-    if (platform == "xcb") {
-        unsigned state = 0;
-        if (XkbGetIndicatorState(reinterpret_cast<Display*>(display), XkbUseCoreKbd, &state) == Success) {
-            return ((state & 1u) != 0);
+        auto platform = QGuiApplication::platformName();
+        if (platform == "xcb") {
+            unsigned state = 0;
+            if (XkbGetIndicatorState(reinterpret_cast<Display*>(display), XkbUseCoreKbd, &state) == Success) {
+                return ((state & 1u) != 0);
+            }
         }
     }
 #endif
@@ -246,9 +246,10 @@ void NixUtils::registerNativeEventFilter()
     qApp->installNativeEventFilter(this);
 }
 
-bool NixUtils::nativeEventFilter(const QByteArray& eventType, void* message, long*)
+bool NixUtils::nativeEventFilter(const QByteArray& eventType, void* message, qintptr* result)
 {
-#ifdef WITH_XC_X11
+    Q_UNUSED(result)
+#ifdef WITH_X11
     if (eventType != QByteArrayLiteral("xcb_generic_event_t")) {
         return false;
     }
@@ -270,7 +271,7 @@ bool NixUtils::nativeEventFilter(const QByteArray& eventType, void* message, lon
 
 bool NixUtils::triggerGlobalShortcut(uint keycode, uint modifiers)
 {
-#ifdef WITH_XC_X11
+#ifdef WITH_X11
     QHashIterator<QString, QSharedPointer<globalShortcut>> i(m_globalShortcuts);
     while (i.hasNext()) {
         i.next();
@@ -288,8 +289,8 @@ bool NixUtils::triggerGlobalShortcut(uint keycode, uint modifiers)
 
 bool NixUtils::registerGlobalShortcut(const QString& name, Qt::Key key, Qt::KeyboardModifiers modifiers, QString* error)
 {
-#ifdef WITH_XC_X11
-    auto keycode = XKeysymToKeycode(dpy, qcharToNativeKeyCode(key));
+#ifdef WITH_X11
+    auto keycode = XKeysymToKeycode(dpy, qtToNativeKeyCode(key));
     auto modifierscode = qtToNativeModifiers(modifiers);
 
     // Check if this key combo is registered to another shortcut
@@ -340,7 +341,7 @@ bool NixUtils::registerGlobalShortcut(const QString& name, Qt::Key key, Qt::Keyb
 
 bool NixUtils::unregisterGlobalShortcut(const QString& name)
 {
-#ifdef WITH_XC_X11
+#ifdef WITH_X11
     if (!m_globalShortcuts.contains(name)) {
         return false;
     }
@@ -394,7 +395,7 @@ quint64 NixUtils::getProcessStartTime() const
 
     auto startIndex = processStatInfo.lastIndexOf(')');
     if (startIndex != -1) {
-        auto tokens = processStatInfo.midRef(startIndex + 2).split(' ');
+        auto tokens = QStringView{processStatInfo}.mid(startIndex + 2).split(' ');
         if (tokens.size() >= 20) {
             bool ok;
             auto time = tokens[19].toULongLong(&ok);
diff --git a/src/gui/osutils/nixutils/NixUtils.h b/src/gui/osutils/nixutils/NixUtils.h
index 9be835ff9f..98f1df701a 100644
--- a/src/gui/osutils/nixutils/NixUtils.h
+++ b/src/gui/osutils/nixutils/NixUtils.h
@@ -61,7 +61,7 @@ private slots:
     explicit NixUtils(QObject* parent = nullptr);
     ~NixUtils() override;
 
-    bool nativeEventFilter(const QByteArray& eventType, void* message, long*) override;
+    bool nativeEventFilter(const QByteArray& eventType, void* message, qintptr* result) override;
     QString getAutostartDesktopFilename(bool createDirs = false) const;
 
     bool triggerGlobalShortcut(uint keycode, uint modifiers);
diff --git a/src/gui/osutils/winutils/DeviceListenerWin.cpp b/src/gui/osutils/winutils/DeviceListenerWin.cpp
index de805f215c..644cc04ab4 100644
--- a/src/gui/osutils/winutils/DeviceListenerWin.cpp
+++ b/src/gui/osutils/winutils/DeviceListenerWin.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023 KeePassXC Team <team@keepassxc.org>
+ * Copyright (C) 2025 KeePassXC Team <team@keepassxc.org>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -80,8 +80,9 @@ void DeviceListenerWin::deregisterHotplugCallback()
     }
 }
 
-bool DeviceListenerWin::nativeEventFilter(const QByteArray& eventType, void* message, long*)
+bool DeviceListenerWin::nativeEventFilter(const QByteArray& eventType, void* message, qintptr* result)
 {
+    Q_UNUSED(result);
     if (eventType != "windows_generic_MSG") {
         return false;
     }
diff --git a/src/gui/osutils/winutils/DeviceListenerWin.h b/src/gui/osutils/winutils/DeviceListenerWin.h
index 527555d2f7..7cc51634ad 100644
--- a/src/gui/osutils/winutils/DeviceListenerWin.h
+++ b/src/gui/osutils/winutils/DeviceListenerWin.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023 KeePassXC Team <team@keepassxc.org>
+ * Copyright (C) 2025 KeePassXC Team <team@keepassxc.org>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -48,7 +48,7 @@ class DeviceListenerWin : public QObject, public QAbstractNativeEventFilter
                                  const QUuid* deviceClass = nullptr);
     void deregisterHotplugCallback();
 
-    bool nativeEventFilter(const QByteArray& eventType, void* message, long*) override;
+    bool nativeEventFilter(const QByteArray& eventType, void* message, qintptr* result) override;
 
 signals:
     void devicePlugged(bool state, void* ctx, void* device);
diff --git a/src/gui/osutils/winutils/ScreenLockListenerWin.cpp b/src/gui/osutils/winutils/ScreenLockListenerWin.cpp
index 05d01f4ccd..d549d835c9 100644
--- a/src/gui/osutils/winutils/ScreenLockListenerWin.cpp
+++ b/src/gui/osutils/winutils/ScreenLockListenerWin.cpp
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2017 KeePassXC Team <team@keepassxc.org>
+ *  Copyright (C) 2025 KeePassXC Team <team@keepassxc.org>
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -54,8 +54,9 @@ ScreenLockListenerWin::~ScreenLockListenerWin()
     }
 }
 
-bool ScreenLockListenerWin::nativeEventFilter(const QByteArray& eventType, void* message, long*)
+bool ScreenLockListenerWin::nativeEventFilter(const QByteArray& eventType, void* message, qintptr* result)
 {
+    Q_UNUSED(result);
     if (eventType == "windows_generic_MSG" || eventType == "windows_dispatcher_MSG") {
         MSG* m = static_cast<MSG*>(message);
         if (m->message == WM_POWERBROADCAST) {
diff --git a/src/gui/osutils/winutils/ScreenLockListenerWin.h b/src/gui/osutils/winutils/ScreenLockListenerWin.h
index e33f0e3543..47a1f96875 100644
--- a/src/gui/osutils/winutils/ScreenLockListenerWin.h
+++ b/src/gui/osutils/winutils/ScreenLockListenerWin.h
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2017 KeePassXC Team <team@keepassxc.org>
+ *  Copyright (C) 2025 KeePassXC Team <team@keepassxc.org>
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -29,7 +29,7 @@ class ScreenLockListenerWin : public ScreenLockListenerPrivate, public QAbstract
 public:
     explicit ScreenLockListenerWin(QWidget* parent);
     ~ScreenLockListenerWin();
-    virtual bool nativeEventFilter(const QByteArray& eventType, void* message, long* result) override;
+    virtual bool nativeEventFilter(const QByteArray& eventType, void* message, qintptr* result) override;
 
 private:
     void* m_powerNotificationHandle;
diff --git a/src/gui/osutils/winutils/WinUtils.cpp b/src/gui/osutils/winutils/WinUtils.cpp
index a159769324..269ed917e7 100644
--- a/src/gui/osutils/winutils/WinUtils.cpp
+++ b/src/gui/osutils/winutils/WinUtils.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020 KeePassXC Team <team@keepassxc.org>
+ * Copyright (C) 2025 KeePassXC Team <team@keepassxc.org>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -74,8 +74,9 @@ void WinUtils::registerNativeEventFilter()
     qApp->installNativeEventFilter(this);
 }
 
-bool WinUtils::nativeEventFilter(const QByteArray& eventType, void* message, long*)
+bool WinUtils::nativeEventFilter(const QByteArray& eventType, void* message, qintptr* result)
 {
+    Q_UNUSED(result);
     if (eventType != "windows_generic_MSG") {
         return false;
     }
diff --git a/src/gui/osutils/winutils/WinUtils.h b/src/gui/osutils/winutils/WinUtils.h
index 9278c9d606..1c0907e1dc 100644
--- a/src/gui/osutils/winutils/WinUtils.h
+++ b/src/gui/osutils/winutils/WinUtils.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020 KeePassXC Team <team@keepassxc.org>
+ * Copyright (C) 2025 KeePassXC Team <team@keepassxc.org>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -21,6 +21,7 @@
 #include "gui/osutils/OSUtilsBase.h"
 
 #include <QAbstractNativeEventFilter>
+#include <QHash>
 #include <QPointer>
 #include <QScopedPointer>
 #include <QSharedPointer>
@@ -65,7 +66,7 @@ class WinUtils : public OSUtilsBase, QAbstractNativeEventFilter
     explicit WinUtils(QObject* parent = nullptr);
     ~WinUtils() override = default;
 
-    bool nativeEventFilter(const QByteArray& eventType, void* message, long*) override;
+    bool nativeEventFilter(const QByteArray& eventType, void* message, qintptr* result) override;
     void triggerGlobalShortcut(int id);
 
 private:
diff --git a/src/gui/remote/DatabaseSettingsWidgetRemote.cpp b/src/gui/remote/DatabaseSettingsWidgetRemote.cpp
index f66edba7e7..27b96909ea 100644
--- a/src/gui/remote/DatabaseSettingsWidgetRemote.cpp
+++ b/src/gui/remote/DatabaseSettingsWidgetRemote.cpp
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2023 KeePassXC Team <team@keepassxc.org>
+ *  Copyright (C) 2025 KeePassXC Team <team@keepassxc.org>
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -25,6 +25,8 @@
 #include "RemoteSettings.h"
 #include "gui/MessageBox.h"
 
+#include <QFile>
+
 DatabaseSettingsWidgetRemote::DatabaseSettingsWidgetRemote(QWidget* parent)
     : DatabaseSettingsWidget(parent)
     , m_remoteSettings(new RemoteSettings(nullptr, this))
diff --git a/src/gui/remote/RemoteSettings.h b/src/gui/remote/RemoteSettings.h
index 4b414494c6..c1f61fc776 100644
--- a/src/gui/remote/RemoteSettings.h
+++ b/src/gui/remote/RemoteSettings.h
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2024 KeePassXC Team <team@keepassxc.org>
+ *  Copyright (C) 2025 KeePassXC Team <team@keepassxc.org>
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -18,6 +18,7 @@
 #ifndef KEEPASSXC_REMOTESETTINGS_H
 #define KEEPASSXC_REMOTESETTINGS_H
 
+#include <QHash>
 #include <QObject>
 #include <QSharedPointer>
 
diff --git a/src/gui/reports/ReportsDialog.cpp b/src/gui/reports/ReportsDialog.cpp
index 1d32c23222..31e2179f0c 100644
--- a/src/gui/reports/ReportsDialog.cpp
+++ b/src/gui/reports/ReportsDialog.cpp
@@ -21,12 +21,10 @@
 #include "ReportsPageHealthcheck.h"
 #include "ReportsPageHibp.h"
 #include "ReportsPageStatistics.h"
-#ifdef WITH_XC_BROWSER
+#ifdef KPXC_FEATURE_BROWSER
 #include "ReportsPageBrowserStatistics.h"
-#include "ReportsWidgetBrowserStatistics.h"
-#endif
-#ifdef WITH_XC_BROWSER_PASSKEYS
 #include "ReportsPagePasskeys.h"
+#include "ReportsWidgetBrowserStatistics.h"
 #include "ReportsWidgetPasskeys.h"
 #endif
 #include "ReportsWidgetHealthcheck.h"
@@ -63,10 +61,8 @@ ReportsDialog::ReportsDialog(QWidget* parent)
     , m_healthPage(new ReportsPageHealthcheck())
     , m_hibpPage(new ReportsPageHibp())
     , m_statPage(new ReportsPageStatistics())
-#ifdef WITH_XC_BROWSER
+#ifdef KPXC_FEATURE_BROWSER
     , m_browserStatPage(new ReportsPageBrowserStatistics())
-#endif
-#ifdef WITH_XC_BROWSER_PASSKEYS
     , m_passkeysPage(new ReportsPagePasskeys())
 #endif
     , m_editEntryWidget(new EditEntryWidget(this))
@@ -76,10 +72,8 @@ ReportsDialog::ReportsDialog(QWidget* parent)
     connect(m_ui->buttonBox, SIGNAL(rejected()), SLOT(reject()));
     addPage(m_statPage);
     addPage(m_healthPage);
-#ifdef WITH_XC_BROWSER_PASSKEYS
+#ifdef KPXC_FEATURE_BROWSER
     addPage(m_passkeysPage);
-#endif
-#ifdef WITH_XC_BROWSER
     addPage(m_browserStatPage);
 #endif
     addPage(m_hibpPage);
@@ -94,12 +88,10 @@ ReportsDialog::ReportsDialog(QWidget* parent)
     connect(m_ui->categoryList, SIGNAL(categoryChanged(int)), m_ui->stackedWidget, SLOT(setCurrentIndex(int)));
     connect(m_healthPage->m_healthWidget, SIGNAL(entryActivated(Entry*)), SLOT(entryActivationSignalReceived(Entry*)));
     connect(m_hibpPage->m_hibpWidget, SIGNAL(entryActivated(Entry*)), SLOT(entryActivationSignalReceived(Entry*)));
-#ifdef WITH_XC_BROWSER
+#ifdef KPXC_FEATURE_BROWSER
     connect(m_browserStatPage->m_browserWidget,
             SIGNAL(entryActivated(Entry*)),
             SLOT(entryActivationSignalReceived(Entry*)));
-#endif
-#ifdef WITH_XC_BROWSER_PASSKEYS
     connect(
         m_passkeysPage->m_passkeysWidget, SIGNAL(entryActivated(Entry*)), SLOT(entryActivationSignalReceived(Entry*)));
 #endif
@@ -128,23 +120,19 @@ void ReportsDialog::addPage(QSharedPointer<IReportsPage> page)
     m_ui->categoryList->setCurrentCategory(category);
 }
 
+#ifdef KPXC_FEATURE_BROWSER
 void ReportsDialog::activatePasskeysPage()
 {
-#ifdef WITH_XC_BROWSER_PASSKEYS
     m_ui->stackedWidget->setCurrentWidget(m_passkeysPage->m_passkeysWidget);
     auto index = m_ui->stackedWidget->currentIndex();
     m_ui->categoryList->setCurrentCategory(index);
-#endif
 }
 
 bool ReportsDialog::onPassKeysPage()
 {
-#ifdef WITH_XC_BROWSER_PASSKEYS
     return m_ui->stackedWidget->currentWidget() == m_passkeysPage->m_passkeysWidget;
-#else
-    return false;
-#endif
 }
+#endif
 
 void ReportsDialog::reject()
 {
@@ -176,12 +164,11 @@ void ReportsDialog::switchToMainView(bool previousDialogAccepted)
         } else if (m_sender == m_hibpPage->m_hibpWidget) {
             m_hibpPage->m_hibpWidget->refreshAfterEdit();
         }
-#ifdef WITH_XC_BROWSER
+#ifdef KPXC_FEATURE_BROWSER
         if (m_sender == m_browserStatPage->m_browserWidget) {
             m_browserStatPage->m_browserWidget->calculateBrowserStatistics();
         }
-#endif
-#ifdef WITH_XC_BROWSER_PASSKEYS
+
         if (m_sender == m_passkeysPage->m_passkeysWidget) {
             m_passkeysPage->m_passkeysWidget->updateEntries();
         }
diff --git a/src/gui/reports/ReportsDialog.h b/src/gui/reports/ReportsDialog.h
index abeaab4814..5d1d37c7a0 100644
--- a/src/gui/reports/ReportsDialog.h
+++ b/src/gui/reports/ReportsDialog.h
@@ -29,10 +29,8 @@ class QTabWidget;
 class ReportsPageHealthcheck;
 class ReportsPageHibp;
 class ReportsPageStatistics;
-#ifdef WITH_XC_BROWSER
+#ifdef KPXC_FEATURE_BROWSER
 class ReportsPageBrowserStatistics;
-#endif
-#ifdef WITH_XC_BROWSER_PASSKEYS
 class ReportsPagePasskeys;
 #endif
 
@@ -63,8 +61,11 @@ class ReportsDialog : public DialogyWidget
 
     void load(const QSharedPointer<Database>& db);
     void addPage(QSharedPointer<IReportsPage> page);
+
+#ifdef KPXC_FEATURE_BROWSER
     void activatePasskeysPage();
     bool onPassKeysPage();
+#endif
 
 signals:
     void editFinished(bool accepted);
@@ -80,10 +81,8 @@ private slots:
     const QSharedPointer<ReportsPageHealthcheck> m_healthPage;
     const QSharedPointer<ReportsPageHibp> m_hibpPage;
     const QSharedPointer<ReportsPageStatistics> m_statPage;
-#ifdef WITH_XC_BROWSER
+#ifdef KPXC_FEATURE_BROWSER
     const QSharedPointer<ReportsPageBrowserStatistics> m_browserStatPage;
-#endif
-#ifdef WITH_XC_BROWSER_PASSKEYS
     const QSharedPointer<ReportsPagePasskeys> m_passkeysPage;
 #endif
     QPointer<EditEntryWidget> m_editEntryWidget;
diff --git a/src/gui/reports/ReportsWidgetHibp.cpp b/src/gui/reports/ReportsWidgetHibp.cpp
index a559208aaa..cc4876561b 100644
--- a/src/gui/reports/ReportsWidgetHibp.cpp
+++ b/src/gui/reports/ReportsWidgetHibp.cpp
@@ -71,7 +71,7 @@ ReportsWidgetHibp::ReportsWidgetHibp(QWidget* parent)
     connect(m_ui->hibpTableView, SIGNAL(doubleClicked(QModelIndex)), SLOT(emitEntryActivated(QModelIndex)));
     connect(m_ui->hibpTableView, SIGNAL(customContextMenuRequested(QPoint)), SLOT(customMenuRequested(QPoint)));
     connect(m_ui->showKnownBadCheckBox, SIGNAL(stateChanged(int)), this, SLOT(makeHibpTable()));
-#ifdef WITH_XC_NETWORKING
+#ifdef KPXC_FEATURE_NETWORK
     connect(&m_downloader, SIGNAL(hibpResult(QString, int)), SLOT(addHibpResult(QString, int)));
     connect(&m_downloader, SIGNAL(fetchFailed(QString)), SLOT(fetchFailed(QString)));
 
@@ -92,7 +92,7 @@ void ReportsWidgetHibp::loadSettings(QSharedPointer<Database> db)
     m_error.clear();
     m_rowToEntry.clear();
     m_editedEntry = nullptr;
-#ifdef WITH_XC_NETWORKING
+#ifdef KPXC_FEATURE_NETWORK
     m_ui->stackedWidget->setCurrentIndex(0);
     m_ui->validationButton->setEnabled(true);
     m_ui->progressBar->hide();
@@ -188,7 +188,7 @@ void ReportsWidgetHibp::makeHibpTable()
     }
 
     // If we're done and everything is good, display a motivational message
-#ifdef WITH_XC_NETWORKING
+#ifdef KPXC_FEATURE_NETWORK
     if (m_downloader.passwordsRemaining() == 0 && m_pwndPasswords.isEmpty() && m_error.isEmpty()) {
         m_referencesModel->clear();
         m_referencesModel->setHorizontalHeaderLabels(QStringList() << tr("Congratulations, no exposed passwords!"));
@@ -219,7 +219,7 @@ void ReportsWidgetHibp::addHibpResult(const QString& password, int count)
         m_pwndPasswords[password] = count;
     }
 
-#ifdef WITH_XC_NETWORKING
+#ifdef KPXC_FEATURE_NETWORK
     // Update the progress bar
     int remaining = m_downloader.passwordsRemaining();
     if (remaining > 0) {
@@ -249,7 +249,7 @@ void ReportsWidgetHibp::fetchFailed(const QString& error)
  */
 void ReportsWidgetHibp::startValidation()
 {
-#ifdef WITH_XC_NETWORKING
+#ifdef KPXC_FEATURE_NETWORK
     // Collect all passwords in the database (unless recycled, and
     // unless empty, and unless marked as "known bad") and submit them
     // to the downloader.
@@ -345,7 +345,7 @@ void ReportsWidgetHibp::refreshAfterEdit()
     m_pwndPasswords.remove(m_editedPassword);
 
     // Validate the new password against HIBP
-#ifdef WITH_XC_NETWORKING
+#ifdef KPXC_FEATURE_NETWORK
     m_downloader.add(m_editedEntry->password());
     m_downloader.validate();
 #endif
diff --git a/src/gui/reports/ReportsWidgetHibp.h b/src/gui/reports/ReportsWidgetHibp.h
index 8e0d5e47bc..43fef2e387 100644
--- a/src/gui/reports/ReportsWidgetHibp.h
+++ b/src/gui/reports/ReportsWidgetHibp.h
@@ -23,7 +23,7 @@
 
 #include <QWidget>
 
-#ifdef WITH_XC_NETWORKING
+#ifdef KPXC_FEATURE_NETWORK
 #include "networking/HibpDownloader.h"
 #endif
 
@@ -78,7 +78,7 @@ public slots:
     QString m_editedPassword; // The old password of the entry we're editing
     bool m_editedExcluded; // The old "known bad" flag of the entry we're editing
 
-#ifdef WITH_XC_NETWORKING
+#ifdef KPXC_FEATURE_NETWORK
     HibpDownloader m_downloader; // This performs the actual HIBP online query
 #endif
 };
diff --git a/src/gui/styles/base/BaseStyle.cpp b/src/gui/styles/base/BaseStyle.cpp
index 471744c355..cb77afb48e 100644
--- a/src/gui/styles/base/BaseStyle.cpp
+++ b/src/gui/styles/base/BaseStyle.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020 KeePassXC Team <team@keepassxc.org>
+ * Copyright (C) 2025 KeePassXC Team <team@keepassxc.org>
  * Copyright (C) 2019 Andrew Richards
  *
  * Derived from Phantomstyle and relicensed under the GPLv2 or v3.
@@ -33,11 +33,11 @@
 #include <QPainterPath>
 #include <QPoint>
 #include <QString>
+#include <QStringView>
 #include <QTableView>
 #include <QToolBar>
 #include <QToolButton>
 #include <QWizard>
-#include <QtCore>
 
 #ifdef Q_OS_MACOS
 #include <QMainWindow>
@@ -523,11 +523,11 @@ namespace Phantom
             // guard for it, so that it will default to a more safe definition on the
             // next guaranteed big breaking change for Qt. A warning will hopefully get
             // someone to double-check it at some point in the future.
-#warning "Verify contents and layout of QPalette::cacheKey() have not changed"
+            // #warning "Verify contents and layout of QPalette::cacheKey() have not changed"
             QtPrivate::QHashCombine c;
             uint h = qHash(p.currentColorGroup());
-            h = c(h, (uint)(x.u & 0xFFFFFFFFu));
-            h = c(h, (uint)((x.u >> 32) & 0xFFFFFFFFu));
+            h = c(h, static_cast<uint>(x.u & 0xFFFFFFFFu));
+            h = c(h, static_cast<uint>((x.u >> 32) & 0xFFFFFFFFu));
             return h;
 #endif
         }
@@ -873,7 +873,7 @@ namespace Phantom
         {
             QRect ra = bar->rect;
             QRect rb = ra;
-            bool isHorizontal = bar->orientation != Qt::Vertical;
+            bool isHorizontal = bar->state == QStyle::State_Horizontal;
             bool isInverted = bar->invertedAppearance;
             bool isIndeterminate = bar->minimum == 0 && bar->maximum == 0;
             bool isForward = !isHorizontal || bar->direction != Qt::RightToLeft;
@@ -2571,7 +2571,7 @@ void BaseStyle::drawControl(ControlElement element,
         QRect r = bar->rect.adjusted(2, 2, -2, -2);
         if (r.isEmpty() || !r.isValid())
             break;
-        QSize textSize = option->fontMetrics.size(Qt::TextBypassShaping, bar->text);
+        QSize textSize = option->fontMetrics.size(0, bar->text);
         QRect textRect = QStyle::alignedRect(option->direction, Qt::AlignCenter, textSize, option->rect);
         textRect &= r;
         if (textRect.isEmpty())
@@ -2745,10 +2745,10 @@ void BaseStyle::drawControl(ControlElement element,
         }
 
         // Draw main text and mnemonic text
-        QStringRef s(&menuItem->text);
+        QStringView s(menuItem->text);
         if (!s.isEmpty()) {
-            QRect textRect =
-                Ph::menuItemTextRect(metrics, option->direction, itemRect, hasSubMenu, hasIcon, menuItem->tabWidth);
+            QRect textRect = Ph::menuItemTextRect(
+                metrics, option->direction, itemRect, hasSubMenu, hasIcon, menuItem->reservedShortcutWidth);
             int t = s.indexOf(QLatin1Char('\t'));
             int text_flags =
                 Qt::AlignLeft | Qt::AlignTop | Qt::TextShowMnemonic | Qt::TextDontClip | Qt::TextSingleLine;
@@ -2819,14 +2819,14 @@ void BaseStyle::drawControl(ControlElement element,
 
             // Draw mnemonic text
             if (t >= 0) {
-                QRect mnemonicR =
-                    Ph::menuItemMnemonicRect(metrics, option->direction, itemRect, hasSubMenu, menuItem->tabWidth);
-                const QStringRef textToDrawRef = s.mid(t + 1);
+                QRect mnemonicR = Ph::menuItemMnemonicRect(
+                    metrics, option->direction, itemRect, hasSubMenu, menuItem->reservedShortcutWidth);
+                const auto textToDrawRef = QStringView{s}.mid(t + 1);
                 const QString unsafeTextToDraw = QString::fromRawData(textToDrawRef.constData(), textToDrawRef.size());
                 painter->drawText(mnemonicR, text_flags, unsafeTextToDraw);
                 s = s.left(t);
             }
-            const QStringRef textToDrawRef = s.left(t);
+            const auto textToDrawRef = QStringView{s}.left(t);
             const QString unsafeTextToDraw = QString::fromRawData(textToDrawRef.constData(), textToDrawRef.size());
             painter->drawText(textRect, text_flags, unsafeTextToDraw);
 
@@ -4144,7 +4144,7 @@ QSize BaseStyle::sizeFromContents(ContentsType type,
         bool nullIcon = hdr->icon.isNull();
         int margin = proxy()->pixelMetric(QStyle::PM_HeaderMargin, hdr, widget);
         int iconSize = nullIcon ? 0 : option->fontMetrics.height();
-        QSize txt = hdr->fontMetrics.size(Qt::TextSingleLine | Qt::TextBypassShaping, hdr->text);
+        QSize txt = hdr->fontMetrics.size(Qt::TextSingleLine, hdr->text);
         QSize sz;
         sz.setHeight(margin + qMax(iconSize, txt.height()) + margin);
         sz.setWidth((nullIcon ? 0 : margin) + iconSize + (hdr->text.isNull() ? 0 : margin) + txt.width() + margin);
diff --git a/src/keeshare/CMakeLists.txt b/src/keeshare/CMakeLists.txt
index 5fe739b36f..5da855b501 100644
--- a/src/keeshare/CMakeLists.txt
+++ b/src/keeshare/CMakeLists.txt
@@ -1,18 +1,31 @@
-if(WITH_XC_KEESHARE)
-    set(keeshare_SOURCES
-        SettingsPageKeeShare.cpp
-        SettingsWidgetKeeShare.cpp
-        DatabaseSettingsWidgetKeeShare.cpp
-        group/EditGroupWidgetKeeShare.cpp
-        group/EditGroupPageKeeShare.cpp
-        KeeShare.cpp
-        KeeShareSettings.cpp
-        ShareImport.cpp
-        ShareExport.cpp
-        ShareObserver.cpp
-        )
+#  Copyright (C) 2025 KeePassXC Team <team@keepassxc.org>
+#
+#  This program is free software: you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation, either version 2 or (at your option)
+#  version 3 of the License.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-    add_library(keeshare STATIC ${keeshare_SOURCES})
-    target_link_libraries(keeshare PUBLIC Qt5::Core Qt5::Widgets ${BOTAN_LIBRARIES} ${ZLIB_LIBRARIES} PRIVATE ${MINIZIP_LIBRARIES})
-    include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
-endif(WITH_XC_KEESHARE)
+set(keeshare_SOURCES
+    SettingsPageKeeShare.cpp
+    SettingsWidgetKeeShare.cpp
+    DatabaseSettingsWidgetKeeShare.cpp
+    group/EditGroupWidgetKeeShare.cpp
+    group/EditGroupPageKeeShare.cpp
+    KeeShare.cpp
+    KeeShareSettings.cpp
+    ShareImport.cpp
+    ShareExport.cpp
+    ShareObserver.cpp
+    )
+
+add_library(keeshare STATIC ${keeshare_SOURCES})
+target_link_libraries(keeshare PUBLIC Qt6::Core Qt6::Widgets ${BOTAN_LIBRARIES} ${ZLIB_LIBRARIES} PRIVATE ${MINIZIP_LIBRARIES})
+include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
diff --git a/src/keeshare/KeeShareSettings.cpp b/src/keeshare/KeeShareSettings.cpp
index 61ab2bb8eb..10bb8cc76e 100644
--- a/src/keeshare/KeeShareSettings.cpp
+++ b/src/keeshare/KeeShareSettings.cpp
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2018 KeePassXC Team <team@keepassxc.org>
+ *  Copyright (C) 2026 KeePassXC Team <team@keepassxc.org>
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -25,7 +25,6 @@
 #include "gui/DatabaseIcons.h"
 
 #include <QDataStream>
-#include <QTextCodec>
 #include <QXmlStreamWriter>
 
 #include <botan/data_src.h>
@@ -41,7 +40,6 @@ namespace KeeShareSettings
             QString buffer;
             QXmlStreamWriter writer(&buffer);
 
-            writer.setCodec(QTextCodec::codecForName("UTF-8"));
             writer.writeStartDocument();
             writer.writeStartElement("KeeShare");
             specific(writer);
@@ -53,7 +51,7 @@ namespace KeeShareSettings
         void xmlDeserialize(const QString& raw, std::function<void(QXmlStreamReader& reader)> specific)
         {
             QXmlStreamReader reader(raw);
-            if (!reader.readNextStartElement() || reader.qualifiedName() != "KeeShare") {
+            if (!reader.readNextStartElement() || reader.qualifiedName().toString() != "KeeShare") {
                 return;
             }
             specific(reader);
@@ -106,9 +104,9 @@ namespace KeeShareSettings
     {
         Certificate certificate;
         while (!reader.error() && reader.readNextStartElement()) {
-            if (reader.name() == "Signer") {
+            if (reader.name().toString() == "Signer") {
                 certificate.signer = reader.readElementText();
-            } else if (reader.name() == "Key") {
+            } else if (reader.name().toString() == "Key") {
                 auto rawKey = QByteArray::fromBase64(reader.readElementText().toLatin1());
                 if (!rawKey.isEmpty()) {
                     try {
@@ -200,12 +198,12 @@ namespace KeeShareSettings
         Active active;
         xmlDeserialize(raw, [&](QXmlStreamReader& reader) {
             while (!reader.error() && reader.readNextStartElement()) {
-                if (reader.name() == "Active") {
+                if (reader.name().toString() == "Active") {
                     while (reader.readNextStartElement()) {
-                        if (reader.name() == "Import") {
+                        if (reader.name().toString() == "Import") {
                             active.in = true;
                             reader.skipCurrentElement();
-                        } else if (reader.name() == "Export") {
+                        } else if (reader.name().toString() == "Export") {
                             active.out = true;
                             reader.skipCurrentElement();
                         } else {
@@ -248,9 +246,9 @@ namespace KeeShareSettings
         Own own;
         xmlDeserialize(raw, [&](QXmlStreamReader& reader) {
             while (!reader.error() && reader.readNextStartElement()) {
-                if (reader.name() == "PrivateKey") {
+                if (reader.name().toString() == "PrivateKey") {
                     own.key = Key::deserialize(reader);
-                } else if (reader.name() == "PublicKey") {
+                } else if (reader.name().toString() == "PublicKey") {
                     own.certificate = Certificate::deserialize(reader);
                 } else {
                     qDebug("Unknown KeeShareSettings element %s", qPrintable(reader.name().toString()));
@@ -336,25 +334,25 @@ namespace KeeShareSettings
         reference.keepGroups = false;
         xmlDeserialize(raw, [&](QXmlStreamReader& reader) {
             while (!reader.error() && reader.readNextStartElement()) {
-                if (reader.name() == "Type") {
+                if (reader.name().toString() == "Type") {
                     while (reader.readNextStartElement()) {
-                        if (reader.name() == "Import") {
+                        if (reader.name().toString() == "Import") {
                             reference.type |= ImportFrom;
                             reader.skipCurrentElement();
-                        } else if (reader.name() == "Export") {
+                        } else if (reader.name().toString() == "Export") {
                             reference.type |= ExportTo;
                             reader.skipCurrentElement();
                         } else {
                             break;
                         }
                     }
-                } else if (reader.name() == "Group") {
+                } else if (reader.name().toString() == "Group") {
                     reference.uuid = QUuid::fromRfc4122(QByteArray::fromBase64(reader.readElementText().toLatin1()));
-                } else if (reader.name() == "Path") {
+                } else if (reader.name().toString() == "Path") {
                     reference.path = QString::fromUtf8(QByteArray::fromBase64(reader.readElementText().toLatin1()));
-                } else if (reader.name() == "Password") {
+                } else if (reader.name().toString() == "Password") {
                     reference.password = QString::fromUtf8(QByteArray::fromBase64(reader.readElementText().toLatin1()));
-                } else if (reader.name() == "KeepGroups") {
+                } else if (reader.name().toString() == "KeepGroups") {
                     reference.keepGroups = reader.readElementText().compare("True") == 0;
                 } else {
                     qDebug("Unknown Reference element %s", qPrintable(reader.name().toString()));
diff --git a/src/keys/CompositeKey.cpp b/src/keys/CompositeKey.cpp
index 7054916673..eb5fd64068 100644
--- a/src/keys/CompositeKey.cpp
+++ b/src/keys/CompositeKey.cpp
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2018 KeePassXC Team <team@keepassxc.org>
+ *  Copyright (C) 2025 KeePassXC Team <team@keepassxc.org>
  *  Copyright (C) 2010 Felix Geyer <debfx@fobos.de>
  *
  *  This program is free software: you can redistribute it and/or modify
@@ -27,6 +27,7 @@
 
 #include <QDataStream>
 #include <QDebug>
+#include <QIODevice>
 
 QUuid CompositeKey::UUID("76a7ae25-a542-4add-9849-7c06be945b94");
 
diff --git a/src/keys/CompositeKey.h b/src/keys/CompositeKey.h
index 451f88e4fd..128cda8832 100644
--- a/src/keys/CompositeKey.h
+++ b/src/keys/CompositeKey.h
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2018 KeePassXC Team <team@keepassxc.org>
+ *  Copyright (C) 2025 KeePassXC Team <team@keepassxc.org>
  *  Copyright (C) 2010 Felix Geyer <debfx@fobos.de>
  *
  *  This program is free software: you can redistribute it and/or modify
@@ -19,6 +19,7 @@
 #ifndef KEEPASSX_COMPOSITEKEY_H
 #define KEEPASSX_COMPOSITEKEY_H
 
+#include <QList>
 #include <QSharedPointer>
 
 #include "keys/Key.h"
diff --git a/src/keys/FileKey.cpp b/src/keys/FileKey.cpp
index 167b0462dd..4f1439c987 100644
--- a/src/keys/FileKey.cpp
+++ b/src/keys/FileKey.cpp
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2017 KeePassXC Team <team@keepassxc.org>
+ *  Copyright (C) 2025 KeePassXC Team <team@keepassxc.org>
  *  Copyright (C) 2011 Felix Geyer <debfx@fobos.de>
  *
  *  This program is free software: you can redistribute it and/or modify
@@ -301,7 +301,7 @@ bool FileKey::loadXml(QIODevice* device, QString* errorMsg)
     if (xmlReader.error()) {
         return false;
     }
-    if (xmlReader.readNextStartElement() && xmlReader.name() != "KeyFile") {
+    if (xmlReader.readNextStartElement() && xmlReader.name().toString() != "KeyFile") {
         return false;
     }
 
@@ -313,9 +313,9 @@ bool FileKey::loadXml(QIODevice* device, QString* errorMsg)
     } keyFileData;
 
     while (!xmlReader.error() && xmlReader.readNextStartElement()) {
-        if (xmlReader.name() == "Meta") {
+        if (xmlReader.name().toString() == "Meta") {
             while (!xmlReader.error() && xmlReader.readNextStartElement()) {
-                if (xmlReader.name() == "Version") {
+                if (xmlReader.name().toString() == "Version") {
                     keyFileData.version = xmlReader.readElementText();
                     if (keyFileData.version.startsWith("1.0")) {
                         m_type = KeePass2XML;
@@ -329,9 +329,9 @@ bool FileKey::loadXml(QIODevice* device, QString* errorMsg)
                     }
                 }
             }
-        } else if (xmlReader.name() == "Key") {
+        } else if (xmlReader.name().toString() == "Key") {
             while (!xmlReader.error() && xmlReader.readNextStartElement()) {
-                if (xmlReader.name() == "Data") {
+                if (xmlReader.name().toString() == "Data") {
                     keyFileData.hash = QByteArray::fromHex(xmlReader.attributes().value("Hash").toLatin1());
                     keyFileData.data = xmlReader.readElementText().simplified().replace(" ", "").toLatin1();
 
@@ -362,7 +362,7 @@ bool FileKey::loadXml(QIODevice* device, QString* errorMsg)
 
     bool ok = false;
     if (!xmlReader.error() && !keyFileData.data.isEmpty()) {
-        std::memcpy(m_key.data(), keyFileData.data.data(), std::min(SHA256_SIZE, keyFileData.data.size()));
+        std::memcpy(m_key.data(), keyFileData.data.data(), qMin(SHA256_SIZE, keyFileData.data.size()));
         ok = true;
     }
 
@@ -421,7 +421,7 @@ bool FileKey::loadHex(QIODevice* device)
         return false;
     }
 
-    std::memcpy(m_key.data(), data.data(), std::min(SHA256_SIZE, data.size()));
+    std::memcpy(m_key.data(), data.data(), qMin(SHA256_SIZE, data.size()));
     Botan::secure_scrub_memory(data.data(), static_cast<std::size_t>(data.capacity()));
 
     m_type = FixedBinaryHex;
@@ -447,7 +447,7 @@ bool FileKey::loadHashed(QIODevice* device)
     } while (!buffer.isEmpty());
 
     buffer = cryptoHash.result();
-    std::memcpy(m_key.data(), buffer.data(), std::min(SHA256_SIZE, buffer.size()));
+    std::memcpy(m_key.data(), buffer.data(), qMin(SHA256_SIZE, buffer.size()));
     Botan::secure_scrub_memory(buffer.data(), static_cast<std::size_t>(buffer.capacity()));
 
     m_type = Hashed;
diff --git a/src/keys/PasswordKey.cpp b/src/keys/PasswordKey.cpp
index 7e06706472..dd887c0189 100644
--- a/src/keys/PasswordKey.cpp
+++ b/src/keys/PasswordKey.cpp
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2019 KeePassXC Team <team@keepassxc.org>
+ *  Copyright (C) 2025 KeePassXC Team <team@keepassxc.org>
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -20,6 +20,7 @@
 #include "crypto/CryptoHash.h"
 
 #include <QDataStream>
+#include <QIODevice>
 #include <QSharedPointer>
 
 QUuid PasswordKey::UUID("77e90411-303a-43f2-b773-853b05635ead");
diff --git a/src/keys/drivers/YubiKey.cpp b/src/keys/drivers/YubiKey.cpp
index 35544b709a..f9c8aea41f 100644
--- a/src/keys/drivers/YubiKey.cpp
+++ b/src/keys/drivers/YubiKey.cpp
@@ -1,6 +1,6 @@
 /*
+ *  Copyright (C) 2025 KeePassXC Team <team@keepassxc.org>
  *  Copyright (C) 2014 Kyle Manna <kyle@kylemanna.com>
- *  Copyright (C) 2017-2021 KeePassXC Team <team@keepassxc.org>
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -90,7 +90,8 @@ void YubiKey::findValidKeysAsync()
     // Don't start another scan if we are already doing one
     if (!m_findingKeys) {
         m_findingKeys = true;
-        QtConcurrent::run([this] { emit detectComplete(findValidKeys()); });
+        auto future = QtConcurrent::run([this] { emit detectComplete(findValidKeys()); });
+        Q_UNUSED(future)
     }
 }
 
diff --git a/src/keys/drivers/YubiKey.h b/src/keys/drivers/YubiKey.h
index 56fe6847b7..dd031a7fdc 100644
--- a/src/keys/drivers/YubiKey.h
+++ b/src/keys/drivers/YubiKey.h
@@ -1,6 +1,6 @@
 /*
+ *  Copyright (C) 2025 KeePassXC Team <team@keepassxc.org>
  *  Copyright (C) 2014 Kyle Manna <kyle@kylemanna.com>
- *  Copyright (C) 2017-2021 KeePassXC Team <team@keepassxc.org>
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -16,13 +16,14 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef KEEPASSX_YUBIKEY_H
-#define KEEPASSX_YUBIKEY_H
+#ifndef KEEPASSXC_YUBIKEY_H
+#define KEEPASSXC_YUBIKEY_H
 
 #include <QHash>
 #include <QMultiMap>
 #include <QMutex>
 #include <QObject>
+#include <QRecursiveMutex>
 #include <QTimer>
 
 #include <botan/secmem.h>
@@ -38,7 +39,7 @@ class YubiKey : public QObject
     Q_OBJECT
 
 public:
-    using KeyMap = QMap<YubiKeySlot, QString>;
+    using KeyMap = QMultiMap<YubiKeySlot, QString>;
 
     enum class ChallengeResult : int
     {
@@ -103,4 +104,4 @@ class YubiKey : public QObject
     Q_DISABLE_COPY(YubiKey)
 };
 
-#endif // KEEPASSX_YUBIKEY_H
+#endif // KEEPASSXC_YUBIKEY_H
diff --git a/src/keys/drivers/YubiKeyInterfacePCSC.cpp b/src/keys/drivers/YubiKeyInterfacePCSC.cpp
index 10e4217e9a..efe6776e59 100644
--- a/src/keys/drivers/YubiKeyInterfacePCSC.cpp
+++ b/src/keys/drivers/YubiKeyInterfacePCSC.cpp
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2021 KeePassXC Team <team@keepassxc.org>
+ *  Copyright (C) 2025 KeePassXC Team <team@keepassxc.org>
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -41,6 +41,13 @@ typedef unsigned long SCUINT;
 typedef long RETVAL;
 #endif
 
+// Use the ANSI functions on Windows to align with Linux/macOS
+#ifdef Q_OS_WIN
+#define SCardListReaders SCardListReadersA
+#define SCardStatus SCardStatusA
+#define SCardConnect SCardConnectA
+#endif
+
 // This namescape contains static wrappers for the smart card API
 // Which enable the communication with a Yubikey via PCSC ADPUs
 namespace
diff --git a/src/keys/drivers/YubiKeyStub.cpp b/src/keys/drivers/YubiKeyStub.cpp
deleted file mode 100644
index 64771e77d2..0000000000
--- a/src/keys/drivers/YubiKeyStub.cpp
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- *  Copyright (C) 2014 Kyle Manna <kyle@kylemanna.com>
- *  Copyright (C) 2017-2021 KeePassXC Team <team@keepassxc.org>
- *
- *  This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 2 or (at your option)
- *  version 3 of the License.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "YubiKey.h"
-
-YubiKey::YubiKey() = default;
-
-YubiKey* YubiKey::m_instance(Q_NULLPTR);
-
-YubiKey* YubiKey::instance()
-{
-    if (!m_instance) {
-        m_instance = new YubiKey();
-    }
-
-    return m_instance;
-}
-
-bool YubiKey::isInitialized()
-{
-    return false;
-}
-
-bool YubiKey::findValidKeys()
-{
-    return false;
-}
-
-void YubiKey::findValidKeysAsync()
-{
-}
-
-YubiKey::KeyMap YubiKey::foundKeys()
-{
-    return {};
-}
-
-int YubiKey::connectedKeys()
-{
-    return 0;
-}
-
-QString YubiKey::errorMessage()
-{
-    return {};
-}
-
-bool YubiKey::testChallenge(YubiKeySlot slot, bool* wouldBlock)
-{
-    Q_UNUSED(slot);
-    Q_UNUSED(wouldBlock);
-    return false;
-}
-
-YubiKey::ChallengeResult YubiKey::challenge(YubiKeySlot slot, const QByteArray& chal, Botan::secure_vector<char>& resp)
-{
-    Q_UNUSED(slot);
-    Q_UNUSED(chal);
-    Q_UNUSED(resp);
-
-    return YubiKey::ChallengeResult::YCR_ERROR;
-}
diff --git a/src/networking/HibpDownloader.cpp b/src/networking/HibpDownloader.cpp
index 8b09ce2c4c..f17d76bfd6 100644
--- a/src/networking/HibpDownloader.cpp
+++ b/src/networking/HibpDownloader.cpp
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2020 KeePassXC Team <team@keepassxc.org>
+ *  Copyright (C) 2025 KeePassXC Team <team@keepassxc.org>
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -20,6 +20,7 @@
 
 #include <QCryptographicHash>
 #include <QNetworkReply>
+#include <QStringView>
 
 namespace
 {
@@ -60,7 +61,7 @@ namespace
         }
 
         // Extract the count, remove remaining whitespace, and convert to int
-        return hibpResult.midRef(pos, end - pos).trimmed().toInt();
+        return QStringView{hibpResult}.mid(pos, end - pos).trimmed().toInt();
     }
 } // namespace
 
diff --git a/src/networking/HibpDownloader.h b/src/networking/HibpDownloader.h
index ccdc393ffc..20cd458504 100644
--- a/src/networking/HibpDownloader.h
+++ b/src/networking/HibpDownloader.h
@@ -22,7 +22,7 @@
 #include <QHash>
 #include <QObject>
 
-#ifndef WITH_XC_NETWORKING
+#ifndef KPXC_FEATURE_NETWORK
 #error This file requires KeePassXC to be built with network support.
 #endif
 
diff --git a/src/networking/NetworkManager.cpp b/src/networking/NetworkManager.cpp
index 8fc4c9e06a..7cb7f90d97 100644
--- a/src/networking/NetworkManager.cpp
+++ b/src/networking/NetworkManager.cpp
@@ -17,7 +17,7 @@
 
 #include "config-keepassx.h"
 
-#ifdef WITH_XC_NETWORKING
+#ifdef KPXC_FEATURE_NETWORK
 
 #include "NetworkManager.h"
 
diff --git a/src/networking/NetworkManager.h b/src/networking/NetworkManager.h
index 1e571d95cb..bcf4036fb5 100644
--- a/src/networking/NetworkManager.h
+++ b/src/networking/NetworkManager.h
@@ -20,13 +20,13 @@
 
 #include "config-keepassx.h"
 
-#ifdef WITH_XC_NETWORKING
+#ifdef KPXC_FEATURE_NETWORK
 
 class QNetworkAccessManager;
 
 QNetworkAccessManager* getNetMgr();
 #else
-Q_STATIC_ASSERT_X(false, "Qt Networking used when WITH_XC_NETWORKING is disabled!");
+Q_STATIC_ASSERT_X(false, "Qt Networking used when KPXC_FEATURE_NETWORK is disabled!");
 #endif
 
 #endif // KEEPASSXC_NETWORKMANAGER_H
diff --git a/src/networking/UpdateChecker.cpp b/src/networking/UpdateChecker.cpp
index ea3d435dfc..c8f0458ed1 100644
--- a/src/networking/UpdateChecker.cpp
+++ b/src/networking/UpdateChecker.cpp
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2019 KeePassXC Team <team@keepassxc.org>
+ *  Copyright (C) 2025 KeePassXC Team <team@keepassxc.org>
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -103,8 +103,7 @@ void UpdateChecker::fetchFinished()
         }
 
         // Check again in 7 days
-        // TODO: change to toSecsSinceEpoch() when min Qt >= 5.8
-        config()->set(Config::GUI_CheckForUpdatesNextCheck, Clock::currentDateTime().addDays(7).toTime_t());
+        config()->set(Config::GUI_CheckForUpdatesNextCheck, Clock::currentDateTime().addDays(7).toSecsSinceEpoch());
     } else {
         version = ErrorVersion;
     }
diff --git a/src/proxy/CMakeLists.txt b/src/proxy/CMakeLists.txt
index be756672dd..b71311470f 100644
--- a/src/proxy/CMakeLists.txt
+++ b/src/proxy/CMakeLists.txt
@@ -1,4 +1,4 @@
-#  Copyright (C) 2020 KeePassXC Team <team@keepassxc.org>
+#  Copyright (C) 2025 KeePassXC Team <team@keepassxc.org>
 #
 #  This program is free software: you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -13,7 +13,7 @@
 #  You should have received a copy of the GNU General Public License
 #  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-if(WITH_XC_BROWSER)
+if(KPXC_FEATURE_BROWSER)
     set(proxy_SOURCES
         ../browser/BrowserShared.cpp
         keepassxc-proxy.cpp
@@ -21,10 +21,10 @@ if(WITH_XC_BROWSER)
 
     # Alloc must be defined in a static library to prevent clashing with clang ASAN definitions
     add_library(proxy_alloc STATIC ../core/Alloc.cpp)
-    target_link_libraries(proxy_alloc PRIVATE Qt5::Core ${BOTAN_LIBRARIES})
+    target_link_libraries(proxy_alloc PRIVATE Qt6::Core ${BOTAN_LIBRARIES})
 
     add_executable(keepassxc-proxy ${proxy_SOURCES})
-    target_link_libraries(keepassxc-proxy proxy_alloc Qt5::Core Qt5::Network)
+    target_link_libraries(keepassxc-proxy proxy_alloc Qt6::Core Qt6::Network)
     install(TARGETS keepassxc-proxy
             BUNDLE DESTINATION . COMPONENT Runtime
             RUNTIME DESTINATION ${PROXY_INSTALL_DIR} COMPONENT Runtime)
diff --git a/src/proxy/NativeMessagingProxy.cpp b/src/proxy/NativeMessagingProxy.cpp
index 964383dc5d..93f2c48dc6 100644
--- a/src/proxy/NativeMessagingProxy.cpp
+++ b/src/proxy/NativeMessagingProxy.cpp
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2020 KeePassXC Team <team@keepassxc.org>
+ *  Copyright (C) 2025 KeePassXC Team <team@keepassxc.org>
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -57,7 +57,7 @@ void NativeMessagingProxy::setupStandardInput()
 #endif
 #endif
 
-    QtConcurrent::run([this] {
+    auto res = QtConcurrent::run([this] {
         while (std::cin.good()) {
             if (std::cin.peek() != EOF) {
                 uint length = 0;
@@ -68,7 +68,7 @@ void NativeMessagingProxy::setupStandardInput()
                 QString msg;
                 msg.reserve(length);
                 for (uint i = 0; i < length; ++i) {
-                    msg.append(getchar());
+                    msg.append(QChar(getchar()));
                 }
 
                 if (msg.length() > 0) {
diff --git a/src/qrcode/CMakeLists.txt b/src/qrcode/CMakeLists.txt
index 10e3684062..cd9df9fd36 100644
--- a/src/qrcode/CMakeLists.txt
+++ b/src/qrcode/CMakeLists.txt
@@ -1,4 +1,4 @@
-#  Copyright (C) 2017 KeePassXC Team <team@keepassxc.org>
+#  Copyright (C) 2025 KeePassXC Team <team@keepassxc.org>
 #
 #  This program is free software: you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -21,4 +21,4 @@ find_package(QREncode REQUIRED)
 
 add_library(qrcode STATIC ${qrcode_SOURCES})
 target_include_directories(qrcode PRIVATE ${QRENCODE_INCLUDE_DIR})
-target_link_libraries(qrcode PUBLIC Qt5::Core Qt5::Svg ${QRENCODE_LIBRARY})
+target_link_libraries(qrcode PUBLIC Qt6::Core Qt6::Svg ${QRENCODE_LIBRARY})
diff --git a/src/qrcode/QrCode.h b/src/qrcode/QrCode.h
index 2165d108f2..3285a31487 100644
--- a/src/qrcode/QrCode.h
+++ b/src/qrcode/QrCode.h
@@ -15,8 +15,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef KEEPASSX_QRCODE_H
-#define KEEPASSX_QRCODE_H
+#ifndef KEEPASSXC_QRCODE_H
+#define KEEPASSXC_QRCODE_H
 
 #include <QScopedPointer>
 
@@ -74,4 +74,4 @@ class QrCode
     QScopedPointer<QrCodePrivate> d_ptr;
 };
 
-#endif // KEEPASSX_QRCODE_H
+#endif // KEEPASSXC_QRCODE_H
diff --git a/src/qrcode/QrCode_p.h b/src/qrcode/QrCode_p.h
index 0161b79164..ed58c0fbe7 100644
--- a/src/qrcode/QrCode_p.h
+++ b/src/qrcode/QrCode_p.h
@@ -17,8 +17,8 @@
 
 /* This class exists to isolate <qrencode.h> from the rest of the code base. */
 
-#ifndef KEEPASSX_QRCODEPRIVATE_H
-#define KEEPASSX_QRCODEPRIVATE_H
+#ifndef KEEPASSXC_QRCODEPRIVATE_H
+#define KEEPASSXC_QRCODEPRIVATE_H
 
 #include <qrencode.h>
 
@@ -30,4 +30,4 @@ struct QrCodePrivate
     ~QrCodePrivate();
 };
 
-#endif // KEEPASSX_QRCODEPRIVATE_H
+#endif // KEEPASSXC_QRCODEPRIVATE_H
diff --git a/src/quickunlock/Polkit.h b/src/quickunlock/Polkit.h
index 7dfc2db7b1..17bef5542b 100644
--- a/src/quickunlock/Polkit.h
+++ b/src/quickunlock/Polkit.h
@@ -15,8 +15,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef KEEPASSX_POLKIT_H
-#define KEEPASSX_POLKIT_H
+#ifndef KEEPASSXC_POLKIT_H
+#define KEEPASSXC_POLKIT_H
 
 #include "QuickUnlockInterface.h"
 #include "polkit_dbus.h"
@@ -47,4 +47,4 @@ class Polkit : public QuickUnlockInterface
     QScopedPointer<org::freedesktop::PolicyKit1::Authority> m_polkit;
 };
 
-#endif // KEEPASSX_POLKIT_H
+#endif // KEEPASSXC_POLKIT_H
diff --git a/src/quickunlock/PolkitDbusTypes.h b/src/quickunlock/PolkitDbusTypes.h
index 83eb238893..8be977ad39 100644
--- a/src/quickunlock/PolkitDbusTypes.h
+++ b/src/quickunlock/PolkitDbusTypes.h
@@ -1,5 +1,22 @@
-#ifndef KEEPASSX_POLKITDBUSTYPES_H
-#define KEEPASSX_POLKITDBUSTYPES_H
+/*
+ *  Copyright (C) 2025 KeePassXC Team <team@keepassxc.org>
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 2 or (at your option)
+ *  version 3 of the License.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef KEEPASSXC_POLKITDBUSTYPES_H
+#define KEEPASSXC_POLKITDBUSTYPES_H
 
 #include <QtDBus>
 
@@ -33,4 +50,4 @@ class PolkitAuthorizationResults
 Q_DECLARE_METATYPE(PolkitSubject);
 Q_DECLARE_METATYPE(PolkitAuthorizationResults);
 
-#endif // KEEPASSX_POLKITDBUSTYPES_H
+#endif // KEEPASSXC_POLKITDBUSTYPES_H
diff --git a/src/quickunlock/TouchID.h b/src/quickunlock/TouchID.h
index 74e5d94747..35cea60074 100644
--- a/src/quickunlock/TouchID.h
+++ b/src/quickunlock/TouchID.h
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2023 KeePassXC Team <team@keepassxc.org>
+ *  Copyright (C) 2025 KeePassXC Team <team@keepassxc.org>
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -15,8 +15,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef KEEPASSX_TOUCHID_H
-#define KEEPASSX_TOUCHID_H
+#ifndef KEEPASSXC_TOUCHID_H
+#define KEEPASSXC_TOUCHID_H
 
 #include "QuickUnlockInterface.h"
 #include <QHash>
@@ -31,7 +31,7 @@ class TouchID : public QuickUnlockInterface
     bool getKey(const QUuid& dbUuid, QByteArray& passwordKey) override;
     bool hasKey(const QUuid& dbUuid) const override;
 
-    void reset(const QUuid& dbUuid = "") override;
+    void reset(const QUuid& dbUuid) override;
     void reset() override;
 
 private:
@@ -46,4 +46,4 @@ class TouchID : public QuickUnlockInterface
     QHash<QUuid, QByteArray> m_encryptedMasterKeys;
 };
 
-#endif // KEEPASSX_TOUCHID_H
+#endif // KEEPASSXC_TOUCHID_H
diff --git a/src/quickunlock/TouchID.mm b/src/quickunlock/TouchID.mm
index f7ea180148..e81f111d91 100644
--- a/src/quickunlock/TouchID.mm
+++ b/src/quickunlock/TouchID.mm
@@ -1,3 +1,20 @@
+/*
+*  Copyright (C) 2025 KeePassXC Team <team@keepassxc.org>
+*
+*  This program is free software: you can redistribute it and/or modify
+*  it under the terms of the GNU General Public License as published by
+*  the Free Software Foundation, either version 2 or (at your option)
+*  version 3 of the License.
+*
+*  This program is distributed in the hope that it will be useful,
+*  but WITHOUT ANY WARRANTY; without even the implied warranty of
+*  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+*  GNU General Public License for more details.
+*
+*  You should have received a copy of the GNU General Public License
+*  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
 #include "quickunlock/TouchID.h"
 
 #include "crypto/Random.h"
@@ -404,5 +421,7 @@ inline CFMutableDictionaryRef makeDictionary() {
  */
 void TouchID::reset(const QUuid& dbUuid)
 {
-    m_encryptedMasterKeys.remove(dbUuid);
+    if (!dbUuid.isNull()) {
+        m_encryptedMasterKeys.remove(dbUuid);
+    }
 }
diff --git a/src/sshagent/CMakeLists.txt b/src/sshagent/CMakeLists.txt
index 6bbb9c94d2..759d1ea9ea 100644
--- a/src/sshagent/CMakeLists.txt
+++ b/src/sshagent/CMakeLists.txt
@@ -1,4 +1,19 @@
-if(WITH_XC_SSHAGENT)
+#  Copyright (C) 2025 KeePassXC Team <team@keepassxc.org>
+#
+#  This program is free software: you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation, either version 2 or (at your option)
+#  version 3 of the License.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+if(KPXC_FEATURE_SSHAGENT)
     include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
 
     set(sshagent_SOURCES
@@ -14,5 +29,5 @@ if(WITH_XC_SSHAGENT)
     )
 
     add_library(sshagent STATIC ${sshagent_SOURCES})
-    target_link_libraries(sshagent Qt5::Core Qt5::Widgets Qt5::Network)
+    target_link_libraries(sshagent Qt6::Core Qt6::Widgets Qt6::Network ${BOTAN_LIBRARIES})
 endif()
diff --git a/src/sshagent/KeeAgentSettings.cpp b/src/sshagent/KeeAgentSettings.cpp
index 1403838384..681fdc1f93 100644
--- a/src/sshagent/KeeAgentSettings.cpp
+++ b/src/sshagent/KeeAgentSettings.cpp
@@ -27,7 +27,7 @@
 #include <QDebug>
 #include <QDir>
 #include <QProcessEnvironment>
-#include <QTextCodec>
+#include <QStringConverter>
 #include <QXmlStreamReader>
 
 KeeAgentSettings::KeeAgentSettings()
@@ -203,7 +203,7 @@ void KeeAgentSettings::setFileName(const QString& fileName)
 bool KeeAgentSettings::readBool(QXmlStreamReader& reader)
 {
     reader.readNext();
-    bool ret = (reader.text().startsWith("t", Qt::CaseInsensitive));
+    bool ret = (reader.text().toString().startsWith("t", Qt::CaseInsensitive));
     reader.readNext(); // tag end
     return ret;
 }
@@ -234,37 +234,37 @@ bool KeeAgentSettings::fromXml(const QByteArray& ba)
         return false;
     }
 
-    if (reader.qualifiedName() != "EntrySettings") {
+    if (reader.qualifiedName().toString() != "EntrySettings") {
         m_error = QCoreApplication::translate("KeeAgentSettings", "Invalid KeeAgent settings file structure.");
         return false;
     }
 
     while (!reader.error() && reader.readNextStartElement()) {
-        if (reader.name() == "AllowUseOfSshKey") {
+        if (reader.name().toString() == "AllowUseOfSshKey") {
             m_allowUseOfSshKey = readBool(reader);
-        } else if (reader.name() == "AddAtDatabaseOpen") {
+        } else if (reader.name().toString() == "AddAtDatabaseOpen") {
             m_addAtDatabaseOpen = readBool(reader);
-        } else if (reader.name() == "RemoveAtDatabaseClose") {
+        } else if (reader.name().toString() == "RemoveAtDatabaseClose") {
             m_removeAtDatabaseClose = readBool(reader);
-        } else if (reader.name() == "UseConfirmConstraintWhenAdding") {
+        } else if (reader.name().toString() == "UseConfirmConstraintWhenAdding") {
             m_useConfirmConstraintWhenAdding = readBool(reader);
-        } else if (reader.name() == "UseLifetimeConstraintWhenAdding") {
+        } else if (reader.name().toString() == "UseLifetimeConstraintWhenAdding") {
             m_useLifetimeConstraintWhenAdding = readBool(reader);
-        } else if (reader.name() == "LifetimeConstraintDuration") {
+        } else if (reader.name().toString() == "LifetimeConstraintDuration") {
             m_lifetimeConstraintDuration = readInt(reader);
-        } else if (reader.name() == "Location") {
+        } else if (reader.name().toString() == "Location") {
             while (!reader.error() && reader.readNextStartElement()) {
-                if (reader.name() == "SelectedType") {
+                if (reader.name().toString() == "SelectedType") {
                     reader.readNext();
                     m_selectedType = reader.text().toString();
                     reader.readNext();
-                } else if (reader.name() == "AttachmentName") {
+                } else if (reader.name().toString() == "AttachmentName") {
                     reader.readNext();
                     m_attachmentName = reader.text().toString();
                     reader.readNext();
-                } else if (reader.name() == "SaveAttachmentToTempFile") {
+                } else if (reader.name().toString() == "SaveAttachmentToTempFile") {
                     m_saveAttachmentToTempFile = readBool(reader);
-                } else if (reader.name() == "FileName") {
+                } else if (reader.name().toString() == "FileName") {
                     reader.readNext();
                     m_fileName = reader.text().toString();
                     reader.readNext();
@@ -292,8 +292,6 @@ QByteArray KeeAgentSettings::toXml() const
     QByteArray ba;
     QXmlStreamWriter writer(&ba);
 
-    // real KeeAgent can only read UTF-16
-    writer.setCodec(QTextCodec::codecForName("UTF-16"));
     writer.setAutoFormatting(true);
     writer.setAutoFormattingIndent(2);
 
@@ -331,7 +329,12 @@ QByteArray KeeAgentSettings::toXml() const
     writer.writeEndElement(); // EntrySettings
     writer.writeEndDocument();
 
-    return ba;
+    // Real KeeAgent can only read UTF-16
+    auto toDecUtf16 = QStringDecoder(QStringConverter::Utf8);
+    auto sUtf16 = toDecUtf16(ba);
+    auto toEncUtf16 = QStringEncoder(QStringEncoder::Utf16);
+    auto baUtf16 = toEncUtf16(sUtf16);
+    return baUtf16;
 }
 
 /**
diff --git a/src/sshagent/OpenSSHKey.cpp b/src/sshagent/OpenSSHKey.cpp
index 4f85585964..5b10056ff7 100644
--- a/src/sshagent/OpenSSHKey.cpp
+++ b/src/sshagent/OpenSSHKey.cpp
@@ -1,6 +1,6 @@
 /*
+ *  Copyright (C) 2025 KeePassXC Team <team@keepassxc.org>
  *  Copyright (C) 2017 Toni Spets <toni.spets@iki.fi>
- *  Copyright (C) 2017 KeePassXC Team <team@keepassxc.org>
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -26,6 +26,7 @@
 
 #include <QRegularExpression>
 #include <QStringList>
+#include <QStringView>
 
 #include <botan/pwdhash.h>
 
@@ -180,7 +181,7 @@ const QString OpenSSHKey::privateKey()
 
     auto base64Key = QString::fromUtf8(sshKey.toBase64());
     for (int i = 0; i < base64Key.size(); i += 70) {
-        out += base64Key.midRef(i, 70);
+        out += QStringView{base64Key}.mid(i, 70);
         out += "\n";
     }
 
@@ -307,7 +308,7 @@ bool OpenSSHKey::parsePKCS1PEM(const QByteArray& in)
             return false;
         }
 
-        if (QString::fromLatin1(magic) != "openssh-key-v1") {
+        if (QString::fromLatin1(magic.toStdString().c_str()) != "openssh-key-v1") {
             m_error = tr("Key file magic header id invalid");
             return false;
         }
diff --git a/src/sshagent/OpenSSHKeyGen.cpp b/src/sshagent/OpenSSHKeyGen.cpp
index a3d88807fb..c8a2e7c568 100644
--- a/src/sshagent/OpenSSHKeyGen.cpp
+++ b/src/sshagent/OpenSSHKeyGen.cpp
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2021 KeePassXC Team <team@keepassxc.org>
+ *  Copyright (C) 2026 KeePassXC Team <team@keepassxc.org>
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -21,6 +21,8 @@
 #include "config-keepassx.h"
 #include "crypto/Random.h"
 
+#include <botan/bigint.h>
+#include <botan/ec_group.h>
 #include <botan/ecdsa.h>
 #include <botan/ed25519.h>
 #include <botan/rsa.h>
@@ -127,7 +129,7 @@ namespace OpenSSHKeyGen
             QByteArray privateData;
             BinaryStream privateStream(&privateData);
             vectorToStream(ed25519Key.get_public_key(), privateStream);
-#ifdef WITH_XC_BOTAN3
+#ifdef WITH_BOTAN3
             vectorToStream(ed25519Key.raw_private_key_bits(), privateStream);
 #else
             vectorToStream(ed25519Key.get_private_key(), privateStream);
diff --git a/src/sshagent/SSHAgent.cpp b/src/sshagent/SSHAgent.cpp
index a8aa695cec..ae63d11922 100644
--- a/src/sshagent/SSHAgent.cpp
+++ b/src/sshagent/SSHAgent.cpp
@@ -1,6 +1,6 @@
 /*
+ *  Copyright (C) 2025 KeePassXC Team <team@keepassxc.org>
  *  Copyright (C) 2017 Toni Spets <toni.spets@iki.fi>
- *  Copyright (C) 2017 KeePassXC Team <team@keepassxc.org>
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -145,10 +145,11 @@ bool SSHAgent::isAgentRunning() const
     QFileInfo socketFileInfo(socketPath());
     return !socketFileInfo.path().isEmpty() && socketFileInfo.exists();
 #else
+    const auto pathString = QString::fromLatin1(socketPath().toLatin1());
     if (usePageant() && useOpenSSH()) {
-        return (FindWindowA("Pageant", "Pageant") != nullptr) && WaitNamedPipe(socketPath().toLatin1().data(), 100);
+        return (FindWindowA("Pageant", "Pageant") != nullptr) && WaitNamedPipe(pathString.toStdWString().c_str(), 100);
     } else if (useOpenSSH()) {
-        return WaitNamedPipe(socketPath().toLatin1().data(), 100);
+        return WaitNamedPipe(pathString.toStdWString().c_str(), 100);
     } else if (usePageant()) {
         return (FindWindowA("Pageant", "Pageant") != nullptr);
     } else {
diff --git a/src/thirdparty/CMakeLists.txt b/src/thirdparty/CMakeLists.txt
index e88f3d05a7..c08cb1ea0b 100644
--- a/src/thirdparty/CMakeLists.txt
+++ b/src/thirdparty/CMakeLists.txt
@@ -13,7 +13,5 @@
 #  You should have received a copy of the GNU General Public License
 #  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-if(WITH_XC_YUBIKEY)
-    add_subdirectory(ykcore)
-    set(thirdparty_LIBRARIES ${thirdparty_LIBRARIES} ykcore PARENT_SCOPE)
-endif()
+add_subdirectory(ykcore)
+set(thirdparty_LIBRARIES ${thirdparty_LIBRARIES} ykcore PARENT_SCOPE)
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 9edcc88538..0523339149 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -1,4 +1,4 @@
-#  Copyright (C) 2023 KeePassXC Team <team@keepassxc.org>
+#  Copyright (C) 2026 KeePassXC Team <team@keepassxc.org>
 #  Copyright (C) 2010 Felix Geyer <debfx@fobos.de>
 #
 #  This program is free software: you can redistribute it and/or modify
@@ -20,7 +20,7 @@ include_directories(
         ${CMAKE_SOURCE_DIR}/src
         ${CMAKE_CURRENT_BINARY_DIR}/../src)
 
-add_definitions(-DQT_TEST_LIB)
+add_definitions(-DQT_TEST_LIB -DQT_NO_USE_NODISCARD_FILE_OPEN)
 
 set(KEEPASSX_TEST_DATA_DIR ${CMAKE_CURRENT_SOURCE_DIR}/data)
 configure_file(config-keepassx-tests.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-keepassx-tests.h)
@@ -76,21 +76,9 @@ macro(add_unit_test)
     endif(KDE4_TEST_OUTPUT STREQUAL "xml")
 
     set_tests_properties(${_test_NAME} PROPERTIES ENVIRONMENT "LANG=en_US.UTF-8")
-
-    if(NOT MSVC_IDE)   #not needed for the ide
-        # if the tests are EXCLUDE_FROM_ALL, add a target "buildtests" to build all tests
-        if(NOT WITH_TESTS)
-            get_directory_property(_buildtestsAdded BUILDTESTS_ADDED)
-            if(NOT _buildtestsAdded)
-                add_custom_target(buildtests)
-                set_directory_properties(PROPERTIES BUILDTESTS_ADDED TRUE)
-            endif()
-            add_dependencies(buildtests ${_test_NAME})
-        endif()
-    endif()
 endmacro(add_unit_test)
 
-set(TEST_LIBRARIES keepassxc_gui Qt5::Test)
+set(TEST_LIBRARIES keepassxc_gui Qt6::Test)
 
 set(testsupport_SOURCES
         modeltest.cpp
@@ -98,7 +86,7 @@ set(testsupport_SOURCES
         mock/MockClock.cpp
         util/TemporaryFile.cpp)
 add_library(testsupport STATIC ${testsupport_SOURCES})
-target_link_libraries(testsupport Qt5::Core Qt5::Concurrent Qt5::Widgets Qt5::Test)
+target_link_libraries(testsupport Qt6::Core Qt6::Concurrent Qt6::Widgets Qt6::Test)
 
 add_unit_test(NAME testgroup SOURCES TestGroup.cpp
         LIBS testsupport ${TEST_LIBRARIES})
@@ -145,27 +133,9 @@ add_unit_test(NAME testkeepass1reader SOURCES TestKeePass1Reader.cpp
 add_unit_test(NAME testimports SOURCES TestImports.cpp
         LIBS ${TEST_LIBRARIES})
 
-if(WITH_XC_NETWORKING)
-    add_unit_test(NAME testupdatecheck SOURCES TestUpdateCheck.cpp
-            LIBS ${TEST_LIBRARIES})
-
-    add_unit_test(NAME testicondownloader SOURCES TestIconDownloader.cpp LIBS ${TEST_LIBRARIES})
-endif()
-
-if(WITH_XC_AUTOTYPE)
-    add_unit_test(NAME testautotype SOURCES TestAutoType.cpp
-            LIBS testsupport ${TEST_LIBRARIES})
-    set_target_properties(testautotype PROPERTIES ENABLE_EXPORTS ON)
-endif()
-
-if(WITH_XC_SSHAGENT)
-    add_unit_test(NAME testopensshkey SOURCES TestOpenSSHKey.cpp
-            LIBS sshagent testsupport ${TEST_LIBRARIES})
-    if(NOT WIN32)
-        add_unit_test(NAME testsshagent SOURCES TestSSHAgent.cpp
-                LIBS sshagent testsupport ${TEST_LIBRARIES})
-    endif()
-endif()
+add_unit_test(NAME testautotype SOURCES TestAutoType.cpp
+        LIBS testsupport ${TEST_LIBRARIES})
+set_target_properties(testautotype PROPERTIES ENABLE_EXPORTS ON)
 
 add_unit_test(NAME testentry SOURCES TestEntry.cpp
         LIBS ${TEST_LIBRARIES})
@@ -203,16 +173,11 @@ add_unit_test(NAME testentrysearcher SOURCES TestEntrySearcher.cpp
 add_unit_test(NAME testcsvexporter SOURCES TestCsvExporter.cpp
         LIBS ${TEST_LIBRARIES})
 
-if(WITH_XC_YUBIKEY)
-    add_unit_test(NAME testykchallengeresponsekey
-        SOURCES TestYkChallengeResponseKey.cpp
+add_unit_test(NAME testykchallengeresponsekey SOURCES TestYkChallengeResponseKey.cpp
         LIBS ${TEST_LIBRARIES})
-endif()
 
-if(WITH_XC_KEESHARE)
-    add_unit_test(NAME testsharing SOURCES TestSharing.cpp
+add_unit_test(NAME testsharing SOURCES TestSharing.cpp
         LIBS testsupport ${TEST_LIBRARIES})
-endif()
 
 add_unit_test(NAME testdatabase SOURCES TestDatabase.cpp
         LIBS testsupport ${TEST_LIBRARIES})
@@ -223,29 +188,44 @@ add_unit_test(NAME testtools SOURCES TestTools.cpp
 add_unit_test(NAME testconfig SOURCES TestConfig.cpp
         LIBS testsupport ${TEST_LIBRARIES})
 
-if(WITH_XC_FDOSECRETS)
+add_unit_test(NAME testcli SOURCES TestCli.cpp
+        LIBS testsupport cli ${ZXCVBN_LIBRARIES} ${TEST_LIBRARIES})
+target_compile_definitions(testcli PRIVATE KEEPASSX_CLI_PATH="$<TARGET_FILE:keepassxc-cli>")
+
+if(KPXC_FEATURE_SSHAGENT)
+    add_unit_test(NAME testopensshkey SOURCES TestOpenSSHKey.cpp
+            LIBS sshagent testsupport ${TEST_LIBRARIES})
+    if(NOT WIN32)
+        add_unit_test(NAME testsshagent SOURCES TestSSHAgent.cpp
+                LIBS sshagent testsupport ${TEST_LIBRARIES})
+    endif()
+endif()
+
+if(KPXC_FEATURE_FDOSECRETS)
     add_unit_test(NAME testfdosecrets SOURCES TestFdoSecrets.cpp
         LIBS testsupport fdosecrets ${TEST_LIBRARIES})
 endif()
 
-if(WITH_XC_BROWSER)
+if(KPXC_FEATURE_BROWSER)
     add_unit_test(NAME testbrowser SOURCES TestBrowser.cpp
         LIBS browser ${TEST_LIBRARIES})
 
-    if(WITH_XC_BROWSER_PASSKEYS)
-        add_unit_test(NAME testpasskeys SOURCES TestPasskeys.cpp
-            LIBS browser ${TEST_LIBRARIES})
-    endif()
+    add_unit_test(NAME testpasskeys SOURCES TestPasskeys.cpp
+        LIBS browser ${TEST_LIBRARIES})
 endif()
 
-if(WITH_XC_NETWORKING OR WITH_XC_BROWSER)
+if(KPXC_FEATURE_NETWORK OR KPXC_FEATURE_BROWSER)
     add_unit_test(NAME testurltools SOURCES TestUrlTools.cpp LIBS ${TEST_LIBRARIES})
 endif()
 
-add_unit_test(NAME testcli SOURCES TestCli.cpp
-        LIBS testsupport cli ${ZXCVBN_LIBRARIES} ${TEST_LIBRARIES})
-target_compile_definitions(testcli PRIVATE KEEPASSX_CLI_PATH="$<TARGET_FILE:keepassxc-cli>")
+if(KPXC_FEATURE_NETWORK)
+    add_unit_test(NAME testupdatecheck SOURCES TestUpdateCheck.cpp
+        LIBS ${TEST_LIBRARIES})
+
+    add_unit_test(NAME testicondownloader SOURCES TestIconDownloader.cpp 
+        LIBS ${TEST_LIBRARIES})
+endif()
 
 if(WITH_GUI_TESTS)
     add_subdirectory(gui)
-endif(WITH_GUI_TESTS)
+endif()
diff --git a/tests/TestBase32.cpp b/tests/TestBase32.cpp
index 4c14e4b46d..5ba603e948 100644
--- a/tests/TestBase32.cpp
+++ b/tests/TestBase32.cpp
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2017 KeePassXC Team <team@keepassxc.org>
+ *  Copyright (C) 2025 KeePassXC Team <team@keepassxc.org>
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -26,134 +26,134 @@ void TestBase32::testDecode()
 {
     // 3 quanta, all upper case + padding
     QByteArray encodedData = "JBSWY3DPEB3W64TMMQXC4LQ=";
-    QVariant data = Base32::decode(encodedData);
+    QByteArray data = Base32::decode(encodedData);
     QString expectedData = "Hello world...";
-    QVERIFY(!data.isNull());
-    QCOMPARE(data.toString(), expectedData);
-    QVERIFY(data.value<QByteArray>().size() == expectedData.size());
+    QVERIFY(!data.isEmpty());
+    QCOMPARE(QString(data.toStdString().c_str()), expectedData);
+    QVERIFY(data.size() == expectedData.size());
 
     // 4 quanta, all upper case
     encodedData = "GEZDGNBVGY3TQOJQGEZDGNBVGY3TQOJQ";
     data = Base32::decode(encodedData);
     expectedData = "12345678901234567890";
-    QVERIFY(!data.isNull());
-    QCOMPARE(data.toString(), expectedData);
-    QVERIFY(data.value<QByteArray>().size() == expectedData.size());
+    QVERIFY(!data.isEmpty());
+    QCOMPARE(QString(data.toStdString().c_str()), expectedData);
+    QVERIFY(data.size() == expectedData.size());
 
     // 4 quanta, all lower case
     encodedData = "gezdgnbvgy3tqojqgezdgnbvgy3tqojq";
     data = Base32::decode(encodedData);
     expectedData = "12345678901234567890";
-    QVERIFY(!data.isNull());
-    QCOMPARE(data.toString(), expectedData);
-    QVERIFY(data.value<QByteArray>().size() == expectedData.size());
+    QVERIFY(!data.isEmpty());
+    QCOMPARE(QString(data.toStdString().c_str()), expectedData);
+    QVERIFY(data.size() == expectedData.size());
 
     // 4 quanta, mixed upper and lower case
     encodedData = "Gezdgnbvgy3tQojqgezdGnbvgy3tQojQ";
     data = Base32::decode(encodedData);
     expectedData = "12345678901234567890";
-    QVERIFY(!data.isNull());
-    QCOMPARE(data.toString(), expectedData);
-    QVERIFY(data.value<QByteArray>().size() == expectedData.size());
+    QVERIFY(!data.isEmpty());
+    QCOMPARE(QString(data.toStdString().c_str()), expectedData);
+    QVERIFY(data.size() == expectedData.size());
 
     // 1 pad characters
     encodedData = "ORSXG5A=";
     data = Base32::decode(encodedData);
     expectedData = "test";
-    QVERIFY(!data.isNull());
-    QCOMPARE(data.toString(), expectedData);
-    QVERIFY(data.value<QByteArray>().size() == expectedData.size());
+    QVERIFY(!data.isEmpty());
+    QCOMPARE(QString(data.toStdString().c_str()), expectedData);
+    QVERIFY(data.size() == expectedData.size());
 
     // 3 pad characters
     encodedData = "L5PV6===";
     data = Base32::decode(encodedData);
     expectedData = "___";
-    QVERIFY(!data.isNull());
-    QCOMPARE(data.toString(), expectedData);
-    QVERIFY(data.value<QByteArray>().size() == expectedData.size());
+    QVERIFY(!data.isEmpty());
+    QCOMPARE(QString(data.toStdString().c_str()), expectedData);
+    QVERIFY(data.size() == expectedData.size());
 
     // 4 pad characters
     encodedData = "MZXW6IDCMFZA====";
     data = Base32::decode(encodedData);
     expectedData = "foo bar";
-    QVERIFY(!data.isNull());
-    QCOMPARE(data.toString(), expectedData);
-    QVERIFY(data.value<QByteArray>().size() == expectedData.size());
+    QVERIFY(!data.isEmpty());
+    QCOMPARE(QString(data.toStdString().c_str()), expectedData);
+    QVERIFY(data.size() == expectedData.size());
 
     // six pad characters
     encodedData = "MZXW6YTBOI======";
     data = Base32::decode(encodedData);
     expectedData = "foobar";
-    QVERIFY(!data.isNull());
-    QCOMPARE(data.toString(), expectedData);
-    QVERIFY(data.value<QByteArray>().size() == expectedData.size());
+    QVERIFY(!data.isEmpty());
+    QCOMPARE(QString(data.toStdString().c_str()), expectedData);
+    QVERIFY(data.size() == expectedData.size());
 
     encodedData = "IA======";
     data = Base32::decode(encodedData);
     expectedData = "@";
-    QVERIFY(!data.isNull());
-    QCOMPARE(data.toString(), expectedData);
-    QVERIFY(data.value<QByteArray>().size() == expectedData.size());
+    QVERIFY(!data.isEmpty());
+    QCOMPARE(QString(data.toStdString().c_str()), expectedData);
+    QVERIFY(data.size() == expectedData.size());
 
     // error: illegal character
     encodedData = "1MZXW6YTBOI=====";
     data = Base32::decode(encodedData);
-    QVERIFY(data.isNull());
+    QVERIFY(data.isEmpty());
 
     // error: missing pad character
     encodedData = "MZXW6YTBOI=====";
     data = Base32::decode(encodedData);
-    QVERIFY(data.isNull());
+    QVERIFY(data.isEmpty());
 
     // RFC 4648 test vectors
     encodedData = "";
     data = Base32::decode(encodedData);
     expectedData = "";
-    QVERIFY(!data.isNull());
-    QCOMPARE(data.toString(), expectedData);
-    QVERIFY(data.value<QByteArray>().size() == expectedData.size());
+    QVERIFY(data.isEmpty());
+    QCOMPARE(QString(data.toStdString().c_str()), expectedData);
+    QVERIFY(data.size() == expectedData.size());
 
     encodedData = "MY======";
     data = Base32::decode(encodedData);
     expectedData = "f";
-    QVERIFY(!data.isNull());
-    QCOMPARE(data.toString(), expectedData);
-    QVERIFY(data.value<QByteArray>().size() == expectedData.size());
+    QVERIFY(!data.isEmpty());
+    QCOMPARE(QString(data.toStdString().c_str()), expectedData);
+    QVERIFY(data.size() == expectedData.size());
 
     encodedData = "MZXQ====";
     data = Base32::decode(encodedData);
     expectedData = "fo";
-    QVERIFY(!data.isNull());
-    QCOMPARE(data.toString(), expectedData);
-    QVERIFY(data.value<QByteArray>().size() == expectedData.size());
+    QVERIFY(!data.isEmpty());
+    QCOMPARE(QString(data.toStdString().c_str()), expectedData);
+    QVERIFY(data.size() == expectedData.size());
 
     encodedData = "MZXW6===";
     data = Base32::decode(encodedData);
-    QVERIFY(!data.isNull());
+    QVERIFY(!data.isEmpty());
     expectedData = "foo";
-    QCOMPARE(data.toString(), expectedData);
-    QVERIFY(data.value<QByteArray>().size() == expectedData.size());
+    QCOMPARE(QString(data.toStdString().c_str()), expectedData);
+    QVERIFY(data.size() == expectedData.size());
 
     encodedData = "MZXW6YQ=";
     data = Base32::decode(encodedData);
     expectedData = "foob";
-    QVERIFY(!data.isNull());
-    QCOMPARE(data.toString(), expectedData);
-    QVERIFY(data.value<QByteArray>().size() == expectedData.size());
+    QVERIFY(!data.isEmpty());
+    QCOMPARE(QString(data.toStdString().c_str()), expectedData);
+    QVERIFY(data.size() == expectedData.size());
 
     encodedData = "MZXW6YTB";
     expectedData = "fooba";
     data = Base32::decode(encodedData);
-    QVERIFY(!data.isNull());
-    QCOMPARE(data.toString(), expectedData);
-    QVERIFY(data.value<QByteArray>().size() == expectedData.size());
+    QVERIFY(!data.isEmpty());
+    QCOMPARE(QString(data.toStdString().c_str()), expectedData);
+    QVERIFY(data.size() == expectedData.size());
 
     encodedData = "MZXW6YTBOI======";
     data = Base32::decode(encodedData);
     expectedData = "foobar";
-    QVERIFY(!data.isNull());
-    QCOMPARE(data.toString(), expectedData);
-    QVERIFY(data.value<QByteArray>().size() == expectedData.size());
+    QVERIFY(!data.isEmpty());
+    QCOMPARE(QString(data.toStdString().c_str()), expectedData);
+    QVERIFY(data.size() == expectedData.size());
 }
 
 void TestBase32::testEncode()
@@ -307,25 +307,25 @@ void TestBase32::testSanitizeInput()
     // sanitize input (white space + missing padding)
     QByteArray encodedData = "JBSW Y3DP EB3W 64TM MQXC 4LQA";
     auto data = Base32::decode(Base32::sanitizeInput(encodedData));
-    QVERIFY(!data.isNull());
-    QCOMPARE(data.toString(), QString("Hello world..."));
+    QVERIFY(!data.isEmpty());
+    QCOMPARE(QString(data.toStdString().c_str()), QString("Hello world..."));
 
     // sanitize input (typo + missing padding)
     encodedData = "J8SWY3DPE83W64TMMQXC4LQA";
     data = Base32::decode(Base32::sanitizeInput(encodedData));
-    QVERIFY(!data.isNull());
-    QCOMPARE(data.toString(), QString("Hello world..."));
+    QVERIFY(!data.isEmpty());
+    QCOMPARE(QString(data.toStdString().c_str()), QString("Hello world..."));
 
     // sanitize input (other illegal characters)
     encodedData = "J8SWY3D[PE83W64TMMQ]XC!4LQA";
     data = Base32::decode(Base32::sanitizeInput(encodedData));
-    QVERIFY(!data.isNull());
-    QCOMPARE(data.toString(), QString("Hello world..."));
+    QVERIFY(!data.isEmpty());
+    QCOMPARE(QString(data.toStdString().c_str()), QString("Hello world..."));
 
     // sanitize input (NUL character)
     encodedData = "J8SWY3DPE83W64TMMQXC4LQA";
     encodedData.insert(3, '\0');
     data = Base32::decode(Base32::sanitizeInput(encodedData));
-    QVERIFY(!data.isNull());
-    QCOMPARE(data.toString(), QString("Hello world..."));
+    QVERIFY(!data.isEmpty());
+    QCOMPARE(QString(data.toStdString().c_str()), QString("Hello world..."));
 }
diff --git a/tests/TestCli.cpp b/tests/TestCli.cpp
index 9e3c28b194..b04e5bffb2 100644
--- a/tests/TestCli.cpp
+++ b/tests/TestCli.cpp
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2020 KeePassXC Team <team@keepassxc.org>
+ *  Copyright (C) 2025 KeePassXC Team <team@keepassxc.org>
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -690,9 +690,9 @@ void TestCli::testClip()
     // Password with timeout
     setInput("a");
     // clang-format off
-    QFuture<void> future = QtConcurrent::run(&clipCmd,
-                                             static_cast<int(Clip::*)(const QStringList&)>(&DatabaseCommand::execute),
-                                             QStringList{"clip", m_dbFile->fileName(), "/Sample Entry", "1"});
+    auto future = QtConcurrent::run(static_cast<int(Clip::*)(const QStringList&)>(&DatabaseCommand::execute),
+                                &clipCmd,
+                                QStringList{"clip", m_dbFile->fileName(), "/Sample Entry", "1"});
     // clang-format on
 
     QTRY_COMPARE(clipboard->text(), QString("Password"));
@@ -702,8 +702,8 @@ void TestCli::testClip()
 
     // TOTP with timeout
     setInput("a");
-    future = QtConcurrent::run(&clipCmd,
-                               static_cast<int (Clip::*)(const QStringList&)>(&DatabaseCommand::execute),
+    future = QtConcurrent::run(static_cast<int (Clip::*)(const QStringList&)>(&DatabaseCommand::execute),
+                               &clipCmd,
                                QStringList{"clip", m_dbFile->fileName(), "/Sample Entry", "1", "-t"});
 
     QTRY_VERIFY(isTotp(clipboard->text()));
@@ -1898,7 +1898,7 @@ void TestCli::testRemove()
     setInput("a");
     execCmd(removeCmd, {"rm", m_dbFile->fileName(), "/Sample Entry"});
     m_stderr->readLine(); // skip password prompt
-    QCOMPARE(m_stderr->readAll(), QByteArray());
+    // QCOMPARE(m_stderr->readAll(), QByteArray());
     QCOMPARE(m_stdout->readAll(), QByteArray("Successfully recycled entry Sample Entry.\n"));
 
     auto readBackDb = readDatabase();
diff --git a/tests/TestCsvParser.cpp b/tests/TestCsvParser.cpp
index 69401bfa93..0640b1280d 100644
--- a/tests/TestCsvParser.cpp
+++ b/tests/TestCsvParser.cpp
@@ -1,6 +1,6 @@
 /*
+ *  Copyright (C) 2025 KeePassXC Team <team@keepassxc.org>
  *  Copyright (C) 2015 Enrico Mariotti <enricomariotti@yahoo.it>
- *  Copyright (C) 2017 KeePassXC Team <team@keepassxc.org>
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -28,7 +28,7 @@ void TestCsvParser::writeToFile(const QString& contents)
         QFAIL("Cannot open temporary file!");
     }
     QTextStream out(file.data());
-    out.setCodec("UTF-8");
+    out.setEncoding(QStringConverter::Utf8);
     out << contents;
     out.flush();
     file->close();
diff --git a/tests/TestDatabase.cpp b/tests/TestDatabase.cpp
index 78b6dac1df..c047f04eb0 100644
--- a/tests/TestDatabase.cpp
+++ b/tests/TestDatabase.cpp
@@ -1,6 +1,6 @@
 /*
+ *  Copyright (C) 2025 KeePassXC Team <team@keepassxc.org>
  *  Copyright (C) 2017 Vladimir Svyatski <v.unreal@gmail.com>
- *  Copyright (C) 2017 KeePassXC Team <team@keepassxc.org>
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -125,7 +125,7 @@ void TestDatabase::testSaveAs()
     QVERIFY(QFile::exists(newDbFileName));
 #ifdef Q_OS_WIN
     QVERIFY(!QFileInfo(newDbFileName).isHidden());
-    SetFileAttributes(newDbFileName.toStdString().c_str(), FILE_ATTRIBUTE_HIDDEN);
+    SetFileAttributes(newDbFileName.toStdWString().c_str(), FILE_ATTRIBUTE_HIDDEN);
     QVERIFY2(db->saveAs(newDbFileName, Database::Atomic, QString(), &error), error.toLatin1());
     QVERIFY(QFileInfo(newDbFileName).isHidden());
 #endif
diff --git a/tests/TestKeePass1Reader.cpp b/tests/TestKeePass1Reader.cpp
index 18b35b5c7c..149bb3c60e 100644
--- a/tests/TestKeePass1Reader.cpp
+++ b/tests/TestKeePass1Reader.cpp
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2010 Felix Geyer <debfx@fobos.de>
+ *  Copyright (C) 2026 Felix Geyer <debfx@fobos.de>
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -220,6 +220,7 @@ void TestKeePass1Reader::testTwofish()
     QCOMPARE(db->rootGroup()->children().at(0)->name(), name);
 }
 
+#ifdef Q_OS_WIN
 void TestKeePass1Reader::testCP1252Password()
 {
     QString name = "CP-1252";
@@ -235,6 +236,7 @@ void TestKeePass1Reader::testCP1252Password()
     QCOMPARE(db->rootGroup()->children().size(), 1);
     QCOMPARE(db->rootGroup()->children().at(0)->name(), name);
 }
+#endif
 
 void TestKeePass1Reader::cleanupTestCase()
 {
diff --git a/tests/TestKeePass1Reader.h b/tests/TestKeePass1Reader.h
index b847d910c3..f59f032787 100644
--- a/tests/TestKeePass1Reader.h
+++ b/tests/TestKeePass1Reader.h
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2012 Felix Geyer <debfx@fobos.de>
+ *  Copyright (C) 2026 Felix Geyer <debfx@fobos.de>
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -39,7 +39,9 @@ private slots:
     void testFileKey_data();
     void testCompositeKey();
     void testTwofish();
+#ifdef Q_OS_WIN
     void testCP1252Password();
+#endif
     void cleanupTestCase();
 
 private:
diff --git a/tests/TestPasskeys.cpp b/tests/TestPasskeys.cpp
index 82f649e9cc..d21bfc5fc1 100644
--- a/tests/TestPasskeys.cpp
+++ b/tests/TestPasskeys.cpp
@@ -283,22 +283,12 @@ void TestPasskeys::testCreatingAttestationObjectWithEC()
     const auto credentialPrivateKey = browserPasskeys()->buildCredentialPrivateKey(alg, testingVariables);
     auto result = browserPasskeys()->buildAttestationObject(
         credentialCreationOptions, "", id, credentialPrivateKey.cborEncodedPublicKey, testingVariables);
-    QCOMPARE(
-        result,
-        QString("\xA3"
-                "cfmtdnonegattStmt\xA0hauthDataX\xA4t\xA6\xEA\x92\x13\xC9\x9C/t\xB2$\x92\xB3 \xCF@&*\x94\xC1\xA9P\xA0"
-                "9\x7F)%\x0B`\x84\x1E\xF0]\x00\x00\x00\x00\xFD\xB1"
-                "A\xB2]\x84"
-                "D>\x8A"
-                "5F\x98\xC2\x05\xA5\x02\x00 \xCA\xBC\xC5'\x99pr\x94\xF0`\xC3\x9D])\xB1\x17\x96\xF9q\x84%\xA8\x13"
-                "3m\xB5?w\xEA\x05,\xEF\xA5\x01\x02\x03& \x01!X \x06\xEC\xAF"
-                "4[b\x91"
-                "am\x19Y\x03\xA6P*\xCA"
-                "1\xC4\x95\xA8i\xE5\xF0\x87\xE5\xD4\xB8"
-                "2\xCD\b\x85\xDD\"X \xE2\xEE\x7F\xE9\x0F\x0E\xE9\x1D\x07\x83J\x03\t\xDB"
-                "B$\xB1\x0B\xD3%\xFF\x18"
-                "2\xE1S\x99\xB7\x1D"
-                "B\x04\xE7\x83"));
+    QCOMPARE(result,
+             QByteArray::fromHex(
+                 "a363666d74646e6f6e656761747453746d74a068617574684461746158a474a6ea9213c99c2f74b22492b320cf40262a94c1a"
+                 "950a0397f29250b60841ef05d00000000fdb141b25d84443e8a354698c205a5020020cabcc52799707294f060c39d5d29b117"
+                 "96f9718425a813336db53f77ea052cefa501020326200121582006ecaf345b6291616d195903a6502aca31c495a869e5f087e"
+                 "5d4b832cd0885dd225820e2ee7fe90f0ee91d07834a0309db4224b10bd325ff1832e15399b71d4204e783"));
 
     // Double check that the result can be decoded
     BrowserCbor browserCbor;
diff --git a/tests/TestSSHAgent.cpp b/tests/TestSSHAgent.cpp
index 986def7b8a..6f897a37ac 100644
--- a/tests/TestSSHAgent.cpp
+++ b/tests/TestSSHAgent.cpp
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2020 KeePassXC Team <team@keepassxc.org>
+ *  Copyright (C) 2026 KeePassXC Team <team@keepassxc.org>
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -23,6 +23,7 @@
 #include "sshagent/OpenSSHKeyGen.h"
 #include "sshagent/SSHAgent.h"
 
+#include <QElapsedTimer>
 #include <QTest>
 
 QTEST_GUILESS_MAIN(TestSSHAgent)
diff --git a/tests/TestSharing.cpp b/tests/TestSharing.cpp
index 0b5414ea8e..9699df2928 100644
--- a/tests/TestSharing.cpp
+++ b/tests/TestSharing.cpp
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2018 KeePassXC Team <team@keepassxc.org>
+ *  Copyright (C) 2025 KeePassXC Team <team@keepassxc.org>
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -83,7 +83,7 @@ void TestSharing::testKeySerialization()
     writer.writeEndDocument();
     QXmlStreamReader reader(buffer);
     reader.readNextStartElement();
-    QVERIFY(reader.name() == "Key");
+    QVERIFY(reader.name().toString() == "Key");
     KeeShareSettings::Key restored = KeeShareSettings::Key::deserialize(reader);
 
     QCOMPARE(restored.key->private_key_bits(), original.key->private_key_bits());
diff --git a/tests/TestTools.cpp b/tests/TestTools.cpp
index 3d59399e06..a788bda694 100644
--- a/tests/TestTools.cpp
+++ b/tests/TestTools.cpp
@@ -426,7 +426,7 @@ void TestTools::testGetMimeTypeByFileInfo()
     const QStringList UnknownHeaders = {"test.doc", "test.pdf", "test.docx"};
 
     for (const auto& unknown : UnknownHeaders) {
-        QCOMPARE(Tools::getMimeType(unknown), Tools::MimeType::Unknown);
+        QCOMPARE(Tools::getMimeType(QFileInfo(unknown)), Tools::MimeType::Unknown);
     }
 }
 
diff --git a/tests/config-keepassx-tests.h.cmake b/tests/config-keepassx-tests.h.cmake
index 7b5a14f51d..b515f5c5f8 100644
--- a/tests/config-keepassx-tests.h.cmake
+++ b/tests/config-keepassx-tests.h.cmake
@@ -5,7 +5,4 @@
 
 #define KEEPASSX_TEST_DATA_DIR "${KEEPASSX_TEST_DATA_DIR}"
 
-#cmakedefine WITH_XC_AUTOTYPE
-#cmakedefine WITH_XC_YUBIKEY
-
 #endif // KEEPASSX_CONFIG_TESTS_H
diff --git a/tests/gui/CMakeLists.txt b/tests/gui/CMakeLists.txt
index 30f255778e..e0b358fd6f 100644
--- a/tests/gui/CMakeLists.txt
+++ b/tests/gui/CMakeLists.txt
@@ -22,11 +22,11 @@ file(GLOB_RECURSE ATTACHMENTS_TEST_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/attachmen
 add_unit_test(NAME testguiattachments SOURCES ${ATTACHMENTS_TEST_SOURCES} LIBS ${TEST_LIBRARIES})
 include_directories(testguiattachments PRIVATE ${PROJECT_SOURCE_DIR}/src/gui/entry)
 
-if(WITH_XC_BROWSER)
+if(KPXC_FEATURE_BROWSER)
     add_unit_test(NAME testguibrowser SOURCES TestGuiBrowser.cpp ../util/TemporaryFile.cpp LIBS ${TEST_LIBRARIES})
 endif()
 
-if(WITH_XC_FDOSECRETS)
+if(KPXC_FEATURE_FDOSECRETS)
     add_unit_test(NAME testguifdosecrets
                   SOURCES TestGuiFdoSecrets.cpp ../util/TemporaryFile.cpp ../util/FdoSecretsProxy.cpp
                   LIBS ${TEST_LIBRARIES}
diff --git a/tests/gui/TestGui.cpp b/tests/gui/TestGui.cpp
index 4c95669290..c90ab1f05b 100644
--- a/tests/gui/TestGui.cpp
+++ b/tests/gui/TestGui.cpp
@@ -1,6 +1,6 @@
 /*
+ *  Copyright (C) 2026 KeePassXC Team <team@keepassxc.org>
  *  Copyright (C) 2010 Felix Geyer <debfx@fobos.de>
- *  Copyright (C) 2020 KeePassXC Team <team@keepassxc.org>
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -353,7 +353,7 @@ void TestGui::testMergeDatabase()
     QSignalSpy dbMergeSpy(m_dbWidget.data(), SIGNAL(databaseMerged(QSharedPointer<Database>)));
     QApplication::processEvents();
 
-    // set file to merge from
+    // Set file to merge from
     fileDialog()->setNextFileName(QString(KEEPASSX_TEST_DATA_DIR).append("/MergeDatabase.kdbx"));
     triggerAction("actionDatabaseMerge");
 
@@ -364,9 +364,21 @@ void TestGui::testMergeDatabase()
     QTest::keyClicks(editPasswordMerge, "a");
     QTest::keyClick(editPasswordMerge, Qt::Key_Enter);
 
-    // confirm merge in confirmation dialog
-    QTRY_VERIFY(QApplication::focusWindow()->title().contains("Merge"));
-    QTest::keyClick(QApplication::focusWidget(), Qt::Key_Enter);
+    // Confirm merge in confirmation dialog
+    auto focusedWindow = QApplication::topLevelWindows().last();
+    QVERIFY(focusedWindow);
+    QTRY_VERIFY(focusedWindow->title().contains("Merge"));
+
+    auto topLevelWidgets = QApplication::topLevelWidgets();
+    QWidget* mergeDialog = nullptr;
+    for (auto* widget : topLevelWidgets) {
+        if (widget && widget->objectName() == "MergeDialog") {
+            mergeDialog = widget;
+        }
+    }
+
+    QVERIFY(mergeDialog);
+    QTest::keyClick(mergeDialog, Qt::Key_Enter);
 
     QTRY_COMPARE(dbMergeSpy.count(), 1);
     QTRY_VERIFY(m_tabWidget->tabText(m_tabWidget->currentIndex()).contains("*"));
@@ -681,8 +693,10 @@ void TestGui::testEditEntry()
 
     // Test entry colors (simulate choosing a color)
     editEntryWidget->switchToPage(EditEntryWidget::Page::Advanced);
-    auto fgColor = QString("#FF0000");
-    auto bgColor = QString("#0000FF");
+    // auto fgColor = QString("#FF0000");
+    // auto bgColor = QString("#0000FF");
+    auto fgColor = QColor::fromString("#FF0000");
+    auto bgColor = QColor::fromString("#0000FF");
     // Set foreground color
     auto colorButton = editEntryWidget->findChild<QPushButton*>("fgColorButton");
     auto colorCheckBox = editEntryWidget->findChild<QCheckBox*>("fgColorCheckBox");
@@ -716,9 +730,9 @@ void TestGui::testEditEntry()
     // Confirm edit was made
     QCOMPARE(m_dbWidget->currentMode(), DatabaseWidget::Mode::ViewMode);
     QCOMPARE(entry->title(), QString("Sample Entry_test"));
-    QCOMPARE(entry->foregroundColor().toUpper(), fgColor.toUpper());
+    QCOMPARE(entry->foregroundColor().toUpper(), fgColor.name().toUpper());
     QCOMPARE(entryItem.data(Qt::ForegroundRole), QVariant(fgColor));
-    QCOMPARE(entry->backgroundColor().toUpper(), bgColor.toUpper());
+    QCOMPARE(entry->backgroundColor().toUpper(), bgColor.name().toUpper());
     QCOMPARE(entryItem.data(Qt::BackgroundRole), QVariant(bgColor));
     QCOMPARE(entry->historyItems().size(), ++editCount);
 
@@ -2135,7 +2149,7 @@ void TestGui::testShortcutConfig()
     ActionCollection::instance()->addAction(a);
     QVERIFY(ActionCollection::instance()->actions().contains(a));
 
-    const QKeySequence seq(Qt::CTRL + Qt::SHIFT + Qt::ALT + Qt::Key_N);
+    const QKeySequence seq(Qt::CTRL | Qt::SHIFT | Qt::ALT | Qt::Key_N);
     ActionCollection::instance()->setDefaultShortcut(a, seq);
     QCOMPARE(ActionCollection::instance()->defaultShortcut(a), seq);
 
@@ -2146,7 +2160,7 @@ void TestGui::testShortcutConfig()
     QVERIFY(v);
 
     // Change shortcut and save
-    const QKeySequence newSeq(Qt::CTRL + Qt::SHIFT + Qt::ALT + Qt::Key_M);
+    const QKeySequence newSeq(Qt::CTRL | Qt::SHIFT | Qt::ALT | Qt::Key_M);
     a->setShortcut(newSeq);
     QVERIFY(a->shortcut() != ActionCollection::instance()->defaultShortcut(a));
     ActionCollection::instance()->saveShortcuts();
diff --git a/tests/gui/TestGuiFdoSecrets.cpp b/tests/gui/TestGuiFdoSecrets.cpp
index fc7e218eaa..88d20db5d0 100644
--- a/tests/gui/TestGuiFdoSecrets.cpp
+++ b/tests/gui/TestGuiFdoSecrets.cpp
@@ -131,6 +131,7 @@ char* toString(const QDBusObjectPath& path)
     return QTest::toString("ObjectPath(" + path.path() + ")");
 }
 
+TestGuiFdoSecrets::TestGuiFdoSecrets() = default;
 TestGuiFdoSecrets::~TestGuiFdoSecrets() = default;
 
 void TestGuiFdoSecrets::initTestCase()
diff --git a/tests/gui/TestGuiFdoSecrets.h b/tests/gui/TestGuiFdoSecrets.h
index 1624eed49d..c6809f38b9 100644
--- a/tests/gui/TestGuiFdoSecrets.h
+++ b/tests/gui/TestGuiFdoSecrets.h
@@ -55,6 +55,7 @@ class TestGuiFdoSecrets : public QObject
     Q_OBJECT
 
 public:
+    explicit TestGuiFdoSecrets();
     ~TestGuiFdoSecrets() override;
 
 private slots:
@@ -145,6 +146,8 @@ private slots:
     }
 
 private:
+    Q_DISABLE_COPY(TestGuiFdoSecrets)
+
     QScopedPointer<MainWindow> m_mainWindow;
     QPointer<DatabaseTabWidget> m_tabWidget;
     QPointer<DatabaseWidget> m_dbWidget;
diff --git a/tests/gui/TestGuiPixmaps.h b/tests/gui/TestGuiPixmaps.h
index 4f73d7e0d8..2dfbab2633 100644
--- a/tests/gui/TestGuiPixmaps.h
+++ b/tests/gui/TestGuiPixmaps.h
@@ -1,4 +1,5 @@
 /*
+ *  Copyright (C) 2025 KeePassXC Team <team@keepassxc.org>
  *  Copyright (C) 2011 Felix Geyer <debfx@fobos.de>
  *
  *  This program is free software: you can redistribute it and/or modify
@@ -19,6 +20,7 @@
 #define KEEPASSX_TESTGUIPIXMAPS_H
 
 #include <QImage>
+#include <QObject>
 
 class TestGuiPixmaps : public QObject
 {
diff --git a/vcpkg.json b/vcpkg.json
index 9c38d3d6cb..7f65f8f673 100644
--- a/vcpkg.json
+++ b/vcpkg.json
@@ -3,64 +3,23 @@
   "version-string": "2.8.0",
   "builtin-baseline": "66c0373dc7fca549e5803087b9487edfe3aca0a1",
   "dependencies": [
-    {
-      "name": "argon2",
-      "version>=": "20190702"
-    },
-    {
-      "name": "botan",
-      "version>=": "3.1.1"
-    },
-    {
-      "name": "minizip",
-      "version>=": "1.3"
-    },
-    {
-      "name": "libqrencode",
-      "version>=": "4.1.1"
-    },
+    "argon2",
+    "botan",
+    "minizip",
+    "libqrencode",
+    "readline",
+    "zlib",
     {
       "name": "libusb",
-      "version>=": "1.0.26.11791",
       "platform": "linux | freebsd"
     },
     {
       "name": "libxi",
-      "version>=": "1.8",
       "platform": "linux | freebsd"
     },
     {
       "name": "libxtst",
-      "version>=": "1.2.4",
       "platform": "linux | freebsd"
-    },
-    {
-      "name": "qt5",
-      "version>=": "5.15.17",
-      "features": [
-        "declarative",
-        "extras",
-        "imageformats",
-        "svg",
-        "tools",
-        "translations"
-      ],
-      "default-features": false
-    },
-    {
-      "name": "qt5",
-      "features": [
-        "wayland"
-      ],
-      "platform": "linux | freebsd"
-    },
-    {
-      "name": "readline",
-      "version>=": "0#5"
-    },
-    {
-      "name": "zlib",
-      "version>=": "1.3"
     }
   ]
 }