summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/manager-lib/fakeapplicationmanagerwindow.cpp2
-rw-r--r--src/manager-lib/fakeapplicationmanagerwindow.h11
2 files changed, 11 insertions, 2 deletions
diff --git a/src/manager-lib/fakeapplicationmanagerwindow.cpp b/src/manager-lib/fakeapplicationmanagerwindow.cpp
index 9172d375..ffa65051 100644
--- a/src/manager-lib/fakeapplicationmanagerwindow.cpp
+++ b/src/manager-lib/fakeapplicationmanagerwindow.cpp
@@ -274,7 +274,7 @@ void FakeApplicationManagerWindow::referenceError(const char *symbol) const
}
void FakeApplicationManagerWindow::grabToImage() const { referenceError("grabToImage"); }
-bool FakeApplicationManagerWindow::contains(const QPointF &) const { referenceError("contains"); return false; }
+void FakeApplicationManagerWindow::contains() const { referenceError("contains"); }
void FakeApplicationManagerWindow::mapFromItem() const { referenceError("mapFromItem"); }
void FakeApplicationManagerWindow::mapToItem() const { referenceError("mapToItem"); }
void FakeApplicationManagerWindow::mapFromGlobal() const { referenceError("mapFromGlobal"); }
diff --git a/src/manager-lib/fakeapplicationmanagerwindow.h b/src/manager-lib/fakeapplicationmanagerwindow.h
index be13e2af..fb87c609 100644
--- a/src/manager-lib/fakeapplicationmanagerwindow.h
+++ b/src/manager-lib/fakeapplicationmanagerwindow.h
@@ -147,7 +147,6 @@ public slots:
// Hide the following functions (from QQuickIem),
// since they are not available in multi-process mode (QWindow):
Q_INVOKABLE void grabToImage() const;
- Q_INVOKABLE bool contains(const QPointF &) const override; // needs the correct parameter because it's virtual
Q_INVOKABLE void mapFromItem() const;
Q_INVOKABLE void mapToItem() const;
Q_INVOKABLE void mapFromGlobal() const;
@@ -155,6 +154,16 @@ public slots:
Q_INVOKABLE void forceActiveFocus() const;
Q_INVOKABLE void nextItemInFocusChain() const;
Q_INVOKABLE void childAt() const;
+#if defined(Q_CC_CLANG)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Woverloaded-virtual"
+#endif
+ // Although "contains" is virtual in QQuickItem with a different signature, from QML
+ // the following, intentionally overloaded version without parameters will be called:
+ Q_INVOKABLE void contains() const;
+#if defined(Q_CC_CLANG)
+#pragma clang diagnostic pop
+#endif
signals:
void fakeCloseSignal();