25587 2009-05-06 09:10:27 -0700 [Qt] Fix Qt build when ENABLE_DATABASE is turned off 2009-05-11 09:23:40 -0700 1 1 1 Unclassified WebKit WebKit Qt 528+ (Nightly build) PC All RESOLVED FIXED P2 Normal --- 0 laszlo.gombos webkit-unassigned oldest_to_newest 120101 0 laszlo.gombos 2009-05-06 09:10:27 -0700 This will ensure that the Qt build compiles all the way when ENABLE_DATABASE is turned off. This is a follow-up to some recent commits in this area: - http://trac.webkit.org/changeset/43283 - http://trac.webkit.org/changeset/43285 120102 1 30052 laszlo.gombos 2009-05-06 09:19:41 -0700 Created attachment 30052 Fix Qt build when ENABLE_DATABASE is turned off 120617 2 zecke 2009-05-11 03:37:35 -0700 Patch looks good, I wonder how smart the compilers used are if you throw them a stub implementation in front of them... I would like to minimize the amount of #ifdef... 120676 3 zecke 2009-05-11 09:23:40 -0700 Landed in r43496. 30052 2009-05-06 09:19:41 -0700 2009-05-11 03:37:57 -0700 Fix Qt build when ENABLE_DATABASE is turned off patch_25587.txt text/plain 4661 laszlo.gombos SW5kZXg6IFdlYktpdC9xdC9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L3F0L0NoYW5n ZUxvZwkocmV2aXNpb24gNDMzMTApCisrKyBXZWJLaXQvcXQvQ2hhbmdlTG9nCSh3b3JraW5nIGNv cHkpCkBAIC0xLDMgKzEsMjIgQEAKKzIwMDktMDUtMDYgIExhc3psbyBHb21ib3MgIDxsYXN6bG8u MS5nb21ib3NAbm9raWEuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIEZpeCBRdCBidWlsZCB3aGVuIEVOQUJMRV9EQVRBQkFTRSBpcyB0dXJuZWQg b2ZmCisKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTI1 NTg3CisKKyAgICAgICAgKiBBcGkvcXdlYmRhdGFiYXNlLmNwcDoKKyAgICAgICAgKFFXZWJEYXRh YmFzZTo6ZGlzcGxheU5hbWUpOgorICAgICAgICAoUVdlYkRhdGFiYXNlOjpleHBlY3RlZFNpemUp OgorICAgICAgICAoUVdlYkRhdGFiYXNlOjpzaXplKToKKyAgICAgICAgKFFXZWJEYXRhYmFzZTo6 ZmlsZU5hbWUpOgorICAgICAgICAoUVdlYkRhdGFiYXNlOjpyZW1vdmVEYXRhYmFzZSk6CisgICAg ICAgICogQXBpL3F3ZWJkYXRhYmFzZV9wLmg6CisgICAgICAgICogQXBpL3F3ZWJzZWN1cml0eW9y aWdpbi5jcHA6CisgICAgICAgIChRV2ViU2VjdXJpdHlPcmlnaW46OmFsbE9yaWdpbnMpOgorICAg ICAgICAoUVdlYlNlY3VyaXR5T3JpZ2luOjpkYXRhYmFzZXMpOgorCiAyMDA5LTA1LTA1ICBLZW5u ZXRoIFJvaGRlIENocmlzdGlhbnNlbiAgPGtlbm5ldGguY2hyaXN0aWFuc2VuQG9wZW5ib3NzYS5v cmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgU2ltb24gSGF1c21hbm4uCkluZGV4OiBXZWJLaXQv cXQvQXBpL3F3ZWJkYXRhYmFzZS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L3F0L0FwaS9xd2Vi ZGF0YWJhc2UuY3BwCShyZXZpc2lvbiA0MzI5NCkKKysrIFdlYktpdC9xdC9BcGkvcXdlYmRhdGFi YXNlLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjAsOCArMjAsNiBAQAogI2luY2x1ZGUgImNvbmZp Zy5oIgogI2luY2x1ZGUgInF3ZWJkYXRhYmFzZS5oIgogCi0jaWYgRU5BQkxFKERBVEFCQVNFKQot CiAjaW5jbHVkZSAicXdlYmRhdGFiYXNlX3AuaCIKICNpbmNsdWRlICJxd2Vic2VjdXJpdHlvcmln aW4uaCIKICNpbmNsdWRlICJxd2Vic2VjdXJpdHlvcmlnaW5fcC5oIgpAQCAtNzIsOCArNzAsMTIg QEAgUVN0cmluZyBRV2ViRGF0YWJhc2U6Om5hbWUoKSBjb25zdAogKi8KIFFTdHJpbmcgUVdlYkRh dGFiYXNlOjpkaXNwbGF5TmFtZSgpIGNvbnN0CiB7CisjaWYgRU5BQkxFKERBVEFCQVNFKQogICAg IERhdGFiYXNlRGV0YWlscyBkZXRhaWxzID0gRGF0YWJhc2VUcmFja2VyOjp0cmFja2VyKCkuZGV0 YWlsc0Zvck5hbWVBbmRPcmlnaW4oZC0+bmFtZSwgZC0+b3JpZ2luLmdldCgpKTsKICAgICByZXR1 cm4gZGV0YWlscy5kaXNwbGF5TmFtZSgpOworI2Vsc2UKKyAgICByZXR1cm4gUVN0cmluZygpOwor I2VuZGlmCiB9CiAKIC8qIQpAQCAtODEsOCArODMsMTIgQEAgUVN0cmluZyBRV2ViRGF0YWJhc2U6 OmRpc3BsYXlOYW1lKCkgY29ucwogKi8KIHFpbnQ2NCBRV2ViRGF0YWJhc2U6OmV4cGVjdGVkU2l6 ZSgpIGNvbnN0CiB7CisjaWYgRU5BQkxFKERBVEFCQVNFKQogICAgIERhdGFiYXNlRGV0YWlscyBk ZXRhaWxzID0gRGF0YWJhc2VUcmFja2VyOjp0cmFja2VyKCkuZGV0YWlsc0Zvck5hbWVBbmRPcmln aW4oZC0+bmFtZSwgZC0+b3JpZ2luLmdldCgpKTsKICAgICByZXR1cm4gZGV0YWlscy5leHBlY3Rl ZFVzYWdlKCk7CisjZWxzZQorICAgIHJldHVybiAwOworI2VuZGlmCiB9CiAKIC8qIQpAQCAtOTAs OCArOTYsMTIgQEAgcWludDY0IFFXZWJEYXRhYmFzZTo6ZXhwZWN0ZWRTaXplKCkgY29ucwogKi8K IHFpbnQ2NCBRV2ViRGF0YWJhc2U6OnNpemUoKSBjb25zdAogeworI2lmIEVOQUJMRShEQVRBQkFT RSkKICAgICBEYXRhYmFzZURldGFpbHMgZGV0YWlscyA9IERhdGFiYXNlVHJhY2tlcjo6dHJhY2tl cigpLmRldGFpbHNGb3JOYW1lQW5kT3JpZ2luKGQtPm5hbWUsIGQtPm9yaWdpbi5nZXQoKSk7CiAg ICAgcmV0dXJuIGRldGFpbHMuY3VycmVudFVzYWdlKCk7CisjZWxzZQorICAgIHJldHVybiAwOwor I2VuZGlmCiB9CiAKIC8qIQpAQCAtMTIxLDcgKzEzMSwxMSBAQCBRV2ViRGF0YWJhc2U6OlFXZWJE YXRhYmFzZShRV2ViRGF0YWJhc2VQCiAqLwogUVN0cmluZyBRV2ViRGF0YWJhc2U6OmZpbGVOYW1l KCkgY29uc3QKIHsKKyNpZiBFTkFCTEUoREFUQUJBU0UpCiAgICAgcmV0dXJuIERhdGFiYXNlVHJh Y2tlcjo6dHJhY2tlcigpLmZ1bGxQYXRoRm9yRGF0YWJhc2UoZC0+b3JpZ2luLmdldCgpLCBkLT5u YW1lLCBmYWxzZSk7CisjZWxzZQorICAgIHJldHVybiBRU3RyaW5nKCk7CisjZW5kaWYKIH0KIAog LyohCkBAIC0xNDAsNyArMTU0LDkgQEAgUVdlYlNlY3VyaXR5T3JpZ2luIFFXZWJEYXRhYmFzZTo6 b3JpZ2luKAogKi8KIHZvaWQgUVdlYkRhdGFiYXNlOjpyZW1vdmVEYXRhYmFzZShjb25zdCBRV2Vi RGF0YWJhc2UgJmRiKQogeworI2lmIEVOQUJMRShEQVRBQkFTRSkKICAgICBEYXRhYmFzZVRyYWNr ZXI6OnRyYWNrZXIoKS5kZWxldGVEYXRhYmFzZShkYi5kLT5vcmlnaW4uZ2V0KCksIGRiLmQtPm5h bWUpOworI2VuZGlmCiB9CiAKIC8qIQpAQCAtMTUwLDQgKzE2NiwzIEBAIFFXZWJEYXRhYmFzZTo6 flFXZWJEYXRhYmFzZSgpCiB7CiB9CiAKLSNlbmRpZgpJbmRleDogV2ViS2l0L3F0L0FwaS9xd2Vi ZGF0YWJhc2VfcC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9xdC9BcGkvcXdlYmRhdGFiYXNlX3Au aAkocmV2aXNpb24gNDMyOTQpCisrKyBXZWJLaXQvcXQvQXBpL3F3ZWJkYXRhYmFzZV9wLmgJKHdv cmtpbmcgY29weSkKQEAgLTE5LDggKzE5LDYgQEAKICNpZm5kZWYgX1dFQkRBVEFCQVNFX1BfSF8K ICNkZWZpbmUgX1dFQkRBVEFCQVNFX1BfSF8KIAotI2lmIEVOQUJMRShEQVRBQkFTRSkKLQogI2lu Y2x1ZGUgPFFTdHJpbmc+CiAjaW5jbHVkZSA8UXRDb3JlL3FzaGFyZWRkYXRhLmg+CiAKQEAgLTM4 LDUgKzM2LDMgQEAgcHVibGljOgogCiAjZW5kaWYKIAotI2VuZGlmCi0KSW5kZXg6IFdlYktpdC9x dC9BcGkvcXdlYnNlY3VyaXR5b3JpZ2luLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQvcXQvQXBp L3F3ZWJzZWN1cml0eW9yaWdpbi5jcHAJKHJldmlzaW9uIDQzMjk0KQorKysgV2ViS2l0L3F0L0Fw aS9xd2Vic2VjdXJpdHlvcmlnaW4uY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xNTQsMTQgKzE1NCwx OCBAQCBRV2ViU2VjdXJpdHlPcmlnaW46OlFXZWJTZWN1cml0eU9yaWdpbihRCiAqLwogUUxpc3Q8 UVdlYlNlY3VyaXR5T3JpZ2luPiBRV2ViU2VjdXJpdHlPcmlnaW46OmFsbE9yaWdpbnMoKQogewor ICAgIFFMaXN0PFFXZWJTZWN1cml0eU9yaWdpbj4gd2ViT3JpZ2luczsKKyAgICAKKyNpZiBFTkFC TEUoREFUQUJBU0UpCiAgICAgVmVjdG9yPFJlZlB0cjxTZWN1cml0eU9yaWdpbj4gPiBjb3JlT3Jp Z2luczsKICAgICBEYXRhYmFzZVRyYWNrZXI6OnRyYWNrZXIoKS5vcmlnaW5zKGNvcmVPcmlnaW5z KTsKLSAgICBRTGlzdDxRV2ViU2VjdXJpdHlPcmlnaW4+IHdlYk9yaWdpbnM7CiAKICAgICBmb3Ig KHVuc2lnbmVkIGkgPSAwOyBpIDwgY29yZU9yaWdpbnMuc2l6ZSgpOyArK2kpIHsKICAgICAgICAg UVdlYlNlY3VyaXR5T3JpZ2luUHJpdmF0ZSogcHJpdiA9IG5ldyBRV2ViU2VjdXJpdHlPcmlnaW5Q cml2YXRlKGNvcmVPcmlnaW5zW2ldLmdldCgpKTsKICAgICAgICAgd2ViT3JpZ2lucy5hcHBlbmQo cHJpdik7CiAgICAgfQorI2VuZGlmCisKICAgICByZXR1cm4gd2ViT3JpZ2luczsKIH0KIApAQCAt MTcwLDggKzE3NCwxMSBAQCBRTGlzdDxRV2ViU2VjdXJpdHlPcmlnaW4+IFFXZWJTZWN1cml0eU9y CiAqLwogUUxpc3Q8UVdlYkRhdGFiYXNlPiBRV2ViU2VjdXJpdHlPcmlnaW46OmRhdGFiYXNlcygp IGNvbnN0CiB7Ci0gICAgVmVjdG9yPFN0cmluZz4gbmFtZVZlY3RvcjsKICAgICBRTGlzdDxRV2Vi RGF0YWJhc2U+IGRhdGFiYXNlczsKKyAgICAKKyNpZiBFTkFCTEUoREFUQUJBU0UpCisgICAgVmVj dG9yPFN0cmluZz4gbmFtZVZlY3RvcjsKKwogICAgIGlmICghRGF0YWJhc2VUcmFja2VyOjp0cmFj a2VyKCkuZGF0YWJhc2VOYW1lc0Zvck9yaWdpbihkLT5vcmlnaW4uZ2V0KCksIG5hbWVWZWN0b3Ip KQogICAgICAgICByZXR1cm4gZGF0YWJhc2VzOwogICAgIGZvciAodW5zaWduZWQgaSA9IDA7IGkg PCBuYW1lVmVjdG9yLnNpemUoKTsgKytpKSB7CkBAIC0xODEsNiArMTg4LDggQEAgUUxpc3Q8UVdl YkRhdGFiYXNlPiBRV2ViU2VjdXJpdHlPcmlnaW46OgogICAgICAgICBRV2ViRGF0YWJhc2Ugd2Vi RGF0YWJhc2UocHJpdik7CiAgICAgICAgIGRhdGFiYXNlcy5hcHBlbmQod2ViRGF0YWJhc2UpOwog ICAgIH0KKyNlbmRpZgorCiAgICAgcmV0dXJuIGRhdGFiYXNlczsKIH0KIAo=