21969 2008-10-30 07:24:01 -0700 QT build is broken 2008-10-30 13:47:47 -0700 1 1 1 Unclassified WebKit WebKit Qt 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 1 yael webkit-unassigned chaz hausmann oldest_to_newest 97117 0 yael 2008-10-30 07:24:01 -0700 QT build needs to be fixed. 97118 1 24769 yael 2008-10-30 07:28:11 -0700 Created attachment 24769 Fix the QT build Removed debuggingButtons.png from webkit.qrc. The image file itself was recently deleted. Modified ImageBufferQt.cpp so that it compiles after ImageBuffer was restructured. Removed extra QPainter::begin(), because QPainter is always initialized in the constructor of ImageBufferData. 97160 2 vestbo 2008-10-30 13:47:47 -0700 Landed in r38006 24769 2008-10-30 07:28:11 -0700 2008-10-30 08:47:02 -0700 Fix the QT build a.patch text/plain 2944 yael SW5kZXg6IFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvcXQvSW1hZ2VCdWZmZXJRdC5jcHAKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9xdC9JbWFnZUJ1ZmZlclF0LmNw cAkocmV2aXNpb24gMzc5OTcpCisrKyBXZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3F0L0ltYWdl QnVmZmVyUXQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC00NCwxNSArNDQsMTUgQEAKIEltYWdlQnVm ZmVyRGF0YTo6SW1hZ2VCdWZmZXJEYXRhKGNvbnN0IEludFNpemUmIHNpemUpCiAgICAgOiBtX3Bp eG1hcChzaXplKQogewotICAgIHB4LmZpbGwoUUNvbG9yKFF0Ojp0cmFuc3BhcmVudCkpOworICAg IG1fcGl4bWFwLmZpbGwoUUNvbG9yKFF0Ojp0cmFuc3BhcmVudCkpOwogICAgIG1fcGFpbnRlci5z ZXQobmV3IFFQYWludGVyKCZtX3BpeG1hcCkpOwogfQogCiBJbWFnZUJ1ZmZlcjo6SW1hZ2VCdWZm ZXIoY29uc3QgSW50U2l6ZSYgc2l6ZSwgYm9vbCBncmF5U2NhbGUsIGJvb2wmIHN1Y2Nlc3MpCi0g ICAgOiBtX3BsYXRmb3JtKHNpemUpCisgICAgOiBtX2RhdGEoc2l6ZSkKICAgICAsIG1fc2l6ZShz aXplKQogewotICAgIG1fY29udGV4dC5zZXQobmV3IEdyYXBoaWNzQ29udGV4dChwbGF0Zm9ybS5t X3BhaW50ZXIpKTsKKyAgICBtX2NvbnRleHQuc2V0KG5ldyBHcmFwaGljc0NvbnRleHQobV9kYXRh Lm1fcGFpbnRlci5nZXQoKSkpOwogICAgIHN1Y2Nlc3MgPSB0cnVlOwogfQogCkBAIC02Miw4ICs2 Miw3IEBACiAKIEdyYXBoaWNzQ29udGV4dCogSW1hZ2VCdWZmZXI6OmNvbnRleHQoKSBjb25zdAog ewotICAgIGlmICghbV9wYWludGVyLT5pc0FjdGl2ZSgpKQotICAgICAgICBtX3BhaW50ZXItPmJl Z2luKCZtX3BpeG1hcCk7CisgICAgQVNTRVJUKG1fZGF0YS5tX3BhaW50ZXItPmlzQWN0aXZlKCkp OwogCiAgICAgcmV0dXJuIG1fY29udGV4dC5nZXQoKTsKIH0KQEAgLTc0LDcgKzczLDcgQEAKICAg ICAgICAgLy8gSXQncyBhc3N1bWVkIHRoYXQgaWYgaW1hZ2UoKSBpcyBjYWxsZWQsIHRoZSBhY3R1 YWwgcmVuZGVyaW5nIHRvIHRoZQogICAgICAgICAvLyBHcmFwaGljc0NvbnRleHQgbXVzdCBiZSBk b25lLgogICAgICAgICBBU1NFUlQoY29udGV4dCgpKTsKLSAgICAgICAgbV9pbWFnZSA9IFN0aWxs SW1hZ2U6OmNyZWF0ZShtX3BpeG1hcCk7CisgICAgICAgIG1faW1hZ2UgPSBTdGlsbEltYWdlOjpj cmVhdGUobV9kYXRhLm1fcGl4bWFwKTsKICAgICB9CiAKICAgICByZXR1cm4gbV9pbWFnZS5nZXQo KTsKQEAgLTEwNiw3ICsxMDUsNyBAQAogICAgIFFCdWZmZXIgYnVmZmVyKCZkYXRhKTsKICAgICBi dWZmZXIub3BlbihRQnVmZmVyOjpXcml0ZU9ubHkpOwogCi0gICAgaWYgKCFtX3BpeG1hcC5zYXZl KCZidWZmZXIsIG1pbWVUeXBlLnN1YnN0cmluZyhzaXplb2YgImltYWdlIikudXRmOCgpLmRhdGEo KSkpCisgICAgaWYgKCFtX2RhdGEubV9waXhtYXAuc2F2ZSgmYnVmZmVyLCBtaW1lVHlwZS5zdWJz dHJpbmcoc2l6ZW9mICJpbWFnZSIpLnV0ZjgoKS5kYXRhKCkpKQogICAgICAgICByZXR1cm4gImRh dGE6LCI7CiAKICAgICBidWZmZXIuY2xvc2UoKTsKSW5kZXg6IFdlYkNvcmUvaW5zcGVjdG9yL2Zy b250LWVuZC9XZWJLaXQucXJjCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvaW5zcGVjdG9yL2Zyb250 LWVuZC9XZWJLaXQucXJjCShyZXZpc2lvbiAzNzk5NykKKysrIFdlYkNvcmUvaW5zcGVjdG9yL2Zy b250LWVuZC9XZWJLaXQucXJjCSh3b3JraW5nIGNvcHkpCkBAIC01Niw3ICs1Niw2IEBACiAgICAg PGZpbGU+SW1hZ2VzL2RlYnVnZ2VyU3RlcEludG8ucG5nPC9maWxlPgogICAgIDxmaWxlPkltYWdl cy9kZWJ1Z2dlclN0ZXBPdXQucG5nPC9maWxlPgogICAgIDxmaWxlPkltYWdlcy9kZWJ1Z2dlclN0 ZXBPdmVyLnBuZzwvZmlsZT4KLSAgICA8ZmlsZT5JbWFnZXMvZGVidWdnaW5nQnV0dG9ucy5wbmc8 L2ZpbGU+CiAgICAgPGZpbGU+SW1hZ2VzL2Rpc2Nsb3N1cmVUcmlhbmdsZVNtYWxsRG93bkJsYWNr LnBuZzwvZmlsZT4KICAgICA8ZmlsZT5JbWFnZXMvZGlzY2xvc3VyZVRyaWFuZ2xlU21hbGxEb3du LnBuZzwvZmlsZT4KICAgICA8ZmlsZT5JbWFnZXMvZGlzY2xvc3VyZVRyaWFuZ2xlU21hbGxEb3du V2hpdGUucG5nPC9maWxlPgpJbmRleDogV2ViQ29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g V2ViQ29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDM4MDAxKQorKysgV2ViQ29yZS9DaGFuZ2VMb2cJ KHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwxNyBAQAorMjAwOC0xMC0zMCAgWWFlbCBBaGFyb24g IDx5YWVsLmFoYXJvbkBub2tpYS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgRml4IHRoZSBRVCBidWlsZC4KKworICAgICAgICAqIGluc3BlY3Rv ci9mcm9udC1lbmQvV2ViS2l0LnFyYzoKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9xdC9J bWFnZUJ1ZmZlclF0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkltYWdlQnVmZmVyRGF0YTo6SW1h Z2VCdWZmZXJEYXRhKToKKyAgICAgICAgKFdlYkNvcmU6OkltYWdlQnVmZmVyOjpJbWFnZUJ1ZmZl cik6CisgICAgICAgIChXZWJDb3JlOjpJbWFnZUJ1ZmZlcjo6Y29udGV4dCk6CisgICAgICAgIChX ZWJDb3JlOjpJbWFnZUJ1ZmZlcjo6aW1hZ2UpOgorICAgICAgICAoV2ViQ29yZTo6SW1hZ2VCdWZm ZXI6OnRvRGF0YVVSTCk6CisKIDIwMDgtMTAtMzAgIERpcmsgU2NodWx6ZSAgPHZiczg1QGdteC5k ZT4KIAogICAgICAgICBSZXZpZXdlZCBieSBBbHAgVG9rZXIuCg==