[SCM] kdeconnect packaging branch, master, updated. debian/0.9g-1-1183-g9d69498
Maximiliano Curia
maxy at moszumanska.debian.org
Fri Oct 14 14:29:17 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/kdeconnect.git;a=commitdiff;h=0bca50a
The following commit has been merged in the master branch:
commit 0bca50af933399bad35c8bbab324b22af07aafb3
Merge: 661fa098d48606ea87d6fdb8086dabf8df3366f9 d2b4a6f214ba7402c36b5e5508cf73c9465f4a4b
Author: Aleix Pol <aleixpol at kde.org>
Date: Mon Oct 19 17:48:13 2015 +0200
Merge branch '0.9'
core/backends/lan/downloadjob.cpp | 34 +++++--
core/backends/lan/downloadjob.h | 6 +-
core/backends/lan/lanlinkprovider.h | 1 -
core/backends/lan/netaddress.h | 37 -------
core/backends/lan/socketlinereader.cpp | 4 +-
core/core_debug.h | 4 +-
core/filetransferjob.cpp | 13 ++-
core/filetransferjob.h | 4 +-
kcm/kcm.ui | 41 +++++++-
kcmplugin/CMakeLists.txt | 3 +-
kio/kiokdeconnect.h | 2 +-
plugins/notifications/notification.cpp | 4 +-
plugins/notifications/notification.h | 6 +-
.../notifications/notificationsdbusinterface.cpp | 8 +-
plugins/notifications/notificationsdbusinterface.h | 2 +-
plugins/sftp/mounter.cpp | 55 +++++------
plugins/sftp/mounter.h | 5 +-
plugins/share/shareplugin.cpp | 2 +-
tests/CMakeLists.txt | 1 +
tests/downloadjobtest.cpp | 107 +++++++++++++++++++++
20 files changed, 225 insertions(+), 114 deletions(-)
diff --cc core/backends/lan/downloadjob.cpp
index ad7765c,abbedf1..b51ff6c
--- a/core/backends/lan/downloadjob.cpp
+++ b/core/backends/lan/downloadjob.cpp
@@@ -20,7 -20,16 +20,16 @@@
#include "downloadjob.h"
+ #include <core/core_debug.h>
+
+ #include <sys/socket.h>
+ #include <netinet/in.h>
+ #include <netinet/tcp.h>
+ #include <netdb.h>
+
+ #include "lanlinkprovider.h"
+
-DownloadJob::DownloadJob(QHostAddress address, QVariantMap transferInfo): KJob()
+DownloadJob::DownloadJob(const QHostAddress &address, const QVariantMap &transferInfo): KJob()
{
mAddress = address;
mPort = transferInfo["port"].toInt();
diff --cc core/backends/lan/downloadjob.h
index f5e0d08,e3d3a7d..ddc9c93
--- a/core/backends/lan/downloadjob.h
+++ b/core/backends/lan/downloadjob.h
@@@ -34,8 -34,9 +34,9 @@@ class DownloadJo
{
Q_OBJECT
public:
- DownloadJob(QHostAddress address, QVariantMap transferInfo);
+ DownloadJob(const QHostAddress &address, const QVariantMap &transferInfo);
- virtual void start() override;
+ ~DownloadJob();
+ void start() Q_DECL_OVERRIDE;
QSharedPointer<QIODevice> getPayload();
private:
diff --cc kcmplugin/CMakeLists.txt
index 3f0fb11,0323228..324f16b
--- a/kcmplugin/CMakeLists.txt
+++ b/kcmplugin/CMakeLists.txt
@@@ -22,8 -22,6 +22,7 @@@ set_target_properties(kdeconnectplugink
)
target_include_directories(kdeconnectpluginkcm PUBLIC ${CMAKE_CURRENT_BINARY_DIR})
+generate_export_header(kdeconnectpluginkcm EXPORT_FILE_NAME kdeconnectpluginkcm_export.h BASE_NAME kdeconnectpluginkcm)
- # Remove NAMELINK_SKIP if/when headers are being installed and the library
- # becomes public.
+ # Remove NAMELINK_SKIP if/when headers are being installed and the library becomes public.
install(TARGETS kdeconnectpluginkcm EXPORT kdeconnectLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS} LIBRARY NAMELINK_SKIP)
diff --cc tests/CMakeLists.txt
index 0ebc919,4be7945..d585d2b
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@@ -14,7 -14,6 +14,8 @@@ set(kdeconnect_librarie
qca-qt5
)
+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(downloadjobtest.cpp ../core/backends/lan/downloadjob.cpp TEST_NAME downloadjobtest LINK_LIBRARIES ${kdeconnect_libraries})
--
kdeconnect packaging
More information about the pkg-kde-commits
mailing list