diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-06-30 08:10:08 +0200 |
|---|---|---|
| committer | Paul Olav Tvete <paul.tvete@qt.io> | 2016-06-30 10:20:40 +0200 |
| commit | cddeb1c7c0e9d02c5f5542d7d12b4fa992bfb050 (patch) | |
| tree | c377fea4c9ffc0c6aff9619698ad95773e648e94 /src/client/qwaylandscreen_p.h | |
| parent | 1723bf4fc62a43c4dd0e7724aab6231c0309c114 (diff) | |
| parent | 00a65be5ae8e1253ed6fd1f2e1df745f4c319de5 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
src/client/qwaylandinputcontext_p.h
src/hardwareintegration/client/brcm-egl/qwaylandbrcmglcontext.h
src/hardwareintegration/client/wayland-egl/qwaylandglcontext.h
src/hardwareintegration/client/xcomposite-glx/qwaylandxcompositeglxcontext.h
Change-Id: Iac517e1985e4e67d7ca00ca4c10dcda9dd9079f9
Diffstat (limited to 'src/client/qwaylandscreen_p.h')
| -rw-r--r-- | src/client/qwaylandscreen_p.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/client/qwaylandscreen_p.h b/src/client/qwaylandscreen_p.h index 12b680640..64980280a 100644 --- a/src/client/qwaylandscreen_p.h +++ b/src/client/qwaylandscreen_p.h @@ -72,25 +72,25 @@ public: void init(); QWaylandDisplay *display() const; - QRect geometry() const; - int depth() const; - QImage::Format format() const; + QRect geometry() const Q_DECL_OVERRIDE; + int depth() const Q_DECL_OVERRIDE; + QImage::Format format() const Q_DECL_OVERRIDE; QSizeF physicalSize() const Q_DECL_OVERRIDE; QDpi logicalDpi() const Q_DECL_OVERRIDE; QList<QPlatformScreen *> virtualSiblings() const Q_DECL_OVERRIDE; - void setOrientationUpdateMask(Qt::ScreenOrientations mask); + void setOrientationUpdateMask(Qt::ScreenOrientations mask) Q_DECL_OVERRIDE; - Qt::ScreenOrientation orientation() const; + Qt::ScreenOrientation orientation() const Q_DECL_OVERRIDE; int scale() const; qreal devicePixelRatio() const Q_DECL_OVERRIDE; - qreal refreshRate() const; + qreal refreshRate() const Q_DECL_OVERRIDE; - QString name() const { return mOutputName; } + QString name() const Q_DECL_OVERRIDE { return mOutputName; } - QPlatformCursor *cursor() const; + QPlatformCursor *cursor() const Q_DECL_OVERRIDE; QWaylandCursor *waylandCursor() const { return mWaylandCursor; }; uint32_t outputId() const { return m_outputId; } |