mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2025-04-04 13:07:38 +03:00
Code Issues Projects Releases Packages Wiki Activity

Fix compiler issues with Qt 5.14

Browse source 
* Remove deprecation warnings when not doing a DEV_BUILD. Qt 5.14 introduced several deprecation flags on basic function calls in QList and QSet that would require several #pragma ignores. Assuming this was in preparation to Qt 6.0.

* Remove unnecessary assert in PasswordEditWidget that was hit in macOS debug builds.
This commit is contained in:
Jonathan White 2019-12-30 11:54:50 -05:00
parent adb29dd0e4
commit 2a51f2cba5
2 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
CMakeLists.txt
View file

@ -300,6 +300,9 @@ endif()
if(WITH_DEV_BUILD) if(WITH_DEV_BUILD)
add_definitions(-DQT_DEPRECATED_WARNINGS -DGCRYPT_NO_DEPRECATED) add_definitions(-DQT_DEPRECATED_WARNINGS -DGCRYPT_NO_DEPRECATED)
else()
add_definitions(-DQT_NO_DEPRECATED_WARNINGS)
add_gcc_compiler_cxxflags("-Wno-deprecated-declarations")
endif() endif()
if(MINGW) if(MINGW)

2
src/gui/masterkey/PasswordEditWidget.cpp
View file

@ -95,8 +95,6 @@ void PasswordEditWidget::initComponentEditWidget(QWidget* widget)
void PasswordEditWidget::hideEvent(QHideEvent* event) void PasswordEditWidget::hideEvent(QHideEvent* event)
{ {
Q_ASSERT(m_compUi->enterPasswordEdit);
if (!isVisible() && m_compUi->enterPasswordEdit) { if (!isVisible() && m_compUi->enterPasswordEdit) {
m_compUi->enterPasswordEdit->setText(""); m_compUi->enterPasswordEdit->setText("");
m_compUi->repeatPasswordEdit->setText(""); m_compUi->repeatPasswordEdit->setText("");