30327 2009-10-13 01:19:44 -0700 [Qt] Fix build break for Qt 4.4 2009-12-29 09:24:14 -0800 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) PC Linux RESOLVED FIXED Qt P2 Normal --- 0 ukai webkit-unassigned commit-queue eric kenneth laszlo.gombos webkit.review.bot oldest_to_newest 154295 0 ukai 2009-10-13 01:19:44 -0700 WebKit/Qt build fails with Qt 4.4, at least the following two errors. ../../../WebCore/platform/graphics/qt/GraphicsContextQt.cpp: In member function ‘void WebCore::GraphicsContext::clipOut(const WebCore::Path&)’: ../../../WebCore/platform/graphics/qt/GraphicsContextQt.cpp:1071: error: no match for ‘operator&’ in ‘clippedOut & newClip’ operator& for QPainterPath was introduced in Qt 4.5. I believe it is equivalent to intersected() that exists in Qt 4.4 ../../../WebCore/plugins/qt/PluginViewQt.cpp: In member function ‘virtual void WebCore::PluginView::paint(WebCore::GraphicsContext*, const WebCore::IntRect&)’: ../../../WebCore/plugins/qt/PluginViewQt.cpp:182: error: ‘fromX11Pixmap’ is not a member of ‘QPixmap’ ../../../WebCore/plugins/qt/PluginViewQt.cpp:182: error: ‘ExplicitlyShared’ is not a member of ‘QPixmap’ QPixmap::fromX11Pixmap was introduced in Qt 4.5, and I couldn't find any fallback in Qt 4.4.. 175252 1 45560 laszlo.gombos 2009-12-28 09:49:10 -0800 Created attachment 45560 proposed patch Enables building (on Linux requires to turn off NPAPI support) with Qt 4.4. I think we should keep the 4.4 support around in the trunk for a while. 4.4.3 was released in 28 September 2008, which was not that long ago and at the moment it does not seems like a big effort to maintain most QtWebKit features for Qt 4.4 as well. 175254 2 webkit.review.bot 2009-12-28 09:51:12 -0800 style-queue ran check-webkit-style on attachment 45560 without any errors. 175262 3 45560 abarth 2009-12-28 10:22:05 -0800 Comment on attachment 45560 proposed patch In general, you can land build fixes without review. 175265 4 45560 commit-queue 2009-12-28 11:15:29 -0800 Comment on attachment 45560 proposed patch Clearing flags on attachment: 45560 Committed r52601: <http://trac.webkit.org/changeset/52601> 175266 5 commit-queue 2009-12-28 11:15:34 -0800 All reviewed patches have been landed. Closing bug. 175539 6 kenneth 2009-12-29 06:45:26 -0800 Why are we doing patches for supporting 4.4 which we decided to not support anymore? 175594 7 eric 2009-12-29 09:23:00 -0800 I didn't realize (and I would assume Fumitoshi didn't realize) that we were not supporting GCC 4.4. Do we have a webkit-dev thread on the subject I should (re-)read? 175595 8 eric 2009-12-29 09:24:14 -0800 Oh, sorry, I was confused. This is Qt 4.4. Not GCC 4.4. My retract my previous comment. 45560 2009-12-28 09:49:10 -0800 2009-12-28 11:15:28 -0800 proposed patch 30327.patch text/plain 4438 laszlo.gombos SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA1MjU5OSkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjAgQEAKKzIwMDktMTItMjggIExhc3psbyBHb21ib3MgIDxsYXN6bG8uMS5nb21i b3NAbm9raWEuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIFtRdF0gRml4IGJ1aWxkIGJyZWFrIGZvciBRdCA0LjQKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTMwMzI3CisKKyAgICAgICAgTm8gbmV3IHRl c3RzLCBhcyB0aGVyZSBpcyBubyBuZXcgZnVuY3Rpb25hbGl0eS4KKworICAgICAgICAqIHBsYXRm b3JtL2dyYXBoaWNzL3F0L0dyYXBoaWNzQ29udGV4dFF0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OkdyYXBoaWNzQ29udGV4dDo6Y2xpcE91dCk6IFVzZSBpbnRlcnNlY3RlZCgpIGluc3RlYWQgb2YK KyAgICAgICAgb3BlcmF0b3IgJiwgd2hpY2ggd2FzIG9ubHkgaW50cm9kdWNlZCBpbiBRdCB2ZXJz aW9uIDQuNS4KKworICAgICAgICAqIHBsYXRmb3JtL3F0L1Njcm9sbGJhclRoZW1lUXQuY3BwOgor ICAgICAgICAoV2ViQ29yZTo6U2Nyb2xsYmFyVGhlbWVRdDo6cGFpbnRTY3JvbGxDb3JuZXIpOiBQ YXNzIENvbG9yU3BhY2UKKyAgICAgICAgYXJndW1lbnQgdG8gZmlsbENvbG9yKCkgaW50cm9kdWNl ZCBpbiByNTA3NjAKKwogMjAwOS0xMi0yOCAgS2VudCBUYW11cmEgIDx0a2VudEBjaHJvbWl1bS5v cmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgTWFjaWVqIFN0YWNob3dpYWsuCkluZGV4OiBXZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL3F0L0dyYXBoaWNzQ29udGV4dFF0LmNwcAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBXZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3F0L0dyYXBoaWNzQ29udGV4dFF0LmNwcAko cmV2aXNpb24gNTI1OTYpCisrKyBXZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3F0L0dyYXBoaWNz Q29udGV4dFF0LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTA1NCw3ICsxMDU0LDcgQEAgdm9pZCBH cmFwaGljc0NvbnRleHQ6OmNsaXBPdXQoY29uc3QgUGF0aAogICAgICAgICBwLT5zZXRDbGlwUGF0 aChuZXdDbGlwLCBRdDo6SW50ZXJzZWN0Q2xpcCk7CiAgICAgfSBlbHNlIHsKICAgICAgICAgbmV3 Q2xpcC5hZGRSZWN0KHAtPndpbmRvdygpKTsKLSAgICAgICAgbmV3Q2xpcC5hZGRQYXRoKGNsaXBw ZWRPdXQgJiBuZXdDbGlwKTsKKyAgICAgICAgbmV3Q2xpcC5hZGRQYXRoKGNsaXBwZWRPdXQuaW50 ZXJzZWN0ZWQobmV3Q2xpcCkpOwogICAgICAgICBwLT5zZXRDbGlwUGF0aChuZXdDbGlwKTsKICAg ICB9CiB9CkluZGV4OiBXZWJDb3JlL3BsYXRmb3JtL3F0L1Njcm9sbGJhclRoZW1lUXQuY3BwCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFdlYkNvcmUvcGxhdGZvcm0vcXQvU2Nyb2xsYmFyVGhlbWVRdC5jcHAJKHJl dmlzaW9uIDUyNTk2KQorKysgV2ViQ29yZS9wbGF0Zm9ybS9xdC9TY3JvbGxiYXJUaGVtZVF0LmNw cAkod29ya2luZyBjb3B5KQpAQCAtMjM1LDcgKzIzNSw3IEBAIHZvaWQgU2Nyb2xsYmFyVGhlbWVR dDo6cGFpbnRTY3JvbGxDb3JuZXIKICAgICB9CiAKICNpZiBRVF9WRVJTSU9OIDwgMHgwNDA1MDAK LSAgICBjb250ZXh0LT5maWxsUmVjdChyZWN0LCBRQXBwbGljYXRpb246OnBhbGV0dGUoKS5jb2xv cihRUGFsZXR0ZTo6Tm9ybWFsLCBRUGFsZXR0ZTo6V2luZG93KSk7CisgICAgY29udGV4dC0+Zmls bFJlY3QocmVjdCwgUUFwcGxpY2F0aW9uOjpwYWxldHRlKCkuY29sb3IoUVBhbGV0dGU6Ok5vcm1h bCwgUVBhbGV0dGU6OldpbmRvdyksIERldmljZUNvbG9yU3BhY2UpOwogI2Vsc2UKICAgICBTdHls ZVBhaW50ZXIgcChjb250ZXh0KTsKICAgICBpZiAoIXAuaXNWYWxpZCgpKQpJbmRleDogV2ViS2l0 VG9vbHMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdFRvb2xzL0NoYW5nZUxvZwkocmV2 aXNpb24gNTI1OTkpCisrKyBXZWJLaXRUb29scy9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAg LTEsMyArMSwxNiBAQAorMjAwOS0xMi0yOCAgTGFzemxvIEdvbWJvcyAgPGxhc3psby4xLmdvbWJv c0Bub2tpYS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgW1F0XSBGaXggYnVpbGQgYnJlYWsgZm9yIFF0IDQuNAorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzAzMjcKKworICAgICAgICAqIER1bXBSZW5k ZXJUcmVlL3F0L0R1bXBSZW5kZXJUcmVlUXQuY3BwOiBJbmNsdWRlIFFMb2NhbGUKKyAgICAgICAg KiBEdW1wUmVuZGVyVHJlZS9xdC9MYXlvdXRUZXN0Q29udHJvbGxlclF0LmNwcDogRGl0dG8uCisg ICAgICAgICogUXRMYXVuY2hlci9tYWluLmNwcDoKKyAgICAgICAgKE1haW5XaW5kb3c6Ok1haW5X aW5kb3cpOiBRdDo6V0FfVHJhbnNsdWNlbnRCYWNrZ3JvdW5kIHdhcworICAgICAgICBpbnRyb2R1 Y2VkIGluIFF0IHZlcnNpb24gNC41CisKIDIwMDktMTItMjggIEFkYW0gQmFydGggIDxhYmFydGhA d2Via2l0Lm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBFcmljIFNlaWRlbC4KSW5kZXg6IFdl YktpdFRvb2xzL0R1bXBSZW5kZXJUcmVlL3F0L0R1bXBSZW5kZXJUcmVlUXQuY3BwCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFdlYktpdFRvb2xzL0R1bXBSZW5kZXJUcmVlL3F0L0R1bXBSZW5kZXJUcmVlUXQuY3Bw CShyZXZpc2lvbiA1MjU5NikKKysrIFdlYktpdFRvb2xzL0R1bXBSZW5kZXJUcmVlL3F0L0R1bXBS ZW5kZXJUcmVlUXQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC00OCw2ICs0OCw3IEBACiAjaW5jbHVk ZSA8UUZpbGVJbmZvPgogI2luY2x1ZGUgPFFGb2N1c0V2ZW50PgogI2luY2x1ZGUgPFFGb250RGF0 YWJhc2U+CisjaW5jbHVkZSA8UUxvY2FsZT4KICNpbmNsdWRlIDxRTmV0d29ya0FjY2Vzc01hbmFn ZXI+CiAjaW5jbHVkZSA8UU5ldHdvcmtSZXBseT4KICNpbmNsdWRlIDxRTmV0d29ya1JlcXVlc3Q+ CkluZGV4OiBXZWJLaXRUb29scy9EdW1wUmVuZGVyVHJlZS9xdC9MYXlvdXRUZXN0Q29udHJvbGxl clF0LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXRUb29scy9EdW1wUmVuZGVyVHJlZS9xdC9MYXlv dXRUZXN0Q29udHJvbGxlclF0LmNwcAkocmV2aXNpb24gNTI1OTYpCisrKyBXZWJLaXRUb29scy9E dW1wUmVuZGVyVHJlZS9xdC9MYXlvdXRUZXN0Q29udHJvbGxlclF0LmNwcAkod29ya2luZyBjb3B5 KQpAQCAtMzMsNiArMzMsNyBAQAogI2luY2x1ZGUgIldvcmtRdWV1ZS5oIgogI2luY2x1ZGUgIldv cmtRdWV1ZUl0ZW1RdC5oIgogI2luY2x1ZGUgPFFEaXI+CisjaW5jbHVkZSA8UUxvY2FsZT4KIAog ZXh0ZXJuIHZvaWQgcXRfZHVtcF9lZGl0aW5nX2NhbGxiYWNrcyhib29sIGIpOwogZXh0ZXJuIHZv aWQgcXRfZHVtcF9yZXNvdXJjZV9sb2FkX2NhbGxiYWNrcyhib29sIGIpOwpJbmRleDogV2ViS2l0 VG9vbHMvUXRMYXVuY2hlci9tYWluLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXRUb29scy9RdExh dW5jaGVyL21haW4uY3BwCShyZXZpc2lvbiA1MjU5NikKKysrIFdlYktpdFRvb2xzL1F0TGF1bmNo ZXIvbWFpbi5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTE3MCw4ICsxNzAsMTAgQEAgcHVibGljOgog ICAgIE1haW5XaW5kb3coUVN0cmluZyB1cmwgPSBRU3RyaW5nKCkpOiBjdXJyZW50Wm9vbSgxMDAp CiAgICAgewogICAgICAgICBzZXRBdHRyaWJ1dGUoUXQ6OldBX0RlbGV0ZU9uQ2xvc2UpOworI2lm IFFUX1ZFUlNJT04gPj0gUVRfVkVSU0lPTl9DSEVDSyg0LCA1LCAwKQogICAgICAgICBpZiAocWdl dGVudigiUVRMQVVOQ0hFUl9VU0VfQVJHQl9WSVNVQUxTIikudG9JbnQoKSA9PSAxKQogICAgICAg ICAgICAgc2V0QXR0cmlidXRlKFF0OjpXQV9UcmFuc2x1Y2VudEJhY2tncm91bmQpOworI2VuZGlm CiAKICAgICAgICAgUVNwbGl0dGVyKiBzcGxpdHRlciA9IG5ldyBRU3BsaXR0ZXIoUXQ6OlZlcnRp Y2FsLCB0aGlzKTsKICAgICAgICAgc2V0Q2VudHJhbFdpZGdldChzcGxpdHRlcik7Cg==