Title: [102824] trunk/Tools
- Revision
- 102824
- Author
- [email protected]
- Date
- 2011-12-14 14:13:24 -0800 (Wed, 14 Dec 2011)
Log Message
[Qt] Test fonts are not used with Qt5
https://bugs.webkit.org/show_bug.cgi?id=72513
My last unreviewed buildfix for this crazy bug.
* qmake/mkspecs/features/features.prf:
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (102823 => 102824)
--- trunk/Tools/ChangeLog 2011-12-14 22:13:09 UTC (rev 102823)
+++ trunk/Tools/ChangeLog 2011-12-14 22:13:24 UTC (rev 102824)
@@ -1,3 +1,12 @@
+2011-12-14 Csaba Osztrogonác <[email protected]>
+
+ [Qt] Test fonts are not used with Qt5
+ https://bugs.webkit.org/show_bug.cgi?id=72513
+
+ My last unreviewed buildfix for this crazy bug.
+
+ * qmake/mkspecs/features/features.prf:
+
2011-12-14 Anders Carlsson <[email protected]>
Another attempt at fixing the Windows build.
Modified: trunk/Tools/qmake/mkspecs/features/features.prf (102823 => 102824)
--- trunk/Tools/qmake/mkspecs/features/features.prf 2011-12-14 22:13:09 UTC (rev 102823)
+++ trunk/Tools/qmake/mkspecs/features/features.prf 2011-12-14 22:13:24 UTC (rev 102824)
@@ -46,10 +46,14 @@
}
# We need fontconfig to set up the test fonts for DumpRenderTree and WebKitTestRunner.
-haveQt(5):contains(config_test_fontconfig, yes)|haveQt(4):unix:!mac:!embedded {
+haveQt(5):contains(config_test_fontconfig, yes) {
DEFINES += HAVE_FONTCONFIG=1
}
+haveQt(4):unix:!mac:!embedded {
+ DEFINES += HAVE_FONTCONFIG=1
+}
+
!contains(DEFINES, ENABLE_JAVASCRIPT_DEBUGGER=.): DEFINES += ENABLE_JAVASCRIPT_DEBUGGER=1
!contains(DEFINES, ENABLE_GAMEPAD=.): DEFINES += ENABLE_GAMEPAD=0
!contains(DEFINES, ENABLE_SQL_DATABASE=.): DEFINES += ENABLE_SQL_DATABASE=1
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
