Title: [99720] trunk/Tools
- Revision
- 99720
- Author
- [email protected]
- Date
- 2011-11-09 07:58:33 -0800 (Wed, 09 Nov 2011)
Log Message
Unreviewed, rolling out r99707.
http://trac.webkit.org/changeset/99707
Re-enable until we can disable it together with tests in one
shot.
* qmake/mkspecs/features/features.prf:
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (99719 => 99720)
--- trunk/Tools/ChangeLog 2011-11-09 15:52:02 UTC (rev 99719)
+++ trunk/Tools/ChangeLog 2011-11-09 15:58:33 UTC (rev 99720)
@@ -1,3 +1,13 @@
+2011-11-09 Simon Hausmann <[email protected]>
+
+ Unreviewed, rolling out r99707.
+ http://trac.webkit.org/changeset/99707
+
+ Re-enable until we can disable it together with tests in one
+ shot.
+
+ * qmake/mkspecs/features/features.prf:
+
2011-11-09 Tor Arne Vestbø <[email protected]>
[Qt] Disable use of QtUiTools if the library/module is not found
Modified: trunk/Tools/qmake/mkspecs/features/features.prf (99719 => 99720)
--- trunk/Tools/qmake/mkspecs/features/features.prf 2011-11-09 15:52:02 UTC (rev 99719)
+++ trunk/Tools/qmake/mkspecs/features/features.prf 2011-11-09 15:58:33 UTC (rev 99720)
@@ -110,7 +110,10 @@
!contains(DEFINES, ENABLE_WEB_TIMING=.): DEFINES += ENABLE_WEB_TIMING=1
# XSLT support with QtXmlPatterns
-!contains(DEFINES, ENABLE_XSLT=.):DEFINES += ENABLE_XSLT=0
+!contains(DEFINES, ENABLE_XSLT=.) {
+ contains(QT_CONFIG, xmlpatterns):DEFINES += ENABLE_XSLT=1
+ else:DEFINES += ENABLE_XSLT=0
+}
# This is experimental and only works on Linux so far.
contains(DEFINES, WTF_USE_LIBXML2=1) {
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
