Title: [100132] trunk/Tools
- Revision
- 100132
- Author
- [email protected]
- Date
- 2011-11-14 05:06:13 -0800 (Mon, 14 Nov 2011)
Log Message
[Qt] Disable plugins on X11 for WK2
Reviewed by Kenneth Rohde Christiansen.
Currently plugins are in-process and they crash in the likely case of
a plugin installation that uses Qt 4, which beautifully clashes with the
Qt 5 based QtWebProcess.
* qmake/mkspecs/features/features.prf:
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (100131 => 100132)
--- trunk/Tools/ChangeLog 2011-11-14 13:01:03 UTC (rev 100131)
+++ trunk/Tools/ChangeLog 2011-11-14 13:06:13 UTC (rev 100132)
@@ -1,3 +1,15 @@
+2011-11-14 Simon Hausmann <[email protected]>
+
+ [Qt] Disable plugins on X11 for WK2
+
+ Reviewed by Kenneth Rohde Christiansen.
+
+ Currently plugins are in-process and they crash in the likely case of
+ a plugin installation that uses Qt 4, which beautifully clashes with the
+ Qt 5 based QtWebProcess.
+
+ * qmake/mkspecs/features/features.prf:
+
2011-11-14 Tor Arne Vestbø <[email protected]>
[Qt] Add support for config tests for Qt 5
Modified: trunk/Tools/qmake/mkspecs/features/features.prf (100131 => 100132)
--- trunk/Tools/qmake/mkspecs/features/features.prf 2011-11-14 13:01:03 UTC (rev 100131)
+++ trunk/Tools/qmake/mkspecs/features/features.prf 2011-11-14 13:06:13 UTC (rev 100132)
@@ -102,7 +102,9 @@
# Netscape plugins support for WebKit2
!no_webkit2:!contains(DEFINES, PLUGIN_ARCHITECTURE_UNSUPPORTED): {
- contains(QT_CONFIG, xcb-xlib) {
+ # 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
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
