diff options
| author | Bernd Weimer <bernd.weimer@pelagicore.com> | 2018-01-16 16:08:06 +0100 |
|---|---|---|
| committer | Bernd Weimer <bernd.weimer@pelagicore.com> | 2018-01-17 08:07:26 +0000 |
| commit | b956d8ff205eaaf2e8f83446e2023fd491562669 (patch) | |
| tree | 5ee24afeb979a1000a7992d10644d37208e7555d | |
| parent | e099f6a81aa35890c2d73daa79b5b79907506599 (diff) | |
Overload virtual contains function again
This basically reverts commit 5e854f43cec14960a189db58fcb8a0d78ddff2c0.
Change-Id: I7856f62b6fdbf8966979e237df65d79fa4c464ad
Reviewed-by: Robert Griebl <robert.griebl@pelagicore.com>
| -rw-r--r-- | src/manager-lib/fakeapplicationmanagerwindow.cpp | 2 | ||||
| -rw-r--r-- | src/manager-lib/fakeapplicationmanagerwindow.h | 11 |
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(); |