Title: [122219] trunk/Tools
- Revision
- 122219
- Author
- [email protected]
- Date
- 2012-07-10 06:22:27 -0700 (Tue, 10 Jul 2012)
Log Message
[Qt] REGRESSION(r122175): It broke the Windows build
https://bugs.webkit.org/show_bug.cgi?id=90850
Reviewed by Noam Rosenthal.
* qmake/mkspecs/features/features.prf: Disable USE(3D_GRAPHICS) on Windows temporarily until proper fix.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (122218 => 122219)
--- trunk/Tools/ChangeLog 2012-07-10 13:21:02 UTC (rev 122218)
+++ trunk/Tools/ChangeLog 2012-07-10 13:22:27 UTC (rev 122219)
@@ -1,3 +1,12 @@
+2012-07-10 Csaba Osztrogonác <[email protected]>
+
+ [Qt] REGRESSION(r122175): It broke the Windows build
+ https://bugs.webkit.org/show_bug.cgi?id=90850
+
+ Reviewed by Noam Rosenthal.
+
+ * qmake/mkspecs/features/features.prf: Disable USE(3D_GRAPHICS) on Windows temporarily until proper fix.
+
2012-07-10 János Badics <[email protected]>
[Qt][NRWT] Enable cascaded TestExpectations
Modified: trunk/Tools/qmake/mkspecs/features/features.prf (122218 => 122219)
--- trunk/Tools/qmake/mkspecs/features/features.prf 2012-07-10 13:21:02 UTC (rev 122218)
+++ trunk/Tools/qmake/mkspecs/features/features.prf 2012-07-10 13:22:27 UTC (rev 122219)
@@ -215,7 +215,10 @@
# Enable the USE(3D_GRAPHICS) flag for Qt5 or when QtOpenGL is enabled.
!contains(DEFINES, WTF_USE_3D_GRAPHICS=.) {
- haveQt(5)|contains(QT_CONFIG, opengl): DEFINES += WTF_USE_3D_GRAPHICS=1
+ # Disable USE(3D_GRAPHICS) on Windows temporarily, see https://bugs.webkit.org/show_bug.cgi?id=90850 for details.
+ !win32-* {
+ haveQt(5)|contains(QT_CONFIG, opengl): DEFINES += WTF_USE_3D_GRAPHICS=1
+ }
}
haveQt(4):contains(DEFINES, ENABLE_WEBGL=1):contains(DEFINES, WTF_USE_3D_GRAPHICS=0) {
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
