Title: [99163] trunk
- Revision
- 99163
- Author
- [email protected]
- Date
- 2011-11-03 03:37:19 -0700 (Thu, 03 Nov 2011)
Log Message
[Qt] X11 plugins need to be reworked for Qt5
https://bugs.webkit.org/show_bug.cgi?id=70023
Reviewed by Simon Hausmann.
Source/WebCore:
Disable X11 plugins with Qt5.
* features.pri:
Source/WebKit2:
Disable X11 plugins.
* config.h:
LayoutTests:
Disable plugin tests with Qt5.
* platform/qt-5.0/Skipped:
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (99162 => 99163)
--- trunk/LayoutTests/ChangeLog 2011-11-03 10:33:35 UTC (rev 99162)
+++ trunk/LayoutTests/ChangeLog 2011-11-03 10:37:19 UTC (rev 99163)
@@ -1,3 +1,13 @@
+2011-11-03 Balazs Kelemen <[email protected]>
+
+ [Qt] X11 plugins need to be reworked for Qt5
+ https://bugs.webkit.org/show_bug.cgi?id=70023
+
+ Reviewed by Simon Hausmann.
+
+ Disable plugin tests with Qt5.
+ * platform/qt-5.0/Skipped:
+
2011-11-03 Sheriff Bot <[email protected]>
Unreviewed, rolling out r99138.
Modified: trunk/LayoutTests/platform/qt-5.0/Skipped (99162 => 99163)
--- trunk/LayoutTests/platform/qt-5.0/Skipped 2011-11-03 10:33:35 UTC (rev 99162)
+++ trunk/LayoutTests/platform/qt-5.0/Skipped 2011-11-03 10:37:19 UTC (rev 99163)
@@ -1,3 +1,7 @@
+# [Qt] Plugins need to be reworked for Qt5
+# https://bugs.webkit.org/show_bug.cgi?id=70023
+plugins
+
# Failing tests after refactored Qt5
animations/3d/change-transform-in-end-event.html
animations/3d/state-at-end-event-transform.html
Modified: trunk/Source/WebCore/ChangeLog (99162 => 99163)
--- trunk/Source/WebCore/ChangeLog 2011-11-03 10:33:35 UTC (rev 99162)
+++ trunk/Source/WebCore/ChangeLog 2011-11-03 10:37:19 UTC (rev 99163)
@@ -1,3 +1,13 @@
+2011-11-03 Balazs Kelemen <[email protected]>
+
+ [Qt] X11 plugins need to be reworked for Qt5
+ https://bugs.webkit.org/show_bug.cgi?id=70023
+
+ Reviewed by Simon Hausmann.
+
+ Disable X11 plugins with Qt5.
+ * features.pri:
+
2011-11-03 Sheriff Bot <[email protected]>
Unreviewed, rolling out r99138.
Modified: trunk/Source/WebCore/features.pri (99162 => 99163)
--- trunk/Source/WebCore/features.pri 2011-11-03 10:33:35 UTC (rev 99162)
+++ trunk/Source/WebCore/features.pri 2011-11-03 10:37:19 UTC (rev 99163)
@@ -87,7 +87,7 @@
# Nescape plugins support (NPAPI)
!contains(DEFINES, ENABLE_NETSCAPE_PLUGIN_API=.) {
- unix|win32-*:!embedded:!wince*: {
+ unix:!qt5|win32-*:!embedded:!wince*: {
DEFINES += ENABLE_NETSCAPE_PLUGIN_API=1
} else {
DEFINES += ENABLE_NETSCAPE_PLUGIN_API=0
Modified: trunk/Source/WebKit2/ChangeLog (99162 => 99163)
--- trunk/Source/WebKit2/ChangeLog 2011-11-03 10:33:35 UTC (rev 99162)
+++ trunk/Source/WebKit2/ChangeLog 2011-11-03 10:37:19 UTC (rev 99163)
@@ -1,3 +1,13 @@
+2011-11-03 Balazs Kelemen <[email protected]>
+
+ [Qt] X11 plugins need to be reworked for Qt5
+ https://bugs.webkit.org/show_bug.cgi?id=70023
+
+ Reviewed by Simon Hausmann.
+
+ Disable X11 plugins.
+ * config.h:
+
2011-11-03 Simon Hausmann <[email protected]>
Unreviewed Qt build fix(es).
Modified: trunk/Source/WebKit2/config.h (99162 => 99163)
--- trunk/Source/WebKit2/config.h 2011-11-03 10:33:35 UTC (rev 99162)
+++ trunk/Source/WebKit2/config.h 2011-11-03 10:37:19 UTC (rev 99163)
@@ -157,7 +157,7 @@
#define PLUGIN_ARCHITECTURE_MAC 1
#elif PLATFORM(WIN)
#define PLUGIN_ARCHITECTURE_WIN 1
-#elif (PLATFORM(QT) || (PLATFORM(GTK))) && (OS(UNIX) && !OS(MAC_OS_X))
+#elif PLATFORM(GTK) && (OS(UNIX) && !OS(MAC_OS_X))
#define PLUGIN_ARCHITECTURE_X11 1
#else
#define PLUGIN_ARCHITECTURE_UNSUPPORTED 1
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
