37136 2010-04-05 21:49:13 -0700 [Qt] Fix trunk (non-standalone) builds for Symbian 2010-04-09 00:44:38 -0700 1 1 1 Unclassified WebKit Platform 528+ (Nightly build) PC All CLOSED FIXED Qt P2 Normal --- 35784 1 laszlo.gombos laszlo.gombos commit-queue dpranke eric hausmann jturcotte oldest_to_newest 208893 0 laszlo.gombos 2010-04-05 21:49:13 -0700 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. 208901 1 52607 laszlo.gombos 2010-04-05 22:46:16 -0700 Created attachment 52607 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. 209174 2 52607 kenneth 2010-04-06 12:26:01 -0700 Comment on attachment 52607 proposed patch I'm OK with this change, but maybe Simon has objections, so clearing cq for now. 209477 3 eric 2010-04-06 23:45:52 -0700 Attachment 52607 was posted by a committer and has review+, assigning to Laszlo Gombos for commit. 209521 4 52607 hausmann 2010-04-07 01:01:05 -0700 Comment on attachment 52607 proposed patch Looks okay to me :) 209524 5 52607 commit-queue 2010-04-07 01:15:50 -0700 Comment on attachment 52607 proposed patch Clearing flags on attachment: 52607 Committed r57198: <http://trac.webkit.org/changeset/57198> 209525 6 commit-queue 2010-04-07 01:15:56 -0700 All reviewed patches have been landed. Closing bug. 209581 7 hausmann 2010-04-07 05:06:06 -0700 Revision r57198 cherry-picked into qtwebkit-2.0 with commit 90e8e997a968f72584c55f0006c09db0944a3e11 210358 8 dpranke 2010-04-08 13:47:13 -0700 Committed r57290: <http://trac.webkit.org/changeset/57290> 210361 9 dpranke 2010-04-08 13:48:18 -0700 (In reply to comment #8) > Committed r57290: <http://trac.webkit.org/changeset/57290> grr. Ignore this. webkit-patch strikes again. 52607 2010-04-05 22:46:16 -0700 2010-04-07 01:15:50 -0700 proposed patch 37136.patch text/plain 1942 laszlo.gombos SW5kZXg6IENoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBDaGFuZ2VMb2cJKHJldmlzaW9uIDU3MTIz KQorKysgQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTAtMDQt MDUgIExhc3psbyBHb21ib3MgIDxsYXN6bG8uMS5nb21ib3NAbm9raWEuY29tPgorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFtRdF0gRml4IHRydW5rIChu b24tc3RhbmRhbG9uZSkgYnVpbGRzIGZvciBTeW1iaWFuCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zNzEzNgorCisgICAgICAgIFRlc3QgZm9yIHNvdXJj ZSBmaWxlcyBiZWZvcmUgYnVpbGRpbmcgaW5zdGVhZCBvZiByZWx5aW5nIG9uCisgICAgICAgIHN0 YW5kYWxvbmVfcGFja2FnZSBjb25maWcuCisKKyAgICAgICAgKiBXZWJLaXQucHJvOgorCiAyMDEw LTA0LTAxICBLaW51a28gWWFzdWRhICA8a2ludWtvQGNocm9taXVtLm9yZz4KIAogICAgICAgICBS ZXZpZXdlZCBieSBEbWl0cnkgVGl0b3YuCkluZGV4OiBXZWJLaXQucHJvCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFdlYktpdC5wcm8JKHJldmlzaW9uIDU3MTE3KQorKysgV2ViS2l0LnBybwkod29ya2luZyBjb3B5 KQpAQCAtNSwxOSArNSwxNyBAQCBpbmNsdWRlKFdlYktpdC5wcmkpCiAKIFNVQkRJUlMgKz0gXAog ICAgICAgICBKYXZhU2NyaXB0Q29yZSBcCi0gICAgICAgIFdlYkNvcmUgXAotICAgICAgICBXZWJL aXRUb29scy9RdExhdW5jaGVyCi0KLSFDT05GSUcoc3RhbmRhbG9uZV9wYWNrYWdlKSB7Ci0gICAg U1VCRElSUyArPSBKYXZhU2NyaXB0Q29yZS9qc2MucHJvIFwKLSAgICAgICAgV2ViS2l0L3F0L3Rl c3RzIFwKLSAgICAgICAgV2ViS2l0VG9vbHMvRHVtcFJlbmRlclRyZWUvcXQvRHVtcFJlbmRlclRy ZWUucHJvCi0KLSAgICAhd2luMzI6IXN5bWJpYW4gewotICAgICAgICBTVUJESVJTICs9IFdlYktp dFRvb2xzL0R1bXBSZW5kZXJUcmVlL3F0L0ltYWdlRGlmZi5wcm8KLSAgICAgICAgU1VCRElSUyAr PSBXZWJLaXRUb29scy9EdW1wUmVuZGVyVHJlZS9xdC9UZXN0TmV0c2NhcGVQbHVnaW4vVGVzdE5l dHNjYXBlUGx1Z2luLnBybwotICAgIH0KKyAgICAgICAgV2ViQ29yZQogCisjIElmIHRoZSBzb3Vy Y2UgZXhpc3RzLCBidWlsdCBpdAorZXhpc3RzKCQkUFdEL1dlYktpdFRvb2xzL1F0TGF1bmNoZXIp OiBTVUJESVJTICs9IFdlYktpdFRvb2xzL1F0TGF1bmNoZXIKK2V4aXN0cygkJFBXRC9KYXZhU2Ny aXB0Q29yZS9qc2MucHJvKTogU1VCRElSUyArPSBKYXZhU2NyaXB0Q29yZS9qc2MucHJvCitleGlz dHMoJCRQV0QvV2ViS2l0L3F0L3Rlc3RzKTogU1VCRElSUyArPSBXZWJLaXQvcXQvdGVzdHMKK2V4 aXN0cygkJFBXRC9XZWJLaXRUb29scy9EdW1wUmVuZGVyVHJlZS9xdC9EdW1wUmVuZGVyVHJlZS5w cm8pOiBTVUJESVJTICs9IFdlYktpdFRvb2xzL0R1bXBSZW5kZXJUcmVlL3F0L0R1bXBSZW5kZXJU cmVlLnBybworCishd2luMzI6IXN5bWJpYW4geworICAgIGV4aXN0cygkJFBXRC9XZWJLaXRUb29s cy9EdW1wUmVuZGVyVHJlZS9xdC9JbWFnZURpZmYucHJvKTogU1VCRElSUyArPSBXZWJLaXRUb29s cy9EdW1wUmVuZGVyVHJlZS9xdC9JbWFnZURpZmYucHJvCisgICAgZXhpc3RzKCQkUFdEL1dlYktp dFRvb2xzL0R1bXBSZW5kZXJUcmVlL3F0L1Rlc3ROZXRzY2FwZVBsdWdpbi9UZXN0TmV0c2NhcGVQ bHVnaW4ucHJvKTogU1VCRElSUyArPSBXZWJLaXRUb29scy9EdW1wUmVuZGVyVHJlZS9xdC9UZXN0 TmV0c2NhcGVQbHVnaW4vVGVzdE5ldHNjYXBlUGx1Z2luLnBybwogfQogCiBidWlsZC1xdHNjcmlw dCB7Cg==