0
0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2024-09-20 04:12:15 +02:00

Remove support for clearing the Klipper history.

KDE Plasma 5 doesn't provide the DBus interface anymore and
this avoids the QtDBus dependency.
This commit is contained in:
Felix Geyer 2015-07-16 20:02:10 +02:00
parent 2170794d9c
commit 6d1ca363af
4 changed files with 0 additions and 21 deletions

View File

@ -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})

View File

@ -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)

View File

@ -21,11 +21,6 @@
#include <QClipboard>
#include <QTimer>
#if defined(Q_OS_UNIX) && !defined(Q_OS_MAC)
#include <QDBusConnection>
#include <QDBusMessage>
#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();
}

View File

@ -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})