diff options
| author | Andras Becsi <andras.becsi@digia.com> | 2014-03-24 18:36:43 +0100 |
|---|---|---|
| committer | Andras Becsi <andras.becsi@digia.com> | 2014-03-25 14:00:22 +0100 |
| commit | d12a5818c08a6e4ca207a0bb1688cb4d82c20460 (patch) | |
| tree | 8532a531375ad4ddcc962f55cfc02eefb5c8d5e7 | |
| parent | a5ffa93943793499889225de8372c7adfc2d2fbe (diff) | |
| download | qtwebengine-chromium-d12a5818c08a6e4ca207a0bb1688cb4d82c20460.tar.gz | |
Hide the definition of MessagePumpX11::GetDefaultXDisplay
This should replace patch 0011 since we do not build GTK code any more.
Change-Id: I156f164128b04eee6d5956a576adef3b9d2d18ea
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@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 |