Title: [128297] trunk/Tools
- Revision
- 128297
- Author
- [email protected]
- Date
- 2012-09-12 05:32:29 -0700 (Wed, 12 Sep 2012)
Log Message
[Qt] Fix the build with ENABLE_NETSCAPE_PLUGIN_API=0
https://bugs.webkit.org/show_bug.cgi?id=96494
Patch by Simon Hausmann <[email protected]> on 2012-09-12
Reviewed by Tor Arne Vestbø.
WK2's ENABLE_PLUGIN_PROCESS uses the NPAPI functions unconditionally, so disable the
plugin process feature if we don't have NPAPI.
* qmake/mkspecs/features/features.prf:
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (128296 => 128297)
--- trunk/Tools/ChangeLog 2012-09-12 12:15:32 UTC (rev 128296)
+++ trunk/Tools/ChangeLog 2012-09-12 12:32:29 UTC (rev 128297)
@@ -1,3 +1,15 @@
+2012-09-12 Simon Hausmann <[email protected]>
+
+ [Qt] Fix the build with ENABLE_NETSCAPE_PLUGIN_API=0
+ https://bugs.webkit.org/show_bug.cgi?id=96494
+
+ Reviewed by Tor Arne Vestbø.
+
+ WK2's ENABLE_PLUGIN_PROCESS uses the NPAPI functions unconditionally, so disable the
+ plugin process feature if we don't have NPAPI.
+
+ * qmake/mkspecs/features/features.prf:
+
2012-09-12 Sheriff Bot <[email protected]>
Unreviewed, rolling out r128280.
Modified: trunk/Tools/qmake/mkspecs/features/features.prf (128296 => 128297)
--- trunk/Tools/qmake/mkspecs/features/features.prf 2012-09-12 12:15:32 UTC (rev 128296)
+++ trunk/Tools/qmake/mkspecs/features/features.prf 2012-09-12 12:32:29 UTC (rev 128297)
@@ -149,5 +149,8 @@
# Fullscreen API relies on WebKit2
!build?(webkit2): WEBKIT_CONFIG -= fullscreen_api
+ # WK2's plugin process code requires NPAPI
+ !enable?(netscape_plugin_api): WEBKIT_CONFIG -= plugin_process
+
export(WEBKIT_CONFIG)
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
