Title: [112530] trunk/Source/WebCore
- Revision
- 112530
- Author
- [email protected]
- Date
- 2012-03-29 07:31:54 -0700 (Thu, 29 Mar 2012)
Log Message
Unavailable pre-processor macro in non-Qt environments
https://bugs.webkit.org/show_bug.cgi?id=82042
Patch by Víctor Manuel Jáquez Leal <[email protected]> on 2012-03-29
Reviewed by Simon Hausmann.
This patch removes the use of the macro QT_VERSION_CHECK() because, in
non-Qt environments, the pre-processors raises an error. Instead of
calling the macro to generate the version number, the version is
expressed directly.
* platform/graphics/texmap/TextureMapperGL.cpp:
(SharedGLData): remove pre-processor macro for Qt version check.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (112529 => 112530)
--- trunk/Source/WebCore/ChangeLog 2012-03-29 14:06:59 UTC (rev 112529)
+++ trunk/Source/WebCore/ChangeLog 2012-03-29 14:31:54 UTC (rev 112530)
@@ -1,3 +1,18 @@
+2012-03-29 Víctor Manuel Jáquez Leal <[email protected]>
+
+ Unavailable pre-processor macro in non-Qt environments
+ https://bugs.webkit.org/show_bug.cgi?id=82042
+
+ Reviewed by Simon Hausmann.
+
+ This patch removes the use of the macro QT_VERSION_CHECK() because, in
+ non-Qt environments, the pre-processors raises an error. Instead of
+ calling the macro to generate the version number, the version is
+ expressed directly.
+
+ * platform/graphics/texmap/TextureMapperGL.cpp:
+ (SharedGLData): remove pre-processor macro for Qt version check.
+
2012-03-29 Andrey Kosyakov <[email protected]>
Web Inspector: event details popover in Timeline panel displays invalid time offset
Modified: trunk/Source/WebCore/platform/graphics/texmap/TextureMapperGL.cpp (112529 => 112530)
--- trunk/Source/WebCore/platform/graphics/texmap/TextureMapperGL.cpp 2012-03-29 14:06:59 UTC (rev 112529)
+++ trunk/Source/WebCore/platform/graphics/texmap/TextureMapperGL.cpp 2012-03-29 14:31:54 UTC (rev 112530)
@@ -30,12 +30,10 @@
#include <wtf/PassRefPtr.h>
#include <wtf/RefCounted.h>
-#if PLATFORM(QT)
-#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
+#if PLATFORM(QT) && QT_VERSION >= 0x050000
#include <QOpenGLContext>
#include <QPlatformPixmap>
#endif
-#endif
#if OS(WINDOWS)
#include <windows.h>
@@ -71,7 +69,7 @@
struct TextureMapperGLData {
struct SharedGLData : public RefCounted<SharedGLData> {
-#if PLATFORM(QT) && (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
+#if PLATFORM(QT) && QT_VERSION >= 0x050000
typedef QOpenGLContext* GLContext;
static GLContext getCurrentGLContext()
{
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
