Title: [117291] trunk/Source/WebCore
- Revision
- 117291
- Author
- [email protected]
- Date
- 2012-05-16 07:56:52 -0700 (Wed, 16 May 2012)
Log Message
Fixes the build with Qt 5 HEAD
Patch by Donald Carr <[email protected]> on 2012-05-16
Reviewed by Csaba Osztrogonác.
* WebCore.pri:
* platform/graphics/texmap/TextureMapperGL.cpp:
* plugins/qt/PluginViewQt.cpp:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (117290 => 117291)
--- trunk/Source/WebCore/ChangeLog 2012-05-16 14:52:56 UTC (rev 117290)
+++ trunk/Source/WebCore/ChangeLog 2012-05-16 14:56:52 UTC (rev 117291)
@@ -1,3 +1,13 @@
+2012-05-16 Donald Carr <[email protected]>
+
+ Fixes the build with Qt 5 HEAD
+
+ Reviewed by Csaba Osztrogonác.
+
+ * WebCore.pri:
+ * platform/graphics/texmap/TextureMapperGL.cpp:
+ * plugins/qt/PluginViewQt.cpp:
+
2012-05-16 Rob Buis <[email protected]>
SVGSVGElement checkIntersection and checkEnclosure Mem corruption
Modified: trunk/Source/WebCore/WebCore.pri (117290 => 117291)
--- trunk/Source/WebCore/WebCore.pri 2012-05-16 14:52:56 UTC (rev 117290)
+++ trunk/Source/WebCore/WebCore.pri 2012-05-16 14:56:52 UTC (rev 117291)
@@ -12,7 +12,7 @@
# We enable TextureMapper by default; remove this line to enable GraphicsLayerQt.
CONFIG += texmap
-QT *= network sql
+QT *= network sql gui-private
WEBCORE_GENERATED_SOURCES_DIR = $${ROOT_BUILD_DIR}/Source/WebCore/$${GENERATED_SOURCES_DESTDIR}
Modified: trunk/Source/WebCore/platform/graphics/texmap/TextureMapperGL.cpp (117290 => 117291)
--- trunk/Source/WebCore/platform/graphics/texmap/TextureMapperGL.cpp 2012-05-16 14:52:56 UTC (rev 117290)
+++ trunk/Source/WebCore/platform/graphics/texmap/TextureMapperGL.cpp 2012-05-16 14:56:52 UTC (rev 117291)
@@ -33,7 +33,7 @@
#if PLATFORM(QT)
#if QT_VERSION >= 0x050000
#include <QOpenGLContext>
-#include <QPlatformPixmap>
+#include <qpa/qplatformpixmap.h>
#else
#include <QGLContext>
#endif // QT_VERSION
Modified: trunk/Source/WebCore/plugins/qt/PluginViewQt.cpp (117290 => 117291)
--- trunk/Source/WebCore/plugins/qt/PluginViewQt.cpp 2012-05-16 14:52:56 UTC (rev 117290)
+++ trunk/Source/WebCore/plugins/qt/PluginViewQt.cpp 2012-05-16 14:56:52 UTC (rev 117291)
@@ -84,7 +84,7 @@
#if HAVE(QT5)
#include "QtX11ImageConversion.h"
#include <QGuiApplication>
-#include <QPlatformNativeInterface>
+#include <qpa/qplatformnativeinterface.h>
#include <QWindow>
#else
#include "PluginContainerQt.h"
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
