cd7d8a60b4
Qt 5.8 is now the default version.
53 lines
2.5 KiB
Diff
53 lines
2.5 KiB
Diff
From 862ce7d357a3ec32683ac6ec7c0ebdc9346b44ba Mon Sep 17 00:00:00 2001
|
|
From: Thomas Tuegel <ttuegel@gmail.com>
|
|
Date: Sun, 23 Aug 2015 09:18:54 -0500
|
|
Subject: [PATCH 1/3] dlopen webkit nsplugin
|
|
|
|
---
|
|
Source/WebCore/plugins/qt/PluginPackageQt.cpp | 2 +-
|
|
Source/WebCore/plugins/qt/PluginViewQt.cpp | 2 +-
|
|
Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp | 2 +-
|
|
3 files changed, 3 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/Source/WebCore/plugins/qt/PluginPackageQt.cpp b/Source/WebCore/plugins/qt/PluginPackageQt.cpp
|
|
index a923d49..2731d05 100644
|
|
--- a/Source/WebCore/plugins/qt/PluginPackageQt.cpp
|
|
+++ b/Source/WebCore/plugins/qt/PluginPackageQt.cpp
|
|
@@ -136,7 +136,7 @@ static void initializeGtk(QLibrary* module = 0)
|
|
}
|
|
}
|
|
|
|
- QLibrary library(QLatin1String("libgtk-x11-2.0"), 0);
|
|
+ QLibrary library(QLatin1String("@gtk@/lib/libgtk-x11-2.0"), 0);
|
|
if (library.load()) {
|
|
typedef void *(*gtk_init_check_ptr)(int*, char***);
|
|
gtk_init_check_ptr gtkInitCheck = (gtk_init_check_ptr)library.resolve("gtk_init_check");
|
|
diff --git a/Source/WebCore/plugins/qt/PluginViewQt.cpp b/Source/WebCore/plugins/qt/PluginViewQt.cpp
|
|
index de06a2f..363bde5 100644
|
|
--- a/Source/WebCore/plugins/qt/PluginViewQt.cpp
|
|
+++ b/Source/WebCore/plugins/qt/PluginViewQt.cpp
|
|
@@ -697,7 +697,7 @@ static Display *getPluginDisplay()
|
|
// support gdk based plugins (like flash) that use a different X connection.
|
|
// The code below has the same effect as this one:
|
|
// Display *gdkDisplay = gdk_x11_display_get_xdisplay(gdk_display_get_default());
|
|
- QLibrary library(QLatin1String("libgdk-x11-2.0"), 0);
|
|
+ QLibrary library(QLatin1String("@gdk_pixbuf@/lib/libgdk-x11-2.0"), 0);
|
|
if (!library.load())
|
|
return 0;
|
|
|
|
diff --git a/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp b/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp
|
|
index d734ff6..62a2197 100644
|
|
--- a/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp
|
|
+++ b/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp
|
|
@@ -64,7 +64,7 @@ static Display* getPluginDisplay()
|
|
// The code below has the same effect as this one:
|
|
// Display *gdkDisplay = gdk_x11_display_get_xdisplay(gdk_display_get_default());
|
|
|
|
- QLibrary library(QLatin1String("libgdk-x11-2.0"), 0);
|
|
+ QLibrary library(QLatin1String("@gdk_pixbuf@/libgdk-x11-2.0"), 0);
|
|
if (!library.load())
|
|
return 0;
|
|
|
|
--
|
|
2.5.0
|
|
|