Merge branch '2.0'

2015-12-15 21:05:00 +01:00
parent 0c36c40a5d 24275d8dc4
commit ecfbf72a57
33 changed files with 9516 additions and 347 deletions
--- a/src/gui/DatabaseWidget.h
+++ b/src/gui/DatabaseWidget.h
@@ -101,6 +101,9 @@ Q_SIGNALS:
    void splitterSizesChanged();
    void entryColumnSizesChanged();

+protected:
+    bool eventFilter(QObject* object, QEvent* event) Q_DECL_OVERRIDE;
+
 public Q_SLOTS:
    void createEntry();
    void cloneEntry();