Bug 85045 - Fix minimal build.
Summary: Fix minimal build.
Status: RESOLVED FIXED
Alias: None
Product: WebKit
Classification: Unclassified
Component: WebKit Qt (show other bugs)
Version: 528+ (Nightly build)
Hardware: Unspecified Unspecified
: P2 Normal
Assignee: Allan Sandfeld Jensen
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2012-04-27 03:17 PDT by Allan Sandfeld Jensen
Modified: 2012-04-27 13:18 PDT (History)
2 users (show)

See Also:


Attachments
Patch (3.19 KB, patch)
2012-04-27 03:20 PDT, Allan Sandfeld Jensen
no flags Details | Formatted Diff | Diff
Patch (3.20 KB, patch)
2012-04-27 06:30 PDT, Allan Sandfeld Jensen
no flags Details | Formatted Diff | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Allan Sandfeld Jensen 2012-04-27 03:17:23 PDT
Build with --minimal currently fails because it makes multiple conflicting definition of ENABLE_XSLT.
Comment 1 Allan Sandfeld Jensen 2012-04-27 03:20:16 PDT
Created attachment 139161 [details]
Patch
Comment 2 Tor Arne Vestbø 2012-04-27 05:55:18 PDT
Comment on attachment 139161 [details]
Patch

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

> Source/WebCore/Target.pri:2914
> +} else {
> +    HEADERS += xml/parser/XMLDocumentParserScope.h
> +    SOURCES += \
> +            xml/parser/XMLDocumentParserLibxml2.cpp \
> +            xml/parser/XMLDocumentParserScope.cpp

Please reverse this,ie, contains(DEFINES, WTF_USE_LIBXML2=1) {} else {}
Comment 3 Allan Sandfeld Jensen 2012-04-27 06:30:31 PDT
Created attachment 139188 [details]
Patch

Patch for landing
Comment 4 WebKit Review Bot 2012-04-27 13:18:01 PDT
Comment on attachment 139188 [details]
Patch

Clearing flags on attachment: 139188

Committed r115482: <http://trac.webkit.org/changeset/115482>
Comment 5 WebKit Review Bot 2012-04-27 13:18:06 PDT
All reviewed patches have been landed.  Closing bug.