Title: [145506] trunk/Source/WebCore
- Revision
- 145506
- Author
- commit-qu...@webkit.org
- Date
- 2013-03-12 02:41:46 -0700 (Tue, 12 Mar 2013)
Log Message
[Qt] WebKit fails to compile if EGL headers are not in default INCLUDEPATH
https://bugs.webkit.org/show_bug.cgi?id=111859
Patch by Floris Bos <b...@je-eigen-domein.nl> on 2013-03-12
Reviewed by Jocelyn Turcotte.
The 3D graphics code wants to include EGL header files.
But on some platforms such as the Raspberry Pi those are not in /usr/include
but in another folder.
Fix adds "egl" to CONFIG when OpenGL ES2 is used, so the right include
paths are added.
* WebCore.pri:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (145505 => 145506)
--- trunk/Source/WebCore/ChangeLog 2013-03-12 09:41:37 UTC (rev 145505)
+++ trunk/Source/WebCore/ChangeLog 2013-03-12 09:41:46 UTC (rev 145506)
@@ -1,3 +1,18 @@
+2013-03-12 Floris Bos <b...@je-eigen-domein.nl>
+
+ [Qt] WebKit fails to compile if EGL headers are not in default INCLUDEPATH
+ https://bugs.webkit.org/show_bug.cgi?id=111859
+
+ Reviewed by Jocelyn Turcotte.
+
+ The 3D graphics code wants to include EGL header files.
+ But on some platforms such as the Raspberry Pi those are not in /usr/include
+ but in another folder.
+ Fix adds "egl" to CONFIG when OpenGL ES2 is used, so the right include
+ paths are added.
+
+ * WebCore.pri:
+
2013-03-12 Mike West <mk...@chromium.org>
XSSAuditor should send only one console error when blocking a page.
Modified: trunk/Source/WebCore/WebCore.pri (145505 => 145506)
--- trunk/Source/WebCore/WebCore.pri 2013-03-12 09:41:37 UTC (rev 145505)
+++ trunk/Source/WebCore/WebCore.pri 2013-03-12 09:41:46 UTC (rev 145506)
@@ -241,7 +241,7 @@
}
}
} else {
- contains(QT_CONFIG, opengles2): LIBS += -lEGL
+ contains(QT_CONFIG, opengles2): CONFIG += egl
}
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
