diff options
author | Laszlo Agocs <laszlo.agocs@digia.com> | 2014-03-06 12:13:14 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-03-06 17:22:55 +0100 |
commit | b0d7e7b2826e7cbc6c93c17366ee59424240bf98 (patch) | |
tree | 1795e693808a7123ca83eba073dd341104b78fc8 | |
parent | 77024a62fefd641ad45371823c77530dcced2750 (diff) |
Avoid polluting debug output in eglfs and linuxfb
Size hints will not be implemented. Grabs maybe some day but the
warnings should be silenced for now.
Change-Id: I1f4861454d45e668c4d758c7f82940cd1136d0c8
Reviewed-by: Jørgen Lind <jorgen.lind@digia.com>
-rw-r--r-- | src/platformsupport/fbconvenience/qfbwindow_p.h | 20 | ||||
-rw-r--r-- | src/plugins/platforms/eglfs/qeglfswindow.h | 4 |
2 files changed, 16 insertions, 8 deletions
diff --git a/src/platformsupport/fbconvenience/qfbwindow_p.h b/src/platformsupport/fbconvenience/qfbwindow_p.h index 5ad921b0d7..a2e0785c96 100644 --- a/src/platformsupport/fbconvenience/qfbwindow_p.h +++ b/src/platformsupport/fbconvenience/qfbwindow_p.h @@ -55,17 +55,17 @@ public: QFbWindow(QWindow *window); ~QFbWindow(); - virtual void raise(); - virtual void lower(); + void raise() Q_DECL_OVERRIDE; + void lower() Q_DECL_OVERRIDE; - virtual void setGeometry(const QRect &rect); - virtual void setVisible(bool visible); + void setGeometry(const QRect &rect) Q_DECL_OVERRIDE; + void setVisible(bool visible) Q_DECL_OVERRIDE; - virtual void setWindowState(Qt::WindowState state); - virtual void setWindowFlags(Qt::WindowFlags type); - virtual Qt::WindowFlags windowFlags() const; + void setWindowState(Qt::WindowState state) Q_DECL_OVERRIDE; + void setWindowFlags(Qt::WindowFlags type) Q_DECL_OVERRIDE; + Qt::WindowFlags windowFlags() const; - WId winId() const { return mWindowId; } + WId winId() const Q_DECL_OVERRIDE { return mWindowId; } void setBackingStore(QFbBackingStore *store) { mBackingStore = store; } QFbBackingStore *backingStore() const { return mBackingStore; } @@ -74,6 +74,10 @@ public: virtual void repaint(const QRegion&); + void propagateSizeHints() Q_DECL_OVERRIDE { } + bool setKeyboardGrabEnabled(bool) Q_DECL_OVERRIDE { return false; } + bool setMouseGrabEnabled(bool) Q_DECL_OVERRIDE { return false; } + protected: friend class QFbScreen; diff --git a/src/plugins/platforms/eglfs/qeglfswindow.h b/src/plugins/platforms/eglfs/qeglfswindow.h index f93a9d54bc..c8c31816a0 100644 --- a/src/plugins/platforms/eglfs/qeglfswindow.h +++ b/src/plugins/platforms/eglfs/qeglfswindow.h @@ -65,6 +65,10 @@ public: void raise() Q_DECL_OVERRIDE; void lower() Q_DECL_OVERRIDE; + void propagateSizeHints() Q_DECL_OVERRIDE { } + bool setKeyboardGrabEnabled(bool) Q_DECL_OVERRIDE { return false; } + bool setMouseGrabEnabled(bool) Q_DECL_OVERRIDE { return false; } + QSurfaceFormat format() const Q_DECL_OVERRIDE; EGLNativeWindowType eglWindow() const Q_DECL_OVERRIDE; EGLSurface surface() const; |