Bug 37136

Summary: [Qt] Fix trunk (non-standalone) builds for Symbian
Product: WebKit Reporter: Laszlo Gombos <laszlo.gombos>
Component: PlatformAssignee: Laszlo Gombos <laszlo.gombos>
Status: CLOSED FIXED    
Severity: Normal CC: commit-queue, dpranke, eric, hausmann, jturcotte
Priority: P2 Keywords: Qt
Version: 528+ (Nightly build)   
Hardware: PC   
OS: All   
Bug Depends on:    
Bug Blocks: 35784    
Attachments:
Description Flags
proposed patch none

Laszlo Gombos
Reported 2010-04-05 21:49:13 PDT
Building clean WebKit trunk build for Symbian starts up as a non-package build and than at a later stage in the build process, the build turns into a package build. The issue seems to be that the "exists($$PWD/WebCore/generated)" condition in WebKit.pri initially evaluates to false, but than after the derived sources are generated the expressions evaluates to true and turns on "standalone_package" CONFIG. As a result jsc, qt autotests and DumprenerTree are never built for Symbian by the "normal" build process.
Attachments
proposed patch (1.90 KB, patch)
2010-04-05 22:46 PDT, Laszlo Gombos 		no flags
DetailsFormatted DiffDiff
View All Add attachment proposed patch, testcase, etc.
Laszlo Gombos
Comment 1 2010-04-05 22:46:16 PDT
Created attachment 52607 [details] proposed patch Test for source files before building instead of relying on standalone_package config test. This not only fixes the bug, but I think it also makes the build file more readable and potentially even allows to patch a package build with some goodies (e.g. Dumprendertree) from trunk sources. I was not sure of the package build includes QtLauncher so I moved that build target to be optional (only build it if exists) as well.
Kenneth Rohde Christiansen
Comment 2 2010-04-06 12:26:01 PDT
Comment on attachment 52607 [details] proposed patch I'm OK with this change, but maybe Simon has objections, so clearing cq for now.
Eric Seidel (no email)
Comment 3 2010-04-06 23:45:52 PDT
Attachment 52607 [details] was posted by a committer and has review+, assigning to Laszlo Gombos for commit.
Simon Hausmann
Comment 4 2010-04-07 01:01:05 PDT
Comment on attachment 52607 [details] proposed patch Looks okay to me :)
WebKit Commit Bot
Comment 5 2010-04-07 01:15:50 PDT
Comment on attachment 52607 [details] proposed patch Clearing flags on attachment: 52607 Committed r57198: <http://trac.webkit.org/changeset/57198>
WebKit Commit Bot
Comment 6 2010-04-07 01:15:56 PDT
All reviewed patches have been landed. Closing bug.
Simon Hausmann
Comment 7 2010-04-07 05:06:06 PDT
Revision r57198 cherry-picked into qtwebkit-2.0 with commit 90e8e997a968f72584c55f0006c09db0944a3e11
Dirk Pranke
Comment 8 2010-04-08 13:47:13 PDT
Committed r57290: <http://trac.webkit.org/changeset/57290>
Dirk Pranke
Comment 9 2010-04-08 13:48:18 PDT
(In reply to comment #8) > Committed r57290: <http://trac.webkit.org/changeset/57290> grr. Ignore this. webkit-patch strikes again.
Note You need to log in before you can comment on or make changes to this bug.