62280 2011-06-08 07:07:57 -0700 [Qt] Build fix for building QtWebKit inside of Qt. 2011-06-08 08:54:15 -0700 1 1 1 Unclassified WebKit WebKit Qt 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 yael webkit-unassigned abecsi ademar kling webkit.review.bot oldest_to_newest 417217 0 yael 2011-06-08 07:07:57 -0700 When building QtWebKit inside of Qt, -lwebcore and -lwebkit2 are wrongly added to QtWebKit.prl, but they should not. 417224 1 96418 yael 2011-06-08 07:15:01 -0700 Created attachment 96418 Patch. 417226 2 96418 abecsi 2011-06-08 07:26:53 -0700 Comment on attachment 96418 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. 417227 3 96419 yael 2011-06-08 07:26:58 -0700 Created attachment 96419 Patch. Added the same to JavaScriptCore.pri based on bbandix comment on IRC. 417228 4 96419 abecsi 2011-06-08 07:29:23 -0700 Comment on attachment 96419 Patch. LGTM. Thanks for fixing this. 417229 5 96419 kling 2011-06-08 07:32:14 -0700 Comment on attachment 96419 Patch. rs=me 417249 6 96419 webkit.review.bot 2011-06-08 08:28:39 -0700 Comment on attachment 96419 Patch. Clearing flags on attachment: 96419 Committed r88350: <http://trac.webkit.org/changeset/88350> 417250 7 webkit.review.bot 2011-06-08 08:28:44 -0700 All reviewed patches have been landed. Closing bug. 417264 8 ademar 2011-06-08 08:54:15 -0700 Revision r88350 cherry-picked into qtwebkit-2.2 with commit 55ed382 <http://gitorious.org/webkit/qtwebkit/commit/55ed382> 96418 2011-06-08 07:15:01 -0700 2011-06-08 07:26:58 -0700 Patch. 62280.patch text/plain 2214 yael SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDg4MzQ1KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTEtMDYtMDggIFlhZWwgQWhh cm9uICA8eWFlbC5haGFyb25Abm9raWEuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIFtRdF0gQnVpbGQgZml4IGZvciBidWlsZGluZyBRdFdlYktp dCBpbnNpZGUgb2YgUXQuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD02MjI4MAorCisgICAgICAgIFJlbW92ZSBDT05GSUc9c3RhdGljbGliLCBiZWNhdXNl IGl0IGNhdXNlcyB0aGUgY29uZmlndXJlIHNjcmlwdCB0byBhZGQgLWx3ZWJjb3JlCisgICAgICAg IGludG8gUXRXZWJLaXQucHJsLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cywgYXMgdGhpcyBpcyBq dXN0IGEgYnVpbGQgZml4LgorCisgICAgICAgICogV2ViQ29yZS5wcmk6CisKIDIwMTEtMDUtMTgg IFBhdmVsIFBvZGl2aWxvdiAgPHBvZGl2aWxvdkBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2 aWV3ZWQgYnkgWXVyeSBTZW1pa2hhdHNreS4KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL1dlYkNvcmUu cHJpCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL1dlYkNvcmUucHJpCShyZXZpc2lvbiA4 ODEzNCkKKysrIFNvdXJjZS9XZWJDb3JlL1dlYkNvcmUucHJpCSh3b3JraW5nIGNvcHkpCkBAIC0z NzEsNiArMzcxLDcgQEAgZGVmaW5lVGVzdChwcmVwZW5kV2ViQ29yZUxpYikgewogICAgIH0KICAg ICAKICAgICBDT05GSUcgLT0gZXhwbGljaXRsaWIKKyAgICBDT05GSUcgLT0gc3RhdGljbGliCiAg ICAgZXhwb3J0KFFNQUtFX0xJQkRJUikKICAgICBleHBvcnQoUE9TVF9UQVJHRVRERVBTKQogICAg IGV4cG9ydChDT05GSUcpCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCShyZXZpc2lvbiA4ODM0NSkKKysrIFNvdXJj ZS9XZWJLaXQyL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE1IEBACisyMDEx LTA2LTA4ICBZYWVsIEFoYXJvbiAgPHlhZWwuYWhhcm9uQG5va2lhLmNvbT4KKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBbUXRdIEJ1aWxkIGZpeCBmb3Ig YnVpbGRpbmcgUXRXZWJLaXQgaW5zaWRlIG9mIFF0LgorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjIyODAKKworICAgICAgICBSZW1vdmUgQ09ORklHPXN0 YXRpY2xpYiwgYmVjYXVzZSBpdCBjYXVzZXMgdGhlIGNvbmZpZ3VyZSBzY3JpcHQgdG8gYWRkIC1s d2Via2l0MgorICAgICAgICBpbnRvIFF0V2ViS2l0LnBybC4KKworICAgICAgICAqIFdlYktpdDIu cHJpOgorCiAyMDExLTA2LTA3ICBUaW0gSG9ydG9uICA8dGltb3RoeV9ob3J0b25AYXBwbGUuY29t PgogCiAgICAgICAgIFJldmlld2VkIGJ5IEFsZXhleSBQcm9za3VyeWFrb3YuCkluZGV4OiBTb3Vy Y2UvV2ViS2l0Mi9XZWJLaXQyLnByaQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9XZWJL aXQyLnByaQkocmV2aXNpb24gODgxMzQpCisrKyBTb3VyY2UvV2ViS2l0Mi9XZWJLaXQyLnByaQko d29ya2luZyBjb3B5KQpAQCAtODksNiArODksNyBAQCBkZWZpbmVUZXN0KHByZXBlbmRXZWJLaXQy TGliKSB7CiAKICAgICAjIFRoZSBmb2xsb3dpbmcgbGluZSBpcyB0byBwcmV2ZW50IHFtYWtlIGZy b20gYWRkaW5nIHdlYmtpdDIgdG8gbGliUXRXZWJLaXQncyBwcmwgZGVwZW5kZW5jaWVzLgogICAg IENPTkZJRyAtPSBleHBsaWNpdGxpYgorICAgIENPTkZJRyAtPSBzdGF0aWNsaWIKIAogICAgIGV4 cG9ydChRTUFLRV9MSUJESVIpCiAgICAgZXhwb3J0KFBPU1RfVEFSR0VUREVQUykK 96419 2011-06-08 07:26:58 -0700 2011-06-08 08:28:39 -0700 Patch. 62280.patch text/plain 3641 yael SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gODgxMzQpCisrKyBTb3VyY2Uv SmF2YVNjcmlwdENvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTcgQEAK KzIwMTEtMDYtMDggIFlhZWwgQWhhcm9uICA8eWFlbC5haGFyb25Abm9raWEuY29tPgorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFtRdF0gQnVpbGQgZml4 IGZvciBidWlsZGluZyBRdFdlYktpdCBpbnNpZGUgb2YgUXQuCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02MjI4MAorCisgICAgICAgIFJlbW92ZSBDT05G SUc9c3RhdGljbGliLCBiZWNhdXNlIGl0IGNhdXNlcyB0aGUgY29uZmlndXJlIHNjcmlwdCB0byBh ZGQgLWxqYXZhc2NyaXB0Y29yZQorICAgICAgICBpbnRvIFF0V2ViS2l0LnBybC4KKworICAgICAg ICBObyBuZXcgdGVzdHMsIGFzIHRoaXMgaXMganVzdCBhIGJ1aWxkIGZpeC4KKworICAgICAgICAq IEphdmFTY3JpcHRDb3JlLnByaToKKwogMjAxMS0wNi0wNCAgS2V2aW4gT2xsaXZpZXIgIDxrZXZp bm9AdGhlb2xsaXZpZXJzLmNvbT4KIAogICAgICAgICBbd3hdIFVucmV2aWV3ZWQgYnVpbGQgZml4 LiBSZXN0b3JlIHRoZSBQUEMgYnVpbGQgYW5kIGFsbG93IHVzZXJzIHRvIHNwZWNpZnkgYXJjaGl0 ZWN0dXJlcwpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL0phdmFTY3JpcHRDb3JlLnByaQo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvSmF2YVNjcmlwdENvcmUucHJpCShy ZXZpc2lvbiA4ODEzNCkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9KYXZhU2NyaXB0Q29yZS5w cmkJKHdvcmtpbmcgY29weSkKQEAgLTEwMiw2ICsxMDIsNyBAQCBkZWZpbmVUZXN0KHByZXBlbmRK YXZhU2NyaXB0Q29yZUxpYikgewogICAgICMgVGhlIGNvbXByb21pc2Ugd2UgaGF2ZSB0byBhY2Nl cHQgYnkgZGlzYWJsaW5nIGV4cGxpY2l0bGliIGlzIHRvIGRyb3Agc3VwcG9ydCB0byBsaW5rIFF0 V2ViS2l0IGFuZCBRdFNjcmlwdAogICAgICMgc3RhdGljYWxseSBpbiBhcHBsaWNhdGlvbnMgKHdo aWNoIGlzbid0IHVzZWQgb2Z0ZW4gYmVjYXVzZSwgYW1vbmcgb3RoZXIgdGhpbmdzLCBvZiBsaWNl bnNpbmcgb2JzdGFjbGVzKS4KICAgICBDT05GSUcgLT0gZXhwbGljaXRsaWIKKyAgICBDT05GSUcg LT0gc3RhdGljbGliCiAKICAgICBleHBvcnQoUU1BS0VfTElCRElSKQogICAgIGV4cG9ydChMSUJT KQpJbmRleDogU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gODgzNDUpCisrKyBTb3VyY2UvV2ViQ29yZS9DaGFu Z2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwxNyBAQAorMjAxMS0wNi0wOCAgWWFlbCBB aGFyb24gIDx5YWVsLmFoYXJvbkBub2tpYS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgW1F0XSBCdWlsZCBmaXggZm9yIGJ1aWxkaW5nIFF0V2Vi S2l0IGluc2lkZSBvZiBRdC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTYyMjgwCisKKyAgICAgICAgUmVtb3ZlIENPTkZJRz1zdGF0aWNsaWIsIGJlY2F1 c2UgaXQgY2F1c2VzIHRoZSBjb25maWd1cmUgc2NyaXB0IHRvIGFkZCAtbHdlYmNvcmUKKyAgICAg ICAgaW50byBRdFdlYktpdC5wcmwuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzLCBhcyB0aGlzIGlz IGp1c3QgYSBidWlsZCBmaXguCisKKyAgICAgICAgKiBXZWJDb3JlLnByaToKKwogMjAxMS0wNS0x OCAgUGF2ZWwgUG9kaXZpbG92ICA8cG9kaXZpbG92QGNocm9taXVtLm9yZz4KIAogICAgICAgICBS ZXZpZXdlZCBieSBZdXJ5IFNlbWlraGF0c2t5LgpJbmRleDogU291cmNlL1dlYkNvcmUvV2ViQ29y ZS5wcmkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvV2ViQ29yZS5wcmkJKHJldmlzaW9u IDg4MTM0KQorKysgU291cmNlL1dlYkNvcmUvV2ViQ29yZS5wcmkJKHdvcmtpbmcgY29weSkKQEAg LTM3MSw2ICszNzEsNyBAQCBkZWZpbmVUZXN0KHByZXBlbmRXZWJDb3JlTGliKSB7CiAgICAgfQog ICAgIAogICAgIENPTkZJRyAtPSBleHBsaWNpdGxpYgorICAgIENPTkZJRyAtPSBzdGF0aWNsaWIK ICAgICBleHBvcnQoUU1BS0VfTElCRElSKQogICAgIGV4cG9ydChQT1NUX1RBUkdFVERFUFMpCiAg ICAgZXhwb3J0KENPTkZJRykKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDg4MzQ1KQorKysgU291 cmNlL1dlYktpdDIvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTUgQEAKKzIw MTEtMDYtMDggIFlhZWwgQWhhcm9uICA8eWFlbC5haGFyb25Abm9raWEuY29tPgorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFtRdF0gQnVpbGQgZml4IGZv ciBidWlsZGluZyBRdFdlYktpdCBpbnNpZGUgb2YgUXQuCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02MjI4MAorCisgICAgICAgIFJlbW92ZSBDT05GSUc9 c3RhdGljbGliLCBiZWNhdXNlIGl0IGNhdXNlcyB0aGUgY29uZmlndXJlIHNjcmlwdCB0byBhZGQg LWx3ZWJraXQyCisgICAgICAgIGludG8gUXRXZWJLaXQucHJsLgorCisgICAgICAgICogV2ViS2l0 Mi5wcmk6CisKIDIwMTEtMDYtMDcgIFRpbSBIb3J0b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5j b20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgQWxleGV5IFByb3NrdXJ5YWtvdi4KSW5kZXg6IFNv dXJjZS9XZWJLaXQyL1dlYktpdDIucHJpCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1dl YktpdDIucHJpCShyZXZpc2lvbiA4ODEzNCkKKysrIFNvdXJjZS9XZWJLaXQyL1dlYktpdDIucHJp CSh3b3JraW5nIGNvcHkpCkBAIC04OSw2ICs4OSw3IEBAIGRlZmluZVRlc3QocHJlcGVuZFdlYktp dDJMaWIpIHsKIAogICAgICMgVGhlIGZvbGxvd2luZyBsaW5lIGlzIHRvIHByZXZlbnQgcW1ha2Ug ZnJvbSBhZGRpbmcgd2Via2l0MiB0byBsaWJRdFdlYktpdCdzIHBybCBkZXBlbmRlbmNpZXMuCiAg ICAgQ09ORklHIC09IGV4cGxpY2l0bGliCisgICAgQ09ORklHIC09IHN0YXRpY2xpYgogCiAgICAg ZXhwb3J0KFFNQUtFX0xJQkRJUikKICAgICBleHBvcnQoUE9TVF9UQVJHRVRERVBTKQo=