Changeset 128297 in webkit

Timestamp:

Sep 12, 2012 5:32:29 AM (12 years ago)

Author:

commit-queue@webkit.org

Message:

[Qt] Fix the build with ENABLE_NETSCAPE_PLUGIN_API=0
​https://bugs.webkit.org/show_bug.cgi?id=96494

Patch by Simon Hausmann <​simon.hausmann@nokia.com> 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:

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• qmake/mkspecs/features/features.prf (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2012-09-12  Simon Hausmann  <simon.hausmann@nokia.com>
+
+        [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  <webkit.review.bot@gmail.com>
 

trunk/Tools/qmake/mkspecs/features/features.prf

@@ -150 +150 @@
     !build?(webkit2): WEBKIT_CONFIG -= fullscreen_api
 
+    # WK2's plugin process code requires NPAPI
+    !enable?(netscape_plugin_api): WEBKIT_CONFIG -= plugin_process
+
     export(WEBKIT_CONFIG)
 }