Merge branch 'master' into qt6_cmake_joshua

This commit is contained in:
joshua
2026-07-31 21:15:21 +02:00
parent f16cf7dac8
commit e6d29cf345
297 changed files with 82691 additions and 27463 deletions
+2 -3
View File
@@ -178,10 +178,9 @@ class QETApp : public QObject
static QTextOrientationSpinBoxWidget *createTextOrientationSpinBoxWidget();
static TitleBlockTemplate *defaultTitleBlockTemplate();
protected:
#ifdef Q_OS_DARWIN
bool eventFiltrer(QObject *object, QEvent *);
public:
bool eventFilter(QObject *object, QEvent *) override;
#endif
// attributes