Diff
Modified: branches/safari-534.51-branch/Source/WebCore/ChangeLog (92506 => 92507)
--- branches/safari-534.51-branch/Source/WebCore/ChangeLog 2011-08-05 20:38:40 UTC (rev 92506)
+++ branches/safari-534.51-branch/Source/WebCore/ChangeLog 2011-08-05 20:40:19 UTC (rev 92507)
@@ -1,5 +1,15 @@
2011-08-05 Lucas Forschler <[email protected]>
+ Merged 92309.
+
+ 2011-08-03 Jeff Miller <[email protected]>
+
+ Fix Chromimum and Qt builds after r92308.
+
+ * config.h: Don't try to include WebCoreHeaderDetection.h for Chromimum and Qt.
+
+2011-08-05 Lucas Forschler <[email protected]>
+
Merged 92308.
2011-08-03 Jeff Miller <[email protected]>
Modified: branches/safari-534.51-branch/Source/WebCore/config.h (92506 => 92507)
--- branches/safari-534.51-branch/Source/WebCore/config.h 2011-08-05 20:38:40 UTC (rev 92506)
+++ branches/safari-534.51-branch/Source/WebCore/config.h 2011-08-05 20:40:19 UTC (rev 92507)
@@ -29,7 +29,7 @@
#include <wtf/Platform.h>
-#if OS(WINDOWS)
+#if OS(WINDOWS) && !PLATFORM(QT) && !PLATFORM(CHROMIUM)
#include <WebCore/WebCoreHeaderDetection.h>
#endif
_______________________________________________ webkit-changes mailing list [email protected] http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
