Title: [107922] trunk/Source/WebCore
- Revision
- 107922
- Author
- hausm...@webkit.org
- Date
- 2012-02-16 04:46:12 -0800 (Thu, 16 Feb 2012)
Log Message
Build fix for Qt 5 without QtWidgets.
Reviewed by Tor Arne Vestbø.
The reason why QGLContext is included in Extensions3DQt.cpp is to
achieve an implicit gl.h inclusion (needed for GL_FALSE). This patch
replaces the inclusion with the OpenGLShims.h inclusions, which has
the necessary #ifdefs in place to pull in gl.h with Qt 5 without QtWidgets.
* platform/graphics/qt/Extensions3DQt.cpp:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (107921 => 107922)
--- trunk/Source/WebCore/ChangeLog 2012-02-16 12:15:50 UTC (rev 107921)
+++ trunk/Source/WebCore/ChangeLog 2012-02-16 12:46:12 UTC (rev 107922)
@@ -1,3 +1,16 @@
+2012-02-16 Simon Hausmann <simon.hausm...@nokia.com>
+
+ Build fix for Qt 5 without QtWidgets.
+
+ Reviewed by Tor Arne Vestbø.
+
+ The reason why QGLContext is included in Extensions3DQt.cpp is to
+ achieve an implicit gl.h inclusion (needed for GL_FALSE). This patch
+ replaces the inclusion with the OpenGLShims.h inclusions, which has
+ the necessary #ifdefs in place to pull in gl.h with Qt 5 without QtWidgets.
+
+ * platform/graphics/qt/Extensions3DQt.cpp:
+
2012-02-16 Shawn Singh <shawnsi...@chromium.org>
[chromium] Refactor CCLayerTreeHostCommon: create helper function for complex boolean condition
Modified: trunk/Source/WebCore/platform/graphics/qt/Extensions3DQt.cpp (107921 => 107922)
--- trunk/Source/WebCore/platform/graphics/qt/Extensions3DQt.cpp 2012-02-16 12:15:50 UTC (rev 107921)
+++ trunk/Source/WebCore/platform/graphics/qt/Extensions3DQt.cpp 2012-02-16 12:46:12 UTC (rev 107922)
@@ -30,7 +30,7 @@
#include "Extensions3DQt.h"
#include "GraphicsContext3D.h"
-#include <QGLContext>
+#include "cairo/OpenGLShims.h"
namespace WebCore {
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
