summaryrefslogtreecommitdiffstats
path: root/src/plugins/platforms/xcb/qxcbconnection.h
diff options
context:
space:
mode:
authorJørgen Lind <jorgen.lind@digia.com>2013-04-25 15:15:20 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-04-26 14:18:16 +0200
commit7288625c52749f566570a7e7ef047faa8171b18c (patch)
treec4c3d0e2808bc868a6440060f7db661417268d0f /src/plugins/platforms/xcb/qxcbconnection.h
parentf8e2a8469f91ac1a7daf73c8ed9c24195e5b5a56 (diff)
Moving logic from Qt4 for grabbing the X server
Basically you don't want to grab the X server while your debugging. Also added an environment variable which lets you force to not grab the X server Change-Id: Iba03f11c8f486ce71c55fac7716bffcb7cc8cb98 Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
Diffstat (limited to 'src/plugins/platforms/xcb/qxcbconnection.h')
-rw-r--r--src/plugins/platforms/xcb/qxcbconnection.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/plugins/platforms/xcb/qxcbconnection.h b/src/plugins/platforms/xcb/qxcbconnection.h
index 8ab65fc2bc..27de5a4e83 100644
--- a/src/plugins/platforms/xcb/qxcbconnection.h
+++ b/src/plugins/platforms/xcb/qxcbconnection.h
@@ -306,7 +306,7 @@ class QXcbConnection : public QObject
{
Q_OBJECT
public:
- QXcbConnection(QXcbNativeInterface *nativeInterface, const char *displayName = 0);
+ QXcbConnection(QXcbNativeInterface *nativeInterface, bool canGrabServer, const char *displayName = 0);
~QXcbConnection();
QXcbConnection *connection() const { return const_cast<QXcbConnection *>(this); }
@@ -391,6 +391,8 @@ public:
QByteArray startupId() const { return m_startupId; }
void clearStartupId() { m_startupId.clear(); }
+ void grabServer();
+ void ungrabServer();
private slots:
void processXcbEvents();
@@ -454,6 +456,7 @@ private:
xcb_connection_t *m_connection;
const xcb_setup_t *m_setup;
+ bool m_canGrabServer;
QList<QXcbScreen *> m_screens;
int m_primaryScreen;