diff options
| author | Jesus Fernandez <jesus.fernandez@qt.io> | 2017-04-25 14:22:13 +0200 |
|---|---|---|
| committer | Jesus Fernandez <Jesus.Fernandez@qt.io> | 2017-09-04 11:36:50 +0000 |
| commit | 3f1ac5899476307923686166705812c24a2e3578 (patch) | |
| tree | eaeb3d40be3d97e9161977a31825f13f07293d0c /src/gui/kernel/qplatformwindow.h | |
| parent | fefdb8466265d632675c50c53a027a86ca1af4a2 (diff) | |
Add QPlatformSurface::screen() const
Classes inheriting QPlatformSurface need to return the QPlatformScreen
to allow the platform integration plugin to know information about the
used screen by the surface.
QPlatformSurface and QPlatformWindow had the same function defined, but
it was not possible to call it without casting the QPlatformSurface
pointer.
Change-Id: I1f93fe7c13ebbc51769677038edeca4de5db0024
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
Diffstat (limited to 'src/gui/kernel/qplatformwindow.h')
| -rw-r--r-- | src/gui/kernel/qplatformwindow.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/kernel/qplatformwindow.h b/src/gui/kernel/qplatformwindow.h index dff8f618e2..4105ef1c1a 100644 --- a/src/gui/kernel/qplatformwindow.h +++ b/src/gui/kernel/qplatformwindow.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2017 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtGui module of the Qt Toolkit. @@ -79,7 +79,7 @@ public: QWindow *window() const; QPlatformWindow *parent() const; - QPlatformScreen *screen() const; + QPlatformScreen *screen() const override; virtual QSurfaceFormat format() const override; |