diff options
author | Christian Mollekopf <chrigi_1@fastmail.fm> | 2017-07-03 14:02:27 +0200 |
---|---|---|
committer | Christian Mollekopf <chrigi_1@fastmail.fm> | 2017-07-03 14:02:27 +0200 |
commit | 55fe06979ceebe67553135b43aa47e70d931304b (patch) | |
tree | 16b10a744879cc1872d6c07624b59ae64469ddbf /synchronizer | |
parent | 56fae95f49a1ca8ca614bd9f89b0ea5f872765e9 (diff) | |
parent | 288946f1694c2abe1d2c5800c87339d1e8780e4b (diff) | |
download | sink-55fe06979ceebe67553135b43aa47e70d931304b.tar.gz sink-55fe06979ceebe67553135b43aa47e70d931304b.zip |
Merge branch 'develop'
Diffstat (limited to 'synchronizer')
-rw-r--r-- | synchronizer/CMakeLists.txt | 2 | ||||
-rw-r--r-- | synchronizer/main.cpp | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/synchronizer/CMakeLists.txt b/synchronizer/CMakeLists.txt index ff9ec86..e049d64 100644 --- a/synchronizer/CMakeLists.txt +++ b/synchronizer/CMakeLists.txt | |||
@@ -8,5 +8,5 @@ set(sinksynchronizer_SRCS | |||
8 | 8 | ||
9 | add_executable(${PROJECT_NAME} ${sinksynchronizer_SRCS}) | 9 | add_executable(${PROJECT_NAME} ${sinksynchronizer_SRCS}) |
10 | target_link_libraries(${PROJECT_NAME} sink KAsync ${CMAKE_DL_LIBS}) | 10 | target_link_libraries(${PROJECT_NAME} sink KAsync ${CMAKE_DL_LIBS}) |
11 | qt5_use_modules(${PROJECT_NAME} Network) | 11 | qt5_use_modules(${PROJECT_NAME} Core Network) |
12 | install(TARGETS ${PROJECT_NAME} ${KDE_INSTALL_TARGETS_DEFAULT_ARGS}) | 12 | install(TARGETS ${PROJECT_NAME} ${KDE_INSTALL_TARGETS_DEFAULT_ARGS}) |
diff --git a/synchronizer/main.cpp b/synchronizer/main.cpp index c66a2fb..3c41c67 100644 --- a/synchronizer/main.cpp +++ b/synchronizer/main.cpp | |||
@@ -39,8 +39,6 @@ | |||
39 | #include "test.h" | 39 | #include "test.h" |
40 | #include "definitions.h" | 40 | #include "definitions.h" |
41 | 41 | ||
42 | SINK_DEBUG_AREA("main") | ||
43 | |||
44 | static Listener *listener = nullptr; | 42 | static Listener *listener = nullptr; |
45 | 43 | ||
46 | //Print a demangled stacktrace | 44 | //Print a demangled stacktrace |