Bug 66770 – [Qt] Build fails on Lion

• Status: RESOLVED
• Resolution: FIXED
• Component: New Bugs

[Tor Arne Vestbø]

[Qt] Build fails on Lion

[Tor Arne Vestbø]

Created attachment 104833 [details]
Patch

[WebKit Review Bot]

Attachment 104833 [details] did not pass style-queue:

Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebCore/ChangeLog', u'Source/WebCor..." exit_code: 1

Source/WebCore/ChangeLog:20:  Line contains tab character.  [whitespace/tab] [5]
Total errors found: 1 in 5 files


If any of these errors are false positives, please file a bug against check-webkit-style.

[Tor Arne Vestbø]

(In reply to comment #2)
> Source/WebCore/ChangeLog:20:  Line contains tab character.  [whitespace/tab] [5]
> Total errors found: 1 in 5 files

Gah, I'll fix before landing.

[Benjamin Poulain]

Comment on attachment 104833 [details]
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=104833&action=review

> w/Source/WebKit/qt/ChangeLog:17
> +        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.
> +

Not relevant for this particular Changelog

[Andreas Kling]

Comment on attachment 104833 [details]
Patch

rs=me

[Tor Arne Vestbø]

Landed in r93600

[Alexis Menard (darktears)]

Good job

[Ademar Reis]

Revision r93600 cherry-picked into qtwebkit-2.2 with commit f011bd5 <http://gitorious.org/webkit/qtwebkit/commit/f011bd5>