[SCM] kdeconnect packaging branch, master, updated. debian/0.9g-1-1183-g9d69498

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/kdeconnect.git;a=commitdiff;h=2603011

The following commit has been merged in the master branch:
commit 260301155f72f5eedb80ae26152f09ab8e3d5132
Author: Heiko Becker <heirecka at exherbo.org>
Date:   Thu Jan 15 21:35:30 2015 -0800

    Use co-installable qca-qt5 version
    
    If both qt4 and qt5 versions of qca are present the build of the
    frameworks branch tries to find Qt4 pulled in by qca and thus fails.
    
    REVIEW: 122054
---
 CMakeLists.txt              | 2 +-
 core/CMakeLists.txt         | 2 +-
 plugins/sftp/CMakeLists.txt | 2 +-
 tests/CMakeLists.txt        | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b4678cb..c3148d4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,7 +7,7 @@ set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR} ${CMAKE_SOURCE_DI
 
 find_package(Qt5 5.2 REQUIRED COMPONENTS Quick Test)
 find_package(KF5 REQUIRED COMPONENTS I18n KIO Notifications ConfigWidgets DBusAddons KCMUtils IconThemes)
-find_package(Qca REQUIRED)
+find_package(Qca-qt5 2.1.0 REQUIRED)
 
 include(KDEInstallDirs)
 include(KDECompilerSettings)
diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt
index faaac94..b6fa09b 100644
--- a/core/CMakeLists.txt
+++ b/core/CMakeLists.txt
@@ -35,7 +35,7 @@ target_link_libraries(kdeconnectcore
 PUBLIC
     Qt5::Network
     KF5::KIOCore
-    qca
+    qca-qt5
 PRIVATE
     Qt5::DBus
     Qt5::Gui
diff --git a/plugins/sftp/CMakeLists.txt b/plugins/sftp/CMakeLists.txt
index ae10b5f..384d70f 100644
--- a/plugins/sftp/CMakeLists.txt
+++ b/plugins/sftp/CMakeLists.txt
@@ -41,7 +41,7 @@ target_link_libraries( kdeconnect_sftp_config
     KF5::KIOWidgets
     KF5::KCMUtils
     KF5::IconThemes
-    qca
+    qca-qt5
 )
 
 install(TARGETS kdeconnect_sftp_config DESTINATION ${PLUGIN_INSTALL_DIR} )
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index a02dd24..4c508b7 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -8,7 +8,7 @@ set(kdeconnect_libraries
     Qt5::Network
     Qt5::Test
     kdeconnectcore
-    qca
+    qca-qt5
 )
 
 ecm_add_test(networkpackagetests.cpp LINK_LIBRARIES ${kdeconnect_libraries})

-- 
kdeconnect packaging