Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2025-03-09 07:46:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix build broken by Qt

Browse Source 
Updating mingw-w64-x86_64-qt5 to version 5.12.4-2 caused EditEntryWidget to fail
building. Fixed that with proper includes. Also ran `make format` which revealed
one file in need of formatting.
This commit is contained in:
Carlos Knippschild 2019-06-24 22:45:22 -07:00 committed by Jonathan White
parent 41b2a013a7
commit bb2d7bca5a
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/gui/DatabaseOpenWidget.cpp
View File

@ -34,10 +34,10 @@
#include "config-keepassx.h" #include "config-keepassx.h"
#include <QSharedPointer>
#include <QtConcurrentRun>
#include <QDesktopServices> #include <QDesktopServices>
#include <QFont> #include <QFont>
#include <QSharedPointer>
#include <QtConcurrentRun>
DatabaseOpenWidget::DatabaseOpenWidget(QWidget* parent) DatabaseOpenWidget::DatabaseOpenWidget(QWidget* parent)
: DialogyWidget(parent) : DialogyWidget(parent)
@ -311,8 +311,7 @@ QSharedPointer<CompositeKey> DatabaseOpenWidget::databaseKey()
legacyWarning.setDefaultButton(QMessageBox::Ok); legacyWarning.setDefaultButton(QMessageBox::Ok);
legacyWarning.setCheckBox(new QCheckBox(tr("Don't show this warning again"))); legacyWarning.setCheckBox(new QCheckBox(tr("Don't show this warning again")));
connect(legacyWarning.checkBox(), &QCheckBox::stateChanged, [](int state) connect(legacyWarning.checkBox(), &QCheckBox::stateChanged, [](int state) {
{
config()->set("Messages/NoLegacyKeyFileWarning", state == Qt::CheckState::Checked); config()->set("Messages/NoLegacyKeyFileWarning", state == Qt::CheckState::Checked);
}); });

1
src/gui/entry/EditEntryWidget.cpp
View File

@ -32,6 +32,7 @@
#include <QSortFilterProxyModel> #include <QSortFilterProxyModel>
#include <QStackedLayout> #include <QStackedLayout>
#include <QStandardPaths> #include <QStandardPaths>
#include <QStringListModel>
#include <QTemporaryFile> #include <QTemporaryFile>
#include "autotype/AutoType.h" #include "autotype/AutoType.h"

1
src/gui/entry/EditEntryWidget.h
View File

@ -41,6 +41,7 @@ class EntryHistoryModel;
class QButtonGroup; class QButtonGroup;
class QMenu; class QMenu;
class QSortFilterProxyModel; class QSortFilterProxyModel;
class QStringListModel;
#ifdef WITH_XC_SSHAGENT #ifdef WITH_XC_SSHAGENT
#include "sshagent/KeeAgentSettings.h" #include "sshagent/KeeAgentSettings.h"
class OpenSSHKey; class OpenSSHKey;