diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-06-30 13:35:37 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-06-30 14:28:55 +0200 |
| commit | b07e95e408fde45a0ce1a1b6683d432c9657e650 (patch) | |
| tree | 65a80f556bf54d188d17ff985f37eb138007c9f4 /src/client/qwaylandwindowmanagerintegration_p.h | |
| parent | 4d4f44a70f663428241c83e26d073f5e5ece8b62 (diff) | |
| parent | cddeb1c7c0e9d02c5f5542d7d12b4fa992bfb050 (diff) | |
Merge remote-tracking branch 'origin/5.7' into dev
Conflicts:
src/compositor/extensions/qwaylandxdgshellintegration.cpp
Change-Id: I3e8666d0c2fd047f12daeb94b2c967c646576ed9
Diffstat (limited to 'src/client/qwaylandwindowmanagerintegration_p.h')
| -rw-r--r-- | src/client/qwaylandwindowmanagerintegration_p.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/client/qwaylandwindowmanagerintegration_p.h b/src/client/qwaylandwindowmanagerintegration_p.h index f2c0ac6be..0e5f67ac1 100644 --- a/src/client/qwaylandwindowmanagerintegration_p.h +++ b/src/client/qwaylandwindowmanagerintegration_p.h @@ -77,10 +77,10 @@ public: explicit QWaylandWindowManagerIntegration(QWaylandDisplay *waylandDisplay); virtual ~QWaylandWindowManagerIntegration(); - QByteArray desktopEnvironment() const; + QByteArray desktopEnvironment() const Q_DECL_OVERRIDE; - bool openUrl(const QUrl &url); - bool openDocument(const QUrl &url); + bool openUrl(const QUrl &url) Q_DECL_OVERRIDE; + bool openDocument(const QUrl &url) Q_DECL_OVERRIDE; bool showIsFullScreen() const; |