Title: [99146] trunk/Source/WebKit2
- Revision
- 99146
- Author
- [email protected]
- Date
- 2011-11-03 00:36:28 -0700 (Thu, 03 Nov 2011)
Log Message
[Qt] Flagging usage of X11 headers under PLAT_ARCH(X11)
https://bugs.webkit.org/show_bug.cgi?id=71409
Reviewed by Simon Hausmann.
Build fix for building qtwebkit with latest qt5 which has removed Qt X11 headers.
* WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp:
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (99145 => 99146)
--- trunk/Source/WebKit2/ChangeLog 2011-11-03 07:34:34 UTC (rev 99145)
+++ trunk/Source/WebKit2/ChangeLog 2011-11-03 07:36:28 UTC (rev 99146)
@@ -1,3 +1,14 @@
+2011-11-03 Mahesh Kulkarni <[email protected]>
+
+ [Qt] Flagging usage of X11 headers under PLAT_ARCH(X11)
+ https://bugs.webkit.org/show_bug.cgi?id=71409
+
+ Reviewed by Simon Hausmann.
+
+ Build fix for building qtwebkit with latest qt5 which has removed Qt X11 headers.
+
+ * WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp:
+
2011-11-03 Philippe Normand <[email protected]>
Unreviewed, GTK build fix after r99093...
Modified: trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp (99145 => 99146)
--- trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp 2011-11-03 07:34:34 UTC (rev 99145)
+++ trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp 2011-11-03 07:36:28 UTC (rev 99146)
@@ -36,11 +36,13 @@
#include <WebCore/SharedBuffer.h>
#include <utility>
+#if PLUGIN_ARCHITECTURE(X11)
#if PLATFORM(QT)
#include <QX11Info>
#elif PLATFORM(GTK)
#include <gdk/gdkx.h>
#endif
+#endif
using namespace WebCore;
using namespace std;
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
