From fbba5b14206ff4782f70fc0ce91df95508459626 Mon Sep 17 00:00:00 2001 From: Weslly Date: Fri, 12 Apr 2019 06:57:09 -0300 Subject: [PATCH] Fix conditional build flags for yubikey and keeshare --- src/gui/DatabaseWidget.cpp | 2 -- src/gui/DatabaseWidget.h | 2 -- src/gui/dbsettings/DatabaseSettingsWidgetMasterKey.cpp | 2 ++ 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/gui/DatabaseWidget.cpp b/src/gui/DatabaseWidget.cpp index 97fdeb0f9..8cfc40815 100644 --- a/src/gui/DatabaseWidget.cpp +++ b/src/gui/DatabaseWidget.cpp @@ -78,9 +78,7 @@ DatabaseWidget::DatabaseWidget(QSharedPointer db, QWidget* parent) , m_previewView(new EntryPreviewWidget(this)) , m_previewSplitter(new QSplitter(m_mainWidget)) , m_searchingLabel(new QLabel(this)) -#ifdef WITH_XC_KEESHARE , m_shareLabel(new QLabel(this)) -#endif , m_csvImportWizard(new CsvImportWizard(this)) , m_editEntryWidget(new EditEntryWidget(this)) , m_editGroupWidget(new EditGroupWidget(this)) diff --git a/src/gui/DatabaseWidget.h b/src/gui/DatabaseWidget.h index 11b2f710c..fb9cf817e 100644 --- a/src/gui/DatabaseWidget.h +++ b/src/gui/DatabaseWidget.h @@ -235,9 +235,7 @@ private: QPointer m_previewView; QPointer m_previewSplitter; QPointer m_searchingLabel; -#ifdef WITH_XC_KEESHARE QPointer m_shareLabel; -#endif QPointer m_csvImportWizard; QPointer m_editEntryWidget; QPointer m_editGroupWidget; diff --git a/src/gui/dbsettings/DatabaseSettingsWidgetMasterKey.cpp b/src/gui/dbsettings/DatabaseSettingsWidgetMasterKey.cpp index a8425aae1..ed22244c7 100644 --- a/src/gui/dbsettings/DatabaseSettingsWidgetMasterKey.cpp +++ b/src/gui/dbsettings/DatabaseSettingsWidgetMasterKey.cpp @@ -102,7 +102,9 @@ void DatabaseSettingsWidgetMasterKey::load(QSharedPointer db) connect(m_passwordEditWidget->findChild("removeButton"), SIGNAL(clicked()), SLOT(markDirty())); connect(m_keyFileEditWidget->findChild("removeButton"), SIGNAL(clicked()), SLOT(markDirty())); +#ifdef WITH_XC_YUBIKEY connect(m_yubiKeyEditWidget->findChild("removeButton"), SIGNAL(clicked()), SLOT(markDirty())); +#endif } void DatabaseSettingsWidgetMasterKey::initialize()