Allow to pass the QScreen pointer to the QML Window

wxmaper · wxmaper · commit 011b783fa38b · 2025-05-15T13:10:28.000+03:00
Some Qt objects may return a QScreen pointer. Allow this pointer to be
accepted as an argument for `Window.screen` on the QML side.
diff --git a/src/quick/items/qquickwindowmodule.cpp b/src/quick/items/qquickwindowmodule.cpp
@@ -549,7 +549,7 @@ QObject *QQuickWindowQmlImpl::screen() const
 void QQuickWindowQmlImpl::setScreen(QObject *screen)
 {
     QQuickScreenInfo *screenWrapper = qobject_cast<QQuickScreenInfo *>(screen);
-    QWindow::setScreen(screenWrapper ? screenWrapper->wrappedScreen() : nullptr);
+    QWindow::setScreen(screenWrapper ? screenWrapper->wrappedScreen() : qobject_cast<QScreen *>(screen));
 }
 
 QQuickWindowAttached *QQuickWindowQmlImpl::qmlAttachedProperties(QObject *object)

Original file line number	Diff line number	Diff line change
`@@ -549,7 +549,7 @@ QObject *QQuickWindowQmlImpl::screen() const`
`549`	`549`	`void QQuickWindowQmlImpl::setScreen(QObject *screen)`
`550`	`550`	`{`
`551`	`551`	`QQuickScreenInfo screenWrapper = qobject_cast<QQuickScreenInfo >(screen);`
`552`		`- QWindow::setScreen(screenWrapper ? screenWrapper->wrappedScreen() : nullptr);`
	`552`	`+ QWindow::setScreen(screenWrapper ? screenWrapper->wrappedScreen() : qobject_cast<QScreen *>(screen));`
`553`	`553`	`}`
`554`	`554`
`555`	`555`	`QQuickWindowAttached QQuickWindowQmlImpl::qmlAttachedProperties(QObject object)`