Title: [109737] trunk/Source/WebCore
- Revision
- 109737
- Author
- hausm...@webkit.org
- Date
- 2012-03-05 06:16:15 -0800 (Mon, 05 Mar 2012)
Log Message
[Qt] Fix build with Qt 5 and OpenGL ES 2.0
Reviewed by Noam Rosenthal.
* platform/graphics/texmap/TextureMapper.h: Since we don't do QT += opengl with Qt 5 anymore
here in WebCore, we cannot check for QT_OPENGL_LIB. But since this is Qt5, we know that the
GLES setting comes qconfig.h and we can rely on it.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (109736 => 109737)
--- trunk/Source/WebCore/ChangeLog 2012-03-05 14:00:22 UTC (rev 109736)
+++ trunk/Source/WebCore/ChangeLog 2012-03-05 14:16:15 UTC (rev 109737)
@@ -1,3 +1,13 @@
+2012-03-05 Simon Hausmann <simon.hausm...@nokia.com>
+
+ [Qt] Fix build with Qt 5 and OpenGL ES 2.0
+
+ Reviewed by Noam Rosenthal.
+
+ * platform/graphics/texmap/TextureMapper.h: Since we don't do QT += opengl with Qt 5 anymore
+ here in WebCore, we cannot check for QT_OPENGL_LIB. But since this is Qt5, we know that the
+ GLES setting comes qconfig.h and we can rely on it.
+
2012-03-05 Alexander Færøy <alexander.fae...@nokia.com>
Whitespace clean-up of TiledBackingStore.cpp.
Modified: trunk/Source/WebCore/platform/graphics/texmap/TextureMapper.h (109736 => 109737)
--- trunk/Source/WebCore/platform/graphics/texmap/TextureMapper.h 2012-03-05 14:00:22 UTC (rev 109736)
+++ trunk/Source/WebCore/platform/graphics/texmap/TextureMapper.h 2012-03-05 14:16:15 UTC (rev 109737)
@@ -20,8 +20,12 @@
#ifndef TextureMapper_h
#define TextureMapper_h
+#if PLATFORM(QT)
+#include <qglobal.h>
+#endif
+
#if USE(ACCELERATED_COMPOSITING)
-#if (defined(QT_OPENGL_LIB))
+#if defined(QT_OPENGL_LIB) || (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
#if defined(QT_OPENGL_ES_2) && !defined(TEXMAP_OPENGL_ES_2)
#define TEXMAP_OPENGL_ES_2
#endif
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
