Title: [99429] trunk/Source/WebCore
- Revision
- 99429
- Author
- [email protected]
- Date
- 2011-11-07 08:51:28 -0800 (Mon, 07 Nov 2011)
Log Message
Fix the Qt build on Mac OS X when using the QuickTime media backend
When QtWebKit is built on Mac OS X using the QuickTime media backend
we build both KURLCFNet.cpp and KURLMac, just like the Mac port, so
we have to guard the potentially duplicate symbol createCFURL with
more than just !PLATFORM(MAC).
Reviewed by Andreas Kling.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (99428 => 99429)
--- trunk/Source/WebCore/ChangeLog 2011-11-07 16:51:15 UTC (rev 99428)
+++ trunk/Source/WebCore/ChangeLog 2011-11-07 16:51:28 UTC (rev 99429)
@@ -1,3 +1,16 @@
+2011-11-07 Tor Arne Vestbø <[email protected]>
+
+ Fix the Qt build on Mac OS X when using the QuickTime media backend
+
+ When QtWebKit is built on Mac OS X using the QuickTime media backend
+ we build both KURLCFNet.cpp and KURLMac, just like the Mac port, so
+ we have to guard the potentially duplicate symbol createCFURL with
+ more than just !PLATFORM(MAC).
+
+ Reviewed by Andreas Kling.
+
+ * platform/cf/KURLCFNet.cpp:
+
2011-11-07 Pavel Feldman <[email protected]>
Not reviewed: follow up to r99407. Style the suggest box.
Modified: trunk/Source/WebCore/platform/cf/KURLCFNet.cpp (99428 => 99429)
--- trunk/Source/WebCore/platform/cf/KURLCFNet.cpp 2011-11-07 16:51:15 UTC (rev 99428)
+++ trunk/Source/WebCore/platform/cf/KURLCFNet.cpp 2011-11-07 16:51:28 UTC (rev 99429)
@@ -75,7 +75,7 @@
return result;
}
-#if !PLATFORM(MAC)
+#if !PLATFORM(MAC) && !(PLATFORM(QT) && USE(QTKIT))
CFURLRef KURL::createCFURL() const
{
// FIXME: What should this return for invalid URLs?
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
