Bug 66770 - [Qt] Build fails on Lion
Summary: [Qt] Build fails on Lion
Status: RESOLVED FIXED
Alias: None
Product: WebKit
Classification: Unclassified
Component: New Bugs (show other bugs)
Version: 528+ (Nightly build)
Hardware: Unspecified Unspecified
: P2 Normal
Assignee: Tor Arne Vestbø (not active)
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2011-08-23 06:06 PDT by Tor Arne Vestbø (not active)
Modified: 2011-08-25 12:26 PDT (History)
3 users (show)

See Also:


Attachments
Patch (5.04 KB, patch)
2011-08-23 06:12 PDT, Tor Arne Vestbø (not active)
akling: review+
Details | Formatted Diff | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Tor Arne Vestbø (not active) 2011-08-23 06:06:04 PDT
[Qt] Build fails on Lion
Comment 1 Tor Arne Vestbø (not active) 2011-08-23 06:12:41 PDT
Created attachment 104833 [details]
Patch
Comment 2 WebKit Review Bot 2011-08-23 06:14:58 PDT
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.
Comment 3 Tor Arne Vestbø (not active) 2011-08-23 06:18:28 PDT
(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.
Comment 4 Benjamin Poulain 2011-08-23 06:22:59 PDT
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
Comment 5 Andreas Kling 2011-08-23 06:23:59 PDT
Comment on attachment 104833 [details]
Patch

rs=me
Comment 6 Tor Arne Vestbø (not active) 2011-08-23 06:27:29 PDT
Landed in r93600
Comment 7 Alexis Menard (darktears) 2011-08-23 06:44:22 PDT
Good job
Comment 8 Ademar Reis 2011-08-25 12:26:38 PDT
Revision r93600 cherry-picked into qtwebkit-2.2 with commit f011bd5 <http://gitorious.org/webkit/qtwebkit/commit/f011bd5>