diff options
| author | Andras Becsi <andras.becsi@digia.com> | 2014-03-24 18:36:43 +0100 |
|---|---|---|
| committer | Andras Becsi <andras.becsi@digia.com> | 2014-06-04 18:08:08 +0200 |
| commit | 4fc055fe9ff8a82ddf6df5402401247f3b86a0d3 (patch) | |
| tree | 8414d4f3f59be414c6f27daad522e2ed956e1525 | |
| parent | 290ea863c512c5d418d9cd5aacf76b3a838af37e (diff) | |
| download | qtwebengine-chromium-4fc055fe9ff8a82ddf6df5402401247f3b86a0d3.tar.gz | |
<chromium> Hide the definition of MessagePumpX11::GetDefaultXDisplay
This should replace patch 0011 since we do not build GTK code any more.
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
Change-Id: I08ba240fd24e2bd644229458a316fb5886dbd82b
Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
| -rw-r--r-- | chromium/base/message_loop/message_pump_x11.cc | 3 |
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 |