summaryrefslogtreecommitdiff
path: root/chromium/base/message_loop/message_pump_x11.cc
diff options
context:
space:
mode:
Diffstat (limited to 'chromium/base/message_loop/message_pump_x11.cc')
-rw-r--r--chromium/base/message_loop/message_pump_x11.cc3
1 files changed, 3 insertions, 0 deletions
diff --git a/chromium/base/message_loop/message_pump_x11.cc b/chromium/base/message_loop/message_pump_x11.cc
index 35dcc040348..001775c5d00 100644
--- a/chromium/base/message_loop/message_pump_x11.cc
+++ b/chromium/base/message_loop/message_pump_x11.cc
@@ -141,12 +141,15 @@ MessagePumpX11::~MessagePumpX11() {
g_xdisplay = NULL;
}
+#if !defined(TOOLKIT_QT)
+// Qt uses it's own version.
// static
Display* MessagePumpX11::GetDefaultXDisplay() {
if (!g_xdisplay)
g_xdisplay = XOpenDisplay(NULL);
return g_xdisplay;
}
+#endif
#if defined(TOOLKIT_GTK)
// static