Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2024-12-26 15:59:50 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix conditional build flags for yubikey and keeshare

Browse Source
This commit is contained in:
Weslly 2019-04-12 06:57:09 -03:00 committed by Jonathan White
parent 05bee40f0a
commit fbba5b1420
3 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/DatabaseWidget.cpp
View File

@ -78,9 +78,7 @@ DatabaseWidget::DatabaseWidget(QSharedPointer<Database> db, QWidget* parent)
, m_previewView(new EntryPreviewWidget(this)) , m_previewView(new EntryPreviewWidget(this))
, m_previewSplitter(new QSplitter(m_mainWidget)) , m_previewSplitter(new QSplitter(m_mainWidget))
, m_searchingLabel(new QLabel(this)) , m_searchingLabel(new QLabel(this))
#ifdef WITH_XC_KEESHARE
, m_shareLabel(new QLabel(this)) , m_shareLabel(new QLabel(this))
#endif
, m_csvImportWizard(new CsvImportWizard(this)) , m_csvImportWizard(new CsvImportWizard(this))
, m_editEntryWidget(new EditEntryWidget(this)) , m_editEntryWidget(new EditEntryWidget(this))
, m_editGroupWidget(new EditGroupWidget(this)) , m_editGroupWidget(new EditGroupWidget(this))

2
src/gui/DatabaseWidget.h
View File

@ -235,9 +235,7 @@ private:
QPointer<EntryPreviewWidget> m_previewView; QPointer<EntryPreviewWidget> m_previewView;
QPointer<QSplitter> m_previewSplitter; QPointer<QSplitter> m_previewSplitter;
QPointer<QLabel> m_searchingLabel; QPointer<QLabel> m_searchingLabel;
#ifdef WITH_XC_KEESHARE
QPointer<QLabel> m_shareLabel; QPointer<QLabel> m_shareLabel;
#endif
QPointer<CsvImportWizard> m_csvImportWizard; QPointer<CsvImportWizard> m_csvImportWizard;
QPointer<EditEntryWidget> m_editEntryWidget; QPointer<EditEntryWidget> m_editEntryWidget;
QPointer<EditGroupWidget> m_editGroupWidget; QPointer<EditGroupWidget> m_editGroupWidget;

2
src/gui/dbsettings/DatabaseSettingsWidgetMasterKey.cpp
View File

@ -102,7 +102,9 @@ void DatabaseSettingsWidgetMasterKey::load(QSharedPointer<Database> db)
connect(m_passwordEditWidget->findChild<QPushButton*>("removeButton"), SIGNAL(clicked()), SLOT(markDirty())); connect(m_passwordEditWidget->findChild<QPushButton*>("removeButton"), SIGNAL(clicked()), SLOT(markDirty()));
connect(m_keyFileEditWidget->findChild<QPushButton*>("removeButton"), SIGNAL(clicked()), SLOT(markDirty())); connect(m_keyFileEditWidget->findChild<QPushButton*>("removeButton"), SIGNAL(clicked()), SLOT(markDirty()));
#ifdef WITH_XC_YUBIKEY
connect(m_yubiKeyEditWidget->findChild<QPushButton*>("removeButton"), SIGNAL(clicked()), SLOT(markDirty())); connect(m_yubiKeyEditWidget->findChild<QPushButton*>("removeButton"), SIGNAL(clicked()), SLOT(markDirty()));
#endif
} }
void DatabaseSettingsWidgetMasterKey::initialize() void DatabaseSettingsWidgetMasterKey::initialize()