Merge branch 'develop' into macos-add-to-path

This commit is contained in:
Ryan Cao 2022-11-14 19:26:31 +08:00 committed by GitHub
commit 2c9452efaf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
59 changed files with 1286 additions and 262 deletions

View file

@ -207,6 +207,8 @@ private slots:
void globalSettingsClosed();
void lockToolbars(bool);
#ifndef Q_OS_MAC
void keyReleaseEvent(QKeyEvent *event) override;
#endif