Merge branch 'develop' into feature/yubikey

This commit is contained in:
Janek Bevendorff 2017-03-10 18:01:14 +01:00
commit 15dd783d2c
No known key found for this signature in database
GPG key ID: CFEC2F6850BFFA53
119 changed files with 616 additions and 381 deletions

View file

@ -34,10 +34,10 @@ public:
bool event(QEvent* event) override;
Q_SIGNALS:
signals:
void openFile(const QString& filename);
private Q_SLOTS:
private slots:
#if defined(Q_OS_UNIX)
void quitBySignal();
#endif