[SCM] ktp-common-internals packaging branch, master, updated. debian/15.12.1-2-1839-gf0635e9

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-common-internals.git;a=commitdiff;h=46f8cbd

The following commit has been merged in the master branch:
commit 46f8cbd2606888531b151e7716a130b392913ceb
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Thu Dec 18 18:26:00 2014 +0100

    Fix porting of otr-proxy tests
---
 otr-proxy/test/CMakeLists.txt     | 2 +-
 otr-proxy/test/lib/CMakeLists.txt | 2 +-
 otr-proxy/test/otr-test.cpp       | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/otr-proxy/test/CMakeLists.txt b/otr-proxy/test/CMakeLists.txt
index 853a60e..5a972db 100644
--- a/otr-proxy/test/CMakeLists.txt
+++ b/otr-proxy/test/CMakeLists.txt
@@ -18,7 +18,7 @@ foreach(file ${TEST_FILES})
     get_filename_component(base_name ${file} NAME_WE)
     get_filename_component(full_name ${file} NAME)
 
-    kde4_add_unit_test(${base_name} TESTNAME ktp-proxy-${base_name} ${full_name})
+    add_executable(${base_name} ${full_name} )
     target_link_libraries (${base_name} ${ktp-proxy-test_LIBS})
 
     LIST(APPEND TEST_NAMES ${base_name})
diff --git a/otr-proxy/test/lib/CMakeLists.txt b/otr-proxy/test/lib/CMakeLists.txt
index 5f94766..ccb5eca 100644
--- a/otr-proxy/test/lib/CMakeLists.txt
+++ b/otr-proxy/test/lib/CMakeLists.txt
@@ -3,5 +3,5 @@ set(ktp-proxy-test-lib_SRCS
     test-config.cpp
 )
 
-kde4_add_library(ktp-proxy-test-lib STATIC ${ktp-proxy-test-lib_SRCS})
+add_library(ktp-proxy-test-lib STATIC ${ktp-proxy-test-lib_SRCS})
 target_link_libraries(ktp-proxy-test-lib ktp-proxy-lib)
diff --git a/otr-proxy/test/otr-test.cpp b/otr-proxy/test/otr-test.cpp
index 90cd88c..5979e10 100644
--- a/otr-proxy/test/otr-test.cpp
+++ b/otr-proxy/test/otr-test.cpp
@@ -845,8 +845,8 @@ void OTRTest::testFingerprintManagement()
 
     startSession(alice, bob);
     startSession(aliceJ, john);
-    kDebug() << (int)alice.trustLevel();
-    kDebug() << (int)bob.trustLevel();
+    qDebug() << (int)alice.trustLevel();
+    qDebug() << (int)bob.trustLevel();
 
     KTp::FingerprintInfoList infoList = aliceMan->getKnownFingerprints(tst::aliceCtx.accountId);
     QCOMPARE(infoList.size(), 2);

-- 
ktp-common-internals packaging