Title: [104167] trunk/Tools
- Revision
- 104167
- Author
- [email protected]
- Date
- 2012-01-05 08:45:48 -0800 (Thu, 05 Jan 2012)
Log Message
[Qt] Never enable FontConfig on Mac OS X
https://bugs.webkit.org/show_bug.cgi?id=75616
Patch by Alexander Færøy <[email protected]> on 2012-01-05
Reviewed by Tor Arne Vestbø.
* qmake/mkspecs/features/features.prf:
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (104166 => 104167)
--- trunk/Tools/ChangeLog 2012-01-05 16:39:40 UTC (rev 104166)
+++ trunk/Tools/ChangeLog 2012-01-05 16:45:48 UTC (rev 104167)
@@ -1,3 +1,12 @@
+2012-01-05 Alexander Færøy <[email protected]>
+
+ [Qt] Never enable FontConfig on Mac OS X
+ https://bugs.webkit.org/show_bug.cgi?id=75616
+
+ Reviewed by Tor Arne Vestbø.
+
+ * qmake/mkspecs/features/features.prf:
+
2012-01-05 Alpha Lam <[email protected]>
Unreviewed, rolling out r104159.
Modified: trunk/Tools/qmake/mkspecs/features/features.prf (104166 => 104167)
--- trunk/Tools/qmake/mkspecs/features/features.prf 2012-01-05 16:39:40 UTC (rev 104166)
+++ trunk/Tools/qmake/mkspecs/features/features.prf 2012-01-05 16:45:48 UTC (rev 104167)
@@ -46,7 +46,7 @@
}
# We need fontconfig to set up the test fonts for DumpRenderTree and WebKitTestRunner.
-haveQt(5):contains(config_test_fontconfig, yes) {
+haveQt(5):contains(config_test_fontconfig, yes):!mac {
DEFINES += HAVE_FONTCONFIG=1
}
haveQt(4):unix:!mac:!embedded {
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
