[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:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@106461 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index b2255c2..0baaafb 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,14 @@
+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>
 
         [Qt][WK2] run-webkit-tests --qt  crashes if WEBKIT_TESTFONTS is not set

diff --git a/Tools/qmake/mkspecs/features/features.prf b/Tools/qmake/mkspecs/features/features.prf
index 4120060..8fd82b4 100644 (file)
--- a/Tools/qmake/mkspecs/features/features.prf
+++ b/Tools/qmake/mkspecs/features/features.prf
@@ -111,15 +111,19 @@ haveQt(4):unix:!mac:!embedded {
 }
 
 # 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
-    } else {
+!contains(DEFINES, PLUGIN_ARCHITECTURE_UNSUPPORTED) {
+    no_webkit2 {
         DEFINES += PLUGIN_ARCHITECTURE_UNSUPPORTED=1
+    } else {
+        # 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
+        }
     }
 }