104677 2012-12-11 08:22:07 -0800 [Qt] Fix the inspector not showing up on Windows 2013-01-10 04:59:12 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 106554 1 jturcotte jturcotte hausmann jturcotte vestbo oldest_to_newest 788466 0 jturcotte 2012-12-11 08:22:07 -0800 [Qt] Fix the inspector not showing up on Windows 788468 1 178811 jturcotte 2012-12-11 08:26:39 -0800 Created attachment 178811 Patch 789269 2 178811 hausmann 2012-12-11 23:58:40 -0800 Comment on attachment 178811 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=178811&action=review r=me with a small change :) > Source/api.pri:24 > + include(WebCore/WebCore.pri) I think if you move this whole block until _after_ the load(webkit_modules) part in api.pri, then you can remove the inclusion of WebCore.pri and therefore avoid it being included twice (webkit_modules will also include it due to WEBKIT += webcore) (WebCore.pri is designed to be included only once, as it does += on LIBS and other variables instead of *=) 789356 3 jturcotte 2012-12-12 02:11:20 -0800 (In reply to comment #2) > I think if you move this whole block until _after_ the load(webkit_modules) part in api.pri, then you can remove the inclusion of WebCore.pri and therefore avoid it being included twice (webkit_modules will also include it due to WEBKIT += webcore) > > (WebCore.pri is designed to be included only once, as it does += on LIBS and other variables instead of *=) It does work if I move it, pretty good point, thanks. 789361 4 jturcotte 2012-12-12 02:14:13 -0800 Committed r137436: <http://trac.webkit.org/changeset/137436> 178811 2012-12-11 08:26:39 -0800 2012-12-11 23:58:40 -0800 Patch bug-104677-20121211172400.patch text/plain 2962 jturcotte U3VidmVyc2lvbiBSZXZpc2lvbjogMTM3MTI4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMmZjYjgyOWE1NGQ1OWFj ZTFkNTM2YjgwODU2NzY0MWMxOWY3ODgyNS4uZmVhZDM1YTY5YmQ5YjVlNDdiMmNlNjE2NWE1OWIx MjhkMTdhYmQzMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEyIEBACisyMDEyLTEyLTExICBKb2Nl bHluIFR1cmNvdHRlICA8am9jZWx5bi50dXJjb3R0ZUBkaWdpYS5jb20+CisKKyAgICAgICAgW1F0 XSBGaXggdGhlIGluc3BlY3RvciBub3Qgc2hvd2luZyB1cCBvbiBXaW5kb3dzCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDQ2NzcKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFRhcmdldC5wcmk6CisKIDIw MTItMTItMTAgIEpvY2VseW4gVHVyY290dGUgIDxqb2NlbHluLnR1cmNvdHRlQGRpZ2lhLmNvbT4K IAogICAgICAgICBDcmFzaCBpbiBXZWJDb3JlOjpDYWNoZWRGcmFtZTo6ZGVzdHJveQpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvVGFyZ2V0LnByaSBiL1NvdXJjZS9XZWJDb3JlL1RhcmdldC5w cmkKaW5kZXggNjk1YWRhOGU3YTFjODhmYmY5M2U2YzBkMzA1NzI0YWZmNjZkNTcyOC4uY2I1NGE3 YzlkY2JhZmIyZjVmNmM1NDY4MWJlOTgxYzcxNjA3ZjNjNSAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvVGFyZ2V0LnByaQorKysgYi9Tb3VyY2UvV2ViQ29yZS9UYXJnZXQucHJpCkBAIC0xNCwx NSArMTQsNiBAQCBXRUJLSVQgKz0gamF2YXNjcmlwdGNvcmUKIAogQ09ORklHICs9IHN0YXRpY2xp YgogCi1SRVNPVVJDRVMgKz0gXAotICAgICQkUFdEL1dlYkNvcmUucXJjCi0KLWluY2x1ZGVfd2Vi aW5zcGVjdG9yIHsKLSAgICBSRVNPVVJDRVMgKz0gXAotICAgICAgICAkJFBXRC9pbnNwZWN0b3Iv ZnJvbnQtZW5kL1dlYktpdC5xcmMgXAotICAgICAgICAkJHtXRUJDT1JFX0dFTkVSQVRFRF9TT1VS Q0VTX0RJUn0vSW5zcGVjdG9yQmFja2VuZENvbW1hbmRzLnFyYwotfQotCiBTT1VSQ0VTICs9IFwK ICAgICBNb2R1bGVzL2dlb2xvY2F0aW9uL0dlb2xvY2F0aW9uLmNwcCBcCiAgICAgTW9kdWxlcy9n ZW9sb2NhdGlvbi9HZW9sb2NhdGlvbkNvbnRyb2xsZXIuY3BwIFwKZGlmZiAtLWdpdCBhL1NvdXJj ZS9hcGkucHJpIGIvU291cmNlL2FwaS5wcmkKaW5kZXggMDEwMzk2MTY5NzZiZDNlYTU2YzdlYzkx ZDQzOWIzNDRlYTcyNjQxNi4uMjJiNjVmMzAyZTE0OGE2MzhkYjZkZGNiZDUxY2Y0YjZhMGYyY2Jm ZSAxMDA2NDQKLS0tIGEvU291cmNlL2FwaS5wcmkKKysrIGIvU291cmNlL2FwaS5wcmkKQEAgLTE3 LDYgKzE3LDE2IEBAIFdFQktJVCArPSB3dGYgamF2YXNjcmlwdGNvcmUgd2ViY29yZQogYnVpbGQ/ KHdlYmtpdDEpOiBXRUJLSVQgKz0gd2Via2l0MQogYnVpbGQ/KHdlYmtpdDIpOiBXRUJLSVQgKz0g d2Via2l0MgogCisjIFJlc291cmNlcyBoYXZlIHRvIGJlIGluY2x1ZGVkIGRpcmVjdGx5IGluIHRo ZSBmaW5hbCBiaW5hcnkuCisjIE1TVkMncyBsaW5rZXIgd29uJ3QgcGljayB0aGVtIGZyb20gYSBz dGF0aWMgbGlicmFyeSBzaW5jZSB0aGV5IGFyZW4ndCByZWZlcmVuY2VkLgorUkVTT1VSQ0VTICs9 ICQkUFdEL1dlYkNvcmUvV2ViQ29yZS5xcmMKK2luY2x1ZGVfd2ViaW5zcGVjdG9yIHsKKyAgICBp bmNsdWRlKFdlYkNvcmUvV2ViQ29yZS5wcmkpCisgICAgUkVTT1VSQ0VTICs9IFwKKyAgICAgICAg JCRQV0QvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1dlYktpdC5xcmMgXAorICAgICAgICAk JHtXRUJDT1JFX0dFTkVSQVRFRF9TT1VSQ0VTX0RJUn0vSW5zcGVjdG9yQmFja2VuZENvbW1hbmRz LnFyYworfQorCiAjIEVuc3VyZSB0aGF0IGNoYW5nZXMgdG8gdGhlIFdlYktpdDEgYW5kIFdlYktp dDIgQVBJIHdpbGwgdHJpZ2dlciBhIHFtYWtlIG9mIHRoaXMKICMgZmlsZSwgd2hpY2ggaW4gdHVy biBydW5zIHN5bmNxdCB0byB1cGRhdGUgdGhlIGZvcndhcmRpbmcgaGVhZGVycy4KIGJ1aWxkPyh3 ZWJraXQxKTogewpkaWZmIC0tZ2l0IGEvQ2hhbmdlTG9nIGIvQ2hhbmdlTG9nCmluZGV4IDUwZjli ZGVkZmRiZGMyNDU4Zjg2NTIwZDVjM2U2M2MwOTE3NTg5MDkuLjgzZTMwMDU3YzI3NmYyMjlkOWM4 OTk2OWUzNWY0ZDU5ZWFhYjUyMDQgMTAwNjQ0Ci0tLSBhL0NoYW5nZUxvZworKysgYi9DaGFuZ2VM b2cKQEAgLTEsMyArMSwxOSBAQAorMjAxMi0xMi0xMSAgSm9jZWx5biBUdXJjb3R0ZSAgPGpvY2Vs eW4udHVyY290dGVAZGlnaWEuY29tPgorCisgICAgICAgIFtRdF0gRml4IHRoZSBpbnNwZWN0b3Ig bm90IHNob3dpbmcgdXAgb24gV2luZG93cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTA0Njc3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgUmVzb3VyY2VzIGFyZW4ndCB0cmFuc2ZlcmVkIHByb3Blcmx5IGZy b20gYSBzdGF0aWMgV2ViQ29yZSB0byB0aGUgZmluYWwgRExMCisgICAgICAgIHdpdGggTVNWQyBz aW5jZSB0aGUgbGlua2VyIG9ubHkgcGljayBmcm9tIHRoZSBzdGF0aWMgbGliIHN5bWJvbHMgdGhh dAorICAgICAgICBhcmUgcmVmZXJlbmNlZCBpbiB0aGUgZmluYWwgYmluYXJ5LgorCisgICAgICAg IE1vdmUgdGhlIHJlc291cmNlIGZpbGVzIGRpcmVjdGx5IHRvIFF0NVdlYktpdC5kbGwgdG8gbWFr ZSBzdXJlIHRoYXQgdGhleSBhcmUKKyAgICAgICAgYXZhaWxhYmxlLgorCisgICAgICAgICogU291 cmNlL2FwaS5wcmk6CisKIDIwMTItMTItMDggIFNlb2tqdSBLd29uICA8c2Vva2p1Lmt3b25AZ21h aWwuY29tPgogCiAgICAgICAgIFtFRkxdW1dLMl0gQWRkIFJlbW90ZSBXZWIgSW5zcGVjdG9yCg==