Changeset 106461 in webkit

Timestamp:

Feb 1, 2012 2:55:27 AM (12 years ago)

Author:

commit-queue@webkit.org

Message:

[Qt] Automatic clean build feature always do clean build with --no-webkit2
​https://bugs.webkit.org/show_bug.cgi?id=74519

Patch by Nándor Huszka <​huszka.nandor@stud.u-szeged.hu> on 2012-02-01
Reviewed by Tor Arne Vestbø.

Set the PLUGIN_ARCHITECTURE_UNSUPPORTED define always.

• 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-02-01  Nándor Huszka  <huszka.nandor@stud.u-szeged.hu>
+
+        [Qt] Automatic clean build feature always do clean build with --no-webkit2
+        https://bugs.webkit.org/show_bug.cgi?id=74519
+
+        Reviewed by Tor Arne Vestbø.
+
+        Set the PLUGIN_ARCHITECTURE_UNSUPPORTED define always.
+
+        * qmake/mkspecs/features/features.prf:
+
 2012-02-01  Jesus Sanchez-Palencia  <jesus.palencia@openbossa.org>
 

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

@@ -112 +112 @@
 
 # Netscape plugins support for WebKit2
-!no_webkit2:!contains(DEFINES, PLUGIN_ARCHITECTURE_UNSUPPORTED): {
-    # Disable xlib plugins while they're in-process, because they crash
-    # as soon as an installed npapi plugin uses Qt 4.
-    false:contains(QT_CONFIG, xcb-xlib) {
-        CONFIG += plugin_backend_xlib
-        DEFINES += PLUGIN_ARCHITECTURE_X11=1 \
-                   PLUGIN_ARCHITECTURE_UNSUPPORTED=0
+!contains(DEFINES, PLUGIN_ARCHITECTURE_UNSUPPORTED) {
+    no_webkit2 {
+        DEFINES += PLUGIN_ARCHITECTURE_UNSUPPORTED=1
     } else {
-        DEFINES += PLUGIN_ARCHITECTURE_UNSUPPORTED=1
+        # Disable xlib plugins while they're in-process, because they crash
+        # as soon as an installed npapi plugin uses Qt 4.
+        false:contains(QT_CONFIG, xcb-xlib) {
+            CONFIG += plugin_backend_xlib
+            DEFINES += PLUGIN_ARCHITECTURE_X11=1 \
+                       PLUGIN_ARCHITECTURE_UNSUPPORTED=0
+        } else {
+            DEFINES += PLUGIN_ARCHITECTURE_UNSUPPORTED=1
+        }
     }
 }