[SCM] ktp-common-internals packaging branch, master, updated. debian/15.12.1-2-1839-gf0635e9
Maximiliano Curia
maxy at moszumanska.debian.org
Mon May 9 09:05:55 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-common-internals.git;a=commitdiff;h=95dd8ec
The following commit has been merged in the master branch:
commit 95dd8ec6f948f86cdf6828c53510082798e55e95
Author: David Edmundson <kde at davidedmundson.co.uk>
Date: Tue Dec 4 21:29:32 2012 -0800
Move capabilities hack outside of models so it can be used by future KTp::Contact
---
KTp/CMakeLists.txt | 1 +
KTp/Models/CMakeLists.txt | 3 ++-
KTp/{Models => }/capabilities-hack-private.cpp | 0
KTp/{Models => }/capabilities-hack-private.h | 0
4 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/KTp/CMakeLists.txt b/KTp/CMakeLists.txt
index 64a12b2..86a9a59 100644
--- a/KTp/CMakeLists.txt
+++ b/KTp/CMakeLists.txt
@@ -3,6 +3,7 @@ include_directories (${CMAKE_CURRENT_BINARY_DIR}
set (ktp_common_internals_private_SRCS
actions.cpp
+ capabilities-hack-private.cpp
circular-countdown.cpp
debug.cpp
error-dictionary.cpp
diff --git a/KTp/Models/CMakeLists.txt b/KTp/Models/CMakeLists.txt
index 404eee3..b83512e 100644
--- a/KTp/Models/CMakeLists.txt
+++ b/KTp/Models/CMakeLists.txt
@@ -7,7 +7,8 @@ set (ktp_models_private_SRCS
accounts-list-model.cpp
accounts-filter-model.cpp
accounts-model-item.cpp
- capabilities-hack-private.cpp
+ ../capabilities-hack-private.cpp #HACK, COPY INTO BOTH LIBRARIES UNTIL ContactModels IS REPLACED
+ ../service-availability-checker.cpp #
contact-model-item.cpp
contacts-model.cpp
groups-model-item.cpp
diff --git a/KTp/Models/capabilities-hack-private.cpp b/KTp/capabilities-hack-private.cpp
similarity index 100%
rename from KTp/Models/capabilities-hack-private.cpp
rename to KTp/capabilities-hack-private.cpp
diff --git a/KTp/Models/capabilities-hack-private.h b/KTp/capabilities-hack-private.h
similarity index 100%
rename from KTp/Models/capabilities-hack-private.h
rename to KTp/capabilities-hack-private.h
--
ktp-common-internals packaging
More information about the pkg-kde-commits
mailing list