Modified: tags/Safari-601.1.31/Source/WebCore/ChangeLog (183570 => 183571)
--- tags/Safari-601.1.31/Source/WebCore/ChangeLog 2015-04-29 19:48:00 UTC (rev 183570)
+++ tags/Safari-601.1.31/Source/WebCore/ChangeLog 2015-04-29 19:53:00 UTC (rev 183571)
@@ -1,5 +1,15 @@
2015-04-29 Babak Shafiei <[email protected]>
+ Merge r183561.
+
+ 2015-04-29 Jer Noble <[email protected]>
+
+ Unreviewed iOS build fix after r183553: fix declaration of QLPreviewScheme
+
+ * platform/ios/QuickLookSoftLink.mm:
+
+2015-04-29 Babak Shafiei <[email protected]>
+
Merge r183553.
2015-04-28 David Kilzer <[email protected]>
Modified: tags/Safari-601.1.31/Source/WebCore/platform/ios/QuickLookSoftLink.mm (183570 => 183571)
--- tags/Safari-601.1.31/Source/WebCore/platform/ios/QuickLookSoftLink.mm 2015-04-29 19:48:00 UTC (rev 183570)
+++ tags/Safari-601.1.31/Source/WebCore/platform/ios/QuickLookSoftLink.mm 2015-04-29 19:53:00 UTC (rev 183571)
@@ -38,6 +38,6 @@
SOFT_LINK_FUNCTION_FOR_SOURCE(WebCore, QuickLook, QLTypeCopyBestMimeTypeForURLAndMimeType, NSString *, (NSURL *url, NSString *mimeType), (url, mimeType))
SOFT_LINK_FUNCTION_FOR_SOURCE(WebCore, QuickLook, QLTypeCopyUTIForURLAndMimeType, NSString *, (NSURL *url, NSString *mimeType), (url, mimeType))
-SOFT_LINK_CONSTANT_FOR_SOURCE(WebCore, QuickLook, QLPreviewScheme, NSString *)
+SOFT_LINK_CONSTANT_FOR_SOURCE(WebCore, QuickLook, QLPreviewScheme, NSString * const)
#endif // USE(QUICK_LOOK)
