27358 2009-07-16 17:16:01 -0700 [Qt] Fix the include path for the Symbian port 2009-08-06 12:18:12 -0700 1 1 1 Unclassified WebKit WebKit Qt 528+ (Nightly build) PC All RESOLVED FIXED P2 Normal --- 27065 0 laszlo.gombos webkit-unassigned hausmann norbert.leser yongjun.zhang oldest_to_newest 132415 0 laszlo.gombos 2009-07-16 17:16:01 -0700 Some number of Symbian system headers have the same name as headers in WebCore\JavaScriptCore (e.g. Profiler.h, Event.h, Base64.h, File.h). Currently system headers are included before WebCore\JavaScriptCore headers in the Qt build system, which leads to a build break on Symbian. 132423 1 32907 laszlo.gombos 2009-07-16 17:36:29 -0700 Created attachment 32907 Proposed fix. Started as a build fix; ended up being a lot of cleanup. This patch puts the system includes at the end of the include path, so that when the include path is built up new (more specific) path elements are prepended (and not appended) to the include path. For example the include path for WebCore looks like this: - Qt port specific dirs - Port independent WebCore dirs - JavaScriptCore dirs - System includes. In addition the patch includes the following cleanups: - Sorted the include lists - Fixed the Qt port specific include list (so that it only includes Qt port specific dirs and it includes all of those) - Removed WebCore/ForwardingHeaders from WebCore include path (as JavaScriptCore.pri is included). This should make the build a bit faster. Tested on Linux/Windows/Symbian. 132564 2 32907 hausmann 2009-07-17 06:55:51 -0700 Comment on attachment 32907 Proposed fix. r=me. Nice! 132565 3 hausmann 2009-07-17 06:56:55 -0700 Landed in r46032 137621 4 norbert.leser 2009-08-06 12:18:12 -0700 *** Bug 27061 has been marked as a duplicate of this bug. *** 32907 2009-07-16 17:36:29 -0700 2009-07-17 06:55:51 -0700 Proposed fix. patch_27358.txt text/plain 5758 laszlo.gombos SW5kZXg6IEphdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBKYXZhU2NyaXB0 Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDQ1OTk5KQorKysgSmF2YVNjcmlwdENvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTIgQEAKKzIwMDktMDctMTYgIExhc3psbyBH b21ib3MgIDxsYXN6bG8uMS5nb21ib3NAbm9raWEuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFtRdF0gRml4IHRoZSBpbmNsdWRlIHBhdGggZm9y IHRoZSBTeW1iaWFuIHBvcnQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTI3MzU4CisKKyAgICAgICAgKiBKYXZhU2NyaXB0Q29yZS5wcmk6CisKIDIwMDkt MDctMTYgIFpvbHRhbiBIb3J2YXRoICA8aHpvbHRhbkBpbmYudS1zemVnZWQuaHU+CiAKICAgICAg ICAgUmV2aWV3ZWQgYnkgT2xpdmVyIEh1bnQuCkluZGV4OiBKYXZhU2NyaXB0Q29yZS9KYXZhU2Ny aXB0Q29yZS5wcmkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gSmF2YVNjcmlwdENvcmUvSmF2YVNjcmlwdENvcmUu cHJpCShyZXZpc2lvbiA0NTk4MCkKKysrIEphdmFTY3JpcHRDb3JlL0phdmFTY3JpcHRDb3JlLnBy aQkod29ya2luZyBjb3B5KQpAQCAtOSwyNCArOSwyNiBAQCBDT05GSUcoZGVidWcsIGRlYnVnfHJl bGVhc2UpIHsKICAgICBPQkpFQ1RTX0RJUiA9IG9iai9yZWxlYXNlCiB9CiAKLUlOQ0xVREVQQVRI ICs9ICQkR0VORVJBVEVEX1NPVVJDRVNfRElSIFwKLSAgICAgICAgICAgICAgICQkUFdEIFwKLSAg ICAgICAgICAgICAgICQkUFdEL3BhcnNlciBcCi0gICAgICAgICAgICAgICAkJFBXRC9ieXRlY29t cGlsZXIgXAotICAgICAgICAgICAgICAgJCRQV0QvZGVidWdnZXIgXAotICAgICAgICAgICAgICAg JCRQV0QvcnVudGltZSBcCi0gICAgICAgICAgICAgICAkJFBXRC93dGYgXAotICAgICAgICAgICAg ICAgJCRQV0Qvd3RmL3VuaWNvZGUgXAotICAgICAgICAgICAgICAgJCRQV0QvaW50ZXJwcmV0ZXIg XAotICAgICAgICAgICAgICAgJCRQV0Qvaml0IFwKLSAgICAgICAgICAgICAgICQkUFdEL3Byb2Zp bGVyIFwKLSAgICAgICAgICAgICAgICQkUFdEL3dyZWMgXAotICAgICAgICAgICAgICAgJCRQV0Qv eWFyciBcCi0gICAgICAgICAgICAgICAkJFBXRC9BUEkgXAotICAgICAgICAgICAgICAgJCRQV0Qv Li4gXAotICAgICAgICAgICAgICAgJCRQV0QvRm9yd2FyZGluZ0hlYWRlcnMgXAotICAgICAgICAg ICAgICAgJCRQV0QvYnl0ZWNvZGUgXAotICAgICAgICAgICAgICAgJCRQV0QvYXNzZW1ibGVyIFwK K0lOQ0xVREVQQVRIID0gXAorICAgICQkUFdEIFwKKyAgICAkJFBXRC8uLiBcCisgICAgJCRQV0Qv YXNzZW1ibGVyIFwKKyAgICAkJFBXRC9ieXRlY29kZSBcCisgICAgJCRQV0QvYnl0ZWNvbXBpbGVy IFwKKyAgICAkJFBXRC9kZWJ1Z2dlciBcCisgICAgJCRQV0QvaW50ZXJwcmV0ZXIgXAorICAgICQk UFdEL2ppdCBcCisgICAgJCRQV0QvcGFyc2VyIFwKKyAgICAkJFBXRC9wcm9maWxlciBcCisgICAg JCRQV0QvcnVudGltZSBcCisgICAgJCRQV0Qvd3JlYyBcCisgICAgJCRQV0Qvd3RmIFwKKyAgICAk JFBXRC93dGYvdW5pY29kZSBcCisgICAgJCRQV0QveWFyciBcCisgICAgJCRQV0QvQVBJIFwKKyAg ICAkJFBXRC9Gb3J3YXJkaW5nSGVhZGVycyBcCisgICAgJCRHRU5FUkFURURfU09VUkNFU19ESVIg XAorICAgICQkSU5DTFVERVBBVEgKIAogREVGSU5FUyArPSBCVUlMRElOR19RVF9fIEJVSUxESU5H X0phdmFTY3JpcHRDb3JlIEJVSUxESU5HX1dURgogCkluZGV4OiBXZWJDb3JlL0NoYW5nZUxvZwo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBXZWJDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gNDU5OTkpCisrKyBXZWJD b3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDEyIEBACisyMDA5LTA3LTE2 ICBMYXN6bG8gR29tYm9zICA8bGFzemxvLjEuZ29tYm9zQG5va2lhLmNvbT4KKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBbUXRdIEZpeCB0aGUgaW5jbHVk ZSBwYXRoIGZvciB0aGUgU3ltYmlhbiBwb3J0CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0yNzM1OAorCisgICAgICAgICogV2ViQ29yZS5wcm86CisKIDIw MDktMDctMTYgIEFkYW0gQmFydGggIDxhYmFydGhAd2Via2l0Lm9yZz4KIAogICAgICAgICBVbnJl dmlld2VkLgpJbmRleDogV2ViQ29yZS9XZWJDb3JlLnBybwo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3Jl L1dlYkNvcmUucHJvCShyZXZpc2lvbiA0NTk4MCkKKysrIFdlYkNvcmUvV2ViQ29yZS5wcm8JKHdv cmtpbmcgY29weSkKQEAgLTE2MCw2MSArMTYwLDYyIEBAIENPTkZJRyhjb21wdXRlX2RlZmF1bHRz KSB7CiAgICAgZXJyb3IoIkRvbmUgY29tcHV0aW5nIGRlZmF1bHRzIikKIH0KIAotIyBFbnN1cmUg dGhhdCB3ZSBwaWNrIHVwIFdlYkNvcmUncyBjb25maWcuaCBvdmVyIEphdmFTY3JpcHRDb3JlJ3MK LUlOQ0xVREVQQVRIID0gJCRQV0QgJCRJTkNMVURFUEFUSAotCi1pbmNsdWRlKCQkUFdELy4uL0ph dmFTY3JpcHRDb3JlL0phdmFTY3JpcHRDb3JlLnByaSkKLQogUkVTT1VSQ0VTICs9IFwKICAgICAk JFBXRC8uLi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvV2ViS2l0LnFyYyBcCiAgICAgJCRQ V0QvLi4vV2ViQ29yZS9XZWJDb3JlLnFyYwotSU5DTFVERVBBVEggKz0gXAotICAgICQkUFdEL3Bs YXRmb3JtL3F0IFwKLSAgICAkJFBXRC9wbGF0Zm9ybS9uZXR3b3JrL3F0IFwKKworaW5jbHVkZSgk JFBXRC8uLi9KYXZhU2NyaXB0Q29yZS9KYXZhU2NyaXB0Q29yZS5wcmkpCisKK0lOQ0xVREVQQVRI ID0gXAorICAgICQkUFdEIFwKKyAgICAkJFBXRC9hY2Nlc3NpYmlsaXR5IFwKKyAgICAkJFBXRC9i aW5kaW5ncy9qcyBcCisgICAgJCRQV0QvYnJpZGdlIFwKKyAgICAkJFBXRC9icmlkZ2UvYyBcCisg ICAgJCRQV0QvY3NzIFwKKyAgICAkJFBXRC9kb20gXAorICAgICQkUFdEL2RvbS9kZWZhdWx0IFwK KyAgICAkJFBXRC9lZGl0aW5nIFwKKyAgICAkJFBXRC9oaXN0b3J5IFwKKyAgICAkJFBXRC9odG1s IFwKKyAgICAkJFBXRC9pbnNwZWN0b3IgXAorICAgICQkUFdEL2xvYWRlciBcCisgICAgJCRQV0Qv bG9hZGVyL2FwcGNhY2hlIFwKKyAgICAkJFBXRC9sb2FkZXIvYXJjaGl2ZSBcCisgICAgJCRQV0Qv bG9hZGVyL2ljb24gXAorICAgICQkUFdEL3BhZ2UgXAorICAgICQkUFdEL3BhZ2UvYW5pbWF0aW9u IFwKKyAgICAkJFBXRC9wbGF0Zm9ybSBcCisgICAgJCRQV0QvcGxhdGZvcm0vYW5pbWF0aW9uIFwK KyAgICAkJFBXRC9wbGF0Zm9ybS9ncmFwaGljcyBcCiAgICAgJCRQV0QvcGxhdGZvcm0vZ3JhcGhp Y3MvZmlsdGVycyBcCiAgICAgJCRQV0QvcGxhdGZvcm0vZ3JhcGhpY3MvdHJhbnNmb3JtcyBcCi0g ICAgJCRQV0QvcGxhdGZvcm0vZ3JhcGhpY3MvcXQgXAorICAgICQkUFdEL3BsYXRmb3JtL2ltYWdl LWRlY29kZXJzIFwKKyAgICAkJFBXRC9wbGF0Zm9ybS9uZXR3b3JrIFwKKyAgICAkJFBXRC9wbGF0 Zm9ybS9zcWwgXAorICAgICQkUFdEL3BsYXRmb3JtL3RleHQgXAorICAgICQkUFdEL3BsdWdpbnMg XAorICAgICQkUFdEL3JlbmRlcmluZyBcCisgICAgJCRQV0QvcmVuZGVyaW5nL3N0eWxlIFwKKyAg ICAkJFBXRC9zdG9yYWdlIFwKKyAgICAkJFBXRC9zdmcgXAorICAgICQkUFdEL3N2Zy9hbmltYXRp b24gXAorICAgICQkUFdEL3N2Zy9ncmFwaGljcyBcCisgICAgJCRQV0Qvc3ZnL2dyYXBoaWNzL2Zp bHRlcnMgXAorICAgICQkUFdEL3dtbCBcCisgICAgJCRQV0Qvd29ya2VycyBcCisgICAgJCRQV0Qv eG1sIFwKKyAgICAkJEdFTkVSQVRFRF9TT1VSQ0VTX0RJUiBcCisgICAgJCRJTkNMVURFUEFUSAor CitJTkNMVURFUEFUSCA9IFwKKyAgICAkJFBXRC9icmlkZ2UvcXQgXAogICAgICQkUFdEL3BhZ2Uv cXQgXAorICAgICQkUFdEL3BsYXRmb3JtL2dyYXBoaWNzL3F0IFwKKyAgICAkJFBXRC9wbGF0Zm9y bS9uZXR3b3JrL3F0IFwKKyAgICAkJFBXRC9wbGF0Zm9ybS9xdCBcCiAgICAgJCRQV0QvLi4vV2Vi S2l0L3F0L1dlYkNvcmVTdXBwb3J0IFwKLQotSU5DTFVERVBBVEggKz0gICQkUFdEL2FjY2Vzc2li aWxpdHkgXAotICAgICAgICAgICAgICAgICQkUFdEL0ZvcndhcmRpbmdIZWFkZXJzIFwKLSAgICAg ICAgICAgICAgICAkJFBXRC9wbGF0Zm9ybSBcCi0gICAgICAgICAgICAgICAgJCRQV0QvcGxhdGZv cm0vYW5pbWF0aW9uIFwKLSAgICAgICAgICAgICAgICAkJFBXRC9wbGF0Zm9ybS9uZXR3b3JrIFwK LSAgICAgICAgICAgICAgICAkJFBXRC9wbGF0Zm9ybS9ncmFwaGljcyBcCi0gICAgICAgICAgICAg ICAgJCRQV0Qvc3ZnL2FuaW1hdGlvbiBcCi0gICAgICAgICAgICAgICAgJCRQV0Qvc3ZnL2dyYXBo aWNzIFwKLSAgICAgICAgICAgICAgICAkJFBXRC9zdmcvZ3JhcGhpY3MvZmlsdGVycyBcCi0gICAg ICAgICAgICAgICAgJCRQV0QvcGxhdGZvcm0vc3FsIFwKLSAgICAgICAgICAgICAgICAkJFBXRC9w bGF0Zm9ybS90ZXh0IFwKLSAgICAgICAgICAgICAgICAkJFBXRC9zdG9yYWdlIFwKLSAgICAgICAg ICAgICAgICAkJFBXRC9sb2FkZXIgXAotICAgICAgICAgICAgICAgICQkUFdEL2xvYWRlci9hcHBj YWNoZSBcCi0gICAgICAgICAgICAgICAgJCRQV0QvbG9hZGVyL2FyY2hpdmUgXAotICAgICAgICAg ICAgICAgICQkUFdEL2xvYWRlci9pY29uIFwKLSAgICAgICAgICAgICAgICAkJFBXRC9jc3MgXAot ICAgICAgICAgICAgICAgICQkUFdEL2RvbSBcCi0gICAgICAgICAgICAgICAgJCRQV0QvZG9tL2Rl ZmF1bHQgXAotICAgICAgICAgICAgICAgICQkUFdEL3BhZ2UgXAotICAgICAgICAgICAgICAgICQk UFdEL3BhZ2UvYW5pbWF0aW9uIFwKLSAgICAgICAgICAgICAgICAkJFBXRC9lZGl0aW5nIFwKLSAg ICAgICAgICAgICAgICAkJFBXRC9yZW5kZXJpbmcgXAotICAgICAgICAgICAgICAgICQkUFdEL3Jl bmRlcmluZy9zdHlsZSBcCi0gICAgICAgICAgICAgICAgJCRQV0QvaGlzdG9yeSBcCi0gICAgICAg ICAgICAgICAgJCRQV0QvaW5zcGVjdG9yIFwKLSAgICAgICAgICAgICAgICAkJFBXRC94bWwgXAot ICAgICAgICAgICAgICAgICQkUFdEL2h0bWwgXAotICAgICAgICAgICAgICAgICQkUFdEL3dtbCBc Ci0gICAgICAgICAgICAgICAgJCRQV0Qvd29ya2VycyBcCi0gICAgICAgICAgICAgICAgJCRQV0Qv YmluZGluZ3MvanMgXAotICAgICAgICAgICAgICAgICQkUFdEL3N2ZyBcCi0gICAgICAgICAgICAg ICAgJCRQV0QvcGxhdGZvcm0vaW1hZ2UtZGVjb2RlcnMgXAotICAgICAgICAgICAgICAgICQkUFdE L3BsdWdpbnMgXAotICAgICAgICAgICAgICAgICQkUFdEL2JyaWRnZSBcCi0gICAgICAgICAgICAg ICAgJCRQV0QvYnJpZGdlL2MgXAotICAgICAgICAgICAgICAgICQkUFdEL2JyaWRnZS9xdAotSU5D TFVERVBBVEggKj0gICQkR0VORVJBVEVEX1NPVVJDRVNfRElSCisgICAgJCRJTkNMVURFUEFUSAog CiBRVCArPSBuZXR3b3JrCiBsZXNzVGhhbihRVF9NSU5PUl9WRVJTSU9OLCA0KTogUVQgKz0geG1s Cg==