diff --git a/CMakeLists.txt b/CMakeLists.txt index 400c68480..2fef3f42b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -159,9 +159,6 @@ if(WITH_TESTS) endif(WITH_TESTS) set(QT_REQUIRED_MODULES QtCore QtGui QtTest) -if(UNIX AND NOT APPLE) - set(QT_REQUIRED_MODULES ${QT_REQUIRED_MODULES} QtDBus) -endif() find_package(Qt4 4.6.0 REQUIRED ${QT_REQUIRED_MODULES}) include(${QT_USE_FILE}) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 05f394dc4..8f97fe06f 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -248,10 +248,6 @@ target_link_libraries(${PROGNAME} ${GCRYPT_LIBRARIES} ${ZLIB_LIBRARIES}) -if(UNIX AND NOT APPLE) - target_link_libraries(${PROGNAME} ${QT_QTDBUS_LIBRARY}) -endif() - set_target_properties(${PROGNAME} PROPERTIES ENABLE_EXPORTS ON) if(APPLE) diff --git a/src/gui/Clipboard.cpp b/src/gui/Clipboard.cpp index 7d8f71faf..d4f34a187 100644 --- a/src/gui/Clipboard.cpp +++ b/src/gui/Clipboard.cpp @@ -21,11 +21,6 @@ #include #include -#if defined(Q_OS_UNIX) && !defined(Q_OS_MAC) -#include -#include -#endif - #include "core/Config.h" Clipboard* Clipboard::m_instance(Q_NULLPTR); @@ -75,11 +70,6 @@ void Clipboard::clearClipboard() clipboard->clear(QClipboard::Selection); } -#if defined(Q_OS_UNIX) && !defined(Q_OS_MAC) - QDBusMessage message = QDBusMessage::createMethodCall("org.kde.klipper", "/klipper", "", "clearClipboardHistory"); - QDBusConnection::sessionBus().send(message); -#endif - m_lastCopied.clear(); } diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 5e0a41fa5..3028d9d5e 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -93,10 +93,6 @@ set(TEST_LIBRARIES ${ZLIB_LIBRARIES} ) -if(UNIX AND NOT APPLE) - set(TEST_LIBRARIES ${TEST_LIBRARIES} ${QT_QTDBUS_LIBRARY}) -endif() - set(modeltest_SOURCRS modeltest.cpp) qt4_wrap_cpp(modeltest_SOURCRS modeltest.h) add_library(modeltest STATIC ${modeltest_SOURCRS})