Title: [127264] trunk/Tools
- Revision
- 127264
- Author
- [email protected]
- Date
- 2012-08-31 08:04:25 -0700 (Fri, 31 Aug 2012)
Log Message
Unreviewed, rolling out r127261.
http://trac.webkit.org/changeset/127261
https://bugs.webkit.org/show_bug.cgi?id=95572
This patch depends on other build fixes (see blockers of bug
95466) which should land first (Requested by milian on
#webkit).
Patch by Sheriff Bot <[email protected]> on 2012-08-31
* qmake/mkspecs/features/features.prf:
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (127263 => 127264)
--- trunk/Tools/ChangeLog 2012-08-31 14:59:42 UTC (rev 127263)
+++ trunk/Tools/ChangeLog 2012-08-31 15:04:25 UTC (rev 127264)
@@ -1,3 +1,15 @@
+2012-08-31 Sheriff Bot <[email protected]>
+
+ Unreviewed, rolling out r127261.
+ http://trac.webkit.org/changeset/127261
+ https://bugs.webkit.org/show_bug.cgi?id=95572
+
+ This patch depends on other build fixes (see blockers of bug
+ 95466) which should land first (Requested by milian on
+ #webkit).
+
+ * qmake/mkspecs/features/features.prf:
+
2012-08-31 Milian Wolff <[email protected]>
[Qt] Support WebKit2/QML on QNX
Modified: trunk/Tools/qmake/mkspecs/features/features.prf (127263 => 127264)
--- trunk/Tools/qmake/mkspecs/features/features.prf 2012-08-31 14:59:42 UTC (rev 127263)
+++ trunk/Tools/qmake/mkspecs/features/features.prf 2012-08-31 15:04:25 UTC (rev 127264)
@@ -108,7 +108,8 @@
# Enable the USE(3D_GRAPHICS) flag when QtOpenGL is enabled.
!contains(DEFINES, WTF_USE_3D_GRAPHICS=.):contains(QT_CONFIG, opengl) {
# Disable USE(3D_GRAPHICS) on Windows temporarily, see https://bugs.webkit.org/show_bug.cgi?id=90850 for details.
- !win32-* {
+ # Also disable on QNX, see https://bugs.webkit.org/show_bug.cgi?id=93278
+ !win32-*:!qnx {
DEFINES += WTF_USE_3D_GRAPHICS=1
}
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
