Bug 104677 - [Qt] Fix the inspector not showing up on Windows
Summary: [Qt] Fix the inspector not showing up on Windows
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: Jocelyn Turcotte
URL:
Keywords:
Depends on: 106554
Blocks:
  Show dependency treegraph
 
Reported: 2012-12-11 08:22 PST by Jocelyn Turcotte
Modified: 2013-01-10 04:59 PST (History)
3 users (show)

See Also:


Attachments
Patch (2.89 KB, patch)
2012-12-11 08:26 PST, Jocelyn Turcotte
hausmann: review+
Details | Formatted Diff | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Jocelyn Turcotte 2012-12-11 08:22:07 PST
[Qt] Fix the inspector not showing up on Windows
Comment 1 Jocelyn Turcotte 2012-12-11 08:26:39 PST
Created attachment 178811 [details]
Patch
Comment 2 Simon Hausmann 2012-12-11 23:58:40 PST
Comment on attachment 178811 [details]
Patch

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

r=me with a small change :)

> Source/api.pri:24
> +    include(WebCore/WebCore.pri)

I think if you move this whole block until _after_ the load(webkit_modules) part in api.pri, then you can remove the inclusion of WebCore.pri and therefore avoid it being included twice (webkit_modules will also include it due to WEBKIT += webcore)

(WebCore.pri is designed to be included only once, as it does += on LIBS and other variables instead of *=)
Comment 3 Jocelyn Turcotte 2012-12-12 02:11:20 PST
(In reply to comment #2)
> I think if you move this whole block until _after_ the load(webkit_modules) part in api.pri, then you can remove the inclusion of WebCore.pri and therefore avoid it being included twice (webkit_modules will also include it due to WEBKIT += webcore)
> 
> (WebCore.pri is designed to be included only once, as it does += on LIBS and other variables instead of *=)

It does work if I move it, pretty good point, thanks.
Comment 4 Jocelyn Turcotte 2012-12-12 02:14:13 PST
Committed r137436: <http://trac.webkit.org/changeset/137436>