[SCM] kdeconnect packaging branch, master, updated. debian/0.9g-1-1183-g9d69498
Maximiliano Curia
maxy at moszumanska.debian.org
Fri Oct 14 14:29:26 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/kdeconnect.git;a=commitdiff;h=77facdb
The following commit has been merged in the master branch:
commit 77facdbcfd0c0813798e515bcc59d1f0e8d7d0c1
Merge: 2e4ce9065657b512de983af37404591558ecf03a 42110549f48994fa7b6070660ef4fc99f862a400
Author: Albert Vaca <albertvaka at gmail.com>
Date: Mon Dec 7 03:38:06 2015 -0800
Merge branch 'master' into sslrefactor
core/kdeconnectpluginconfig.cpp | 30 +++
core/kdeconnectpluginconfig.h | 8 +
kdeconnect.appdata.xml | 2 +
plugins/notifications/CMakeLists.txt | 26 +-
.../kdeconnect_notifications_config.desktop | 10 +
plugins/notifications/notifications_config.cpp | 113 ++++++++
.../notifications_config.h} | 22 +-
plugins/notifications/notifications_config.ui | 210 +++++++++++++++
.../notifications/notificationsdbusinterface.cpp | 19 +-
plugins/notifications/notificationsdbusinterface.h | 2 +-
plugins/notifications/notificationslistener.cpp | 161 ++++++++++++
...tificationsplugin.h => notificationslistener.h} | 46 ++--
plugins/notifications/notificationsplugin.cpp | 3 +
plugins/notifications/notificationsplugin.h | 4 +-
.../notifications/notifyingapplication.cpp | 53 ++--
.../{notification.cpp => notifyingapplication.h} | 40 ++-
.../notifications/notifyingapplicationmodel.cpp | 235 +++++++++++++++++
plugins/notifications/notifyingapplicationmodel.h | 56 ++++
.../remotecontrol/kdeconnect_remotecontrol.json | 2 +
plugins/share/shareplugin.cpp | 10 +-
plugins/share/shareplugin.h | 2 +-
tests/CMakeLists.txt | 10 +-
tests/sendfiletest.cpp | 4 +-
tests/testnotificationlistener.cpp | 289 +++++++++++++++++++++
24 files changed, 1261 insertions(+), 96 deletions(-)
diff --cc tests/CMakeLists.txt
index a2db3bb,66aeb5f..1f52153
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@@ -19,40 -17,13 +19,48 @@@ set(kdeconnect_librarie
ecm_add_test(pluginloadtest.cpp LINK_LIBRARIES ${kdeconnect_libraries})
ecm_add_test(sendfiletest.cpp LINK_LIBRARIES ${kdeconnect_libraries})
ecm_add_test(networkpackagetests.cpp LINK_LIBRARIES ${kdeconnect_libraries})
-ecm_add_test(testsocketlinereader.cpp ../core/backends/lan/socketlinereader.cpp TEST_NAME testsocketlinereader LINK_LIBRARIES ${kdeconnect_libraries})
+
+ecm_add_test(testsocketlinereader.cpp ../core/backends/lan/socketlinereader.cpp ../core/backends/lan/server.cpp TEST_NAME testsocketlinereader LINK_LIBRARIES ${kdeconnect_libraries})
+
+set(testsslsocketlinereader_sources
+ ../core/backends/lan/server.cpp
+ ../core/backends/lan/socketlinereader.cpp
+)
+ecm_add_test(testsslsocketlinereader.cpp ${testsslsocketlinereader_sources} TEST_NAME testsslsocketlinereader LINK_LIBRARIES ${kdeconnect_libraries})
+
+set(kdeconnectconfigtest_sources
+ ../core/backends/devicelink.cpp
+ ../core/backends/pairinghandler.cpp
+ ../core/dbushelper.cpp
+ ../core/device.cpp
+ ../core/pluginloader.cpp
+)
+ecm_add_test(kdeconnectconfigtest.cpp ${kdeconnectconfigtest_sources} TEST_NAME kdeconnectconfigtest LINK_LIBRARIES ${kdeconnect_libraries})
+
+set(lanlinkprovidertest_sources
+ ../core/backends/devicelink.cpp
+ ../core/backends/lan/downloadjob.cpp
+ ../core/backends/lan/landevicelink.cpp
+ ../core/backends/lan/lanlinkprovider.cpp
+ ../core/backends/lan/lanpairinghandler.cpp
+ ../core/backends/lan/server.cpp
+ ../core/backends/lan/socketlinereader.cpp
+ ../core/backends/lan/uploadjob.cpp
+ ../core/backends/linkprovider.cpp
+ ../core/backends/pairinghandler.cpp
+ ../core/device.cpp
+ ../core/pluginloader.cpp
+)
+ecm_add_test(lanlinkprovidertest.cpp ${lanlinkprovidertest_sources} TEST_NAME lanlinkprovidertest LINK_LIBRARIES ${kdeconnect_libraries})
+
+ecm_add_test(devicetest.cpp ${lanlinkprovidertest_sources} TEST_NAME devicetest LINK_LIBRARIES ${kdeconnect_libraries})
+
ecm_add_test(downloadjobtest.cpp ../core/backends/lan/downloadjob.cpp TEST_NAME downloadjobtest LINK_LIBRARIES ${kdeconnect_libraries})
+ ecm_add_test(testnotificationlistener.cpp
+ ../plugins/notifications/notificationslistener.cpp
+ ../plugins/notifications/notificationsplugin.cpp
+ ../plugins/notifications/notification.cpp
+ ../plugins/notifications/notifyingapplication.cpp
+ ../plugins/notifications/notificationsdbusinterface.cpp
+ TEST_NAME testnotificationlistener
+ LINK_LIBRARIES ${kdeconnect_libraries} Qt5::DBus KF5::Notifications)
--
kdeconnect packaging
More information about the pkg-kde-commits
mailing list