Title: [154321] trunk/Source/WebKit2
- Revision
- 154321
- Author
- [email protected]
- Date
- 2013-08-20 03:44:32 -0700 (Tue, 20 Aug 2013)
Log Message
[Qt][WK2] Doesn't build without Plugin-process
https://bugs.webkit.org/show_bug.cgi?id=120060
Reviewed by Jocelyn Turcotte.
Disable netscape plugin api in WebKit2 when the plugin architecture is unsupported for WebKit2.
* Target.pri:
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (154320 => 154321)
--- trunk/Source/WebKit2/ChangeLog 2013-08-20 10:13:00 UTC (rev 154320)
+++ trunk/Source/WebKit2/ChangeLog 2013-08-20 10:44:32 UTC (rev 154321)
@@ -1,3 +1,14 @@
+2013-08-20 Allan Sandfeld Jensen <[email protected]>
+
+ [Qt][WK2] Doesn't build without Plugin-process
+ https://bugs.webkit.org/show_bug.cgi?id=120060
+
+ Reviewed by Jocelyn Turcotte.
+
+ Disable netscape plugin api in WebKit2 when the plugin architecture is unsupported for WebKit2.
+
+ * Target.pri:
+
2013-08-19 Ryosuke Niwa <[email protected]>
<https://webkit.org/b/120049> Delete code for Snow Leopard
Modified: trunk/Source/WebKit2/Target.pri (154320 => 154321)
--- trunk/Source/WebKit2/Target.pri 2013-08-20 10:13:00 UTC (rev 154320)
+++ trunk/Source/WebKit2/Target.pri 2013-08-20 10:44:32 UTC (rev 154321)
@@ -15,6 +15,12 @@
RESOURCES += $$PWD/WebKit2.qrc
+enable?(netscape_plugin_api):enable?(plugin_architecture_unsupported) {
+ # Netscape plugins are not supported for this architecture on WebKit2,
+ # but they may have been enabled for WebKit1.
+ WEBKIT_CONFIG -= netscape_plugin_api
+}
+
HEADERS += \
Platform/CoreIPC/ArgumentDecoder.h \
Platform/CoreIPC/ArgumentEncoder.h \
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
