From d18f8c6221b2a0ffbf7c95a6de33c51fb0dcc345 Mon Sep 17 00:00:00 2001 From: Richard Liebscher Date: Tue, 9 Apr 2024 23:33:52 +0200 Subject: [PATCH] Fix build with latest kdeconnect --- CMakeLists.txt | 1 + app/src/sailfishconnect.cpp | 3 --- kdeconnect-kde | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 44f94b4..30cddd5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -48,6 +48,7 @@ add_subdirectory(kdeconnect-kde) # Sailfish Connect find_package(ECM ${KF5_MIN_VERSION} REQUIRED NO_MODULE) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH}) +include(ECMQtDeclareLoggingCategory) find_package(Qt5 REQUIRED COMPONENTS Core DBus Network Gui Sql Quick Feedback) find_package(KF5 REQUIRED COMPONENTS I18n CoreAddons Config) diff --git a/app/src/sailfishconnect.cpp b/app/src/sailfishconnect.cpp index 3699106..7930178 100644 --- a/app/src/sailfishconnect.cpp +++ b/app/src/sailfishconnect.cpp @@ -63,9 +63,6 @@ #include "helper/jobsnotificator.h" #include "helper/keyboardlayoutprovider.h" -// load QCA openssl plugin -Q_IMPORT_PLUGIN(opensslPlugin) - namespace SailfishConnect { namespace { diff --git a/kdeconnect-kde b/kdeconnect-kde index 48bf646..32b8fe8 160000 --- a/kdeconnect-kde +++ b/kdeconnect-kde @@ -1 +1 @@ -Subproject commit 48bf64625082e48892aaec22d4f694c60f44e994 +Subproject commit 32b8fe898802ff133a40233e0378ce395f5205cb