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/qwaylandnativeinterface_p.h | |
| parent | 1723bf4fc62a43c4dd0e7724aab6231c0309c114 (diff) | |
| parent | 00a65be5ae8e1253ed6fd1f2e1df745f4c319de5 (diff) | |
| download | qtwayland-cddeb1c7c0e9d02c5f5542d7d12b4fa992bfb050.tar.gz | |
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/qwaylandnativeinterface_p.h')
| -rw-r--r-- | src/client/qwaylandnativeinterface_p.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/client/qwaylandnativeinterface_p.h b/src/client/qwaylandnativeinterface_p.h index 61c5e59d..83e3fe5f 100644 --- a/src/client/qwaylandnativeinterface_p.h +++ b/src/client/qwaylandnativeinterface_p.h @@ -67,17 +67,17 @@ class Q_WAYLAND_CLIENT_EXPORT QWaylandNativeInterface : public QPlatformNativeIn { public: QWaylandNativeInterface(QWaylandIntegration *integration); - void *nativeResourceForIntegration(const QByteArray &resource); + void *nativeResourceForIntegration(const QByteArray &resource) Q_DECL_OVERRIDE; void *nativeResourceForWindow(const QByteArray &resourceString, - QWindow *window); + QWindow *window) Q_DECL_OVERRIDE; void *nativeResourceForScreen(const QByteArray &resourceString, - QScreen *screen); - void *nativeResourceForContext(const QByteArray &resource, QOpenGLContext *context); + QScreen *screen) Q_DECL_OVERRIDE; + void *nativeResourceForContext(const QByteArray &resource, QOpenGLContext *context) Q_DECL_OVERRIDE; - QVariantMap windowProperties(QPlatformWindow *window) const; - QVariant windowProperty(QPlatformWindow *window, const QString &name) const; - QVariant windowProperty(QPlatformWindow *window, const QString &name, const QVariant &defaultValue) const; - void setWindowProperty(QPlatformWindow *window, const QString &name, const QVariant &value); + QVariantMap windowProperties(QPlatformWindow *window) const Q_DECL_OVERRIDE; + QVariant windowProperty(QPlatformWindow *window, const QString &name) const Q_DECL_OVERRIDE; + QVariant windowProperty(QPlatformWindow *window, const QString &name, const QVariant &defaultValue) const Q_DECL_OVERRIDE; + void setWindowProperty(QPlatformWindow *window, const QString &name, const QVariant &value) Q_DECL_OVERRIDE; void emitWindowPropertyChanged(QPlatformWindow *window, const QString &name); |