88306 2012-06-05 01:15:42 -0700 [Qt][Win] Fix building ImageQt.cpp 2012-06-10 05:09:57 -0700 1 1 1 Unclassified WebKit Tools / Tests 420+ All All RESOLVED FIXED Qt, QtTriaged P1 Blocker --- 88300 1 ossy kbalazs cmarcelo hausmann kbalazs ossy zoltan oldest_to_newest 641278 0 ossy 2012-06-05 01:15:42 -0700 WebCore/platform/graphics/qt/ImageQt.cpp doesn't build, because QPixmap::fromWinHBITMAP(...) doesn't exist. (or is it renamed/refactored?) 641615 1 ossy 2012-06-05 09:02:01 -0700 The exact build error: f:\WebKit\Source\WebCore\platform\graphics\qt\ImageQt.cpp(292) : error C2039: 'fromWinHBITMAP' : is not a member of 'QPixmap' f:\qt5\qtbase\include\qtgui\../../src/gui/image/qpixmap.h(64) : see declaration of 'QPixmap' f:\WebKit\Source\WebCore\platform\graphics\qt\ImageQt.cpp(292) : error C3861: 'fromWinHBITMAP': identifier not found 641718 2 cmarcelo 2012-06-05 10:56:36 -0700 (In reply to comment #0) > WebCore/platform/graphics/qt/ImageQt.cpp doesn't build, because > QPixmap::fromWinHBITMAP(...) doesn't exist. (or is it renamed/refactored?) See qtbase hash b8d330904b279de57d70caef70ab2d2a6770f0cc. Apparently this function now goes by the name of qt_pixmapFromWinHBITMAP(). 643437 3 146258 ossy 2012-06-07 05:09:10 -0700 Created attachment 146258 Patch WIP patch, not tested yet 643550 4 ossy 2012-06-07 07:43:03 -0700 (In reply to comment #3) > Created an attachment (id=146258) [details] > Patch > > WIP patch, not tested yet It doesn't work, because there isn't any header for qt_pixmapFromWinHBITMAP() function, so we can't use it in WebKit ... From this point I have no idea how to fix it. Any volunteer to fix it? 643624 5 146309 ossy 2012-06-07 09:37:21 -0700 Created attachment 146309 Patch Please don't review it, I don't want to land it. It is only a workaround until proper fix to be able test other build problems. 643626 6 ossy 2012-06-07 09:37:54 -0700 Crazy webkit-patch, I don't want to assign it myself ... 644714 7 146580 kbalazs 2012-06-08 09:06:19 -0700 Created attachment 146580 Patch 644720 8 ossy 2012-06-08 09:14:33 -0700 (In reply to comment #7) > Created an attachment (id=146580) [details] > Patch I tested on Windows and works fine. Simon, r? 644722 9 ossy 2012-06-08 09:15:14 -0700 Hmmm ... Just a quick question ... will it work with Qt 4? 644729 10 kbalazs 2012-06-08 09:18:59 -0700 (In reply to comment #9) > Hmmm ... Just a quick question ... will it work with Qt 4? Of course it won't. I did not think about that. I'm going to fix it. 644738 11 146586 kbalazs 2012-06-08 09:33:50 -0700 Created attachment 146586 Patch 645484 12 146586 kbalazs 2012-06-10 05:09:49 -0700 Comment on attachment 146586 Patch Clearing flags on attachment: 146586 Committed r119924: <http://trac.webkit.org/changeset/119924> 645485 13 kbalazs 2012-06-10 05:09:57 -0700 All reviewed patches have been landed. Closing bug. 146258 2012-06-07 05:09:10 -0700 2012-06-07 09:37:03 -0700 Patch bug-88306-20120607050909.patch text/plain 1503 ossy U3VidmVyc2lvbiBSZXZpc2lvbjogMTE5NzA3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzFmYzZkMWQ0MDcxM2E1 ZWE2ZmZhNTMzMmZmNDBjODY2OTljOGIxMi4uYjcxNTllMDg1OTlkOGY2MGUzMzE1NmY3M2JkMGYw NjkwNjBkNTFiYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDE3IEBACiAyMDEyLTA2LTA3ICBDc2Fi YSBPc3p0cm9nb27DoWMgIDxvc3N5QHdlYmtpdC5vcmc+CiAKKyAgICAgICAgW1F0XVtXaW5dIEZp eCBidWlsZGluZyBJbWFnZVF0LmNwcAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9ODgzMDYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBCdWlsZGZpeCwgdXNlIHF0X3BpeG1hcEZyb21XaW5IQklUTUFQKCkgaW5z dGVhZCBvZiBRUGl4bWFwOjpmcm9tV2luSEJJVE1BUCgpLCBiZWNhdXNlIGl0IHdhcyByZW5hbWVk LgorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvcXQvSW1hZ2VRdC5jcHA6CisgICAgICAg IChXZWJDb3JlOjpCaXRtYXBJbWFnZTo6Y3JlYXRlKToKKworMjAxMi0wNi0wNyAgQ3NhYmEgT3N6 dHJvZ29uw6FjICA8b3NzeUB3ZWJraXQub3JnPgorCiAgICAgICAgIFtRdF1bV2luXSBVc2UgT1Mo V0lORE9XUykgaW5zdGVhZCBvZiBRX1dTX1dJTiBpbiBXZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L0dyYXBoaWNzQ29udGV4dC5oCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD04ODMwNQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9xdC9JbWFnZVF0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L3F0L0ltYWdlUXQuY3BwCmluZGV4IDg0OTQzNWY2MzNlNjIxNTYyOTFlODQ0ZGQ0YmQxNGNkMzYw YzkxZGMuLjNmMGFjZDg1MmJjYjI4NWYxOTExYjRjN2I3YmMyNWQzMDY4OGFhMzcgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3F0L0ltYWdlUXQuY3BwCisrKyBi L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3F0L0ltYWdlUXQuY3BwCkBAIC0yODks NyArMjg5LDcgQEAgdm9pZCBCaXRtYXBJbWFnZTo6Y2hlY2tGb3JTb2xpZENvbG9yKCkKICNpZiBP UyhXSU5ET1dTKQogUGFzc1JlZlB0cjxCaXRtYXBJbWFnZT4gQml0bWFwSW1hZ2U6OmNyZWF0ZShI QklUTUFQIGhCaXRtYXApCiB7Ci0gICAgcmV0dXJuIEJpdG1hcEltYWdlOjpjcmVhdGUobmV3IFFQ aXhtYXAoUVBpeG1hcDo6ZnJvbVdpbkhCSVRNQVAoaEJpdG1hcCkpKTsKKyAgICByZXR1cm4gQml0 bWFwSW1hZ2U6OmNyZWF0ZShuZXcgUVBpeG1hcChxdF9waXhtYXBGcm9tV2luSEJJVE1BUChoQml0 bWFwKSkpOwogfQogI2VuZGlmCiAK 146309 2012-06-07 09:37:21 -0700 2012-06-08 09:06:09 -0700 Patch bug-88306-20120607093720.patch text/plain 1317 ossy U3VidmVyc2lvbiBSZXZpc2lvbjogMTE5NzI5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNjdmZmIwZGVhMzk0YWU5 ZjllMmVkOWRiNjExZThhMGQwZWEzNzhkZi4uMjdjZjNjZTMzZDdjYmM1ZmJiNTgxOGZhM2Q4MzM0 ZGQ2MjA1MmJjZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEzIEBACisyMDEyLTA2LTA3ICBDc2Fi YSBPc3p0cm9nb27DoWMgIDxvc3N5QHdlYmtpdC5vcmc+CisKKyAgICAgICAgW1F0XVtXaW5dIEZp eCBidWlsZGluZyBJbWFnZVF0LmNwcAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9ODgzMDYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL3F0L0ltYWdlUXQuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6Qml0bWFwSW1hZ2U6OmNyZWF0ZSk6CisKIDIwMTItMDYtMDYgIERhbmEgSmFu c2VucyAgPGRhbmFrakBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgW2Nocm9taXVtXSBJbiBlYWNo IGNvbXBvc2l0ZWQgZnJhbWUsIGRpZERyYXcoKSBzaG91bGQgb25seSBiZSBjYWxsZWQgb24gbGF5 ZXJzIGZvciB3aGljaCB3aWxsRHJhdygpIHdhcyBjYWxsZWQKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3F0L0ltYWdlUXQuY3BwIGIvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvcXQvSW1hZ2VRdC5jcHAKaW5kZXggODQ5NDM1ZjYzM2U2MjE1NjI5 MWU4NDRkZDRiZDE0Y2QzNjBjOTFkYy4uN2I1ZDEwZDQyNjQyZTdlMTQ2MDBkNTI1MTI4MjQ4NmY1 MzZjZmQ0YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvcXQv SW1hZ2VRdC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvcXQvSW1h Z2VRdC5jcHAKQEAgLTI4OSw3ICsyODksNyBAQCB2b2lkIEJpdG1hcEltYWdlOjpjaGVja0ZvclNv bGlkQ29sb3IoKQogI2lmIE9TKFdJTkRPV1MpCiBQYXNzUmVmUHRyPEJpdG1hcEltYWdlPiBCaXRt YXBJbWFnZTo6Y3JlYXRlKEhCSVRNQVAgaEJpdG1hcCkKIHsKLSAgICByZXR1cm4gQml0bWFwSW1h Z2U6OmNyZWF0ZShuZXcgUVBpeG1hcChRUGl4bWFwOjpmcm9tV2luSEJJVE1BUChoQml0bWFwKSkp OworICAgIHJldHVybiBCaXRtYXBJbWFnZTo6Y3JlYXRlKG5ldyBRUGl4bWFwKCkpOwogfQogI2Vu ZGlmCiAK 146580 2012-06-08 09:06:19 -0700 2012-06-08 09:33:42 -0700 Patch bug-88306-20120608180614.patch text/plain 1564 kbalazs U3VidmVyc2lvbiBSZXZpc2lvbjogMTE5NzIzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMjZjNzAxOGE0ZmI4NWE2 YWY0ZjBlZGY5NzhmMmRlYTJhYjNhYjQ0MS4uMTRkZWQxY2IxZmM2NmIyODljZDljNGFkZDQxZGFl ZmFjYTM5YmQ4YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDE5IEBACiAyMDEyLTA2LTA4ICBCYWxh enMgS2VsZW1lbiAgPGtiYWxhenNAd2Via2l0Lm9yZz4KIAorICAgICAgICBbUXRdW1dpbl0gRml4 IGJ1aWxkaW5nIEltYWdlUXQuY3BwCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD04ODMwNgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIE5vIG5ldyB0ZXN0cywgdGhpcyBpcyBqdXN0IGEgYnVpbGQgZml4LgorCisg ICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvcXQvSW1hZ2VRdC5jcHA6CisgICAgICAgIChXZWJD b3JlKToKKyAgICAgICAgKFdlYkNvcmU6OkJpdG1hcEltYWdlOjpjcmVhdGUpOgorICAgICAgICBB ZGFwdCB0byB0aGUgIkFQSSIgY2hhbmdlcyBpbiBRdC4KKworMjAxMi0wNi0wOCAgQmFsYXpzIEtl bGVtZW4gIDxrYmFsYXpzQHdlYmtpdC5vcmc+CisKICAgICAgICAgW1F0XVtXaW5dIEZpeCBidWls ZGluZyBTb3VyY2UvV2ViQ29yZS9wbHVnaW5zL3dpbi9QbHVnaW5WaWV3V2luLmNwcAogICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODgzMDgKIApkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvcXQvSW1hZ2VRdC5jcHAgYi9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9xdC9JbWFnZVF0LmNwcAppbmRleCA4NDk0 MzVmNjMzZTYyMTU2MjkxZTg0NGRkNGJkMTRjZDM2MGM5MWRjLi5hOGU3NTUxM2I0YTljNTcxYjc5 NjYzNmJmMjdhMTMzMGUxYjYzOWRkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9xdC9JbWFnZVF0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9xdC9JbWFnZVF0LmNwcApAQCAtMjg3LDkgKzI4NywxMSBAQCB2b2lkIEJpdG1hcElt YWdlOjpjaGVja0ZvclNvbGlkQ29sb3IoKQogfQogCiAjaWYgT1MoV0lORE9XUykKK1FfR1VJX0VY UE9SVCBRUGl4bWFwIHF0X3BpeG1hcEZyb21XaW5IQklUTUFQKEhCSVRNQVAsIGludCBoYml0bWFw Rm9ybWF0ID0gMCk7CisKIFBhc3NSZWZQdHI8Qml0bWFwSW1hZ2U+IEJpdG1hcEltYWdlOjpjcmVh dGUoSEJJVE1BUCBoQml0bWFwKQogewotICAgIHJldHVybiBCaXRtYXBJbWFnZTo6Y3JlYXRlKG5l dyBRUGl4bWFwKFFQaXhtYXA6OmZyb21XaW5IQklUTUFQKGhCaXRtYXApKSk7CisgICAgcmV0dXJu IEJpdG1hcEltYWdlOjpjcmVhdGUobmV3IFFQaXhtYXAocXRfcGl4bWFwRnJvbVdpbkhCSVRNQVAo aEJpdG1hcCkpKTsKIH0KICNlbmRpZgogCg== 146586 2012-06-08 09:33:50 -0700 2012-06-10 05:09:49 -0700 Patch bug-88306-20120608183344.patch text/plain 1725 kbalazs U3VidmVyc2lvbiBSZXZpc2lvbjogMTE5ODM2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOTY1NTkwYTVmZTU2OTZj ODVkYWU2ZTA0OGE0NjIyYWJiMWMwZmFmOS4uMWEzOTdiNzJmMDgzZmIxZTdiMzM2ZjAwODdhMDEw OWU3MjNiMTEwMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDE5IEBACiAyMDEyLTA2LTA4ICBCYWxh enMgS2VsZW1lbiAgPGtiYWxhenNAd2Via2l0Lm9yZz4KIAorICAgICAgICBbUXRdW1dpbl0gRml4 IGJ1aWxkaW5nIEltYWdlUXQuY3BwCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD04ODMwNgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIE5vIG5ldyB0ZXN0cywgdGhpcyBpcyBqdXN0IGEgYnVpbGQgZml4LgorCisg ICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvcXQvSW1hZ2VRdC5jcHA6CisgICAgICAgIChXZWJD b3JlKToKKyAgICAgICAgKFdlYkNvcmU6OkJpdG1hcEltYWdlOjpjcmVhdGUpOgorICAgICAgICBB ZGFwdCB0byB0aGUgIkFQSSIgY2hhbmdlcyBpbiBRdC4KKworMjAxMi0wNi0wOCAgQmFsYXpzIEtl bGVtZW4gIDxrYmFsYXpzQHdlYmtpdC5vcmc+CisKICAgICAgICAgW1F0XVtXaW5dIEZpeCBidWls ZGluZyBTb3VyY2UvV2ViQ29yZS9wbHVnaW5zL3dpbi9QbHVnaW5WaWV3V2luLmNwcAogICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODgzMDgKIApkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvcXQvSW1hZ2VRdC5jcHAgYi9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9xdC9JbWFnZVF0LmNwcAppbmRleCA4NDk0 MzVmNjMzZTYyMTU2MjkxZTg0NGRkNGJkMTRjZDM2MGM5MWRjLi42OTIyN2JjMjExNzliYjY1N2Fm OWM1Mzg1NzY1MTgzNzI4OGZlN2M5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9xdC9JbWFnZVF0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9xdC9JbWFnZVF0LmNwcApAQCAtMjg3LDkgKzI4NywyMCBAQCB2b2lkIEJpdG1hcElt YWdlOjpjaGVja0ZvclNvbGlkQ29sb3IoKQogfQogCiAjaWYgT1MoV0lORE9XUykKKworI2lmIEhB VkUoUVQ1KQorUV9HVUlfRVhQT1JUIFFQaXhtYXAgcXRfcGl4bWFwRnJvbVdpbkhCSVRNQVAoSEJJ VE1BUCwgaW50IGhiaXRtYXBGb3JtYXQgPSAwKTsKKyNlbmRpZgorCiBQYXNzUmVmUHRyPEJpdG1h cEltYWdlPiBCaXRtYXBJbWFnZTo6Y3JlYXRlKEhCSVRNQVAgaEJpdG1hcCkKIHsKLSAgICByZXR1 cm4gQml0bWFwSW1hZ2U6OmNyZWF0ZShuZXcgUVBpeG1hcChRUGl4bWFwOjpmcm9tV2luSEJJVE1B UChoQml0bWFwKSkpOworI2lmIEhBVkUoUVQ1KQorICAgIFFQaXhtYXAqIHFQaXhtYXAgPSBuZXcg UVBpeG1hcChxdF9waXhtYXBGcm9tV2luSEJJVE1BUChoQml0bWFwKSk7CisjZWxzZQorICAgIFFQ aXhtYXAqIHFQaXhtYXAgPSBuZXcgUVBpeG1hcChRUGl4bWFwOjpmcm9tV2luSEJJVE1BUChoQml0 bWFwKSk7CisjZW5kaWYKKworICAgIHJldHVybiBCaXRtYXBJbWFnZTo6Y3JlYXRlKHFQaXhtYXAp OwogfQogI2VuZGlmCiAK