Add autotype library linking

Added Autotype switch + updated Travis to always test all extension
This commit is contained in:
thez3ro 2016-12-13 21:14:39 +01:00 committed by Jonathan White
parent fa891edb7c
commit 07a41f58d7
No known key found for this signature in database
GPG key ID: 440FC65F2E0C6E01
6 changed files with 28 additions and 15 deletions

View file

@ -20,6 +20,8 @@
#include <QApplication>
#include <QPluginLoader>
#include "config-keepassx.h"
#include "autotype/AutoTypePlatformPlugin.h"
#include "autotype/AutoTypeSelectDialog.h"
#include "autotype/WildcardMatcher.h"
@ -59,7 +61,9 @@ AutoType::AutoType(QObject* parent, bool test)
QString pluginPath = filePath()->pluginPath(pluginName);
if (!pluginPath.isEmpty()) {
#ifdef WITH_XC_AUTOTYPE
loadPlugin(pluginPath);
#endif
}
connect(qApp, SIGNAL(aboutToQuit()), SLOT(unloadPlugin()));

View file

@ -1,5 +1,3 @@
add_feature_info(Autotype WITH_XC_AUTOTYPE "Auto-type passwords in Input fields")
if(WITH_XC_AUTOTYPE)
if(UNIX AND NOT APPLE)
find_package(X11)

View file

@ -3,4 +3,4 @@ set(autotype_test_SOURCES
)
add_library(keepassx-autotype-test MODULE ${autotype_test_SOURCES})
target_link_libraries(keepassx-autotype-test testautotype Qt5::Core Qt5::Widgets)
target_link_libraries(keepassx-autotype-test testautotype keepassx_core ${autotype_LIB} Qt5::Core Qt5::Widgets)