Title: [128466] trunk/Tools
- Revision
- 128466
- Author
- hausm...@webkit.org
- Date
- 2012-09-13 08:15:52 -0700 (Thu, 13 Sep 2012)
Log Message
[Qt] Make WebKit2 work on Windows with Qt 5
https://bugs.webkit.org/show_bug.cgi?id=76776
Reviewed by Tor Arne Vestbø.
WebKit2 should compile with Qt on Windows now, so enable it. This patch in fact corrects
the check to disable WebKit when we don't have USE_3D_GRAPHICS available, because we need
that for the GL TextureMapper (it's only built when that feature is set).
* qmake/mkspecs/features/configure.prf:
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (128465 => 128466)
--- trunk/Tools/ChangeLog 2012-09-13 15:10:43 UTC (rev 128465)
+++ trunk/Tools/ChangeLog 2012-09-13 15:15:52 UTC (rev 128466)
@@ -1,3 +1,16 @@
+2012-09-13 Simon Hausmann <simon.hausm...@nokia.com>
+
+ [Qt] Make WebKit2 work on Windows with Qt 5
+ https://bugs.webkit.org/show_bug.cgi?id=76776
+
+ Reviewed by Tor Arne Vestbø.
+
+ WebKit2 should compile with Qt on Windows now, so enable it. This patch in fact corrects
+ the check to disable WebKit when we don't have USE_3D_GRAPHICS available, because we need
+ that for the GL TextureMapper (it's only built when that feature is set).
+
+ * qmake/mkspecs/features/configure.prf:
+
2012-09-13 Tor Arne Vestbø <tor.arne.ves...@nokia.com>
[Qt] Ensure that QT is finalized before loading qt_module.prf
Modified: trunk/Tools/qmake/mkspecs/features/configure.prf (128465 => 128466)
--- trunk/Tools/qmake/mkspecs/features/configure.prf 2012-09-13 15:10:43 UTC (rev 128465)
+++ trunk/Tools/qmake/mkspecs/features/configure.prf 2012-09-13 15:15:52 UTC (rev 128466)
@@ -54,8 +54,8 @@
WEBKIT_CONFIG -= build_webkit1
}
- # WebKit2 not supported on Windows yet
- win32*: WEBKIT_CONFIG -= build_webkit2
+ # WebKit2 requires OpenGL TextureMapper, which requires 3D Graphics
+ !use?(3d_graphics): WEBKIT_CONFIG -= build_webkit2
export(CONFIG)
export(WEBKIT_CONFIG)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
