Merge branch 'develop' into macos-add-to-path
This commit is contained in:
commit
2c9452efaf
59 changed files with 1286 additions and 262 deletions
|
@ -207,6 +207,8 @@ private slots:
|
|||
|
||||
void globalSettingsClosed();
|
||||
|
||||
void lockToolbars(bool);
|
||||
|
||||
#ifndef Q_OS_MAC
|
||||
void keyReleaseEvent(QKeyEvent *event) override;
|
||||
#endif
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue