Title: [125891] trunk/Tools
- Revision
- 125891
- Author
- commit-qu...@webkit.org
- Date
- 2012-08-17 06:23:51 -0700 (Fri, 17 Aug 2012)
Log Message
[Qt] QtWebKit fails to build with OpenGL support on QNX
https://bugs.webkit.org/show_bug.cgi?id=93278
Patch by Milian Wolff <milian.wo...@kdab.com> on 2012-08-17
Reviewed by Noam Rosenthal.
Change the order in which we define WTF_USE_3D_GRAPHICS and ENABLE_WEBGL.
First, we now defined WTF_USE_3D_GRAPHICS=1, but only if QT_CONFIG
contains opengl. Furthermore, we disable this feature on win32-* as usual,
but now also disable it on QNX.
Then, we set ENABLE_WEBGL=1 but only if we previously set WTF_USE_3D_GRAPHICS=1.
* qmake/mkspecs/features/features.prf:
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (125890 => 125891)
--- trunk/Tools/ChangeLog 2012-08-17 13:11:15 UTC (rev 125890)
+++ trunk/Tools/ChangeLog 2012-08-17 13:23:51 UTC (rev 125891)
@@ -1,3 +1,19 @@
+2012-08-17 Milian Wolff <milian.wo...@kdab.com>
+
+ [Qt] QtWebKit fails to build with OpenGL support on QNX
+ https://bugs.webkit.org/show_bug.cgi?id=93278
+
+ Reviewed by Noam Rosenthal.
+
+ Change the order in which we define WTF_USE_3D_GRAPHICS and ENABLE_WEBGL.
+ First, we now defined WTF_USE_3D_GRAPHICS=1, but only if QT_CONFIG
+ contains opengl. Furthermore, we disable this feature on win32-* as usual,
+ but now also disable it on QNX.
+
+ Then, we set ENABLE_WEBGL=1 but only if we previously set WTF_USE_3D_GRAPHICS=1.
+
+ * qmake/mkspecs/features/features.prf:
+
2012-08-16 Gustavo Noronha Silva <g...@gnome.org>
[jhbuild] EFL now runs jhbuild update for every build
Modified: trunk/Tools/qmake/mkspecs/features/features.prf (125890 => 125891)
--- trunk/Tools/qmake/mkspecs/features/features.prf 2012-08-17 13:11:15 UTC (rev 125890)
+++ trunk/Tools/qmake/mkspecs/features/features.prf 2012-08-17 13:23:51 UTC (rev 125891)
@@ -105,11 +105,20 @@
# QStyle detection
haveQtModule(widgets): DEFINES += HAVE_QSTYLE=1
-# WebGL support
-!contains(DEFINES, ENABLE_WEBGL=.) {
- contains(QT_CONFIG, opengl):!win32-*: DEFINES += ENABLE_WEBGL=1
+# 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.
+ # Also disable on QNX, see https://bugs.webkit.org/show_bug.cgi?id=93278
+ !win32-*:!qnx {
+ DEFINES += WTF_USE_3D_GRAPHICS=1
+ }
}
+# WebGL support - only enabled if we can use 3D graphics
+!contains(DEFINES, ENABLE_WEBGL=.):contains(DEFINES, WTF_USE_3D_GRAPHICS=1) {
+ DEFINES += ENABLE_WEBGL=1
+}
+
# CSS Shaders support
!contains(DEFINES, ENABLE_CSS_SHADERS=.) {
# Enable CSS shaders when CSS filters and WebGL are enabled.
@@ -219,14 +228,6 @@
contains(DEFINES, $$opposite): DEFINES -= $$define
}
-# Enable the USE(3D_GRAPHICS) flag for Qt5 or when QtOpenGL is enabled.
-!contains(DEFINES, WTF_USE_3D_GRAPHICS=.) {
- # Disable USE(3D_GRAPHICS) on Windows temporarily, see https://bugs.webkit.org/show_bug.cgi?id=90850 for details.
- !win32-* {
- DEFINES += WTF_USE_3D_GRAPHICS=1
- }
-}
-
contains(DEFINES, ENABLE_GAMEPAD=1) {
!packagesExist(libudev) {
error("Gamepad API requires libudev to build. Please install libudev development files, or build WebKit without gamepad.")
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
