summaryrefslogtreecommitdiff
path: root/src/x11extras/qx11info_x11.h
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@theqtcompany.com>2016-04-08 23:44:15 +0200
committerLiang Qi <liang.qi@theqtcompany.com>2016-04-08 23:44:15 +0200
commita292671f0842211ca60e51cf34b6fb47d8bae655 (patch)
tree9eb75c6b218533e5136b23d6b43e3f782e6c885f /src/x11extras/qx11info_x11.h
parentb35074ec6cf0da49ce153948aff45c42950cab9a (diff)
parentb414120c60ef8c3cc2aad7dca41092647d741a36 (diff)
downloadqtx11extras-a292671f0842211ca60e51cf34b6fb47d8bae655.tar.gz
Merge remote-tracking branch 'origin/5.7' into dev
Change-Id: I98ab3d1c372f68a7a24f831be30bae939c6a62ba
Diffstat (limited to 'src/x11extras/qx11info_x11.h')
-rw-r--r--src/x11extras/qx11info_x11.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/x11extras/qx11info_x11.h b/src/x11extras/qx11info_x11.h
index 620428d..ab72686 100644
--- a/src/x11extras/qx11info_x11.h
+++ b/src/x11extras/qx11info_x11.h
@@ -73,6 +73,8 @@ public:
static Display *display();
static xcb_connection_t *connection();
+ static bool isCompositingManagerRunning(int screen = -1);
+
private:
QX11Info();
};