Summary: | [Qt] Build fix for building QtWebKit inside of Qt. | ||||||||
---|---|---|---|---|---|---|---|---|---|
Product: | WebKit | Reporter: | Yael <yael> | ||||||
Component: | WebKit Qt | Assignee: | Nobody <webkit-unassigned> | ||||||
Status: | RESOLVED FIXED | ||||||||
Severity: | Normal | CC: | abecsi, ademar, kling, webkit.review.bot | ||||||
Priority: | P2 | ||||||||
Version: | 528+ (Nightly build) | ||||||||
Hardware: | Unspecified | ||||||||
OS: | Unspecified | ||||||||
Attachments: |
|
Description
Yael
2011-06-08 07:07:57 PDT
Created attachment 96418 [details]
Patch.
Comment on attachment 96418 [details]
Patch.
I would also add the CONFIG -= staticlib line to JSC.pri for consistency reasons.
The cause why the build works without it is the order of prepend calls in the QtWebKit.pro file:
!v8:prependJavaScriptCoreLib(../../JavaScriptCore)
prependWebCoreLib(../../WebCore)
webkit2:prependWebKit2Lib(../../WebKit2)
Theoretically only the last would have to remove the staticlib, but if we for some reason change the order or use these functions elsewhere then the build might fail again, so it's safer to be consistent.
Created attachment 96419 [details]
Patch.
Added the same to JavaScriptCore.pri based on bbandix comment on IRC.
Comment on attachment 96419 [details]
Patch.
LGTM.
Thanks for fixing this.
Comment on attachment 96419 [details]
Patch.
rs=me
Comment on attachment 96419 [details] Patch. Clearing flags on attachment: 96419 Committed r88350: <http://trac.webkit.org/changeset/88350> All reviewed patches have been landed. Closing bug. Revision r88350 cherry-picked into qtwebkit-2.2 with commit 55ed382 <http://gitorious.org/webkit/qtwebkit/commit/55ed382> |