Title: [184281] branches/safari-601.1.32-branch/Tools
Diff
Modified: branches/safari-601.1.32-branch/Tools/ChangeLog (184280 => 184281)
--- branches/safari-601.1.32-branch/Tools/ChangeLog 2015-05-13 07:10:03 UTC (rev 184280)
+++ branches/safari-601.1.32-branch/Tools/ChangeLog 2015-05-13 07:21:39 UTC (rev 184281)
@@ -1,3 +1,15 @@
+2015-05-13 Babak Shafiei <[email protected]>
+
+ Merge r183915.
+
+ 2015-05-06 Alexey Proskuryakov <[email protected]>
+
+ iOS build fix attempt
+
+ Link WebKitTestRunnerApp to WebKit, now that we don't have WebKit2.
+
+ * WebKitTestRunner/WebKitTestRunner.xcodeproj/project.pbxproj:
+
2015-05-12 Babak Shafiei <[email protected]>
Merge r183933.
Modified: branches/safari-601.1.32-branch/Tools/WebKitTestRunner/WebKitTestRunner.xcodeproj/project.pbxproj (184280 => 184281)
--- branches/safari-601.1.32-branch/Tools/WebKitTestRunner/WebKitTestRunner.xcodeproj/project.pbxproj 2015-05-13 07:10:03 UTC (rev 184280)
+++ branches/safari-601.1.32-branch/Tools/WebKitTestRunner/WebKitTestRunner.xcodeproj/project.pbxproj 2015-05-13 07:21:39 UTC (rev 184281)
@@ -112,6 +112,7 @@
C0CE720B1247C93300BC0EC4 /* TestRunnerMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = C0CE720A1247C93300BC0EC4 /* TestRunnerMac.mm */; };
E132AA3A17CD5F1000611DF0 /* WebKitTestRunnerDraggingInfo.mm in Sources */ = {isa = PBXBuildFile; fileRef = E132AA3817CD5F1000611DF0 /* WebKitTestRunnerDraggingInfo.mm */; };
E132AA3D17CE776F00611DF0 /* WebKitTestRunnerEvent.mm in Sources */ = {isa = PBXBuildFile; fileRef = E132AA3B17CE776F00611DF0 /* WebKitTestRunnerEvent.mm */; };
+ E1AC69F21AFB3B5B00F6D567 /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0F5169CA1445222D00E0A9D7 /* WebKit.framework */; };
E1C642C317CBCC7300D66A3C /* PoseAsClass.mm in Sources */ = {isa = PBXBuildFile; fileRef = E1C642C117CBCC7300D66A3C /* PoseAsClass.mm */; };
E1C642C617CBCD4C00D66A3C /* WebKitTestRunnerPasteboard.mm in Sources */ = {isa = PBXBuildFile; fileRef = E1C642C417CBCD4C00D66A3C /* WebKitTestRunnerPasteboard.mm */; };
/* End PBXBuildFile section */
@@ -294,6 +295,7 @@
files = (
2EE52CE51890A9A80010ED21 /* CoreGraphics.framework in Frameworks */,
2EE52CE71890A9A80010ED21 /* UIKit.framework in Frameworks */,
+ E1AC69F21AFB3B5B00F6D567 /* WebKit.framework in Frameworks */,
2EE52CE31890A9A80010ED21 /* Foundation.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
