Title: [128435] trunk/Tools
- Revision
- 128435
- Author
- [email protected]
- Date
- 2012-09-13 03:00:08 -0700 (Thu, 13 Sep 2012)
Log Message
[Qt][Win] Enable USE(3D_GRAPHICS)
https://bugs.webkit.org/show_bug.cgi?id=90879
Reviewed by Kenneth Rohde Christiansen.
Enable it on Windows as well as on QNX (bug fixed).
* qmake/mkspecs/features/features.prf:
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (128434 => 128435)
--- trunk/Tools/ChangeLog 2012-09-13 09:32:20 UTC (rev 128434)
+++ trunk/Tools/ChangeLog 2012-09-13 10:00:08 UTC (rev 128435)
@@ -1,5 +1,16 @@
2012-09-13 Simon Hausmann <[email protected]>
+ [Qt][Win] Enable USE(3D_GRAPHICS)
+ https://bugs.webkit.org/show_bug.cgi?id=90879
+
+ Reviewed by Kenneth Rohde Christiansen.
+
+ Enable it on Windows as well as on QNX (bug fixed).
+
+ * qmake/mkspecs/features/features.prf:
+
+2012-09-13 Simon Hausmann <[email protected]>
+
[Qt] The ANGLE build on Windows breaks with GnuWin32's flex because it is too old
https://bugs.webkit.org/show_bug.cgi?id=96359
Modified: trunk/Tools/qmake/mkspecs/features/features.prf (128434 => 128435)
--- trunk/Tools/qmake/mkspecs/features/features.prf 2012-09-13 09:32:20 UTC (rev 128434)
+++ trunk/Tools/qmake/mkspecs/features/features.prf 2012-09-13 10:00:08 UTC (rev 128435)
@@ -80,11 +80,8 @@
# Enable the USE(3D_GRAPHICS) flag when QtOpenGL is enabled.
contains(QT_CONFIG, opengl) {
- # Disable USE(3D_GRAPHICS) on Windows temporarily, see https://bugs.webkit.org/show_bug.cgi?id=90850 for details.
- # Also disable on QNX, see https://bugs.webkit.org/show_bug.cgi?id=93278
- !win32-*:!qnx {
- WEBKIT_CONFIG += use_3d_graphics
- }
+ # On Windows we require GLES2/EGL through ANGLE.
+ !win32|contains(QT_CONFIG, opengles2): WEBKIT_CONFIG += use_3d_graphics
}
# WebGL support - only enabled if we can use 3D graphics
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
