From 7610c3a509b8a04d25e72a6282d9c8ea8ecbd27f Mon Sep 17 00:00:00 2001
From: iveswang <1660583890@qq.com>
Date: ćšć, 13 6æ 2024 14:09:06 +0800
Subject: [PATCH] fix: QObjectPrivate::threadData type change when qt >=5.15
---
src/quick/quickwindowagent.h | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/src/quick/quickwindowagent.h b/src/quick/quickwindowagent.h
index c319615..de52d49 100644
--- a/src/quick/quickwindowagent.h
+++ b/src/quick/quickwindowagent.h
@@ -31,8 +31,13 @@
Q_INVOKABLE QQuickItem *systemButton(SystemButton button) const;
Q_INVOKABLE void setSystemButton(SystemButton button, QQuickItem *item);
+#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
+ Q_INVOKABLE bool isHitTestVisible(QQuickItem *item) const;
+ Q_INVOKABLE void setHitTestVisible(QQuickItem *item, bool visible = true);
+#else
Q_INVOKABLE bool isHitTestVisible(const QQuickItem *item) const;
Q_INVOKABLE void setHitTestVisible(const QQuickItem *item, bool visible = true);
+#endif
#ifdef Q_OS_MAC
// The system button area APIs are experimental, very likely to change in the future.
@@ -44,8 +49,8 @@
#endif
Q_SIGNALS:
- void titleBarWidgetChanged(const QQuickItem *item);
- void systemButtonChanged(SystemButton button, const QQuickItem *item);
+ void titleBarWidgetChanged(QQuickItem *item);
+ void systemButtonChanged(SystemButton button, QQuickItem *item);
protected:
QuickWindowAgent(QuickWindowAgentPrivate &d, QObject *parent = nullptr);
@@ -53,4 +58,4 @@
}
-#endif // QUICKWINDOWAGENT_H
\ No newline at end of file
+#endif // QUICKWINDOWAGENT_H
--
Gitblit v1.9.1