From 5e854f43cec14960a189db58fcb8a0d78ddff2c0 Mon Sep 17 00:00:00 2001 From: Robert Griebl Date: Tue, 9 Jan 2018 17:34:23 +0100 Subject: Fix clang handling of virtual overrides Change-Id: Ia709946efb7c776b194dc9a90b6a8d10601a6bf5 Reviewed-by: Thomas Senyk --- src/manager-lib/fakeapplicationmanagerwindow.cpp | 2 +- src/manager-lib/fakeapplicationmanagerwindow.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/manager-lib/fakeapplicationmanagerwindow.cpp b/src/manager-lib/fakeapplicationmanagerwindow.cpp index ffa65051..9172d375 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"); } -void FakeApplicationManagerWindow::contains() const { referenceError("contains"); } +bool FakeApplicationManagerWindow::contains(const QPointF &) const { referenceError("contains"); return false; } 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 7b300717..be13e2af 100644 --- a/src/manager-lib/fakeapplicationmanagerwindow.h +++ b/src/manager-lib/fakeapplicationmanagerwindow.h @@ -147,7 +147,7 @@ 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 void contains() 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; -- cgit v1.2.3