Merge branch 'release/2.6.2' into develop

2020-10-15 00:13:14 -04:00
parent fd3cc7e8c3 b10a55a547
commit 0c5dd1556a
43 changed files with 291 additions and 469 deletions
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -118,7 +118,6 @@ set(keepassx_SOURCES
        gui/IconModels.cpp
        gui/KeePass1OpenWidget.cpp
        gui/KMessageWidget.cpp
-        gui/LineEdit.cpp
        gui/MainWindow.cpp
        gui/MessageBox.cpp
        gui/MessageWidget.cpp