61869 2011-06-01 09:50:55 -0700 [Qt] Fix the Phonon build when logging is disabled 2011-06-03 14:01:17 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) All Linux RESOLVED FIXED Qt, QtTriaged P2 Major --- 1 abecsi abecsi ademar commit-queue ossy oldest_to_newest 413448 0 abecsi 2011-06-01 09:50:55 -0700 When building without qt-mobility using Phonon as media back-end the build fails with "variable set but not used" errors because of -Werror=unused-but-set-variable. These variables are only used by unguarded LOG calls, which need "#if !LOG_DISABLED" guards. 413451 1 95616 abecsi 2011-06-01 09:52:58 -0700 Created attachment 95616 proposed fix 413525 2 95616 commit-queue 2011-06-01 11:16:26 -0700 Comment on attachment 95616 proposed fix Clearing flags on attachment: 95616 Committed r87828: <http://trac.webkit.org/changeset/87828> 413526 3 commit-queue 2011-06-01 11:16:31 -0700 All reviewed patches have been landed. Closing bug. 415159 4 ademar 2011-06-03 14:01:17 -0700 Revision r87828 cherry-picked into qtwebkit-2.2 with commit 875e920 <http://gitorious.org/webkit/qtwebkit/commit/875e920> 95616 2011-06-01 09:52:58 -0700 2011-06-01 11:16:26 -0700 proposed fix phonon_buildfix.patch text/plain 3595 abecsi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCAyMjE3MDQzLi40YTNlODQyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTgg QEAKKzIwMTEtMDYtMDEgIEFuZHJhcyBCZWNzaSAgPGFiZWNzaUB3ZWJraXQub3JnPgorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFtRdF0gRml4IHRoZSBQ aG9ub24gYnVpbGQgd2hlbiBsb2dnaW5nIGlzIGRpc2FibGVkCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02MTg2OQorCisgICAgICAgIE5vIG5ldyB0ZXN0 cyBuZWVkZWQuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9xdC9NZWRpYVBsYXllclBy aXZhdGVQaG9ub24uY3BwOiBBZGQgbWlzc2luZyBndWFyZHMuCisgICAgICAgIChXZWJDb3JlOjpN ZWRpYVBsYXllclByaXZhdGVQaG9ub246Om5ldHdvcmtTdGF0ZSk6CisgICAgICAgIChXZWJDb3Jl OjpNZWRpYVBsYXllclByaXZhdGVQaG9ub246OnJlYWR5U3RhdGUpOgorICAgICAgICAoV2ViQ29y ZTo6TWVkaWFQbGF5ZXJQcml2YXRlUGhvbm9uOjp1cGRhdGVTdGF0ZXMpOgorICAgICAgICAoV2Vi Q29yZTo6TWVkaWFQbGF5ZXJQcml2YXRlUGhvbm9uOjpzdGF0ZUNoYW5nZWQpOgorCiAyMDExLTA2 LTAxICBZdXJ5IFNlbWlraGF0c2t5ICA8eXVyeXNAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJl dmlld2VkIGJ5IFBhdmVsIEZlbGRtYW4uCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9xdC9NZWRpYVBsYXllclByaXZhdGVQaG9ub24uY3BwIGIvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvcXQvTWVkaWFQbGF5ZXJQcml2YXRlUGhvbm9uLmNwcApp bmRleCA0ZTM5NjllLi41MGVlMGYxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9xdC9NZWRpYVBsYXllclByaXZhdGVQaG9ub24uY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3F0L01lZGlhUGxheWVyUHJpdmF0ZVBob25vbi5jcHAK QEAgLTM1MCwxNyArMzUwLDIxIEBAIHZvaWQgTWVkaWFQbGF5ZXJQcml2YXRlUGhvbm9uOjpzZXRN dXRlZChib29sIG11dGVkKQogCiBNZWRpYVBsYXllcjo6TmV0d29ya1N0YXRlIE1lZGlhUGxheWVy UHJpdmF0ZVBob25vbjo6bmV0d29ya1N0YXRlKCkgY29uc3QKIHsKKyNpZiAhTE9HX0RJU0FCTEVE CiAgICAgY29uc3QgUU1ldGFPYmplY3QqIG1ldGFPYmogPSB0aGlzLT5tZXRhT2JqZWN0KCk7CiAg ICAgUU1ldGFFbnVtIG5ldHdvcmtTdGF0ZXMgPSBtZXRhT2JqLT5lbnVtZXJhdG9yKG1ldGFPYmot PmluZGV4T2ZFbnVtZXJhdG9yKCJOZXR3b3JrU3RhdGUiKSk7CiAgICAgTE9HKE1lZGlhLCAiTWVk aWFQbGF5ZXJQcml2YXRlUGhvbm9uOjpuZXR3b3JrU3RhdGUoKSAtLT4gJXMiLCBuZXR3b3JrU3Rh dGVzLnZhbHVlVG9LZXkobV9uZXR3b3JrU3RhdGUpKTsKKyNlbmRpZgogICAgIHJldHVybiBtX25l dHdvcmtTdGF0ZTsKIH0KIAogTWVkaWFQbGF5ZXI6OlJlYWR5U3RhdGUgTWVkaWFQbGF5ZXJQcml2 YXRlUGhvbm9uOjpyZWFkeVN0YXRlKCkgY29uc3QKIHsKKyNpZiAhTE9HX0RJU0FCTEVECiAgICAg Y29uc3QgUU1ldGFPYmplY3QqIG1ldGFPYmogPSB0aGlzLT5tZXRhT2JqZWN0KCk7CiAgICAgUU1l dGFFbnVtIHJlYWR5U3RhdGVzID0gbWV0YU9iai0+ZW51bWVyYXRvcihtZXRhT2JqLT5pbmRleE9m RW51bWVyYXRvcigiUmVhZHlTdGF0ZSIpKTsKICAgICBMT0coTWVkaWEsICJNZWRpYVBsYXllclBy aXZhdGVQaG9ub246OnJlYWR5U3RhdGUoKSAtLT4gJXMiLCByZWFkeVN0YXRlcy52YWx1ZVRvS2V5 KG1fcmVhZHlTdGF0ZSkpOworI2VuZGlmCiAgICAgcmV0dXJuIG1fcmVhZHlTdGF0ZTsKIH0KIApA QCAtMzk0LDIwICszOTgsMjQgQEAgdm9pZCBNZWRpYVBsYXllclByaXZhdGVQaG9ub246OnVwZGF0 ZVN0YXRlcygpCiAgICAgICAgIG1fcmVhZHlTdGF0ZSA9IE1lZGlhUGxheWVyOjpIYXZlTm90aGlu ZzsKIAogICAgIGlmIChtX25ldHdvcmtTdGF0ZSAhPSBvbGROZXR3b3JrU3RhdGUpIHsKKyNpZiAh TE9HX0RJU0FCTEVECiAgICAgICAgIGNvbnN0IFFNZXRhT2JqZWN0KiBtZXRhT2JqID0gdGhpcy0+ bWV0YU9iamVjdCgpOwogICAgICAgICBRTWV0YUVudW0gbmV0d29ya1N0YXRlcyA9IG1ldGFPYmot PmVudW1lcmF0b3IobWV0YU9iai0+aW5kZXhPZkVudW1lcmF0b3IoIk5ldHdvcmtTdGF0ZSIpKTsK ICAgICAgICAgTE9HKE1lZGlhLCAiTmV0d29yayBzdGF0ZSBjaGFuZ2VkIGZyb20gJyVzJyB0byAn JXMnIiwKICAgICAgICAgICAgICAgICBuZXR3b3JrU3RhdGVzLnZhbHVlVG9LZXkob2xkTmV0d29y a1N0YXRlKSwKICAgICAgICAgICAgICAgICBuZXR3b3JrU3RhdGVzLnZhbHVlVG9LZXkobV9uZXR3 b3JrU3RhdGUpKTsKKyNlbmRpZgogICAgICAgICBtX3BsYXllci0+bmV0d29ya1N0YXRlQ2hhbmdl ZCgpOwogICAgIH0KIAogICAgIGlmIChtX3JlYWR5U3RhdGUgIT0gb2xkUmVhZHlTdGF0ZSkgewor I2lmICFMT0dfRElTQUJMRUQKICAgICAgICAgY29uc3QgUU1ldGFPYmplY3QqIG1ldGFPYmogPSB0 aGlzLT5tZXRhT2JqZWN0KCk7CiAgICAgICAgIFFNZXRhRW51bSByZWFkeVN0YXRlcyA9IG1ldGFP YmotPmVudW1lcmF0b3IobWV0YU9iai0+aW5kZXhPZkVudW1lcmF0b3IoIlJlYWR5U3RhdGUiKSk7 CiAgICAgICAgIExPRyhNZWRpYSwgIlJlYWR5IHN0YXRlIGNoYW5nZWQgZnJvbSAnJXMnIHRvICcl cyciLAogICAgICAgICAgICAgICAgIHJlYWR5U3RhdGVzLnZhbHVlVG9LZXkob2xkUmVhZHlTdGF0 ZSksCiAgICAgICAgICAgICAgICAgcmVhZHlTdGF0ZXMudmFsdWVUb0tleShtX3JlYWR5U3RhdGUp KTsKKyNlbmRpZgogICAgICAgICBtX3BsYXllci0+cmVhZHlTdGF0ZUNoYW5nZWQoKTsKICAgICB9 CiB9CkBAIC00ODMsMTAgKzQ5MSwxMiBAQCB2b2lkIE1lZGlhUGxheWVyUHJpdmF0ZVBob25vbjo6 cGFpbnQoR3JhcGhpY3NDb250ZXh0KiBncmFwaGljc0NvbnRlY3QsIGNvbnN0IEludAogCiB2b2lk IE1lZGlhUGxheWVyUHJpdmF0ZVBob25vbjo6c3RhdGVDaGFuZ2VkKFBob25vbjo6U3RhdGUgbmV3 U3RhdGUsIFBob25vbjo6U3RhdGUgb2xkU3RhdGUpCiB7CisjaWYgIUxPR19ESVNBQkxFRAogICAg IGNvbnN0IFFNZXRhT2JqZWN0KiBtZXRhT2JqID0gdGhpcy0+bWV0YU9iamVjdCgpOwogICAgIFFN ZXRhRW51bSBwaG9ub25TdGF0ZXMgPSBtZXRhT2JqLT5lbnVtZXJhdG9yKG1ldGFPYmotPmluZGV4 T2ZFbnVtZXJhdG9yKCJQaG9ub25TdGF0ZSIpKTsKICAgICBMT0coTWVkaWEsICJNZWRpYVBsYXll clByaXZhdGVQaG9ub246OnN0YXRlQ2hhbmdlZChuZXdTdGF0ZT0lcywgb2xkU3RhdGU9JXMpIiwK ICAgICAgICAgICAgIHBob25vblN0YXRlcy52YWx1ZVRvS2V5KG5ld1N0YXRlKSwgcGhvbm9uU3Rh dGVzLnZhbHVlVG9LZXkob2xkU3RhdGUpKTsKKyNlbmRpZgogCiAgICAgdXBkYXRlU3RhdGVzKCk7 CiB9Cg==