Title: [104551] trunk/Tools
Revision
104551
Author
[email protected]
Date
2012-01-10 04:11:42 -0800 (Tue, 10 Jan 2012)

Log Message

[Qt] DRT crashes with Qt 5
https://bugs.webkit.org/show_bug.cgi?id=75951

Reviewed by Ossy.

* DumpRenderTree/qt/fonts.conf: Add missing last-resort font fallback for Qt 5 where
Qt relies on font-config to define the default font family.

Modified Paths

Diff

Modified: trunk/Tools/ChangeLog (104550 => 104551)


--- trunk/Tools/ChangeLog	2012-01-10 11:35:32 UTC (rev 104550)
+++ trunk/Tools/ChangeLog	2012-01-10 12:11:42 UTC (rev 104551)
@@ -1,3 +1,13 @@
+2012-01-10  Simon Hausmann  <[email protected]>
+
+        [Qt] DRT crashes with Qt 5
+        https://bugs.webkit.org/show_bug.cgi?id=75951
+
+        Reviewed by Ossy.
+
+        * DumpRenderTree/qt/fonts.conf: Add missing last-resort font fallback for Qt 5 where
+        Qt relies on font-config to define the default font family.
+
 2012-01-10  Csaba Osztrogonác  <[email protected]>
 
         [Qt] REGRESSION(r100130): Clean build feature is broken.

Modified: trunk/Tools/DumpRenderTree/qt/fonts.conf (104550 => 104551)


--- trunk/Tools/DumpRenderTree/qt/fonts.conf	2012-01-10 11:35:32 UTC (rev 104550)
+++ trunk/Tools/DumpRenderTree/qt/fonts.conf	2012-01-10 12:11:42 UTC (rev 104551)
@@ -38,6 +38,23 @@
 		</edit>
 	</match>
 
+<!--
+  If the font still has no generic name, add sans-serif
+ -->
+	<match target="pattern">
+		<test qual="all" name="family" compare="not_eq">
+			<string>sans-serif</string>
+		</test>
+		<test qual="all" name="family" compare="not_eq">
+			<string>serif</string>
+		</test>
+		<test qual="all" name="family" compare="not_eq">
+			<string>monospace</string>
+		</test>
+		<edit name="family" mode="append_last">
+			<string>sans-serif</string>
+		</edit>
+	</match>
 
 	<config>
 <!--
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to