No OneTemporary
Actions

Size

52 KB

Subscribers

None

View Options

	diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
	index 78cdcdebd..7adb8187f 100644
	--- a/.gitlab-ci.yml
	+++ b/.gitlab-ci.yml
	@@ -1,8 +1,6 @@
	# SPDX-FileCopyrightText: 2020-2021 Laurent Montel <montel@kde.org>
	# SPDX-License-Identifier: CC0-1.0

	include:
	- - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/linux.yml
	- - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/freebsd.yml
	- https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/linux-qt6.yml
	- https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/flatpak.yml
	diff --git a/.kde-ci.yml b/.kde-ci.yml
	index 98b8341f5..b9192e29b 100644
	--- a/.kde-ci.yml
	+++ b/.kde-ci.yml
	@@ -1,22 +1,14 @@
	# SPDX-FileCopyrightText: None
	# SPDX-License-Identifier: CC0-1.0

	Dependencies:
	-- 'on': ['Linux/Qt5', 'FreeBSD/Qt5', 'Windows/Qt5']
	- 'require':
	- 'frameworks/extra-cmake-modules': '@latest'
	- 'pim/kmime' : '@same'
	- 'pim/libkleo' : '@same'
	- 'pim/kidentitymanagement' : '@same'
	- 'pim/kmailtransport' : '@same'
	-
	- 'on': ['Linux/Qt6', 'FreeBSD/Qt6', 'Windows/Qt6']
	'require':
	'frameworks/extra-cmake-modules': '@latest-kf6'
	'pim/kmime' : '@latest-kf6'
	'pim/libkleo' : '@latest-kf6'
	'pim/kidentitymanagement' : '@latest-kf6'
	'pim/kmailtransport' : '@latest-kf6'

	Options:
	require-passing-tests-on: [ 'Linux', 'FreeBSD' ]
	diff --git a/CMakeLists.txt b/CMakeLists.txt
	index f47f320d9..831386312 100644
	--- a/CMakeLists.txt
	+++ b/CMakeLists.txt
	@@ -1,282 +1,265 @@
	# SPDX-FileCopyrightText: none
	# SPDX-License-Identifier: BSD-3-Clause
	cmake_minimum_required(VERSION 3.16 FATAL_ERROR)

	set(RELEASE_SERVICE_VERSION_MAJOR "23")
	set(RELEASE_SERVICE_VERSION_MINOR "07")
	set(RELEASE_SERVICE_VERSION_MICRO "70")

	# The RELEASE_SERVICE_VERSION is used by Gpg4win to add the Gpg4win version
	if (NOT RELEASE_SERVICE_VERSION)
	set(RELEASE_SERVICE_VERSION "${RELEASE_SERVICE_VERSION_MAJOR}.${RELEASE_SERVICE_VERSION_MINOR}.${RELEASE_SERVICE_VERSION_MICRO}")
	endif()
	if(RELEASE_SERVICE_VERSION_MICRO LESS 10)
	set(KDE_APPLICATIONS_COMPACT_VERSION "${RELEASE_SERVICE_VERSION_MAJOR}${RELEASE_SERVICE_VERSION_MINOR}0${RELEASE_SERVICE_VERSION_MICRO}")
	else()
	set(KDE_APPLICATIONS_COMPACT_VERSION "${RELEASE_SERVICE_VERSION_MAJOR}${RELEASE_SERVICE_VERSION_MINOR}${RELEASE_SERVICE_VERSION_MICRO}")
	endif()

	set(KLEOPATRA_VERSION_MAJOR "3")
	set(KLEOPATRA_VERSION_MINOR "1")
	set(KLEOPATRA_VERSION_MICRO "26")

	set(kleopatra_version "${KLEOPATRA_VERSION_MAJOR}.${KLEOPATRA_VERSION_MINOR}.${KLEOPATRA_VERSION_MICRO}.${KDE_APPLICATIONS_COMPACT_VERSION}")
	# The following is for Windows
	set(kleopatra_version_win "${KLEOPATRA_VERSION_MAJOR}.${KLEOPATRA_VERSION_MINOR}.${KLEOPATRA_VERSION_MICRO}")
	set(kleopatra_fileversion_win "${KLEOPATRA_VERSION_MAJOR},${KLEOPATRA_VERSION_MINOR},${KLEOPATRA_VERSION_MICRO},0")
	if (NOT KLEOPATRA_DISTRIBUTION_TEXT)
	# This is only used on Windows for the file attributes of Kleopatra
	set(KLEOPATRA_DISTRIBUTION_TEXT "KDE")
	endif()

	project(kleopatra VERSION ${kleopatra_version})

	option(DISABLE_KWATCHGNUPG "Don't build the kwatchgnupg tool [default=OFF]" OFF)

	# Standalone build. Find / include everything necessary.
	-set(KF_MIN_VERSION "5.105.0")
	+set(KF_MIN_VERSION "5.240.0")
	set(KIDENTITYMANAGEMENT_VERSION "5.23.40")
	set(KMAILTRANSPORT_VERSION "5.23.40")
	set(AKONADI_MIME_VERSION "5.23.41")
	set(KMIME_VERSION "5.23.40")
	set(LIBKLEO_VERSION "5.23.41")
	-set(QT_REQUIRED_VERSION "5.15.2")
	-if (QT_MAJOR_VERSION STREQUAL "6")
	- set(QT_REQUIRED_VERSION "6.4.0")
	-endif()
	+set(QT_REQUIRED_VERSION "6.4.0")
	+set(QT_REQUIRED_VERSION "6.4.0")
	set(GPGME_REQUIRED_VERSION "1.16.0")
	set(LIBASSUAN_REQUIRED_VERSION "2.4.2")
	set(GPG_ERROR_REQUIRED_VERSION "1.36")

	if (WIN32)
	- set(KF5_WANT_VERSION "5.70.0")
	+ set(KF6_WANT_VERSION "5.70.0")
	set(KMIME_WANT_VERSION "5.12.0")
	else ()
	- set(KF5_WANT_VERSION ${KF_MIN_VERSION})
	+ set(KF6_WANT_VERSION ${KF_MIN_VERSION})
	set(KMIME_WANT_VERSION ${KMIME_VERSION})
	endif ()

	set(CMAKE_CXX_STANDARD 20)
	set(CMAKE_CXX_STANDARD_REQUIRED ON)

	-find_package(ECM ${KF5_WANT_VERSION} CONFIG REQUIRED)
	+find_package(ECM ${KF6_WANT_VERSION} CONFIG REQUIRED)
	set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH})
	set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules ${CMAKE_MODULE_PATH})

	include(ECMInstallIcons)
	include(ECMSetupVersion)
	include(ECMAddTests)
	include(GenerateExportHeader)
	include(ECMGenerateHeaders)
	include(FeatureSummary)
	include(CheckFunctionExists)
	include(KDEInstallDirs)
	include(KDECMakeSettings)
	include(KDECompilerSettings NO_POLICY_SCOPE)
	include(ECMAddAppIcon)
	include(ECMQtDeclareLoggingCategory)
	include(ECMDeprecationSettings)
	include(KDEClangFormat)

	-if (QT_MAJOR_VERSION STREQUAL "6")
	- set(QT_REQUIRED_VERSION "6.4.0")
	- set(KF_MIN_VERSION "5.240.0")
	- set(KF_MAJOR_VERSION "6")
	-else()
	- set(KF_MIN_VERSION "5.105.0")
	- set(KF_MAJOR_VERSION "5")
	-endif()
	-
	-# Find KF5 packages
	-find_package(KF${KF_MAJOR_VERSION} ${KF5_WANT_VERSION}
	+# Find KF6 packages
	+find_package(KF6 ${KF6_WANT_VERSION}
	REQUIRED COMPONENTS
	Codecs
	Config
	ConfigWidgets
	CoreAddons
	Crash
	I18n
	IconThemes
	ItemModels
	KCMUtils
	KIO
	WidgetsAddons
	WindowSystem
	XmlGui

	OPTIONAL_COMPONENTS
	DocTools
	)

	-set_package_properties(KF${KF_MAJOR_VERSION}DocTools PROPERTIES
	+set_package_properties(KF6DocTools PROPERTIES
	DESCRIPTION "Documentation tools"
	PURPOSE "Required to generate Kleopatra documentation."
	TYPE OPTIONAL)

	# Optional packages
	if (WIN32)
	# Only a replacement available for Windows so this
	# is required on other platforms.
	- find_package(KF${KF_MAJOR_VERSION}DBusAddons ${KF5_WANT_VERSION} CONFIG)
	- set_package_properties(KF${KF_MAJOR_VERSION}DBusAddons PROPERTIES DESCRIPTION "Support library to work with DBus"
	+ find_package(KF6DBusAddons ${KF6_WANT_VERSION} CONFIG)
	+ set_package_properties(KF6DBusAddons PROPERTIES DESCRIPTION "Support library to work with DBus"
	PURPOSE "DBus session integration"
	URL "https://inqlude.org/libraries/kdbusaddons.html"
	TYPE OPTIONAL)
	else()
	- find_package(KF${KF_MAJOR_VERSION}DBusAddons ${KF5_WANT_VERSION} CONFIG REQUIRED)
	- set(_kleopatra_dbusaddons_libs KF${KF_MAJOR_VERSION}::DBusAddons)
	+ find_package(KF6DBusAddons ${KF6_WANT_VERSION} CONFIG REQUIRED)
	+ set(_kleopatra_dbusaddons_libs KF6::DBusAddons)
	endif()

	-set(HAVE_QDBUS ${Qt${QT_MAJOR_VERSION}DBus_FOUND})
	+set(HAVE_QDBUS ${Qt6DBus_FOUND})

	find_package(Gpgmepp ${GPGME_REQUIRED_VERSION} CONFIG REQUIRED)
	if (Gpgmepp_VERSION VERSION_GREATER_EQUAL "1.19.0")
	set(GPGMEPP_SUPPORTS_SET_CURVE 1)
	endif()
	-if (QT_MAJOR_VERSION STREQUAL "6")
	- find_package(QGpgmeQt6 ${GPGME_REQUIRED_VERSION} CONFIG REQUIRED)
	-else()
	- find_package(QGpgme ${GPGME_REQUIRED_VERSION} CONFIG REQUIRED)
	-endif()
	+find_package(QGpgmeQt6 ${GPGME_REQUIRED_VERSION} CONFIG REQUIRED)
	if (QGpgme_VERSION VERSION_GREATER_EQUAL "1.17.0")
	set(QGPGME_SUPPORTS_CHANGING_EXPIRATION_OF_COMPLETE_KEY 1)
	set(QGPGME_CRYPTOCONFIGENTRY_HAS_DEFAULT_VALUE 1)
	set(QGPGME_SUPPORTS_WKDLOOKUP 1)
	set(QGPGME_SUPPORTS_IMPORT_WITH_FILTER 1)
	set(QGPGME_SUPPORTS_IMPORT_WITH_KEY_ORIGIN 1)
	set(QGPGME_SUPPORTS_SECRET_KEY_EXPORT 1)
	set(QGPGME_SUPPORTS_SECRET_SUBKEY_EXPORT 1)
	set(QGPGME_SUPPORTS_RECEIVING_KEYS_BY_KEY_ID 1)
	endif()
	if (QGpgme_VERSION VERSION_GREATER_EQUAL "1.18.0")
	set(QGPGME_SUPPORTS_KEY_REVOCATION 1)
	set(QGPGME_SUPPORTS_KEY_REFRESH 1)
	set(QGPGME_SUPPORTS_SET_FILENAME 1)
	set(QGPGME_SUPPORTS_SET_PRIMARY_UID 1)
	endif()
	if (QGpgme_VERSION VERSION_GREATER_EQUAL "1.19.0")
	set(QGPGME_SUPPORTS_DEFERRED_IMPORT_JOB 1)
	set(QGPGME_SUPPORTS_ARCHIVE_JOBS 1)
	set(QGPGME_JOB_HAS_NEW_PROGRESS_SIGNALS 1)
	endif()

	-if (QT_MAJOR_VERSION STREQUAL "6")
	- find_package(Qt6Core5Compat)
	-endif()
	+find_package(Qt6Core5Compat)

	# Kdepimlibs packages
	-find_package(KPim${KF_MAJOR_VERSION}Libkleo ${LIBKLEO_VERSION} CONFIG REQUIRED)
	-find_package(KPim${KF_MAJOR_VERSION}Mime ${KMIME_WANT_VERSION} CONFIG REQUIRED)
	-find_package(KPim${KF_MAJOR_VERSION}IdentityManagement ${KIDENTITYMANAGEMENT_VERSION} CONFIG)
	-find_package(KPim${KF_MAJOR_VERSION}MailTransport ${KMAILTRANSPORT_VERSION} CONFIG)
	-find_package(KPim${KF_MAJOR_VERSION}AkonadiMime ${AKONADI_MIME_VERSION} CONFIG)
	+find_package(KPim6Libkleo ${LIBKLEO_VERSION} CONFIG REQUIRED)
	+find_package(KPim6Mime ${KMIME_WANT_VERSION} CONFIG REQUIRED)
	+find_package(KPim6IdentityManagement ${KIDENTITYMANAGEMENT_VERSION} CONFIG)
	+find_package(KPim6MailTransport ${KMAILTRANSPORT_VERSION} CONFIG)
	+find_package(KPim6AkonadiMime ${AKONADI_MIME_VERSION} CONFIG)

	-find_package(Qt${QT_MAJOR_VERSION} ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets Test Network PrintSupport)
	+find_package(Qt6 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets Test Network PrintSupport)

	find_package(LibAssuan ${LIBASSUAN_REQUIRED_VERSION} REQUIRED)
	set_package_properties(LibAssuan PROPERTIES
	TYPE REQUIRED
	PURPOSE "Needed for Kleopatra to act as the GnuPG UI Server"
	)
	find_package(LibGpgError ${GPG_ERROR_REQUIRED_VERSION} REQUIRED)
	set_package_properties(LibGpgError PROPERTIES
	TYPE REQUIRED
	)

	set(kleopatra_release FALSE)

	if(NOT kleopatra_release)
	find_package(Git)
	if(GIT_FOUND)
	execute_process(COMMAND ${GIT_EXECUTABLE} rev-parse
	WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
	RESULT_VARIABLE rc
	ERROR_QUIET)
	if(rc EQUAL 0)
	execute_process(COMMAND ${GIT_EXECUTABLE} log -1 --oneline --format=%h ${CMAKE_CURRENT_SOURCE_DIR}
	WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
	OUTPUT_VARIABLE Kleopatra_WC_REVISION)
	string(REGEX REPLACE "\n" "" Kleopatra_WC_REVISION "${Kleopatra_WC_REVISION}")

	execute_process(COMMAND ${GIT_EXECUTABLE} log -1 --oneline --format=%cI ${CMAKE_CURRENT_SOURCE_DIR}
	WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
	OUTPUT_VARIABLE Kleopatra_WC_LAST_CHANGED_DATE)
	string(REGEX REPLACE "^([0-9]+)-([0-9]+)-([0-9]+)T([0-9]+):([0-9]+):([0-9]+).*$" "\\1\\2\\3T\\4\\5\\6"
	Kleopatra_WC_LAST_CHANGED_DATE "${Kleopatra_WC_LAST_CHANGED_DATE}")

	set(kleopatra_version "${kleopatra_version}+git${Kleopatra_WC_LAST_CHANGED_DATE}~${Kleopatra_WC_REVISION}")
	endif()
	endif()
	endif()

	configure_file(${CMAKE_CURRENT_SOURCE_DIR}/version-kleopatra.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/version-kleopatra.h)
	configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config-kleopatra.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-kleopatra.h)

	include_directories(
	${CMAKE_CURRENT_BINARY_DIR}
	${CMAKE_CURRENT_SOURCE_DIR}
	)

	if (WIN32)
	# On Windows, we need to use stuff deprecated since Qt 5.11, e.g. from QDesktopWidget
	ecm_set_disabled_deprecation_versions(QT 5.10.0 KF 5.103.0)
	else ()
	ecm_set_disabled_deprecation_versions(QT 6.4 KF 5.103.0)
	endif ()

	if(CMAKE_COMPILER_IS_GNUCXX)
	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-missing-braces -Wno-parentheses -Wno-ignored-qualifiers")
	endif()
	if(MINGW)
	# we do not care about different signedness of passed pointer arguments
	add_compile_options($<$<COMPILE_LANGUAGE:C>:-Wno-pointer-sign>)
	endif()

	add_definitions(-DQT_NO_EMIT)
	remove_definitions(-DQT_NO_FOREACH)

	# Disable the use of QStringBuilder for operator+ to prevent crashes when
	# returning the result of concatenating string temporaries in lambdas. We do
	# this for example in some std::transform expressions.
	# This is a known issue: https://bugreports.qt.io/browse/QTBUG-47066
	# Alternatively, one would always have to remember to force the lambdas to
	# return a QString instead of QStringBuilder, but that's just too easy to
	# forget and, unfortunately, the compiler doesn't issue a warning if one forgets
	# this. So, it's just too dangerous.
	# One can still use QStringBuilder explicitly with the operator% if necessary.
	remove_definitions(-DQT_USE_FAST_OPERATOR_PLUS)
	remove_definitions(-DQT_USE_QSTRINGBUILDER)

	kde_enable_exceptions()
	option(USE_UNITY_CMAKE_SUPPORT "Use UNITY cmake support (speedup compile time)" OFF)

	set(COMPILE_WITH_UNITY_CMAKE_SUPPORT OFF)
	if (USE_UNITY_CMAKE_SUPPORT)
	set(COMPILE_WITH_UNITY_CMAKE_SUPPORT ON)
	endif()


	add_subdirectory(pics)
	add_subdirectory(src)

	if(BUILD_TESTING)
	add_subdirectory(tests)
	add_subdirectory(autotests)
	endif()

	ecm_qt_install_logging_categories(
	EXPORT KLEOPATRA
	FILE kleopatra.categories
	DESTINATION ${KDE_INSTALL_LOGGINGCATEGORIESDIR}
	)

	ki18n_install(po)
	-if(KF${KF_MAJOR_VERSION}DocTools_FOUND)
	+if(KF6DocTools_FOUND)
	kdoctools_install(po)
	add_subdirectory(doc)
	endif()
	feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)

	# add clang-format target for all our real source files
	file(GLOB_RECURSE ALL_CLANG_FORMAT_SOURCE_FILES .cpp .h *.c)
	kde_clang_format(${ALL_CLANG_FORMAT_SOURCE_FILES})
	diff --git a/CMakePresets.json b/CMakePresets.json
	index 1abcc3bab..81cb5365c 100644
	--- a/CMakePresets.json
	+++ b/CMakePresets.json
	@@ -1,215 +1,218 @@
	{
	"version": 3,
	"configurePresets": [
	{
	"name": "base",
	"displayName": "base preset",
	"generator": "Ninja",
	"binaryDir": "${sourceDir}/build-${presetName}",
	"installDir": "$env{KF6}",
	+ "cacheVariables": {
	+ "BUILD_WITH_QT6": "ON"
	+ },
	"hidden": true
	},
	{
	"name": "dev-mold",
	"displayName": "Build as debug + using mold linker",
	"cacheVariables": {
	"CMAKE_BUILD_TYPE": "Debug",
	"CMAKE_EXPORT_COMPILE_COMMANDS": "ON",
	"CMAKE_SHARED_LINKER_FLAGS": "-fuse-ld=mold"
	},
	"inherits": [
	"base"
	]
	},
	{
	"name": "dev",
	"displayName": "Build as debug",
	"cacheVariables": {
	"CMAKE_BUILD_TYPE": "Debug",
	"CMAKE_EXPORT_COMPILE_COMMANDS": "ON"
	},
	"inherits": [
	"base"
	]
	},
	{
	"name": "dev-qch",
	"displayName": "Build as debug",
	"cacheVariables": {
	"CMAKE_BUILD_TYPE": "Debug",
	"CMAKE_EXPORT_COMPILE_COMMANDS": "ON",
	"BUILD_QCH": "ON"
	},
	"inherits": [
	"base"
	]
	},
	{
	"name": "asan",
	"displayName": "Build with Asan support.",
	"cacheVariables": {
	"CMAKE_BUILD_TYPE": "Debug",
	"ECM_ENABLE_SANITIZERS" : "'address;undefined'"
	},
	"inherits": [
	"base"
	]
	},
	{
	"name": "dev-clang",
	"displayName": "dev-clang",
	"cacheVariables": {
	"CMAKE_BUILD_TYPE": "Debug",
	"CMAKE_EXPORT_COMPILE_COMMANDS": "ON"
	},
	"environment": {
	"CXX": "clang++",
	"CCACHE_DISABLE": "ON"
	},
	"inherits": [
	"base"
	]
	},
	{
	"name": "unity",
	"displayName": "Build with CMake unity support.",
	"cacheVariables": {
	"CMAKE_BUILD_TYPE": "Debug",
	"USE_UNITY_CMAKE_SUPPORT": "ON"
	},
	"inherits": [
	"base"
	]
	},
	{
	"name": "release",
	"displayName": "Build as release mode.",
	"cacheVariables": {
	"CMAKE_BUILD_TYPE": "Release"
	},
	"inherits": [
	"base"
	]
	},
	{
	"name": "profile",
	"displayName": "profile",
	"cacheVariables": {
	"CMAKE_BUILD_TYPE": "RelWithDebInfo"
	},
	"inherits": [
	"base"
	]
	},
	{
	"name": "coverage",
	"displayName": "coverage",
	"cacheVariables": {
	"CMAKE_BUILD_TYPE": "Debug",
	"USE_UNITY_CMAKE_SUPPORT": "OFF",
	"BUILD_COVERAGE": "ON"
	},
	"inherits": [
	"base"
	]
	},
	{
	"name": "clazy",
	"displayName": "clazy",
	"cacheVariables": {
	"CMAKE_BUILD_TYPE": "Debug"
	},
	"environment": {
	"CXX": "clazy",
	"CCACHE_DISABLE": "ON"
	},
	"inherits": [
	"base"
	]
	},
	{
	"name": "pch",
	"displayName": "pch",
	"cacheVariables": {
	"CMAKE_BUILD_TYPE": "Debug",
	"USE_PRECOMPILED_HEADERS": "ON",
	"BUILD_COVERAGE": "ON"
	},
	"inherits": [
	"base"
	]
	}
	],
	"buildPresets": [
	{
	"name": "dev",
	"configurePreset": "dev"
	},
	{
	"name": "dev-mold",
	"configurePreset": "dev-mold"
	},
	{
	"name": "dev-qch",
	"configurePreset": "dev-qch"
	},
	{
	"name": "dev-clang",
	"configurePreset": "dev-clang"
	},
	{
	"name": "pch",
	"configurePreset": "pch"
	},
	{
	"name": "release",
	"configurePreset": "release"
	},
	{
	"name": "unity",
	"configurePreset": "unity"
	},
	{
	"name": "coverage",
	"configurePreset": "coverage"
	},
	{
	"name": "asan",
	"configurePreset": "asan"
	},
	{
	"name": "clazy",
	"configurePreset": "clazy",
	"environment": {
	"CLAZY_CHECKS" : "level0,level1,detaching-member,ifndef-define-typo,isempty-vs-count,qrequiredresult-candidates,reserve-candidates,signal-with-return-value,unneeded-cast,function-args-by-ref,function-args-by-value,returning-void-expression,no-ctor-missing-parent-argument,isempty-vs-count,qhash-with-char-pointer-key,raw-environment-function,qproperty-type-mismatch,old-style-connect,qstring-allocations,container-inside-loop,heap-allocated-small-trivial-type,inefficient-qlist,qstring-varargs,level2,detaching-member,heap-allocated-small-trivial-type,isempty-vs-count,qstring-varargs,qvariant-template-instantiation,raw-environment-function,reserve-candidates,signal-with-return-value,thread-with-slots,no-ctor-missing-parent-argument,no-missing-typeinfo",
	"CCACHE_DISABLE" : "ON"
	}
	}
	],
	"testPresets": [
	{
	"name": "dev",
	"configurePreset": "dev",
	"output": {"outputOnFailure": true},
	"execution": {"noTestsAction": "error", "stopOnFailure": false}
	},
	{
	"name": "asan",
	"configurePreset": "asan",
	"output": {"outputOnFailure": true},
	"execution": {"noTestsAction": "error", "stopOnFailure": true}
	},
	{
	"name": "unity",
	"configurePreset": "unity",
	"output": {"outputOnFailure": true},
	"execution": {"noTestsAction": "error", "stopOnFailure": true}
	},
	{
	"name": "coverage",
	"configurePreset": "coverage",
	"output": {"outputOnFailure": true},
	"execution": {"noTestsAction": "error", "stopOnFailure": true}
	}
	]
	}
	diff --git a/autotests/CMakeLists.txt b/autotests/CMakeLists.txt
	index ea9d06234..4fb7f57c6 100644
	--- a/autotests/CMakeLists.txt
	+++ b/autotests/CMakeLists.txt
	@@ -1,39 +1,39 @@
	# SPDX-FileCopyrightText: none
	# SPDX-License-Identifier: BSD-3-Clause

	include(ECMAddTests)

	-find_package(Qt${QT_MAJOR_VERSION}Test ${REQUIRED_QT_VERSION} CONFIG QUIET)
	+find_package(Qt6Test ${REQUIRED_QT_VERSION} CONFIG QUIET)

	if(NOT TARGET Qt::Test)
	- message(STATUS "Qt${QT_MAJOR_VERSION}Test not found, autotests will not be built.")
	+ message(STATUS "Qt6Test not found, autotests will not be built.")
	return()
	endif()

	include_directories(${CMAKE_SOURCE_DIR}/src)

	ecm_qt_declare_logging_category(logging_category_srcs HEADER kleopatra_debug.h IDENTIFIER KLEOPATRA_LOG CATEGORY_NAME org.kde.pim.kleopatra)

	ecm_add_test(
	kuniqueservicetest.cpp
	${CMAKE_SOURCE_DIR}/src/utils/kuniqueservice.cpp
	${logging_category_srcs}
	TEST_NAME kuniqueservicetest
	LINK_LIBRARIES ${_kleopatra_dbusaddons_libs} Qt::Test
	)

	ecm_add_test(
	stripsuffixtest.cpp
	${CMAKE_SOURCE_DIR}/src/utils/path-helper.cpp
	${logging_category_srcs}
	TEST_NAME stripsuffixtest
	- LINK_LIBRARIES KF${KF_MAJOR_VERSION}::I18n KPim${KF_MAJOR_VERSION}::Libkleo Qt::Test
	+ LINK_LIBRARIES KF6::I18n KPim6::Libkleo Qt::Test
	)

	ecm_add_test(
	keyparameterstest.cpp
	${CMAKE_SOURCE_DIR}/src/utils/keyparameters.cpp
	${logging_category_srcs}
	TEST_NAME keyparameterstest
	LINK_LIBRARIES Gpgmepp Qt::Test
	)
	diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
	index 87376e28f..3204d64fb 100644
	--- a/src/CMakeLists.txt
	+++ b/src/CMakeLists.txt
	@@ -1,617 +1,617 @@
	# SPDX-FileCopyrightText: none
	# SPDX-License-Identifier: BSD-3-Clause
	add_subdirectory(icons)
	add_subdirectory(mimetypes)

	include_directories(${CMAKE_CURRENT_BINARY_DIR})
	include_directories(${CMAKE_CURRENT_SOURCE_DIR})

	if (NOT DISABLE_KWATCHGNUPG)
	add_subdirectory(kwatchgnupg)
	endif()
	add_subdirectory(libkleopatraclient)
	add_subdirectory(conf)
	add_subdirectory(kconf_update)

	if(WIN32)
	set(_kleopatra_extra_uiserver_SRCS uiserver/uiserver_win.cpp)
	set(_kleopatra_extra_SRCS
	selftest/registrycheck.cpp selftest/registrycheck.h
	utils/gnupg-registry.c
	utils/userinfo_win.cpp
	utils/windowsprocessdevice.cpp utils/windowsprocessdevice.h
	versioninfo.rc
	)
	else()
	set(_kleopatra_extra_uiserver_SRCS uiserver/uiserver_unix.cpp)
	set(_kleopatra_extra_SRCS)
	endif()

	set(_kleopatra_uiserver_SRCS
	${_kleopatra_extra_uiserver_SRCS}

	selftest/uiservercheck.cpp selftest/uiservercheck.h
	uiserver/assuanserverconnection.cpp uiserver/assuanserverconnection.h
	uiserver/createchecksumscommand.cpp uiserver/createchecksumscommand.h
	uiserver/decryptverifycommandemailbase.cpp uiserver/decryptverifycommandemailbase.h
	uiserver/decryptverifycommandfilesbase.cpp uiserver/decryptverifycommandfilesbase.h
	uiserver/echocommand.cpp uiserver/echocommand.h
	uiserver/encryptcommand.cpp uiserver/encryptcommand.h
	uiserver/importfilescommand.cpp uiserver/importfilescommand.h
	uiserver/prepencryptcommand.cpp uiserver/prepencryptcommand.h
	uiserver/prepsigncommand.cpp uiserver/prepsigncommand.h
	uiserver/selectcertificatecommand.cpp
	uiserver/sessiondata.cpp uiserver/sessiondata.h
	uiserver/signcommand.cpp uiserver/signcommand.h
	uiserver/signencryptfilescommand.cpp
	uiserver/uiserver.cpp
	uiserver/verifychecksumscommand.cpp uiserver/verifychecksumscommand.h
	)

	set(_kleopatra_uiserver_extra_libs LibAssuan::LibAssuan LibGpgError::LibGpgError)

	if(HAVE_GPG_ERR_SOURCE_KLEO)
	add_definitions(-DGPG_ERR_SOURCE_DEFAULT=GPG_ERR_SOURCE_KLEO)
	add_definitions(-DGPGMEPP_ERR_SOURCE_DEFAULT=GPG_ERR_SOURCE_KLEO)
	else()
	add_definitions(-DGPG_ERR_SOURCE_DEFAULT=GPG_ERR_SOURCE_USER_1)
	add_definitions(-DGPGMEPP_ERR_SOURCE_DEFAULT=GPG_ERR_SOURCE_USER_1)
	endif()

	-if(KPim${KF_MAJOR_VERSION}IdentityManagement_FOUND AND KPim${KF_MAJOR_VERSION}MailTransport_FOUND AND KPim${KF_MAJOR_VERSION}AkonadiMime_FOUND)
	+if(KPim6IdentityManagement_FOUND AND KPim6MailTransport_FOUND AND KPim6AkonadiMime_FOUND)
	set(_kleopatra_mail_libs
	- KPim${KF_MAJOR_VERSION}::IdentityManagement # Export OpenPGP keys using WKS
	- KPim${KF_MAJOR_VERSION}::MailTransport
	- KPim${KF_MAJOR_VERSION}::AkonadiMime
	+ KPim6::IdentityManagement # Export OpenPGP keys using WKS
	+ KPim6::MailTransport
	+ KPim6::AkonadiMime
	)
	add_definitions(-DMAILAKONADI_ENABLED)
	endif()

	ki18n_wrap_ui(_kleopatra_uiserver_SRCS crypto/gui/signingcertificateselectionwidget.ui)

	set(_kleopatra_SRCS
	${_kleopatra_extra_SRCS}

	accessibility/accessiblelink.cpp
	accessibility/accessiblelink_p.h
	accessibility/accessiblerichtextlabel.cpp
	accessibility/accessiblerichtextlabel_p.h
	accessibility/accessiblevaluelabel.cpp
	accessibility/accessiblevaluelabel_p.h
	accessibility/accessiblewidgetfactory.cpp
	accessibility/accessiblewidgetfactory.h
	commands/adduseridcommand.cpp
	commands/adduseridcommand.h
	commands/authenticatepivcardapplicationcommand.cpp
	commands/authenticatepivcardapplicationcommand.h
	commands/cardcommand.cpp
	commands/cardcommand.h
	commands/certificatetopivcardcommand.cpp
	commands/certificatetopivcardcommand.h
	commands/certifycertificatecommand.cpp
	commands/certifycertificatecommand.h
	commands/changeexpirycommand.cpp
	commands/changeexpirycommand.h
	commands/changeownertrustcommand.cpp
	commands/changeownertrustcommand.h
	commands/changepassphrasecommand.cpp
	commands/changepassphrasecommand.h
	commands/changepincommand.cpp
	commands/changepincommand.h
	commands/changeroottrustcommand.cpp
	commands/changeroottrustcommand.h
	commands/checksumcreatefilescommand.cpp
	commands/checksumcreatefilescommand.h
	commands/checksumverifyfilescommand.cpp
	commands/checksumverifyfilescommand.h
	commands/clearcrlcachecommand.cpp
	commands/clearcrlcachecommand.h
	commands/command.cpp
	commands/command.h
	commands/createcsrforcardkeycommand.cpp
	commands/createcsrforcardkeycommand.h
	commands/createopenpgpkeyfromcardkeyscommand.cpp
	commands/createopenpgpkeyfromcardkeyscommand.h
	commands/decryptverifyclipboardcommand.cpp
	commands/decryptverifyclipboardcommand.h
	commands/decryptverifyfilescommand.cpp
	commands/decryptverifyfilescommand.h
	commands/deletecertificatescommand.cpp
	commands/deletecertificatescommand.h
	commands/detailscommand.cpp
	commands/detailscommand.h
	commands/dumpcertificatecommand.cpp
	commands/dumpcertificatecommand.h
	commands/dumpcrlcachecommand.cpp
	commands/dumpcrlcachecommand.h
	commands/encryptclipboardcommand.cpp
	commands/encryptclipboardcommand.h
	commands/exportcertificatecommand.cpp
	commands/exportcertificatecommand.h
	commands/exportgroupscommand.cpp
	commands/exportgroupscommand.h
	commands/exportopenpgpcertstoservercommand.cpp
	commands/exportopenpgpcertstoservercommand.h
	commands/exportopenpgpcerttoprovidercommand.cpp
	commands/exportopenpgpcerttoprovidercommand.h
	commands/exportpaperkeycommand.cpp
	commands/exportpaperkeycommand.h
	commands/exportsecretkeycommand.cpp
	commands/exportsecretkeycommand.h
	commands/exportsecretkeycommand_old.cpp
	commands/exportsecretkeycommand_old.h
	commands/exportsecretsubkeycommand.cpp
	commands/exportsecretsubkeycommand.h
	commands/genrevokecommand.cpp
	commands/genrevokecommand.h
	commands/gnupgprocesscommand.cpp
	commands/gnupgprocesscommand.h
	commands/importcertificatefromclipboardcommand.cpp
	commands/importcertificatefromclipboardcommand.h
	commands/importcertificatefromdatacommand.cpp
	commands/importcertificatefromdatacommand.h
	commands/importcertificatefromfilecommand.cpp
	commands/importcertificatefromfilecommand.h
	commands/importcertificatefromkeyservercommand.cpp
	commands/importcertificatefromkeyservercommand.h
	commands/importcertificatefrompivcardcommand.cpp
	commands/importcertificatefrompivcardcommand.h
	commands/importcertificatescommand.cpp
	commands/importcertificatescommand.h
	commands/importcrlcommand.cpp
	commands/importcrlcommand.h
	commands/importpaperkeycommand.cpp
	commands/importpaperkeycommand.h
	commands/keytocardcommand.cpp
	commands/keytocardcommand.h
	commands/learncardkeyscommand.cpp
	commands/learncardkeyscommand.h
	commands/lookupcertificatescommand.cpp
	commands/lookupcertificatescommand.h
	commands/newcertificatesigningrequestcommand.cpp
	commands/newcertificatesigningrequestcommand.h
	commands/newopenpgpcertificatecommand.cpp
	commands/newopenpgpcertificatecommand.h
	commands/openpgpgeneratecardkeycommand.cpp
	commands/openpgpgeneratecardkeycommand.h
	commands/pivgeneratecardkeycommand.cpp
	commands/pivgeneratecardkeycommand.h
	commands/refreshcertificatecommand.cpp
	commands/refreshcertificatecommand.h
	commands/refreshopenpgpcertscommand.cpp
	commands/refreshopenpgpcertscommand.h
	commands/refreshx509certscommand.cpp
	commands/refreshx509certscommand.h
	commands/reloadkeyscommand.cpp
	commands/reloadkeyscommand.h
	commands/revokecertificationcommand.cpp
	commands/revokecertificationcommand.h
	commands/revokekeycommand.cpp
	commands/revokekeycommand.h
	commands/revokeuseridcommand.cpp
	commands/revokeuseridcommand.h
	commands/selftestcommand.cpp
	commands/selftestcommand.h
	commands/setinitialpincommand.cpp
	commands/setinitialpincommand.h
	commands/setpivcardapplicationadministrationkeycommand.cpp
	commands/setpivcardapplicationadministrationkeycommand.h
	commands/setprimaryuseridcommand.cpp
	commands/setprimaryuseridcommand.h
	commands/signclipboardcommand.cpp
	commands/signclipboardcommand.h
	commands/signencryptfilescommand.cpp
	commands/signencryptfilescommand.h
	commands/signencryptfoldercommand.cpp
	commands/signencryptfoldercommand.h
	conf/configuredialog.cpp
	conf/configuredialog.h
	conf/groupsconfigdialog.cpp
	conf/groupsconfigdialog.h
	conf/groupsconfigpage.cpp
	conf/groupsconfigpage.h
	conf/groupsconfigwidget.cpp
	conf/groupsconfigwidget.h
	crypto/autodecryptverifyfilescontroller.cpp
	crypto/autodecryptverifyfilescontroller.h
	crypto/certificateresolver.cpp
	crypto/certificateresolver.h
	crypto/checksumsutils_p.cpp
	crypto/checksumsutils_p.h
	crypto/controller.cpp
	crypto/controller.h
	crypto/createchecksumscontroller.cpp
	crypto/createchecksumscontroller.h
	crypto/decryptverifyemailcontroller.cpp
	crypto/decryptverifyemailcontroller.h
	crypto/decryptverifyfilescontroller.cpp
	crypto/decryptverifyfilescontroller.h
	crypto/decryptverifytask.cpp
	crypto/decryptverifytask.h
	crypto/encryptemailcontroller.cpp
	crypto/encryptemailcontroller.h
	crypto/encryptemailtask.cpp
	crypto/encryptemailtask.h
	crypto/gui/certificatelineedit.cpp
	crypto/gui/certificatelineedit.h
	crypto/gui/certificateselectionline.cpp
	crypto/gui/certificateselectionline.h
	crypto/gui/decryptverifyfilesdialog.cpp
	crypto/gui/decryptverifyfilesdialog.h
	crypto/gui/decryptverifyfileswizard.cpp
	crypto/gui/decryptverifyfileswizard.h
	crypto/gui/decryptverifyoperationwidget.cpp
	crypto/gui/decryptverifyoperationwidget.h
	crypto/gui/encryptemailwizard.cpp
	crypto/gui/encryptemailwizard.h
	crypto/gui/newresultpage.cpp
	crypto/gui/newresultpage.h
	crypto/gui/objectspage.cpp
	crypto/gui/objectspage.h
	crypto/gui/resolverecipientspage.cpp
	crypto/gui/resolverecipientspage.h
	crypto/gui/resultitemwidget.cpp
	crypto/gui/resultitemwidget.h
	crypto/gui/resultlistwidget.cpp
	crypto/gui/resultlistwidget.h
	crypto/gui/resultpage.cpp
	crypto/gui/resultpage.h
	crypto/gui/signemailwizard.cpp
	crypto/gui/signemailwizard.h
	crypto/gui/signencryptemailconflictdialog.cpp
	crypto/gui/signencryptemailconflictdialog.h
	crypto/gui/signencryptfileswizard.cpp
	crypto/gui/signencryptfileswizard.h
	crypto/gui/signencryptwidget.cpp
	crypto/gui/signencryptwidget.h
	crypto/gui/signencryptwizard.cpp
	crypto/gui/signencryptwizard.h
	crypto/gui/signerresolvepage.cpp
	crypto/gui/signerresolvepage.h
	crypto/gui/signingcertificateselectiondialog.cpp
	crypto/gui/signingcertificateselectiondialog.h
	crypto/gui/signingcertificateselectionwidget.cpp
	crypto/gui/signingcertificateselectionwidget.h
	crypto/gui/unknownrecipientwidget.cpp
	crypto/gui/unknownrecipientwidget.h
	crypto/gui/verifychecksumsdialog.cpp
	crypto/gui/verifychecksumsdialog.h
	crypto/gui/wizard.cpp
	crypto/gui/wizard.h
	crypto/gui/wizardpage.cpp
	crypto/gui/wizardpage.h
	crypto/newsignencryptemailcontroller.cpp
	crypto/newsignencryptemailcontroller.h
	crypto/recipient.cpp
	crypto/recipient.h
	crypto/sender.cpp
	crypto/sender.h
	crypto/signemailcontroller.cpp
	crypto/signemailcontroller.h
	crypto/signemailtask.cpp
	crypto/signemailtask.h
	crypto/signencryptfilescontroller.cpp
	crypto/signencryptfilescontroller.h
	crypto/signencrypttask.cpp
	crypto/signencrypttask.h
	crypto/task.cpp
	crypto/task.h
	crypto/taskcollection.cpp
	crypto/taskcollection.h
	crypto/verifychecksumscontroller.cpp
	crypto/verifychecksumscontroller.h
	dialogs/adduseriddialog.cpp
	dialogs/adduseriddialog.h
	dialogs/certificatedetailsdialog.cpp
	dialogs/certificatedetailsdialog.h
	dialogs/certificatedetailsinputwidget.cpp
	dialogs/certificatedetailsinputwidget.h
	dialogs/certificatedetailswidget.cpp
	dialogs/certificatedetailswidget.h
	dialogs/certificateselectiondialog.cpp
	dialogs/certificateselectiondialog.h
	dialogs/certifycertificatedialog.cpp
	dialogs/certifycertificatedialog.h
	dialogs/certifywidget.cpp
	dialogs/certifywidget.h
	dialogs/createcsrforcardkeydialog.cpp
	dialogs/createcsrforcardkeydialog.h
	dialogs/deletecertificatesdialog.cpp
	dialogs/deletecertificatesdialog.h
	dialogs/editgroupdialog.cpp
	dialogs/editgroupdialog.h
	dialogs/expirydialog.cpp
	dialogs/expirydialog.h
	dialogs/exportdialog.cpp
	dialogs/exportdialog.h
	dialogs/gencardkeydialog.cpp
	dialogs/gencardkeydialog.h
	dialogs/groupdetailsdialog.cpp
	dialogs/groupdetailsdialog.h
	dialogs/lookupcertificatesdialog.cpp
	dialogs/lookupcertificatesdialog.h
	dialogs/nameandemailwidget.cpp
	dialogs/nameandemailwidget.h
	dialogs/newopenpgpcertificatedetailsdialog.cpp
	dialogs/newopenpgpcertificatedetailsdialog.h
	dialogs/pivcardapplicationadministrationkeyinputdialog.cpp
	dialogs/pivcardapplicationadministrationkeyinputdialog.h
	dialogs/revokekeydialog.cpp
	dialogs/revokekeydialog.h
	dialogs/selftestdialog.cpp
	dialogs/selftestdialog.h
	dialogs/setinitialpindialog.cpp
	dialogs/setinitialpindialog.h
	dialogs/subkeyswidget.cpp
	dialogs/subkeyswidget.h
	dialogs/trustchainwidget.cpp
	dialogs/trustchainwidget.h
	dialogs/updatenotification.cpp
	dialogs/updatenotification.h
	dialogs/weboftrustdialog.cpp
	dialogs/weboftrustdialog.h
	dialogs/weboftrustwidget.cpp
	dialogs/weboftrustwidget.h
	interfaces/anchorprovider.h
	interfaces/focusfirstchild.h
	newcertificatewizard/advancedsettingsdialog.cpp
	newcertificatewizard/advancedsettingsdialog_p.h
	newcertificatewizard/enterdetailspage.cpp
	newcertificatewizard/enterdetailspage_p.h
	newcertificatewizard/keyalgo.cpp
	newcertificatewizard/keyalgo_p.h
	newcertificatewizard/keycreationpage.cpp
	newcertificatewizard/keycreationpage_p.h
	newcertificatewizard/listwidget.cpp
	newcertificatewizard/listwidget.h
	newcertificatewizard/newcertificatewizard.cpp
	newcertificatewizard/newcertificatewizard.h
	newcertificatewizard/resultpage.cpp
	newcertificatewizard/resultpage_p.h
	newcertificatewizard/wizardpage.cpp
	newcertificatewizard/wizardpage_p.h
	selftest/compliancecheck.cpp
	selftest/compliancecheck.h
	selftest/enginecheck.cpp
	selftest/enginecheck.h
	selftest/gpgagentcheck.cpp
	selftest/gpgagentcheck.h
	selftest/gpgconfcheck.cpp
	selftest/gpgconfcheck.h
	selftest/libkleopatrarccheck.cpp
	selftest/libkleopatrarccheck.h
	selftest/selftest.cpp
	selftest/selftest.h
	smartcard/algorithminfo.h
	smartcard/card.cpp
	smartcard/card.h
	smartcard/deviceinfowatcher.cpp
	smartcard/deviceinfowatcher.h
	smartcard/keypairinfo.cpp
	smartcard/keypairinfo.h
	smartcard/netkeycard.cpp
	smartcard/netkeycard.h
	smartcard/openpgpcard.cpp
	smartcard/openpgpcard.h
	smartcard/p15card.cpp
	smartcard/p15card.h
	smartcard/pivcard.cpp
	smartcard/pivcard.h
	smartcard/readerstatus.cpp
	smartcard/readerstatus.h
	smartcard/utils.cpp
	smartcard/utils.h
	utils/accessibility.cpp
	utils/accessibility.h
	utils/action_data.cpp
	utils/action_data.h
	utils/applicationstate.cpp
	utils/applicationstate.h
	utils/archivedefinition.cpp
	utils/archivedefinition.h
	utils/clipboardmenu.cpp
	utils/clipboardmenu.h
	utils/debug-helpers.cpp
	utils/debug-helpers.h
	utils/dragqueen.cpp
	utils/dragqueen.h
	utils/email.cpp
	utils/email.h
	utils/emptypassphraseprovider.cpp
	utils/emptypassphraseprovider.h
	utils/filedialog.cpp
	utils/filedialog.h
	utils/gui-helper.cpp
	utils/gui-helper.h
	utils/headerview.cpp
	utils/headerview.h
	utils/input.cpp
	utils/input.h
	utils/iodevicelogger.cpp
	utils/iodevicelogger.h
	utils/kdpipeiodevice.cpp
	utils/kdpipeiodevice.h
	utils/keyparameters.cpp
	utils/keyparameters.h
	utils/keys.cpp
	utils/keys.h
	utils/kuniqueservice.cpp
	utils/kuniqueservice.h
	utils/log.cpp
	utils/log.h
	utils/memory-helpers.h
	utils/multivalidator.cpp
	utils/multivalidator.h
	utils/output.cpp
	utils/output.h
	utils/overwritedialog.cpp
	utils/overwritedialog.h
	utils/path-helper.cpp
	utils/path-helper.h
	utils/scrollarea.cpp
	utils/scrollarea.h
	utils/systemtrayicon.cpp
	utils/systemtrayicon.h
	utils/tags.cpp
	utils/tags.h
	utils/types.cpp
	utils/types.h
	utils/userinfo.cpp
	utils/userinfo.h
	utils/validation.cpp
	utils/validation.h
	utils/writecertassuantransaction.cpp
	utils/writecertassuantransaction.h
	utils/wsastarter.cpp
	utils/wsastarter.h
	view/anchorcache.cpp
	view/anchorcache_p.h
	view/errorlabel.cpp
	view/errorlabel.h
	view/formtextinput.cpp
	view/formtextinput.h
	view/htmllabel.cpp
	view/htmllabel.h
	view/infofield.cpp
	view/infofield.h
	view/keycacheoverlay.cpp
	view/keycacheoverlay.h
	view/keylistcontroller.cpp
	view/keylistcontroller.h
	view/keytreeview.cpp
	view/keytreeview.h
	view/netkeywidget.cpp
	view/netkeywidget.h
	view/nullpinwidget.cpp
	view/nullpinwidget.h
	view/openpgpkeycardwidget.cpp
	view/openpgpkeycardwidget.h
	view/p15cardwidget.cpp
	view/p15cardwidget.h
	view/padwidget.cpp
	view/padwidget.h
	view/pgpcardwidget.cpp
	view/pgpcardwidget.h
	view/pivcardwidget.cpp
	view/pivcardwidget.h
	view/searchbar.cpp
	view/searchbar.h
	view/smartcardwidget.cpp
	view/smartcardwidget.h
	view/tabwidget.cpp
	view/tabwidget.h
	view/urllabel.cpp
	view/urllabel.h
	view/waitwidget.cpp
	view/waitwidget.h
	view/welcomewidget.cpp
	view/welcomewidget.h

	aboutdata.cpp
	aboutdata.h
	kleopatra.qrc
	kleopatraapplication.cpp
	kleopatraapplication.h
	main.cpp
	mainwindow.cpp
	mainwindow.h
	systrayicon.cpp
	systrayicon.h
	)

	if(WIN32)
	configure_file (versioninfo.rc.in versioninfo.rc)
	set(_kleopatra_SRCS ${CMAKE_CURRENT_BINARY_DIR}/versioninfo.rc ${_kleopatra_SRCS})
	endif()

	set (_kleopatra_SRCS conf/kleopageconfigdialog.cpp conf/kleopageconfigdialog.h ${_kleopatra_SRCS})

	ecm_qt_declare_logging_category(_kleopatra_SRCS HEADER kleopatra_debug.h IDENTIFIER KLEOPATRA_LOG CATEGORY_NAME org.kde.pim.kleopatra
	DESCRIPTION "kleopatra (kleopatra)"
	OLD_CATEGORY_NAMES log_kleopatra
	EXPORT KLEOPATRA
	)


	if(KLEO_MODEL_TEST)
	add_definitions(-DKLEO_MODEL_TEST)
	set(_kleopatra_SRCS ${_kleopatra_SRCS} models/modeltest.cpp)
	endif()

	ki18n_wrap_ui(_kleopatra_SRCS
	dialogs/setinitialpindialog.ui
	dialogs/trustchainwidget.ui
	newcertificatewizard/listwidget.ui
	)

	kconfig_add_kcfg_files(_kleopatra_SRCS
	kcfg/emailoperationspreferences.kcfgc
	kcfg/fileoperationspreferences.kcfgc
	kcfg/settings.kcfgc
	kcfg/smimevalidationpreferences.kcfgc
	kcfg/tagspreferences.kcfgc
	kcfg/tooltippreferences.kcfgc
	)

	file(GLOB ICONS_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/icons/*-apps-kleopatra.png")
	ecm_add_app_icon(_kleopatra_SRCS ICONS ${ICONS_SRCS})

	add_executable(kleopatra_bin ${_kleopatra_SRCS} ${_kleopatra_uiserver_SRCS})

	# For the ConfigureDialog & KCMs
	target_link_libraries(kleopatra_bin kcm_kleopatra_static)

	#if (COMPILE_WITH_UNITY_CMAKE_SUPPORT)
	# set_target_properties(kleopatra_bin PROPERTIES UNITY_BUILD ON)
	#endif()
	set_target_properties(kleopatra_bin PROPERTIES OUTPUT_NAME kleopatra)

	if (WIN32)
	set(_kleopatra_platform_libs "secur32")
	endif ()

	target_link_libraries(kleopatra_bin
	Gpgmepp
	- KPim${KF_MAJOR_VERSION}::Libkleo
	- KPim${KF_MAJOR_VERSION}::Mime
	- KF${KF_MAJOR_VERSION}::Codecs
	- KF${KF_MAJOR_VERSION}::CoreAddons
	- KF${KF_MAJOR_VERSION}::Crash
	- KF${KF_MAJOR_VERSION}::I18n
	- KF${KF_MAJOR_VERSION}::IconThemes
	- KF${KF_MAJOR_VERSION}::ItemModels
	- KF${KF_MAJOR_VERSION}::KIOCore
	- KF${KF_MAJOR_VERSION}::KIOWidgets
	- KF${KF_MAJOR_VERSION}::WindowSystem
	- KF${KF_MAJOR_VERSION}::XmlGui
	+ KPim6::Libkleo
	+ KPim6::Mime
	+ KF6::Codecs
	+ KF6::CoreAddons
	+ KF6::Crash
	+ KF6::I18n
	+ KF6::IconThemes
	+ KF6::ItemModels
	+ KF6::KIOCore
	+ KF6::KIOWidgets
	+ KF6::WindowSystem
	+ KF6::XmlGui
	Qt::Network
	Qt::PrintSupport # Printing secret keys
	kleopatraclientcore
	${_kleopatra_extra_libs}
	${_kleopatra_mail_libs}
	${_kleopatra_uiserver_extra_libs}
	${_kleopatra_dbusaddons_libs}
	${_kleopatra_platform_libs}
	)

	if (QT_MAJOR_VERSION STREQUAL "6")
	target_link_libraries(kleopatra_bin Qt6::Core5Compat)
	target_link_libraries(kleopatra_bin QGpgmeQt6)
	else()
	target_link_libraries(kleopatra_bin QGpgme)
	endif()

	install(TARGETS kleopatra_bin ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})

	install(
	PROGRAMS data/org.kde.kleopatra.desktop data/kleopatra_import.desktop
	DESTINATION ${KDE_INSTALL_APPDIR}
	)
	install(FILES data/org.kde.kleopatra.appdata.xml DESTINATION ${KDE_INSTALL_METAINFODIR})
	install(
	PROGRAMS data/kleopatra_signencryptfiles.desktop
	data/kleopatra_signencryptfolders.desktop
	data/kleopatra_decryptverifyfiles.desktop
	data/kleopatra_decryptverifyfolders.desktop
	DESTINATION ${KDE_INSTALL_DATADIR}/kio/servicemenus
	)
	diff --git a/src/conf/CMakeLists.txt b/src/conf/CMakeLists.txt
	index 48effb57c..200b09883 100644
	--- a/src/conf/CMakeLists.txt
	+++ b/src/conf/CMakeLists.txt
	@@ -1,76 +1,76 @@
	include_directories(${kleopatra_SOURCE_DIR}/src)


	set(_kcm_kleopatra_libkleopatraclient_extra_SRCS
	smimevalidationconfigurationwidget.cpp
	smimevalidationconfigurationpage.cpp
	cryptooperationsconfigwidget.cpp
	cryptooperationsconfigpage.cpp
	smimevalidationconfigurationwidget.h
	smimevalidationconfigurationpage.h
	cryptooperationsconfigwidget.h
	cryptooperationsconfigpage.h
	smartcardconfigpage.cpp
	smartcardconfigpage.h
	)

	ki18n_wrap_ui(_kcm_kleopatra_libkleopatraclient_extra_SRCS
	smimevalidationconfigurationwidget.ui
	)

	kconfig_add_kcfg_files(_kcm_kleopatra_libkleopatraclient_extra_SRCS
	${kleopatra_SOURCE_DIR}/src/kcfg/smimevalidationpreferences.kcfgc
	)

	set(_kcm_kleopatra_libkleopatraclient_extra_LIBS kleopatraclientgui)


	set(kcm_kleopatra_PART_SRCS
	dirservconfigpage.cpp
	appearanceconfigpage.cpp
	appearanceconfigwidget.cpp
	gnupgsystemconfigurationpage.cpp
	dirservconfigpage.h
	appearanceconfigpage.h
	appearanceconfigwidget.h
	gnupgsystemconfigurationpage.h
	labelledwidget.cpp labelledwidget.h
	labelledwidget.cpp labelledwidget.h
	${kleopatra_BINARY_DIR}/src/kleopatra_debug.cpp
	${_kcm_kleopatra_libkleopatraclient_extra_SRCS}
	)


	ki18n_wrap_ui(kcm_kleopatra_PART_SRCS
	appearanceconfigwidget.ui
	smimevalidationconfigurationwidget.ui
	)

	kconfig_add_kcfg_files(kcm_kleopatra_PART_SRCS
	${kleopatra_SOURCE_DIR}/src/kcfg/tooltippreferences.kcfgc
	${kleopatra_SOURCE_DIR}/src/kcfg/emailoperationspreferences.kcfgc
	${kleopatra_SOURCE_DIR}/src/kcfg/fileoperationspreferences.kcfgc
	${kleopatra_SOURCE_DIR}/src/kcfg/tagspreferences.kcfgc
	${kleopatra_SOURCE_DIR}/src/kcfg/settings.kcfgc
	)

	add_library(kcm_kleopatra_static STATIC ${kcm_kleopatra_PART_SRCS})
	set_property(TARGET kcm_kleopatra_static PROPERTY POSITION_INDEPENDENT_CODE ON)

	target_link_libraries(kcm_kleopatra_static
	- KPim${KF_MAJOR_VERSION}::Libkleo
	- KF${KF_MAJOR_VERSION}::I18n
	- KF${KF_MAJOR_VERSION}::IconThemes
	- KF${KF_MAJOR_VERSION}::KCMUtils
	- KF${KF_MAJOR_VERSION}::WidgetsAddons
	+ KPim6::Libkleo
	+ KF6::I18n
	+ KF6::IconThemes
	+ KF6::KCMUtils
	+ KF6::WidgetsAddons
	${_kcm_kleopatra_extra_libs}
	${_kleopatra_dbusaddons_libs}
	${_kcm_kleopatra_libkleopatraclient_extra_LIBS}
	)

	if (NOT WIN32)
	add_library(kleopatra_config_gnupgsystem MODULE kcm_gnupgsystemconfigurationpage.cpp)
	- target_link_libraries(kleopatra_config_gnupgsystem kcm_kleopatra_static KF${KF_MAJOR_VERSION}::CoreAddons)
	+ target_link_libraries(kleopatra_config_gnupgsystem kcm_kleopatra_static KF6::CoreAddons)

	install(TARGETS kleopatra_config_gnupgsystem DESTINATION ${KDE_INSTALL_PLUGINDIR}/pim${QT_MAJOR_VERSION}/kcms/kleopatra)
	endif()
	diff --git a/src/kwatchgnupg/CMakeLists.txt b/src/kwatchgnupg/CMakeLists.txt
	index 1b25afadb..1109358bd 100644
	--- a/src/kwatchgnupg/CMakeLists.txt
	+++ b/src/kwatchgnupg/CMakeLists.txt
	@@ -1,56 +1,56 @@
	# SPDX-FileCopyrightText: none
	# SPDX-License-Identifier: BSD-3-Clause
	set(kwatchgnupg_version 1.0)

	-find_package(KF${KF_MAJOR_VERSION}Notifications ${KF_MIN_VERSION} CONFIG REQUIRED)
	-find_package(KF${KF_MAJOR_VERSION}TextWidgets ${KF_MIN_VERSION} CONFIG REQUIRED)
	+find_package(KF6Notifications ${KF_MIN_VERSION} CONFIG REQUIRED)
	+find_package(KF6TextWidgets ${KF_MIN_VERSION} CONFIG REQUIRED)

	configure_file(${CMAKE_CURRENT_SOURCE_DIR}/version-kwatchgnupg.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/version-kwatchgnupg.h)

	set(kwatchgnupg_SRCS
	../utils/kuniqueservice.cpp
	../kleopatra_debug.cpp
	kwatchgnupgmainwin.cpp
	kwatchgnupgconfig.cpp
	aboutdata.cpp
	tray.cpp
	../utils/kuniqueservice.h
	../kleopatra_debug.h
	kwatchgnupgmainwin.h
	kwatchgnupgconfig.h
	aboutdata.h
	tray.h
	main.cpp
	kwatchgnupg.qrc
	)

	ecm_qt_declare_logging_category(kwatchgnupg_SRCS HEADER kwatchgnupg_debug.h IDENTIFIER KWATCHGNUPG_LOG CATEGORY_NAME org.kde.pim.kwatchgnupg
	DESCRIPTION "kwatchgnupg (kwatchgnupg)"
	OLD_CATEGORY_NAMES log_kwatchgnupg
	EXPORT KLEOPATRA
	)

	if(WIN32)
	set(kwatchgnupg_SRCS ${kwatchgnupg_SRCS} ../utils/gnupg-registry.c)
	endif()

	add_executable(kwatchgnupg ${kwatchgnupg_SRCS})
	if (COMPILE_WITH_UNITY_CMAKE_SUPPORT)
	set_target_properties(kwatchgnupg PROPERTIES UNITY_BUILD ON)
	endif()


	target_link_libraries(kwatchgnupg
	- KF${KF_MAJOR_VERSION}::DBusAddons
	- KF${KF_MAJOR_VERSION}::XmlGui
	- KF${KF_MAJOR_VERSION}::Notifications
	- KF${KF_MAJOR_VERSION}::TextWidgets
	- KF${KF_MAJOR_VERSION}::IconThemes
	- KPim${KF_MAJOR_VERSION}::Libkleo
	- KF${KF_MAJOR_VERSION}::CoreAddons
	- KF${KF_MAJOR_VERSION}::Crash
	+ KF6::DBusAddons
	+ KF6::XmlGui
	+ KF6::Notifications
	+ KF6::TextWidgets
	+ KF6::IconThemes
	+ KPim6::Libkleo
	+ KF6::CoreAddons
	+ KF6::Crash
	)

	install(TARGETS kwatchgnupg ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})

	install(FILES images/kwatchgnupg.png images/kwatchgnupg2.png DESTINATION ${KDE_INSTALL_DATADIR}/kwatchgnupg/pics)
	diff --git a/src/libkleopatraclient/core/CMakeLists.txt b/src/libkleopatraclient/core/CMakeLists.txt
	index f65fba8c2..824b3f7d2 100644
	--- a/src/libkleopatraclient/core/CMakeLists.txt
	+++ b/src/libkleopatraclient/core/CMakeLists.txt
	@@ -1,45 +1,45 @@
	# SPDX-FileCopyrightText: none
	# SPDX-License-Identifier: BSD-3-Clause

	if(WIN32)
	set(_kleopatraclientcore_extra_SRCS ../../utils/gnupg-registry.c)
	else()
	set(_kleopatraclientcore_extra_SRCS)
	endif()

	ecm_qt_declare_logging_category(_kleopatraclientcore_common_SRCS HEADER libkleopatraclientcore_debug.h IDENTIFIER LIBKLEOPATRACLIENTCORE_LOG CATEGORY_NAME org.kde.pim.libkleopatraclientcore
	DESCRIPTION "kleopatra (kleopatra)"
	OLD_CATEGORY_NAMES log_libkleopatraclientcore
	EXPORT KLEOPATRA
	)


	add_library(kleopatraclientcore
	${_kleopatraclientcore_extra_SRCS}
	initialization.cpp
	command.cpp
	selectcertificatecommand.cpp
	signencryptfilescommand.cpp
	decryptverifyfilescommand.cpp
	libkleopatraclientcore_debug.cpp
	initialization.h
	command.h
	selectcertificatecommand.h
	signencryptfilescommand.h
	decryptverifyfilescommand.h
	libkleopatraclientcore_debug.h
	${_kleopatraclientcore_common_SRCS}
	)
	generate_export_header(kleopatraclientcore BASE_NAME kleopatraclientcore)

	set_target_properties(kleopatraclientcore PROPERTIES
	VERSION ${libkleopatraclient_version}
	SOVERSION ${libkleopatraclient_soversion}
	)
	if (COMPILE_WITH_UNITY_CMAKE_SUPPORT)
	set_target_properties(kleopatraclientcore PROPERTIES UNITY_BUILD ON)
	endif()

	-target_link_libraries(kleopatraclientcore LibAssuan::LibAssuan LibGpgError::LibGpgError Qt::Widgets KF${KF_MAJOR_VERSION}::I18n Gpgmepp)
	+target_link_libraries(kleopatraclientcore LibAssuan::LibAssuan LibGpgError::LibGpgError Qt::Widgets KF6::I18n Gpgmepp)

	install(TARGETS kleopatraclientcore ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
	diff --git a/src/libkleopatraclient/gui/CMakeLists.txt b/src/libkleopatraclient/gui/CMakeLists.txt
	index 10174e4ce..34eb11e25 100644
	--- a/src/libkleopatraclient/gui/CMakeLists.txt
	+++ b/src/libkleopatraclient/gui/CMakeLists.txt
	@@ -1,16 +1,16 @@
	# SPDX-FileCopyrightText: none
	# SPDX-License-Identifier: BSD-3-Clause
	add_library(kleopatraclientgui certificaterequester.cpp certificaterequester.h)
	generate_export_header(kleopatraclientgui BASE_NAME kleopatraclientgui)

	target_link_libraries(kleopatraclientgui
	kleopatraclientcore
	- KF${KF_MAJOR_VERSION}::I18n
	+ KF6::I18n
	)

	set_target_properties(kleopatraclientgui PROPERTIES
	VERSION ${libkleopatraclient_version}
	SOVERSION ${libkleopatraclient_soversion}
	)

	install(TARGETS kleopatraclientgui ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
	diff --git a/src/mimetypes/CMakeLists.txt b/src/mimetypes/CMakeLists.txt
	index 90a22ba35..5abfa6953 100644
	--- a/src/mimetypes/CMakeLists.txt
	+++ b/src/mimetypes/CMakeLists.txt
	@@ -1,16 +1,16 @@
	# SPDX-FileCopyrightText: none
	# SPDX-License-Identifier: BSD-3-Clause
	# always install the media types
	install(FILES application-vnd-kde-kleopatra.xml DESTINATION ${KDE_INSTALL_MIMEDIR})

	-# require at least version 1.3 (same as for KF5)
	+# require at least version 1.3 (same as for KF6)
	find_package(SharedMimeInfo 1.3)
	set_package_properties(SharedMimeInfo PROPERTIES
	TYPE OPTIONAL
	PURPOSE "Enables import of exported certificate groups with Kleopatra"
	)

	# update XDG mime-types if shared mime info is around
	if(SharedMimeInfo_FOUND AND NOT CMAKE_CROSSCOMPILING)
	update_xdg_mimetypes(${KDE_INSTALL_MIMEDIR})
	endif()
	diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
	index 02cc87d6f..42c3172c4 100644
	--- a/tests/CMakeLists.txt
	+++ b/tests/CMakeLists.txt
	@@ -1,62 +1,62 @@
	# SPDX-FileCopyrightText: none
	# SPDX-License-Identifier: BSD-3-Clause
	add_subdirectory(gnupg_home)

	set(EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR})
	include_directories(
	${CMAKE_SOURCE_DIR}/src/
	${CMAKE_BINARY_DIR}/src/
	${GPGME_INCLUDES}
	)

	########### next target ###############

	set(test_verify_SRCS test_verify.cpp)

	add_definitions(-DKLEO_TEST_GNUPGHOME="${CMAKE_CURRENT_BINARY_DIR}/gnupg_home")
	add_definitions(-DKLEO_TEST_DATADIR="${CMAKE_CURRENT_SOURCE_DIR}")


	add_executable(test_verify ${test_verify_SRCS})
	add_test(NAME test_verify COMMAND test_verify)
	ecm_mark_as_test(test_verify)

	target_link_libraries(test_verify
	- KPim${KF_MAJOR_VERSION}::Libkleo
	+ KPim6::Libkleo
	Qt::Test
	- KF${KF_MAJOR_VERSION}::CoreAddons
	- KF${KF_MAJOR_VERSION}::I18n
	+ KF6::CoreAddons
	+ KF6::I18n
	Qt::Widgets
	)

	if (QT_MAJOR_VERSION STREQUAL "6")
	target_link_libraries(test_verify QGpgmeQt6)
	else()
	target_link_libraries(test_verify QGpgme)
	endif()


	########### next target ###############

	# this doesn't yet work on Windows

	add_definitions(-DGPG_ERR_SOURCE_DEFAULT=GPG_ERR_SOURCE_USER_2)

	set(test_uiserver_SRCS test_uiserver.cpp ${CMAKE_SOURCE_DIR}/src/utils/wsastarter.cpp)

	#FIXME: omitting TEST makes test_uiserver print output again on a Win32 console;
	# find a better fix for this issue
	if(WIN32)
	add_executable(test_uiserver ${test_uiserver_SRCS})
	else()
	add_executable(test_uiserver ${test_uiserver_SRCS})
	endif()

	- target_link_libraries(test_uiserver KF${KF_MAJOR_VERSION}::I18n KPim${KF_MAJOR_VERSION}::Libkleo LibAssuan::LibAssuan LibGpgError::LibGpgError)
	+ target_link_libraries(test_uiserver KF6::I18n KPim6::Libkleo LibAssuan::LibAssuan LibGpgError::LibGpgError)

	if (QT_MAJOR_VERSION STREQUAL "6")
	target_link_libraries(test_uiserver QGpgmeQt6)
	else()
	target_link_libraries(test_uiserver QGpgme)
	endif()

File Metadata

Mime Type: text/x-diff
Expires: Mon, May 12, 6:41 PM (1 d, 21 h)
Storage Engine: local-disk
Storage Format: Raw Data
Storage Handle: bc/5f/457071a4b10dccd0bfc773c19f7d

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions