53400 2011-01-30 10:59:15 -0800 [Qt][WK2]REGRESSION (r76991): Fix build errors 2011-01-30 12:25:50 -0800 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) All All RESOLVED FIXED Qt, QtTriaged P2 Normal --- 50174 1 ossy webkit-unassigned abecsi andersca kbalazs laszlo.gombos sam oldest_to_newest 342342 0 ossy 2011-01-30 10:59:15 -0800 31 #ifdef __cplusplus 32 #define new ("if you use new/delete make sure to include config.h at the top of the file"()) 33 #define delete ("if you use new/delete make sure to include config.h at the top of the file"()) This change caused build error in moc_qwkhistory.cpp and moc_qwkpage.cpp . These files are generated from qwkhistory.h and qwkpage.h by Qt's moc and they only inlcude its own header file. To fix this build break I added including config.h to these headers: http://trac.webkit.org/changeset/77088 I know we shouldn't include config.h in headers, but I don't know if it is possible to make moc add including config.h to moc_[...].cpp files. I leave this bug open to find a correct solution for this build break. 342344 1 ossy 2011-01-30 11:16:56 -0800 Adding Source/JavascriptCore to INCLUDEPATH was needed, because config.h includes 3 headears from wtf: - wtf/FastMalloc.h - wtf/DisallowCType.h - wtf/Platform.h 342347 2 kbalazs 2011-01-30 11:50:20 -0800 The correct solution is to throw away the prefix header let trust in ourselves and check-webkit-style to not forget about config.h. This is our policy in WebCore and JavaScriptCore as well. 342351 3 80597 kbalazs 2011-01-30 11:58:37 -0800 Created attachment 80597 Patch 342357 4 80597 kbalazs 2011-01-30 12:25:43 -0800 Comment on attachment 80597 Patch Clearing flags on attachment: 80597 Committed r77092: <http://trac.webkit.org/changeset/77092> 342358 5 kbalazs 2011-01-30 12:25:50 -0800 All reviewed patches have been landed. Closing bug. 80597 2011-01-30 11:58:37 -0800 2011-01-30 12:25:42 -0800 Patch bug-53400-20110130195836.patch text/plain 3484 kbalazs ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCBjNDU5NTg4MzU5NWZmYzI5MTM1ZjE0OWZmMjExMmQ0Mzc1ZGNkOWQ2Li44 NTVjY2YyMDVlZmFhY2Y2YTFhMzM2YzRkZTFkNDQ4MWRiMGJlNWMyIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0x LDMgKzEsMTYgQEAKKzIwMTEtMDEtMzAgIEJhbGF6cyBLZWxlbWVuICA8a2JhbGF6c0B3ZWJraXQu b3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFtR dF1bV0syXVJFR1JFU1NJT04gKHI3Njk5MSk6IEZpeCBidWlsZCBlcnJvcnMKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTUzNDAwCisKKyAgICAgICAgUmV2 ZXJ0IHRoZSB0ZW1wb3JhcnkgYnVpbGQgZml4IChodHRwOi8vdHJhYy53ZWJraXQub3JnL2NoYW5n ZXNldC83NzA4OCkKKyAgICAgICAgYW5kIHJlbW92ZSBXZWJLaXQyUHJlZml4LmggZnJvbSB0aGUg YnVpbGQuCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9xdC9xd2toaXN0b3J5Lmg6CisgICAgICAg ICogVUlQcm9jZXNzL0FQSS9xdC9xd2twYWdlLmg6CisgICAgICAgICogV2ViS2l0Mi5wcm86CisK IDIwMTEtMDEtMzAgIENzYWJhIE9zenRyb2dvbsOhYyAgPG9zc3lAd2Via2l0Lm9yZz4KIAogICAg ICAgICBVbnJldmlld2VkLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQ SS9xdC9xd2toaXN0b3J5LmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3F3a2hp c3RvcnkuaAppbmRleCA2Nzg0NjZkN2U3ZjRkMDMyNDBjNGM5MWY5MGFlOGY1ZGI2OWY0ODcyLi44 MTA4MWM5OGMxYTMyODBjMmE5MTQzN2IwNzllYjdkNTJkNDNlZmVkIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3F3a2hpc3RvcnkuaAorKysgYi9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3F3a2hpc3RvcnkuaApAQCAtMjUsNyArMjUsNiBAQAogI2lm bmRlZiBxd2toaXN0b3J5X2gKICNkZWZpbmUgcXdraGlzdG9yeV9oCiAKLSNpbmNsdWRlICJjb25m aWcuaCIKICNpbmNsdWRlICJxd2Via2l0Z2xvYmFsLmgiCiAjaW5jbHVkZSA8UU9iamVjdD4KICNp bmNsdWRlIDxRU2hhcmVkRGF0YT4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9BUEkvcXQvcXdrcGFnZS5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xd2tw YWdlLmgKaW5kZXggZTU3Njg0ZjExMzcyZjY0N2ViMTdmZGJhNTgzYWEyOGM2Yzc0NTUzMS4uY2I3 OTMzYWVlNTA4MTc2NzI4ZjgyNjFmMDkxZDE5NGM2ODhiZmJjMyAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xd2twYWdlLmgKKysrIGIvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL0FQSS9xdC9xd2twYWdlLmgKQEAgLTEsNyArMSw2IEBACiAjaWZuZGVmIHF3a3Bh Z2VfaAogI2RlZmluZSBxd2twYWdlX2gKIAotI2luY2x1ZGUgImNvbmZpZy5oIgogI2luY2x1ZGUg InF3ZWJraXRnbG9iYWwuaCIKICNpbmNsdWRlIDxRQWN0aW9uPgogI2luY2x1ZGUgPFFPYmplY3Q+ CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJLaXQyLnBybyBiL1NvdXJjZS9XZWJLaXQy L1dlYktpdDIucHJvCmluZGV4IDliNzJmY2YyZWQ5OWQ0ZDc3ZjBmZWFmOTZiODBmZTVjNTE3Yzhi MjEuLmIyZjNiMTYyNTg3NjE1MWU5YmQ3YzJjNGM1MzBiNWQyMjM3MWFiMTAgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQyL1dlYktpdDIucHJvCisrKyBiL1NvdXJjZS9XZWJLaXQyL1dlYktpdDIu cHJvCkBAIC0xNzAsOSArMTcwLDYgQEAgc3ltYmlhbiB7CiAgICAgSU5DTFVERVBBVEggPSAkJFdF QktJVDJfSU5DTFVERVBBVEggJCRJTkNMVURFUEFUSAogfQogCi1QUkVGSVhfSEVBREVSID0gJCRQ V0QvLi4vV2ViS2l0Mi9XZWJLaXQyUHJlZml4LmgKLSotZysrKjpRTUFLRV9DWFhGTEFHUyArPSAi LWluY2x1ZGUgJCRQUkVGSVhfSEVBREVSIgotCiBXRUJLSVQyX0dFTkVSQVRFRF9IRUFERVJTID0g XAogICAgICQkV0VCS0lUMl9HRU5FUkFURURfU09VUkNFU19ESVIvQXV0aGVudGljYXRpb25NYW5h Z2VyTWVzc2FnZXMuaCBcCiAgICAgJCRXRUJLSVQyX0dFTkVSQVRFRF9TT1VSQ0VTX0RJUi9Eb3du bG9hZFByb3h5TWVzc2FnZXMuaCBcCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cgYi9Ub29s cy9DaGFuZ2VMb2cKaW5kZXggMjM4M2QzNTg4NDg4MTcxMjcyMDUxNjA0ZGJkNmU5ZTFiMDk2ZTYx Yi4uZjNlZmZmNzQ2M2M0YmVkMzBhOWUzNzI0MjdhNWFlNzAzMmRiZDIwNiAxMDA2NDQKLS0tIGEv VG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisy MDExLTAxLTMwICBCYWxhenMgS2VsZW1lbiAgPGtiYWxhenNAd2Via2l0Lm9yZz4KKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBbUXRdW1dLMl1SRUdSRVNT SU9OIChyNzY5OTEpOiBGaXggYnVpbGQgZXJyb3JzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD01MzQwMAorCisgICAgICAgIFJldmVydCB0aGUgdGVtcG9y YXJ5IGJ1aWxkIGZpeCAoaHR0cDovL3RyYWMud2Via2l0Lm9yZy9jaGFuZ2VzZXQvNzcwODgpCisg ICAgICAgIGFuZCByZW1vdmUgV2ViS2l0MlByZWZpeC5oIGZyb20gdGhlIGJ1aWxkLgorICAgICAg ICAqIE1pbmlCcm93c2VyL3F0L01pbmlCcm93c2VyLnBybzoKKwogMjAxMS0wMS0zMCAgQ3NhYmEg T3N6dHJvZ29uw6FjICA8b3NzeUB3ZWJraXQub3JnPgogCiAgICAgICAgIFVucmV2aWV3ZWQuCmRp ZmYgLS1naXQgYS9Ub29scy9NaW5pQnJvd3Nlci9xdC9NaW5pQnJvd3Nlci5wcm8gYi9Ub29scy9N aW5pQnJvd3Nlci9xdC9NaW5pQnJvd3Nlci5wcm8KaW5kZXggOGI2MDQwNWFmMDRkM2Y2MjJjZjlm NjYzYTI3M2UyMmQ3N2EwMjNjYS4uODRiYmIzMzY4ZThkN2FiZThjNzQ0NDA1MWI3OGZhYmI1MTQ0 NjI4MyAxMDA2NDQKLS0tIGEvVG9vbHMvTWluaUJyb3dzZXIvcXQvTWluaUJyb3dzZXIucHJvCisr KyBiL1Rvb2xzL01pbmlCcm93c2VyL3F0L01pbmlCcm93c2VyLnBybwpAQCAtMTYsNyArMTYsNiBA QCBpc0VtcHR5KE9VVFBVVF9ESVIpOiBPVVRQVVRfRElSID0gLi4vLi4vLi4KIGluY2x1ZGUoLi4v Li4vLi4vU291cmNlL1dlYktpdC5wcmkpCiAKIElOQ0xVREVQQVRIICs9IFwKLSAgICAkJFBXRC8u Li8uLi8uLi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUgXAogICAgICQkUFdELy4uLy4uLy4uL1NvdXJj ZS9XZWJLaXQyLyBcCiAgICAgJCRQV0QvLi4vLi4vLi4vU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L0FQSS9jcHAgXAogICAgICQkUFdELy4uLy4uLy4uL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9B UEkvQyBcCg==