Title: [140675] trunk/Source/WebCore
- Revision
- 140675
- Author
- [email protected]
- Date
- 2013-01-24 04:19:50 -0800 (Thu, 24 Jan 2013)
Log Message
[Qt] Webkit debug build links against release binaries of ANGLE libEGL, libGLESv2
https://bugs.webkit.org/show_bug.cgi?id=106217
Patch by Kai Koehne <[email protected]> on 2013-01-24
Reviewed by Jocelyn Turcotte.
Use libEGLd, libEGLSv2d if qtbase was compiled with ANGLE.
* WebCore.pri: Mirror logic of qtbase\mkspecs\features\win32\opengl.prf
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (140674 => 140675)
--- trunk/Source/WebCore/ChangeLog 2013-01-24 12:19:37 UTC (rev 140674)
+++ trunk/Source/WebCore/ChangeLog 2013-01-24 12:19:50 UTC (rev 140675)
@@ -1,3 +1,14 @@
+2013-01-24 Kai Koehne <[email protected]>
+
+ [Qt] Webkit debug build links against release binaries of ANGLE libEGL, libGLESv2
+ https://bugs.webkit.org/show_bug.cgi?id=106217
+
+ Reviewed by Jocelyn Turcotte.
+
+ Use libEGLd, libEGLSv2d if qtbase was compiled with ANGLE.
+
+ * WebCore.pri: Mirror logic of qtbase\mkspecs\features\win32\opengl.prf
+
2013-01-24 Sergio Villar Senin <[email protected]>
[GTK] Unreviewed build fix.
Modified: trunk/Source/WebCore/WebCore.pri (140674 => 140675)
--- trunk/Source/WebCore/WebCore.pri 2013-01-24 12:19:37 UTC (rev 140674)
+++ trunk/Source/WebCore/WebCore.pri 2013-01-24 12:19:50 UTC (rev 140675)
@@ -219,7 +219,11 @@
win32-g++: {
# Make sure OpenGL libs are after the webcore lib so MinGW can resolve symbols
contains(QT_CONFIG, opengles2) {
- LIBS += $$QMAKE_LIBS_OPENGL_ES2
+ CONFIG(debug, debug|release):contains(QT_CONFIG, angle) {
+ LIBS += $$QMAKE_LIBS_OPENGL_ES2_DEBUG
+ } else {
+ LIBS += $$QMAKE_LIBS_OPENGL_ES2
+ }
} else {
LIBS += $$QMAKE_LIBS_OPENGL
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
