Title: [176860] tags/Safari-600.3.10.1/Source/WebCore
- Revision
- 176860
- Author
- [email protected]
- Date
- 2014-12-05 11:47:09 -0800 (Fri, 05 Dec 2014)
Log Message
Merged r176855. rdar://problem/19159480
Modified Paths
Diff
Modified: tags/Safari-600.3.10.1/Source/WebCore/ChangeLog (176859 => 176860)
--- tags/Safari-600.3.10.1/Source/WebCore/ChangeLog 2014-12-05 19:44:21 UTC (rev 176859)
+++ tags/Safari-600.3.10.1/Source/WebCore/ChangeLog 2014-12-05 19:47:09 UTC (rev 176860)
@@ -1,3 +1,16 @@
+2014-12-05 Babak Shafiei <[email protected]>
+
+ Merge r176855.
+
+ 2014-12-05 Beth Dakin <[email protected]>
+
+ rdar://problem/19156353 Additional build-fixes needed.
+
+ Rubber-stamped by Tim Horton.
+
+ This is a bit unfortunate, but we need to always forward-declare this for now.
+ * platform/spi/mac/QuickLookMacSPI.h:
+
2014-12-04 Dana Burkart <[email protected]>
Merge r176803. <rdar://problem/19034499>
Modified: tags/Safari-600.3.10.1/Source/WebCore/platform/spi/mac/QuickLookMacSPI.h (176859 => 176860)
--- tags/Safari-600.3.10.1/Source/WebCore/platform/spi/mac/QuickLookMacSPI.h 2014-12-05 19:44:21 UTC (rev 176859)
+++ tags/Safari-600.3.10.1/Source/WebCore/platform/spi/mac/QuickLookMacSPI.h 2014-12-05 19:47:09 UTC (rev 176860)
@@ -25,12 +25,6 @@
#import <QuickLookUI/QLPreviewItem.h>
-#if __has_include(<QuickLookUI/QLPreviewMenuItem.h>)
-
-#import <QuickLookUI/QLPreviewMenuItem.h>
-
-#else
-
@protocol QLPreviewMenuItemDelegate <NSObject>
@optional
@@ -52,5 +46,3 @@
@property (assign) id<QLPreviewMenuItemDelegate> delegate;
@property QLPreviewStyle previewStyle;
@end
-
-#endif
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
