Bug 60347

Summary: [Qt] [qtwebkit-2.2] Fails to build with Qt for Embedded Linux
Product: WebKit Reporter: Bernhard Rosenkraenzer <bero>
Component: WebKit QtAssignee: Alexis Menard (darktears) <menard>
Status: RESOLVED FIXED    
Severity: Normal CC: ademar, benjamin, menard
Priority: P1 Keywords: Qt, QtTriaged
Version: 528+ (Nightly build)   
Hardware: Unspecified   
OS: Unspecified   
Attachments:
Description Flags
Proposed patch. kling: review+, kling: commit-queue-

Description Bernhard Rosenkraenzer 2011-05-06 00:17:23 PDT 
Attempting to build qtwebkit-2.2 with Qt for Embedded Linux results in a build failure because PluginContainerQt.cpp (which uses QX11EmbedContainer, which obviously doesn't exist on embedded, unconditionally) is being built.
Comment 1 Alexis Menard (darktears) 2011-05-06 10:42:25 PDT 
Created attachment 92603 [details]
Proposed patch.

Fix the build.
Comment 2 Andreas Kling 2011-05-06 10:55:59 PDT 
Comment on attachment 92603 [details]
Proposed patch.

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

rs=me

> ChangeLog:6
> +        Fix the build on embedded linux. qpa is the name for lighthouse but the old
> +        name for Qt for Embedded Linux should still be used in order to build properly.

I'm missing a [Qt] here somewhere.
embedded linux -> Embedded Linux

> Source/WebCore/ChangeLog:6
> +        Fix the build on embedded linux. qpa is the name for lighthouse but the old
> +        name for Qt for Embedded Linux should still be used in order to build properly.

Ditto.
Comment 3 Alexis Menard (darktears) 2011-05-09 12:58:10 PDT 
Committed r86083: <http://trac.webkit.org/changeset/86083>
Comment 4 Ademar Reis 2011-05-09 13:46:15 PDT 
Revision r86083 cherry-picked into qtwebkit-2.2 with commit b105226 <http://gitorious.org/webkit/qtwebkit/commit/b105226>