103198 2012-11-25 09:40:07 -0800 [Qt] QStyleFacadeImp build break with latest Qt 5 2012-11-26 02:36:20 -0800 1 1 1 Unclassified WebKit WebKit Qt 528+ (Nightly build) Mac OS X 10.8 RESOLVED FIXED P2 Normal --- 76773 0 jpnurmi michael.bruning hausmann michael.bruning oldest_to_newest 774999 0 jpnurmi 2012-11-25 09:40:07 -0800 QMacStyle has been made internal in Qt 5. The QMacStyle include should be removed, and relevant qobject_casts should be replaced by QObject::inherits("QMacStyle"). Change I44a2f5ee: Made QMacStyle internal https://codereview.qt-project.org/#change,39716 775214 1 michael.bruning 2012-11-26 00:27:40 -0800 Will make a fix. 775263 2 175944 michael.bruning 2012-11-26 01:57:20 -0800 Created attachment 175944 Patch 775282 3 175944 hausmann 2012-11-26 02:28:55 -0800 Comment on attachment 175944 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=175944&action=review > Source/WebKit/qt/ChangeLog:8 > + Original patch by J-P Nurmi <jpnurmi@gmail.com>. Shouldn't that be his digia email address? 775284 4 michael.bruning 2012-11-26 02:36:20 -0800 Committed r135696: <http://trac.webkit.org/changeset/135696> 175944 2012-11-26 01:57:20 -0800 2012-11-26 02:28:55 -0800 Patch bug-103198-20121126105458.patch text/plain 4018 michael.bruning U3VidmVyc2lvbiBSZXZpc2lvbjogMTM0NzUzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L3F0 L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvcXQvQ2hhbmdlTG9nCmluZGV4IDM0MGNmOTUzNzQ2 M2M2NjMxNThiNGJjMzM4NjZhYjc0ZGEwMzI4NjkuLjkzNDcyNzk5OTg2YjczODI0M2E0NTM3MmJk YzM4NGE3NzhlZmU4ZGEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvcXQvQ2hhbmdlTG9nCisr KyBiL1NvdXJjZS9XZWJLaXQvcXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjMgQEAKKzIwMTItMTEt MjYgIE1pY2hhZWwgQnLDvG5pbmcgIDxtaWNoYWVsLmJydW5pbmdAZGlnaWEuY29tPgorCisgICAg ICAgIFtRdF0gUVN0eWxlRmFjYWRlSW1wIGJ1aWxkIGJyZWFrIHdpdGggbGF0ZXN0IFF0IDUKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwMzE5OAorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE9yaWdpbmFsIHBh dGNoIGJ5IEotUCBOdXJtaSA8anBudXJtaUBnbWFpbC5jb20+LgorCisgICAgICAgIEZpeGVzIFF0 V2ViS2l0IGJ1aWxkIGJ5IHJlcGxhY2luZyBxb2JqZWN0X2Nhc3QgdG8KKyAgICAgICAgUU1hY1N0 eWxlIHdpdGggY2FsbHMgdG8gUU9iamVjdDo6aW5oZXJpdHMuIEFsc28KKyAgICAgICAgcmVwbGFj ZXMgUV9XU19NQUMgcHJlcHJvY2Vzc2VyIGRpcmVjdGl2ZXMgd2l0aCBRX09TX01BQworICAgICAg ICBmb3IgUXQgNSBjb21wYXRpYmlsaXR5LgorCisgICAgICAgICogV2ViQ29yZVN1cHBvcnQvUVN0 eWxlRmFjYWRlSW1wLmNwcDoKKyAgICAgICAgKFdlYktpdDo6UVN0eWxlRmFjYWRlSW1wOjpnZXRC dXR0b25NZXRyaWNzKToKKyAgICAgICAgKFdlYktpdDo6UVN0eWxlRmFjYWRlSW1wOjpwYWludENv bWJvQm94KToKKyAgICAgICAgKFdlYktpdDo6UVN0eWxlRmFjYWRlSW1wOjpwYWludElubmVyU3Bp bkJ1dHRvbik6CisgICAgICAgIChXZWJLaXQ6OlFTdHlsZUZhY2FkZUltcDo6cGFpbnRTY3JvbGxC YXIpOgorCiAyMDEyLTExLTE0ICBDc2FiYSBPc3p0cm9nb27DoWMgIDxvc3N5QHdlYmtpdC5vcmc+ CiAKICAgICAgICAgW1F0XSBGaXggdHN0X1FXZWJGcmFtZTo6c2V0VXJsV2l0aFBlbmRpbmdMb2Fk cygpIEFQSSB0ZXN0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L3F0L1dlYkNvcmVTdXBwb3J0 L1FTdHlsZUZhY2FkZUltcC5jcHAgYi9Tb3VyY2UvV2ViS2l0L3F0L1dlYkNvcmVTdXBwb3J0L1FT dHlsZUZhY2FkZUltcC5jcHAKaW5kZXggN2ZjNWNjNTZlZjgwNzk4ZmMwODZmZGRjZmFiZjA4MzNk MmMyOTdmNC4uM2FmNmNmNjk0NjExOGQxMGE2OGU1MmE3MTBjYjcxNTE3YzA0Njk5YyAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdC9xdC9XZWJDb3JlU3VwcG9ydC9RU3R5bGVGYWNhZGVJbXAuY3Bw CisrKyBiL1NvdXJjZS9XZWJLaXQvcXQvV2ViQ29yZVN1cHBvcnQvUVN0eWxlRmFjYWRlSW1wLmNw cApAQCAtMjcsNyArMjcsNiBAQAogCiAjaW5jbHVkZSA8UUFwcGxpY2F0aW9uPgogI2luY2x1ZGUg PFFMaW5lRWRpdD4KLSNpbmNsdWRlIDxRTWFjU3R5bGU+CiAjaW5jbHVkZSA8UVBhaW50ZXI+CiAj aW5jbHVkZSA8UVB1c2hCdXR0b24+CiAjaW5jbHVkZSA8UVN0eWxlRmFjdG9yeT4KQEAgLTIyMSw3 ICsyMjAsNyBAQCB2b2lkIFFTdHlsZUZhY2FkZUltcDo6Z2V0QnV0dG9uTWV0cmljcyhRU3RyaW5n ICpidXR0b25Gb250RmFtaWx5LCBpbnQgKmJ1dHRvbkZvbgogICAgIFFGb250IGRlZmF1bHRCdXR0 b25Gb250ID0gUUFwcGxpY2F0aW9uOjpmb250KCZidXR0b24pOwogICAgICpidXR0b25Gb250RmFt aWx5ID0gZGVmYXVsdEJ1dHRvbkZvbnQuZmFtaWx5KCk7CiAgICAgKmJ1dHRvbkZvbnRQaXhlbFNp emUgPSAwOwotI2lmZGVmIFFfV1NfTUFDCisjaWZkZWYgUV9PU19NQUMKICAgICBidXR0b24uc2V0 QXR0cmlidXRlKFF0OjpXQV9NYWNTbWFsbFNpemUpOwogICAgIFFGb250SW5mbyBmb250SW5mbyhk ZWZhdWx0QnV0dG9uRm9udCk7CiAgICAgKmJ1dHRvbkZvbnRQaXhlbFNpemUgPSBmb250SW5mby5w aXhlbFNpemUoKTsKQEAgLTI3NSwxMSArMjc0LDExIEBAIHZvaWQgUVN0eWxlRmFjYWRlSW1wOjpw YWludENvbWJvQm94KFFQYWludGVyICpwYWludGVyLCBjb25zdCBRU3R5bGVGYWNhZGVPcHRpb24K IAogICAgIEludFJlY3QgcmVjdCA9IG9wdC5yZWN0OwogCi0jaWYgZGVmaW5lZChRX1dTX01BQykg JiYgIWRlZmluZWQoUVRfTk9fU1RZTEVfTUFDKQorI2lmIGRlZmluZWQoUV9PU19NQUMpICYmICFk ZWZpbmVkKFFUX05PX1NUWUxFX01BQykKICAgICAvLyBRTWFjU3R5bGUgbWFrZXMgdGhlIGNvbWJv IGJveGVzIGEgbGl0dGxlIGJpdCBzbWFsbGVyIHRvIGxlYXZlIHNwYWNlIGZvciB0aGUgZm9jdXMg cmVjdC4KICAgICAvLyBCZWNhdXNlIG9mIGl0LCB0aGUgY29tYm8gYnV0dG9uIGlzIGRyYXduIGF0 IGEgcG9pbnQgdG8gdGhlIGxlZnQgb2Ygd2hlcmUgaXQgd2FzIGV4cGVjdCB0byBiZSBhbmQgbWF5 IGVuZCB1cAogICAgIC8vIG92ZXJsYXBwZWQgd2l0aCB0aGUgdGV4dC4gVGhpcyB3aWxsIGZvcmNl IFFNYWNTdHlsZSB0byBkcmF3IHRoZSBjb21ibyBib3ggd2l0aCB0aGUgZXhwZWN0ZWQgd2lkdGgu Ci0gICAgaWYgKHFvYmplY3RfY2FzdDxRTWFjU3R5bGUqPihtX3N0eWxlKSkKKyAgICBpZiAobV9z dHlsZS0+aW5oZXJpdHMoIlFNYWNTdHlsZSIpKQogICAgICAgICByZWN0LmluZmxhdGVYKDMpOwog I2VuZGlmCiAKQEAgLTM1OSwxMSArMzU4LDExIEBAIHZvaWQgUVN0eWxlRmFjYWRlSW1wOjpwYWlu dElubmVyU3BpbkJ1dHRvbihRUGFpbnRlciogcGFpbnRlciwgY29uc3QgUVN0eWxlRmFjYWRlCiAg ICAgLy8gRGVmYXVsdCB0byBtb3ZpbmcgdGhlIGJ1dHRvbnMgYSBsaXR0bGUgYml0IHdpdGhpbiB0 aGUgZWRpdG9yIGZyYW1lLgogICAgIGludCBpbmZsYXRlWCA9IC0yOwogICAgIGludCBpbmZsYXRl WSA9IC0yOwotI2lmIGRlZmluZWQoUV9XU19NQUMpICYmICFkZWZpbmVkKFFUX05PX1NUWUxFX01B QykKKyNpZiBkZWZpbmVkKFFfT1NfTUFDKSAmJiAhZGVmaW5lZChRVF9OT19TVFlMRV9NQUMpCiAg ICAgLy8gUU1hY1N0eWxlIHdpbGwgcG9zaXRpb24gdGhlIGFxdWEgYnV0dG9ucyBmbHVzaCB0byB0 aGUgcmlnaHQuCiAgICAgLy8gVGhpcyB3aWxsIG1vdmUgdGhlbSBtb3JlIHdpdGhpbiB0aGUgY29u dHJvbCBmb3IgYmV0dGVyIHN0eWxlLCBhIGxhCiAgICAgLy8gQ2hyb21pdW0gbG9vayAmIGZlZWwu Ci0gICAgaWYgKHFvYmplY3RfY2FzdDxRTWFjU3R5bGUqPihtX3N0eWxlKSkgeworICAgIGlmICht X3N0eWxlLT5pbmhlcml0cygiUU1hY1N0eWxlIikpIHsKICAgICAgICAgaW5mbGF0ZVggPSAtNDsK ICAgICAgICAgLy8gUmVuZGVyIG1pbmkgYXF1YSBzcGluIGJ1dHRvbnMgZm9yIFFNYWNTdHlsZSB0 byBmaXQgbmljZWx5IGludG8KICAgICAgICAgLy8gdGhlIGVkaXRvciBhcmVhLCBsaWtlIENocm9t aXVtLgpAQCAtNDUxLDEwICs0NTAsMTAgQEAgdm9pZCBRU3R5bGVGYWNhZGVJbXA6OnBhaW50U2Ny b2xsQmFyKFFQYWludGVyICpwYWludGVyLCBjb25zdCBRU3R5bGVGYWNhZGVPcHRpb24KIAogICAg IE1hcHBlZFN0eWxlT3B0aW9uPFFTdHlsZU9wdGlvblNsaWRlcj4gb3B0KHdpZGdldCwgcHJveHlP cHRpb24pOwogCi0jaWZkZWYgUV9XU19NQUMKKyNpZmRlZiBRX09TX01BQwogICAgIC8vIEZJWE1F OiBXZSBhbHNvIG5lZWQgdG8gY2hlY2sgdGhlIHdpZGdldCBzdHlsZSBidXQgdG9kYXkgU2Nyb2xs YmFyVGhlbWUgaXMgbm90IGF3YXJlIG9mIHRoZSBwYWdlIHNvIHdlCiAgICAgLy8gY2FuJ3QgZ2V0 IHRoZSB3aWRnZXQuCi0gICAgaWYgKHFvYmplY3RfY2FzdDxRTWFjU3R5bGUqPihtX3N0eWxlKSkK KyAgICBpZiAobV9zdHlsZS0+aW5oZXJpdHMoIlFNYWNTdHlsZSIpKQogICAgICAgICBtX3N0eWxl LT5kcmF3Q29tcGxleENvbnRyb2woUVN0eWxlOjpDQ19TY3JvbGxCYXIsICZvcHQsIHBhaW50ZXIs IHdpZGdldCk7CiAgICAgZWxzZQogI2VuZGlmCg==