diff options
Diffstat (limited to 'src/gui/kernel')
-rw-r--r-- | src/gui/kernel/qplatformoffscreensurface.cpp | 2 | ||||
-rw-r--r-- | src/gui/kernel/qplatformoffscreensurface.h | 4 | ||||
-rw-r--r-- | src/gui/kernel/qplatformsurface.h | 4 | ||||
-rw-r--r-- | src/gui/kernel/qplatformwindow.h | 4 |
4 files changed, 8 insertions, 6 deletions
diff --git a/src/gui/kernel/qplatformoffscreensurface.cpp b/src/gui/kernel/qplatformoffscreensurface.cpp index 9d35b37c6a..c2952e166c 100644 --- a/src/gui/kernel/qplatformoffscreensurface.cpp +++ b/src/gui/kernel/qplatformoffscreensurface.cpp @@ -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. diff --git a/src/gui/kernel/qplatformoffscreensurface.h b/src/gui/kernel/qplatformoffscreensurface.h index be15a98e28..cef0fab7e1 100644 --- a/src/gui/kernel/qplatformoffscreensurface.h +++ b/src/gui/kernel/qplatformoffscreensurface.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. @@ -68,7 +68,7 @@ public: QOffscreenSurface *offscreenSurface() const; - QPlatformScreen *screen() const; + QPlatformScreen *screen() const override; virtual QSurfaceFormat format() const override; virtual bool isValid() const; diff --git a/src/gui/kernel/qplatformsurface.h b/src/gui/kernel/qplatformsurface.h index 5a1e4fe82d..76e8767a05 100644 --- a/src/gui/kernel/qplatformsurface.h +++ b/src/gui/kernel/qplatformsurface.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. @@ -56,6 +56,7 @@ QT_BEGIN_NAMESPACE +class QPlatformScreen; class Q_GUI_EXPORT QPlatformSurface { @@ -64,6 +65,7 @@ public: virtual QSurfaceFormat format() const = 0; QSurface *surface() const; + virtual QPlatformScreen *screen() const = 0; private: explicit QPlatformSurface(QSurface *surface); 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; |