summaryrefslogtreecommitdiff
path: root/src/plugins/shellintegration/xdg-shell/qwaylandxdgshell_p.h
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@qt.io>2018-10-30 00:50:22 +0100
committerOswald Buddenhagen <oswald.buddenhagen@qt.io>2018-10-30 00:50:22 +0100
commit52876056ff3dcda97f93932bc8c6e1c0fbce9d5e (patch)
tree5bdd3cc28573a90e192b24564d3ed7cc4792f365 /src/plugins/shellintegration/xdg-shell/qwaylandxdgshell_p.h
parent9ebe63181ba3504569c75b25862172353b6cfaa8 (diff)
parent16a98829a664403f2fb8962884701f5d4d31cacd (diff)
downloadqtwayland-52876056ff3dcda97f93932bc8c6e1c0fbce9d5e.tar.gz
Merge 5.12 into 5.12.0
Change-Id: Ic7b7999f42b1867982b9410efb5224d68e9443f8
Diffstat (limited to 'src/plugins/shellintegration/xdg-shell/qwaylandxdgshell_p.h')
-rw-r--r--src/plugins/shellintegration/xdg-shell/qwaylandxdgshell_p.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/shellintegration/xdg-shell/qwaylandxdgshell_p.h b/src/plugins/shellintegration/xdg-shell/qwaylandxdgshell_p.h
index 45d7d4b0..5e97a34b 100644
--- a/src/plugins/shellintegration/xdg-shell/qwaylandxdgshell_p.h
+++ b/src/plugins/shellintegration/xdg-shell/qwaylandxdgshell_p.h
@@ -89,7 +89,7 @@ public:
void setAppId(const QString &appId) override;
void setWindowFlags(Qt::WindowFlags flags) override;
- bool isExposed() const override { return m_configured; }
+ bool isExposed() const override;
bool handleExpose(const QRegion &) override;
bool handlesActiveState() const { return m_toplevel; }
void applyConfigure() override;