Merge #14801: qt: Use window() instead of obsolete topLevelWidget()

laanwj · laanwj · commit 0eb65aa90218 · 2018-12-09T16:53:55.000+01:00
0b4a578 Use window() instead of obsolete topLevelWidget() (Hennadii Stepanov) Pull request description: `QWidget::topLevelWidget()` is obsolete since at least Qt 4.8. Refs: - https://doc-snapshots.qt.io/4.8/qwidget-obsolete.html#topLevelWidget - https://doc.qt.io/qt-5.9/qwidget-obsolete.html#topLevelWidget Tree-SHA512: 45a79a3f11acd24bbf335603e60cb46545f4c9ce9b16280117676797a611c4422525abd39ad6784a7bc459926e3f5120b49a170403ff60ba4788d679862e3ff0
diff --git a/src/qt/guiutil.cpp b/src/qt/guiutil.cpp
@@ -339,7 +339,7 @@ bool checkPoint(const QPoint &p, const QWidget *w)
 {
     QWidget *atW = QApplication::widgetAt(w->mapToGlobal(p));
     if (!atW) return false;
-    return atW->topLevelWidget() == w;
+    return atW->window() == w;
 }
 
 bool isObscured(QWidget *w)

Original file line number	Diff line number	Diff line change
`@@ -339,7 +339,7 @@ bool checkPoint(const QPoint &p, const QWidget *w)`
`339`	`339`	`{`
`340`	`340`	`QWidget *atW = QApplication::widgetAt(w->mapToGlobal(p));`
`341`	`341`	`if (!atW) return false;`
`342`		`- return atW->topLevelWidget() == w;`
	`342`	`+ return atW->window() == w;`
`343`	`343`	`}`
`344`	`344`
`345`	`345`	`bool isObscured(QWidget *w)`