diff options
| author | Shawn Rutledge <shawn.rutledge@digia.com> | 2015-03-06 09:29:56 +0100 |
|---|---|---|
| committer | Shawn Rutledge <shawn.rutledge@digia.com> | 2015-03-06 19:55:07 +0000 |
| commit | 483328a956bfb9c8908ebe36e3695fab44384820 (patch) | |
| tree | 83d3fe2ef2412d87696c2266aea42225579f3e25 /src | |
| parent | 51ada7734ad780178ecced11e0dff454dfc2e5f2 (diff) | |
docs: QPlatformWindow::screen() and QWindow::screen() can return null
After change f4b8697c40bd476ef6bf83418e144adce7c7d4a3, it is normal
on X11 to have a null screen when all outputs have been disconnected
or turned off.
Change-Id: I97eeefd86d97701be50f0757fe5c53ca36d79aaa
Reviewed-by: Harri Porten <porten@froglogic.com>
Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/kernel/qplatformwindow.cpp | 3 | ||||
| -rw-r--r-- | src/gui/kernel/qwindow.cpp | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/gui/kernel/qplatformwindow.cpp b/src/gui/kernel/qplatformwindow.cpp index d8e4e7736e..114fcf8062 100644 --- a/src/gui/kernel/qplatformwindow.cpp +++ b/src/gui/kernel/qplatformwindow.cpp @@ -79,7 +79,8 @@ QPlatformWindow *QPlatformWindow::parent() const } /*! - Returns the platform screen handle corresponding to this platform window. + Returns the platform screen handle corresponding to this platform window, + or null if the window is not associated with a screen. */ QPlatformScreen *QPlatformWindow::screen() const { diff --git a/src/gui/kernel/qwindow.cpp b/src/gui/kernel/qwindow.cpp index 33f0409216..06db4e81fa 100644 --- a/src/gui/kernel/qwindow.cpp +++ b/src/gui/kernel/qwindow.cpp @@ -1678,7 +1678,7 @@ bool QWindow::setMouseGrabEnabled(bool grab) } /*! - Returns the screen on which the window is shown. + Returns the screen on which the window is shown, or null if there is none. For child windows, this returns the screen of the corresponding top level window. |