Title: [168737] branches/safari-538.34-branch/Source/WebKit2
- Revision
- 168737
- Author
- lforsch...@apple.com
- Date
- 2014-05-13 14:18:53 -0700 (Tue, 13 May 2014)
Log Message
Merged r168569.
Modified Paths
Diff
Modified: branches/safari-538.34-branch/Source/WebKit2/ChangeLog (168736 => 168737)
--- branches/safari-538.34-branch/Source/WebKit2/ChangeLog 2014-05-13 21:17:10 UTC (rev 168736)
+++ branches/safari-538.34-branch/Source/WebKit2/ChangeLog 2014-05-13 21:18:53 UTC (rev 168737)
@@ -1,5 +1,16 @@
2014-05-13 Lucas Forschler <lforsch...@apple.com>
+ Merge r168569
+
+ 2014-05-09 Anders Carlsson <ander...@apple.com>
+
+ Another build fix.
+
+ * mac/MigrateHeadersToWebKit2.make:
+ Don't migrate the WKPreferences.h header, WebKit2 provides its own header.
+
+2014-05-13 Lucas Forschler <lforsch...@apple.com>
+
Merge r168552
2014-05-09 Tim Horton <timothy_hor...@apple.com>
Modified: branches/safari-538.34-branch/Source/WebKit2/mac/MigrateHeadersToWebKit2.make (168736 => 168737)
--- branches/safari-538.34-branch/Source/WebKit2/mac/MigrateHeadersToWebKit2.make 2014-05-13 21:17:10 UTC (rev 168736)
+++ branches/safari-538.34-branch/Source/WebKit2/mac/MigrateHeadersToWebKit2.make 2014-05-13 21:18:53 UTC (rev 168737)
@@ -1,6 +1,6 @@
PRIVATE_HEADERS_DIR = $(TARGET_BUILD_DIR)/$(PRIVATE_HEADERS_FOLDER_PATH)
-WEBKIT2_HEADERS = $(addprefix $(PRIVATE_HEADERS_DIR)/, $(notdir $(wildcard $(BUILT_PRODUCTS_DIR)/WebKit.framework/PrivateHeaders/*.h))) $(addprefix $(PRIVATE_HEADERS_DIR)/, $(notdir $(wildcard $(BUILT_PRODUCTS_DIR)/WebKit.framework/Headers/*.h)))
+WEBKIT2_HEADERS = $(addprefix $(PRIVATE_HEADERS_DIR)/, $(notdir $(wildcard $(BUILT_PRODUCTS_DIR)/WebKit.framework/PrivateHeaders/*.h))) $(addprefix $(PRIVATE_HEADERS_DIR)/, $(filter-out WKPreferences.h, $(notdir $(wildcard $(BUILT_PRODUCTS_DIR)/WebKit.framework/Headers/*.h))))
all : $(WEBKIT2_HEADERS)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
