Title: [106461] trunk/Tools
- Revision
- 106461
- Author
- [email protected]
- Date
- 2012-02-01 02:55:27 -0800 (Wed, 01 Feb 2012)
Log 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 <[email protected]> on 2012-02-01
Reviewed by Tor Arne Vestbø.
Set the PLUGIN_ARCHITECTURE_UNSUPPORTED define always.
* qmake/mkspecs/features/features.prf:
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (106460 => 106461)
--- trunk/Tools/ChangeLog 2012-02-01 10:37:14 UTC (rev 106460)
+++ trunk/Tools/ChangeLog 2012-02-01 10:55:27 UTC (rev 106461)
@@ -1,3 +1,14 @@
+2012-02-01 Nándor Huszka <[email protected]>
+
+ [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 <[email protected]>
[Qt][WK2] run-webkit-tests --qt crashes if WEBKIT_TESTFONTS is not set
Modified: trunk/Tools/qmake/mkspecs/features/features.prf (106460 => 106461)
--- trunk/Tools/qmake/mkspecs/features/features.prf 2012-02-01 10:37:14 UTC (rev 106460)
+++ trunk/Tools/qmake/mkspecs/features/features.prf 2012-02-01 10:55:27 UTC (rev 106461)
@@ -111,15 +111,19 @@
}
# 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
+ }
}
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
