From e5c3837218c3dc2b7b327f11de5894b9350adbc9 Mon Sep 17 00:00:00 2001
From: SineStriker <55847490+SineStriker@users.noreply.github.com>
Date: ćšć, 30 5æ 2024 19:54:59 +0800
Subject: [PATCH] Merge pull request #94 from mentalfl0w/patch-2
---
src/quick/quickwindowagent.h | 7 ++++++-
src/quick/quickwindowagent.cpp | 11 +++++++++--
2 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/src/quick/quickwindowagent.cpp b/src/quick/quickwindowagent.cpp
index 32ed68f..a9bfd84 100644
--- a/src/quick/quickwindowagent.cpp
+++ b/src/quick/quickwindowagent.cpp
@@ -82,12 +82,19 @@
Q_EMIT systemButtonChanged(button, item);
}
+#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
+ bool QuickWindowAgent::isHitTestVisible(QQuickItem *item) const {
+#else
bool QuickWindowAgent::isHitTestVisible(const QQuickItem *item) const {
+#endif
Q_D(const QuickWindowAgent);
return d->context->isHitTestVisible(item);
}
-
+#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
+ void QuickWindowAgent::setHitTestVisible(QQuickItem *item, bool visible) {
+#else
void QuickWindowAgent::setHitTestVisible(const QQuickItem *item, bool visible) {
+#endif
Q_D(QuickWindowAgent);
d->context->setHitTestVisible(item, visible);
}
@@ -100,4 +107,4 @@
d.init();
}
-}
\ No newline at end of file
+}
diff --git a/src/quick/quickwindowagent.h b/src/quick/quickwindowagent.h
index e5a9b5a..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.
@@ -53,4 +58,4 @@
}
-#endif // QUICKWINDOWAGENT_H
\ No newline at end of file
+#endif // QUICKWINDOWAGENT_H
--
Gitblit v1.9.1