Summary: | [Qt][WK2] Fix Mountain Lion builds after r150277. | ||||||
---|---|---|---|---|---|---|---|
Product: | WebKit | Reporter: | Michael Brüning <michael.bruning> | ||||
Component: | WebKit Qt | Assignee: | Nobody <webkit-unassigned> | ||||
Status: | RESOLVED FIXED | ||||||
Severity: | Normal | CC: | allan.jensen, andersca, commit-queue, darin, jturcotte, sam, zarvai | ||||
Priority: | P2 | ||||||
Version: | 528+ (Nightly build) | ||||||
Hardware: | Unspecified | ||||||
OS: | Unspecified | ||||||
Bug Depends on: | |||||||
Bug Blocks: | 116335 | ||||||
Attachments: |
|
Description
Michael Brüning
2013-05-20 15:13:12 PDT
Created attachment 202326 [details]
Patch.
Attached patch should fix the problem. I can't test this at the moment unfortunately as I do not have access to a recent Mac checkout & build right now.
*** Bug 116522 has been marked as a duplicate of this bug. *** Comment on attachment 202326 [details]
Patch.
I believe that this can go in without owner approval, correct me if I'm wrong.
Comment on attachment 202326 [details] Patch. Clearing flags on attachment: 202326 Committed r150432: <http://trac.webkit.org/changeset/150432> All reviewed patches have been landed. Closing bug. (In reply to comment #3) > I believe that this can go in without owner approval, correct me if I'm wrong. I think that’s wrong. This WKBase.h file is shipped as a public header on Mac. I don’t think it’s appropriate to have a BUILDING_QT__ #if in it. We probably need a different solution. Anders? Sam? (In reply to comment #6) > (In reply to comment #3) > > I believe that this can go in without owner approval, correct me if I'm wrong. > > I think that’s wrong. This WKBase.h file is shipped as a public header on Mac. I don’t think it’s appropriate to have a BUILDING_QT__ #if in it. We probably need a different solution. > > Anders? Sam? Ah, sorry, I was not aware of that. I just assumed the BUILDING_ would be okay since there were both BUILDING_EFL__ and BUILDING_GTK__ #if guards around the efl and GTK specific WKBase header includes in it already. Should we use to PLATFORM(xyz) #ifs or which would be the preferred guard? (In reply to comment #7) > I just assumed the BUILDING_ would be okay since there were both BUILDING_EFL__ and BUILDING_GTK__ #if guards around the efl and GTK specific WKBase header includes in it already. OK. Probably fine. I still would like to hear from Anders and Sam, but that is good thinking. |