Changeset 93600 in webkit

Timestamp:

Aug 23, 2011 6:26:26 AM (13 years ago)

Author:

vestbo@webkit.org

Message:

[Qt] Fix build on Lion

​https://bugs.webkit.org/show_bug.cgi?id=66770

Reviewed by Andreas Kling.

We were mistakenly picking up mac/WebCoreSystemInterface.h instead of
the Qt one, and building on Lion revealed this when a typedef for
IOSurfaceRef was wrapped in PLATFORM(MAC).

For now we fix this by including WebCoreSystemInterface using
brackets, so that we'll pick up the right file based on the
include paths. This also means exposing a few missing enums
in our own version of the file, so those were added.

Lasty, we need to link against the right system interface library
on Lion.

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/mac/WebVideoFullscreenHUDWindowController.mm (modified) (1 diff)
• WebCore/platform/qt/WebCoreSystemInterface.h (modified) (1 diff)
• WebKit/qt/ChangeLog (modified) (1 diff)
• WebKit/qt/QtWebKit.pro (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-08-23  Tor Arne Vestbø  <tor.arne.vestbo@nokia.com>
+
+        [Qt] Fix build on Lion
+
+        https://bugs.webkit.org/show_bug.cgi?id=66770
+
+        Reviewed by Andreas Kling.
+
+        We were mistakenly picking up mac/WebCoreSystemInterface.h instead of
+        the Qt one, and building on Lion revealed this when a typedef for
+        IOSurfaceRef was wrapped in PLATFORM(MAC).
+
+        For now we fix this by including WebCoreSystemInterface using
+        brackets, so that we'll pick up the right file based on the
+        include paths. This also means exposing a few missing enums
+        in our own version of the file, so those were added.
+
+        Lasty, we need to link against the right system interface library
+        on Lion.
+
+        * platform/mac/WebVideoFullscreenHUDWindowController.mm:
+        * platform/qt/WebCoreSystemInterface.h:
+
 2011-08-23  Steve Block  <steveblock@google.com>
 

trunk/Source/WebCore/platform/mac/WebVideoFullscreenHUDWindowController.mm

@@ -30 +30 @@
 
 #import "FloatConversion.h"
-#import "WebCoreSystemInterface.h"
+#import <WebCoreSystemInterface.h>
 #import <WebCore/HTMLMediaElement.h>
 #import <wtf/RetainPtr.h>

trunk/Source/WebCore/platform/qt/WebCoreSystemInterface.h

@@ -80 +80 @@
 extern void (*wkWindowSetScaledFrame)(NSWindow *, NSRect, NSRect);
 
+typedef enum {
+    wkMediaUIControlTimeline,
+    wkMediaUIControlSlider,
+    wkMediaUIControlPlayPauseButton,
+    wkMediaUIControlExitFullscreenButton,
+    wkMediaUIControlRewindButton,
+    wkMediaUIControlFastForwardButton,
+    wkMediaUIControlVolumeUpButton,
+    wkMediaUIControlVolumeDownButton
+} wkMediaUIControlType;
+
 }
 

trunk/Source/WebKit/qt/ChangeLog

@@ +1 @@
+2011-08-23  Tor Arne Vestbø  <tor.arne.vestbo@nokia.com>
+
+        [Qt] Fix build on Lion
+
+        https://bugs.webkit.org/show_bug.cgi?id=66770
+
+        Reviewed by Andreas Kling.
+
+        We were mistakenly picking up mac/WebCoreSystemInterface.h instead of
+        the Qt one, and building on Lion revealed this when a typedef for
+        IOSurfaceRef was wrapped in PLATFORM(MAC).
+
+        For now we fix this by including WebCoreSystemInterface using
+        brackets, so that we'll pick up the right file based on the
+        include paths. This also means exposing a few missing enums
+        in our own version of the file, so those were added.
+
+        Lasty, we need to link against the right system interface library
+        on Lion.
+
+        * QtWebKit.pro:
+
 2011-08-21  Lindsay Mathieson  <lindsay.mathieson@gmail.com>
 

trunk/Source/WebKit/qt/QtWebKit.pro

@@ -257 +257 @@
         DARWIN_VERSION = $$split(QMAKE_HOST.version, ".")
         DARWIN_MAJOR_VERSION = $$first(DARWIN_VERSION)
-        equals(DARWIN_MAJOR_VERSION, "10") {
-            LIBS+= $$SOURCE_DIR/../WebKitLibraries/libWebKitSystemInterfaceSnowLeopard.a
-        } else {
-            equals(DARWIN_MAJOR_VERSION, "9") {
-                LIBS+= $$SOURCE_DIR/../WebKitLibraries/libWebKitSystemInterfaceLeopard.a
-            }
+        equals(DARWIN_MAJOR_VERSION, "11") {
+            LIBS += $$SOURCE_DIR/../WebKitLibraries/libWebKitSystemInterfaceLion.a
+        } else:equals(DARWIN_MAJOR_VERSION, "10") {
+            LIBS += $$SOURCE_DIR/../WebKitLibraries/libWebKitSystemInterfaceSnowLeopard.a
+        } else:equals(DARWIN_MAJOR_VERSION, "9") {
+            LIBS += $$SOURCE_DIR/../WebKitLibraries/libWebKitSystemInterfaceLeopard.a
         }
     }