diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-04-05 14:20:06 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-08-21 22:18:52 +0200 |
| commit | b455a863a1df61337f36f2e8b43101ca21514697 (patch) | |
| tree | c2bac33b202629e8c35377df36567d68c75968f0 /src/widgets/kernel/qdesktopwidget_p.h | |
| parent | e71bf9d5c7b14fb3e3b7f970440060c5fd9f9059 (diff) | |
Add screen() accessor to QWidget
Base it on QWidgetPrivate::associatedScreen(), but make a larger
effort to find a screen in case the widget is not shown yet.
Rename QDesktopScreenWidget::screen() to something else to avoid
clashes.
Task-number: QTBUG-62094
Task-number: QTBUG-53022
Change-Id: I36ba5ef5f0645a4ac89da0b38a391f7057b2f49c
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
Diffstat (limited to 'src/widgets/kernel/qdesktopwidget_p.h')
| -rw-r--r-- | src/widgets/kernel/qdesktopwidget_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/widgets/kernel/qdesktopwidget_p.h b/src/widgets/kernel/qdesktopwidget_p.h index 69f87337b3..63949055aa 100644 --- a/src/widgets/kernel/qdesktopwidget_p.h +++ b/src/widgets/kernel/qdesktopwidget_p.h @@ -68,7 +68,7 @@ public: int screenNumber() const; void setScreenGeometry(const QRect &geometry); - QScreen *screen() const { return m_screen.data(); } + QScreen *assignedScreen() const { return m_screen.data(); } QRect screenGeometry() const { return m_geometry; } private: |