Title: [176747] branches/safari-600.3-branch/Source/WebCore
- Revision
- 176747
- Author
- [email protected]
- Date
- 2014-12-03 12:36:54 -0800 (Wed, 03 Dec 2014)
Log Message
Merged r176694. rdar://problems/18944696
Modified Paths
Diff
Modified: branches/safari-600.3-branch/Source/WebCore/ChangeLog (176746 => 176747)
--- branches/safari-600.3-branch/Source/WebCore/ChangeLog 2014-12-03 20:36:43 UTC (rev 176746)
+++ branches/safari-600.3-branch/Source/WebCore/ChangeLog 2014-12-03 20:36:54 UTC (rev 176747)
@@ -1,5 +1,16 @@
2014-12-03 Dana Burkart <[email protected]>
+ Merge r176694. <rdar://problem/18944696>
+
+ 2014-12-02 Beth Dakin <[email protected]>
+
+ More build fixing.
+
+ * platform/spi/mac/QuickLookMacSPI.h:
+
+
+2014-12-03 Dana Burkart <[email protected]>
+
Merge r176692. <rdar://problem/18944696>
2014-12-02 Beth Dakin <[email protected]>
Modified: branches/safari-600.3-branch/Source/WebCore/platform/spi/mac/QuickLookMacSPI.h (176746 => 176747)
--- branches/safari-600.3-branch/Source/WebCore/platform/spi/mac/QuickLookMacSPI.h 2014-12-03 20:36:43 UTC (rev 176746)
+++ branches/safari-600.3-branch/Source/WebCore/platform/spi/mac/QuickLookMacSPI.h 2014-12-03 20:36:54 UTC (rev 176747)
@@ -23,9 +23,10 @@
* THE POSSIBILITY OF SUCH DAMAGE.
*/
+#import <QuickLookUI/QLPreviewItem.h>
+
#if __has_include(<QuickLookUI/QLPreviewMenuItem.h>)
-#import <QuickLookUI/QLPreviewItem.h>
#import <QuickLookUI/QLPreviewMenuItem.h>
#else
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes