Merge pull request #1346 from keepassxreboot/hotfix/sshagent_autouic

Fix sshagent autouic
This commit is contained in:
Janek Bevendorff 2018-01-03 12:36:49 +01:00 committed by GitHub
commit f5070dfa26
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 3 deletions

View File

@ -17,6 +17,7 @@
*/
#include "AgentSettingsWidget.h"
#include "ui_AgentSettingsWidget.h"
#include "core/Config.h"
AgentSettingsWidget::AgentSettingsWidget(QWidget* parent)
@ -26,6 +27,10 @@ AgentSettingsWidget::AgentSettingsWidget(QWidget* parent)
m_ui->setupUi(this);
}
AgentSettingsWidget::~AgentSettingsWidget()
{
}
void AgentSettingsWidget::loadSettings()
{
m_ui->enableSSHAgentCheckBox->setChecked(config()->get("SSHAgent", false).toBool());

View File

@ -21,7 +21,6 @@
#include <QWidget>
#include <QScopedPointer>
#include "ui_AgentSettingsWidget.h"
namespace Ui {
class AgentSettingsWidget;
@ -32,8 +31,7 @@ class AgentSettingsWidget : public QWidget
Q_OBJECT
public:
explicit AgentSettingsWidget(QWidget* parent = nullptr);
signals:
~AgentSettingsWidget();
public slots:
void loadSettings();

View File

@ -1,4 +1,6 @@
if(WITH_XC_SSHAGENT)
include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
set(sshagent_SOURCES
bcrypt_pbkdf.cpp
blowfish.c