diff options
| author | Jocelyn Turcotte <jocelyn.turcotte@digia.com> | 2013-10-30 11:28:48 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-11-11 17:25:17 +0100 |
| commit | 258e3aad97be370663983573b557c4115db3fafb (patch) | |
| tree | 0a5a55d7825fa93d7c3a0557c1dfb851aac05ec3 /patches | |
| parent | fb62607e950ac711f7366b378d8d5f952d4fd1b3 (diff) | |
Use our own implementation of GetDefaultXDisplay.
This allows the Chromium GL code to initialize on the display created
by Qt.
Change-Id: I3d21f56c3792d6e99cb94690f56d7dd5c542045a
Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
Diffstat (limited to 'patches')
| -rw-r--r-- | patches/0001-Hide-the-definition-of-MessagePumpGtk-GetDefaultXDis.patch | 34 | ||||
| -rwxr-xr-x | patches/patch-chromium.sh | 1 |
2 files changed, 35 insertions, 0 deletions
diff --git a/patches/0001-Hide-the-definition-of-MessagePumpGtk-GetDefaultXDis.patch b/patches/0001-Hide-the-definition-of-MessagePumpGtk-GetDefaultXDis.patch new file mode 100644 index 000000000..20b614d56 --- /dev/null +++ b/patches/0001-Hide-the-definition-of-MessagePumpGtk-GetDefaultXDis.patch @@ -0,0 +1,34 @@ +From 717b027460dbda87c965ea0069fd11bbe7aad59f Mon Sep 17 00:00:00 2001 +From: Jocelyn Turcotte <jocelyn.turcotte@digia.com> +Date: Fri, 20 Sep 2013 15:01:41 +0200 +Subject: [PATCH] Hide the definition of MessagePumpGtk::GetDefaultXDisplay. + +--- + base/message_loop/message_pump_gtk.cc | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/base/message_loop/message_pump_gtk.cc b/base/message_loop/message_pump_gtk.cc +index ad65113..af59685 100644 +--- a/base/message_loop/message_pump_gtk.cc ++++ b/base/message_loop/message_pump_gtk.cc +@@ -85,6 +85,9 @@ void MessagePumpGtk::DispatchEvents(GdkEvent* event) { + DidProcessEvent(event); + } + ++// FIXME: Get our own MessagePumpUI to avoid this. ++// Comment out this version so that our Qt version in shared_globals.cpp is used. ++/* + // static + Display* MessagePumpGtk::GetDefaultXDisplay() { + static GdkDisplay* display = gdk_display_get_default(); +@@ -96,6 +99,7 @@ Display* MessagePumpGtk::GetDefaultXDisplay() { + } + return GDK_DISPLAY_XDISPLAY(display); + } ++*/ + + void MessagePumpGtk::WillProcessEvent(GdkEvent* event) { + FOR_EACH_OBSERVER(MessagePumpObserver, observers(), WillProcessEvent(event)); +-- +1.8.4 + diff --git a/patches/patch-chromium.sh b/patches/patch-chromium.sh index 510237a5a..2c3834b08 100755 --- a/patches/patch-chromium.sh +++ b/patches/patch-chromium.sh @@ -68,6 +68,7 @@ git am $PATCH_DIR/0001-remove-Wno-deprecated-register-from-common.gypi.patch git am $PATCH_DIR/0001-Solve-conflicts-when-including-both-QtOpenGL-headers.patch git am $PATCH_DIR/0001-Do-not-forward-declare-UIResourceRequest-Identity-an.patch git am $PATCH_DIR/0001-Fix-the-build-with-a-GL-ES2-configured-Qt.patch +git am $PATCH_DIR/0001-Hide-the-definition-of-MessagePumpGtk-GetDefaultXDis.patch cd $CHROMIUM_SRC_DIR/third_party/WebKit echo "Entering $PWD" |