29362 2009-09-18 00:27:39 -0700 Qt build error in GraphicsContextQt.cpp (qt 4.4.0) 2009-10-06 04:27:58 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) PC Linux RESOLVED FIXED Qt P2 Normal --- 0 ukai webkit-unassigned ariya.hidayat commit-queue eric oldest_to_newest 148027 0 ukai 2009-09-18 00:27:39 -0700 ../../../WebCore/platform/graphics/qt/GraphicsContextQt.cpp: In member function ‘void WebCore::GraphicsContext::drawRect(const WebCore::IntRect&)’: ../../../WebCore/platform/graphics/qt/GraphicsContextQt.cpp:425: error: no match ing function for call to ‘QPainter::fillRect(WebCore::IntRect&, WebCore::Color&) ’ /usr/include/qt4/QtGui/qpainter.h:382: note: candidates are: void QPainter::fillRect(const QRectF&, const QBrush&) /usr/include/qt4/QtGui/qpainter.h:714: note: void QPainter::fillRect(int, int, int, int, const QBrush&) /usr/include/qt4/QtGui/qpainter.h:384: note: void QPainter::fillRect(const QRect&, const QBrush&) ../../../WebCore/platform/graphics/qt/GraphicsContextQt.cpp: In member function ‘void WebCore::GraphicsContext::drawLine(const WebCore::IntPoint&, const WebCore::IntPoint&)’: ../../../WebCore/platform/graphics/qt/GraphicsContextQt.cpp:485: error: no matching function for call to ‘QPainter::fillRect(WebCore::FloatRect, WebCore::Color&)’ /usr/include/qt4/QtGui/qpainter.h:382: note: candidates are: void QPainter::fillRect(const QRectF&, const QBrush&) /usr/include/qt4/QtGui/qpainter.h:714: note: void QPainter::fillRect(int, int, int, int, const QBrush&) /usr/include/qt4/QtGui/qpainter.h:384: note: void QPainter::fillRect(const QRect&, const QBrush&) ../../../WebCore/platform/graphics/qt/GraphicsContextQt.cpp:486: error: no matching function for call to ‘QPainter::fillRect(WebCore::FloatRect, WebCore::Color&)’ /usr/include/qt4/QtGui/qpainter.h:382: note: candidates are: void QPainter::fillRect(const QRectF&, const QBrush&) /usr/include/qt4/QtGui/qpainter.h:714: note: void QPainter::fillRect(int, int, int, int, const QBrush&) /usr/include/qt4/QtGui/qpainter.h:384: note: void QPainter::fillRect(const QRect&, const QBrush&) ../../../WebCore/platform/graphics/qt/GraphicsContextQt.cpp:488: error: no matching function for call to ‘QPainter::fillRect(WebCore::FloatRect, WebCore::Color&)’ /usr/include/qt4/QtGui/qpainter.h:382: note: candidates are: void QPainter::fillRect(const QRectF&, const QBrush&) /usr/include/qt4/QtGui/qpainter.h:714: note: void QPainter::fillRect(int, int, int, int, const QBrush&) /usr/include/qt4/QtGui/qpainter.h:384: note: void QPainter::fillRect(const QRect&, const QBrush&) ../../../WebCore/platform/graphics/qt/GraphicsContextQt.cpp:489: error: no matching function for call to ‘QPainter::fillRect(WebCore::FloatRect, WebCore::Color&)’ /usr/include/qt4/QtGui/qpainter.h:382: note: candidates are: void QPainter::fillRect(const QRectF&, const QBrush&) /usr/include/qt4/QtGui/qpainter.h:714: note: void QPainter::fillRect(int, int, int, int, const QBrush&) /usr/include/qt4/QtGui/qpainter.h:384: note: void QPainter::fillRect(const QRect&, const QBrush&) ../../../WebCore/platform/graphics/qt/GraphicsContextQt.cpp: In function ‘void WebCore::drawBorderlessRectShadow(WebCore::GraphicsContext*, QPainter*, const WebCore::FloatRect&)’: ../../../WebCore/platform/graphics/qt/GraphicsContextQt.cpp:721: error: no matching function for call to ‘QPainter::fillRect(WebCore::FloatRect&, WebCore::Color&)’ /usr/include/qt4/QtGui/qpainter.h:382: note: candidates are: void QPainter::fillRect(const QRectF&, const QBrush&) /usr/include/qt4/QtGui/qpainter.h:714: note: void QPainter::fillRect(int, int, int, int, const QBrush&) /usr/include/qt4/QtGui/qpainter.h:384: note: void QPainter::fillRect(const QRect&, const QBrush&) make[1]: *** [obj/release/GraphicsContextQt.o] Error 1 148028 1 ukai 2009-09-18 00:32:03 -0700 gcc version 4.2.4 (Ubuntu 4.2.4-1ubuntu4) 148029 2 39752 ukai 2009-09-18 00:35:18 -0700 Created attachment 39752 Qt build fix --- 2 files changed, 18 insertions(+), 6 deletions(-) 148254 3 39752 eric 2009-09-18 11:36:08 -0700 Comment on attachment 39752 Qt build fix This looks fine, but you should explain why this is needed in the ChangeLog. It looks like QBrush(QPen) was marked as explicit in 4.4? Please add some explanation to the ChangeLog on landing. 149642 4 40040 ukai 2009-09-23 20:18:56 -0700 Created attachment 40040 Qt build fix 149811 5 eric 2009-09-24 13:25:03 -0700 I have no idea what this sentence means: 8 In Qt 4.4, QBrush constructor that takes QColor was added additional 9 default parameter Qt::BrushStyle, so that WebCore::Color isn't 10 converted as QBrush implicitly. 149812 6 39752 eric 2009-09-24 13:25:40 -0700 Comment on attachment 39752 Qt build fix Clearing r+ on this old patch now that a new one has been posted. 150003 7 40040 ariya.hidayat 2009-09-25 07:16:30 -0700 Comment on attachment 40040 Qt build fix The idea is good, the implementation needs some tweak. > + In Qt 4.4, QBrush constructor that takes QColor was added additional > + default parameter Qt::BrushStyle, so that WebCore::Color isn't > + converted as QBrush implicitly. Actually, it's more like "In Qt 4.5, a new function QPainter::fillRect(QRect, QColor) is introduced". The idea is to speed up solid color fill, because we can avoid the rather expensive construction of QBrush. > - p->fillRect(shadowRect, shadowColor); > + p->fillRect(shadowRect, QBrush(shadowColor)); And therefore the right fix should be QColor(shadowColor). Otherwise, we keep falling back to use QBrush, thereby cancelling out the intended optimization. 150472 8 40222 ukai 2009-09-28 01:37:31 -0700 Created attachment 40222 Use QColor(shadowColor) instead of QBrush(shadowColor) 150473 9 ukai 2009-09-28 01:38:50 -0700 Thanks for review! (In reply to comment #7) > (From update of attachment 40040 [details]) > The idea is good, the implementation needs some tweak. > > > + In Qt 4.4, QBrush constructor that takes QColor was added additional > > + default parameter Qt::BrushStyle, so that WebCore::Color isn't > > + converted as QBrush implicitly. > > Actually, it's more like "In Qt 4.5, a new function QPainter::fillRect(QRect, > QColor) is introduced". > The idea is to speed up solid color fill, because we can avoid the rather > expensive construction of QBrush. Ah, I see. > > > - p->fillRect(shadowRect, shadowColor); > > + p->fillRect(shadowRect, QBrush(shadowColor)); > > And therefore the right fix should be QColor(shadowColor). Otherwise, we keep > falling back to use QBrush, thereby cancelling out the intended optimization. Fixed to use QColor(shadowColor) instead of QBrush(shadowColor). 150586 10 40222 eric 2009-09-28 11:44:59 -0700 Comment on attachment 40222 Use QColor(shadowColor) instead of QBrush(shadowColor) I'm confused. http://trac.webkit.org/browser/trunk/WebCore/platform/graphics/Color.h#L111 Transparently converts to QColor, and not to QBrush, right? So why is an explicit conversion necessary here? Shouldn't operator QColor automatically be called? Or maybe I'm incorrect in my understanding of the QColor operator(). I still don't understand why this is necessary? Won't the existing code already do the right thing on either Qt 4.4 or 4.5? 150587 11 eric 2009-09-28 11:47:32 -0700 Clearly it's already correctly calling "QRect IntRect::operator()" correctly, no? http://trac.webkit.org/browser/trunk/WebCore/platform/graphics/IntRect.h#L145 I'm confused as to why we need to be explicit about calling QColor() here for C++ to understand this. 150792 12 ukai 2009-09-28 20:55:49 -0700 (In reply to comment #11) > Clearly it's already correctly calling "QRect IntRect::operator()" correctly, > no? > http://trac.webkit.org/browser/trunk/WebCore/platform/graphics/IntRect.h#L145 > > I'm confused as to why we need to be explicit about calling QColor() here for > C++ to understand this. Here, fillRect wants a QBrush and we passes a WebCore::Color. So compiler needs to find QColor to convert from WebCore::Color to QBrush, which is different situation from IntRect to QRect (no intermediate class needed). (In Qt 4.5, fillRect takes a QColor, so it works fine?) I'm not sure, but this is the explanation? 151174 13 eric 2009-09-29 23:50:59 -0700 I could believe that the compiler wouldn't understand a two-level "cast" like that. But it seems it already is, no? Isn't the QColor variant new? Or is this bug about a build error in versions of Qt before the Qcolor version of the function existed? 151193 14 ukai 2009-09-30 02:04:27 -0700 (In reply to comment #13) > I could believe that the compiler wouldn't understand a two-level "cast" like > that. But it seems it already is, no? Isn't the QColor variant new? Or is > this bug about a build error in versions of Qt before the Qcolor version of the > function existed? Hmm. I encountered this bug when I first tried to compile for Qt. It seems webkit r48220 removed QColor, and broke build on Qt 4.4? Does Qt port requires Qt 4.5 or later now? 152637 15 ariya.hidayat 2009-10-06 03:19:02 -0700 Eric: it's likely because there is no conversion from WebCore::Color to QBrush (needed for fillRect in Qt < 4.5), and for which the compiler seems unable to find by itself. Another alternative patch will be to add WebCore::Color to QBrush explicit conversion. But then, I'm not sure which code path the compiler will take in 4.5 (either it will be confused due to the ambiguity or take the "slower" one, i.e. QBrush). 152652 16 40222 commit-queue 2009-10-06 04:27:54 -0700 Comment on attachment 40222 Use QColor(shadowColor) instead of QBrush(shadowColor) Clearing flags on attachment: 40222 Committed r49165: <http://trac.webkit.org/changeset/49165> 152653 17 commit-queue 2009-10-06 04:27:58 -0700 All reviewed patches have been landed. Closing bug. 39752 2009-09-18 00:35:18 -0700 2009-09-24 13:25:40 -0700 Qt build fix bug-29362-20090918163516.patch text/plain 2758 ukai ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg NGExMGNjNC4uNzViNWI3MyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNSBAQAorMjAwOS0wOS0xOCAgRnVtaXRvc2hpIFVr YWkgIDx1a2FpQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBRdCBidWlsZCBmaXguCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yOTM2MgorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhp Y3MvcXQvR3JhcGhpY3NDb250ZXh0UXQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6R3JhcGhpY3ND b250ZXh0OjpkcmF3UmVjdCk6CisgICAgICAgIChXZWJDb3JlOjpHcmFwaGljc0NvbnRleHQ6OmRy YXdMaW5lKToKKyAgICAgICAgKFdlYkNvcmU6OmRyYXdCb3JkZXJsZXNzUmVjdFNoYWRvdyk6CisK IDIwMDktMDktMTcgIEFsYmVydCBKLiBXb25nICA8YWp3b25nQGNocm9taXVtLm9yZz4KIAogICAg ICAgICBSZXZpZXdlZCBieSBEYXZpZCBMZXZpbi4KZGlmZiAtLWdpdCBhL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvcXQvR3JhcGhpY3NDb250ZXh0UXQuY3BwIGIvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9xdC9HcmFwaGljc0NvbnRleHRRdC5jcHAKaW5kZXggMmYzNjdmYS4uYmJjNWYzZiAx MDA2NDQKLS0tIGEvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9xdC9HcmFwaGljc0NvbnRleHRR dC5jcHAKKysrIGIvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9xdC9HcmFwaGljc0NvbnRleHRR dC5jcHAKQEAgLTQyMiw3ICs0MjIsNyBAQCB2b2lkIEdyYXBoaWNzQ29udGV4dDo6ZHJhd1JlY3Qo Y29uc3QgSW50UmVjdCYgcmVjdCkKICAgICAgICAgSW50UmVjdCBzaGFkb3dSZWN0ID0gcmVjdDsK ICAgICAgICAgc2hhZG93UmVjdC5tb3ZlKHNoYWRvd1NpemUud2lkdGgoKSwgc2hhZG93U2l6ZS5o ZWlnaHQoKSk7CiAgICAgICAgIHNoYWRvd1JlY3QuaW5mbGF0ZShzdGF0aWNfY2FzdDxpbnQ+KHAt PnBlbigpLndpZHRoRigpKSk7Ci0gICAgICAgIHAtPmZpbGxSZWN0KHNoYWRvd1JlY3QsIHNoYWRv d0NvbG9yKTsKKyAgICAgICAgcC0+ZmlsbFJlY3Qoc2hhZG93UmVjdCwgUUJydXNoKHNoYWRvd0Nv bG9yKSk7CiAgICAgfQogCiAgICAgcC0+ZHJhd1JlY3QocmVjdCk7CkBAIC00ODIsMTEgKzQ4Miwx MSBAQCB2b2lkIEdyYXBoaWNzQ29udGV4dDo6ZHJhd0xpbmUoY29uc3QgSW50UG9pbnQmIHBvaW50 MSwgY29uc3QgSW50UG9pbnQmIHBvaW50MikKICAgICAgICAgLy8gRG8gYSByZWN0IGZpbGwgb2Yg b3VyIGVuZHBvaW50cy4gIFRoaXMgZW5zdXJlcyB3ZSBhbHdheXMgaGF2ZSB0aGUKICAgICAgICAg Ly8gYXBwZWFyYW5jZSBvZiBiZWluZyBhIGJvcmRlci4gIFdlIHRoZW4gZHJhdyB0aGUgYWN0dWFs IGRvdHRlZC9kYXNoZWQgbGluZS4KICAgICAgICAgaWYgKGlzVmVydGljYWxMaW5lKSB7Ci0gICAg ICAgICAgICBwLT5maWxsUmVjdChGbG9hdFJlY3QocDEueCgpIC0gd2lkdGggLyAyLCBwMS55KCkg LSB3aWR0aCwgd2lkdGgsIHdpZHRoKSwgY29sb3IpOwotICAgICAgICAgICAgcC0+ZmlsbFJlY3Qo RmxvYXRSZWN0KHAyLngoKSAtIHdpZHRoIC8gMiwgcDIueSgpLCB3aWR0aCwgd2lkdGgpLCBjb2xv cik7CisgICAgICAgICAgICBwLT5maWxsUmVjdChGbG9hdFJlY3QocDEueCgpIC0gd2lkdGggLyAy LCBwMS55KCkgLSB3aWR0aCwgd2lkdGgsIHdpZHRoKSwgUUJydXNoKGNvbG9yKSk7CisgICAgICAg ICAgICBwLT5maWxsUmVjdChGbG9hdFJlY3QocDIueCgpIC0gd2lkdGggLyAyLCBwMi55KCksIHdp ZHRoLCB3aWR0aCksIFFCcnVzaChjb2xvcikpOwogICAgICAgICB9IGVsc2UgewotICAgICAgICAg ICAgcC0+ZmlsbFJlY3QoRmxvYXRSZWN0KHAxLngoKSAtIHdpZHRoLCBwMS55KCkgLSB3aWR0aCAv IDIsIHdpZHRoLCB3aWR0aCksIGNvbG9yKTsKLSAgICAgICAgICAgIHAtPmZpbGxSZWN0KEZsb2F0 UmVjdChwMi54KCksIHAyLnkoKSAtIHdpZHRoIC8gMiwgd2lkdGgsIHdpZHRoKSwgY29sb3IpOwor ICAgICAgICAgICAgcC0+ZmlsbFJlY3QoRmxvYXRSZWN0KHAxLngoKSAtIHdpZHRoLCBwMS55KCkg LSB3aWR0aCAvIDIsIHdpZHRoLCB3aWR0aCksIFFCcnVzaChjb2xvcikpOworICAgICAgICAgICAg cC0+ZmlsbFJlY3QoRmxvYXRSZWN0KHAyLngoKSwgcDIueSgpIC0gd2lkdGggLyAyLCB3aWR0aCwg d2lkdGgpLCBRQnJ1c2goY29sb3IpKTsKICAgICAgICAgfQogCiAgICAgICAgIC8vIEV4YW1wbGU6 IDgwIHBpeGVscyB3aXRoIGEgd2lkdGggb2YgMzAgcGl4ZWxzLgpAQCAtNzE4LDcgKzcxOCw3IEBA IHN0YXRpYyBpbmxpbmUgdm9pZCBkcmF3Qm9yZGVybGVzc1JlY3RTaGFkb3coR3JhcGhpY3NDb250 ZXh0KiBjb250ZXh0LCBRUGFpbnRlcioKICAgICBpZiAoY29udGV4dC0+Z2V0U2hhZG93KHNoYWRv d1NpemUsIHNoYWRvd0JsdXIsIHNoYWRvd0NvbG9yKSkgewogICAgICAgICBGbG9hdFJlY3Qgc2hh ZG93UmVjdChyZWN0KTsKICAgICAgICAgc2hhZG93UmVjdC5tb3ZlKHNoYWRvd1NpemUud2lkdGgo KSwgc2hhZG93U2l6ZS5oZWlnaHQoKSk7Ci0gICAgICAgIHAtPmZpbGxSZWN0KHNoYWRvd1JlY3Qs IHNoYWRvd0NvbG9yKTsKKyAgICAgICAgcC0+ZmlsbFJlY3Qoc2hhZG93UmVjdCwgUUJydXNoKHNo YWRvd0NvbG9yKSk7CiAgICAgfQogfQ== 40040 2009-09-23 20:18:56 -0700 2009-09-28 01:37:26 -0700 Qt build fix bug-29362-20090924121854.patch text/plain 2941 ukai ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg MGMwZjZhMi4uOGVhYTZkNCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOSBAQAorMjAwOS0wOS0yMyAgRnVtaXRvc2hpIFVr YWkgIDx1a2FpQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBRdCBidWlsZCBmaXguCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yOTM2MgorCisgICAgICAgIEluIFF0IDQuNCwgUUJydXNo IGNvbnN0cnVjdG9yIHRoYXQgdGFrZXMgUUNvbG9yIHdhcyBhZGRlZCBhZGRpdGlvbmFsCisgICAg ICAgIGRlZmF1bHQgcGFyYW1ldGVyIFF0OjpCcnVzaFN0eWxlLCBzbyB0aGF0IFdlYkNvcmU6OkNv bG9yIGlzbid0CisgICAgICAgIGNvbnZlcnRlZCBhcyBRQnJ1c2ggaW1wbGljaXRseS4KKworICAg ICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL3F0L0dyYXBoaWNzQ29udGV4dFF0LmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OkdyYXBoaWNzQ29udGV4dDo6ZHJhd1JlY3QpOgorICAgICAgICAoV2ViQ29y ZTo6R3JhcGhpY3NDb250ZXh0OjpkcmF3TGluZSk6CisgICAgICAgIChXZWJDb3JlOjpkcmF3Qm9y ZGVybGVzc1JlY3RTaGFkb3cpOgorCiAyMDA5LTA5LTIzICBTYW0gV2VpbmlnICA8c2FtQHdlYmtp dC5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgQWRhbSBCYXJ0aC4KZGlmZiAtLWdpdCBhL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvcXQvR3JhcGhpY3NDb250ZXh0UXQuY3BwIGIvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9xdC9HcmFwaGljc0NvbnRleHRRdC5jcHAKaW5kZXggMmYzNjdm YS4uYmJjNWYzZiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9xdC9HcmFw aGljc0NvbnRleHRRdC5jcHAKKysrIGIvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9xdC9HcmFw aGljc0NvbnRleHRRdC5jcHAKQEAgLTQyMiw3ICs0MjIsNyBAQCB2b2lkIEdyYXBoaWNzQ29udGV4 dDo6ZHJhd1JlY3QoY29uc3QgSW50UmVjdCYgcmVjdCkKICAgICAgICAgSW50UmVjdCBzaGFkb3dS ZWN0ID0gcmVjdDsKICAgICAgICAgc2hhZG93UmVjdC5tb3ZlKHNoYWRvd1NpemUud2lkdGgoKSwg c2hhZG93U2l6ZS5oZWlnaHQoKSk7CiAgICAgICAgIHNoYWRvd1JlY3QuaW5mbGF0ZShzdGF0aWNf Y2FzdDxpbnQ+KHAtPnBlbigpLndpZHRoRigpKSk7Ci0gICAgICAgIHAtPmZpbGxSZWN0KHNoYWRv d1JlY3QsIHNoYWRvd0NvbG9yKTsKKyAgICAgICAgcC0+ZmlsbFJlY3Qoc2hhZG93UmVjdCwgUUJy dXNoKHNoYWRvd0NvbG9yKSk7CiAgICAgfQogCiAgICAgcC0+ZHJhd1JlY3QocmVjdCk7CkBAIC00 ODIsMTEgKzQ4MiwxMSBAQCB2b2lkIEdyYXBoaWNzQ29udGV4dDo6ZHJhd0xpbmUoY29uc3QgSW50 UG9pbnQmIHBvaW50MSwgY29uc3QgSW50UG9pbnQmIHBvaW50MikKICAgICAgICAgLy8gRG8gYSBy ZWN0IGZpbGwgb2Ygb3VyIGVuZHBvaW50cy4gIFRoaXMgZW5zdXJlcyB3ZSBhbHdheXMgaGF2ZSB0 aGUKICAgICAgICAgLy8gYXBwZWFyYW5jZSBvZiBiZWluZyBhIGJvcmRlci4gIFdlIHRoZW4gZHJh dyB0aGUgYWN0dWFsIGRvdHRlZC9kYXNoZWQgbGluZS4KICAgICAgICAgaWYgKGlzVmVydGljYWxM aW5lKSB7Ci0gICAgICAgICAgICBwLT5maWxsUmVjdChGbG9hdFJlY3QocDEueCgpIC0gd2lkdGgg LyAyLCBwMS55KCkgLSB3aWR0aCwgd2lkdGgsIHdpZHRoKSwgY29sb3IpOwotICAgICAgICAgICAg cC0+ZmlsbFJlY3QoRmxvYXRSZWN0KHAyLngoKSAtIHdpZHRoIC8gMiwgcDIueSgpLCB3aWR0aCwg d2lkdGgpLCBjb2xvcik7CisgICAgICAgICAgICBwLT5maWxsUmVjdChGbG9hdFJlY3QocDEueCgp IC0gd2lkdGggLyAyLCBwMS55KCkgLSB3aWR0aCwgd2lkdGgsIHdpZHRoKSwgUUJydXNoKGNvbG9y KSk7CisgICAgICAgICAgICBwLT5maWxsUmVjdChGbG9hdFJlY3QocDIueCgpIC0gd2lkdGggLyAy LCBwMi55KCksIHdpZHRoLCB3aWR0aCksIFFCcnVzaChjb2xvcikpOwogICAgICAgICB9IGVsc2Ug ewotICAgICAgICAgICAgcC0+ZmlsbFJlY3QoRmxvYXRSZWN0KHAxLngoKSAtIHdpZHRoLCBwMS55 KCkgLSB3aWR0aCAvIDIsIHdpZHRoLCB3aWR0aCksIGNvbG9yKTsKLSAgICAgICAgICAgIHAtPmZp bGxSZWN0KEZsb2F0UmVjdChwMi54KCksIHAyLnkoKSAtIHdpZHRoIC8gMiwgd2lkdGgsIHdpZHRo KSwgY29sb3IpOworICAgICAgICAgICAgcC0+ZmlsbFJlY3QoRmxvYXRSZWN0KHAxLngoKSAtIHdp ZHRoLCBwMS55KCkgLSB3aWR0aCAvIDIsIHdpZHRoLCB3aWR0aCksIFFCcnVzaChjb2xvcikpOwor ICAgICAgICAgICAgcC0+ZmlsbFJlY3QoRmxvYXRSZWN0KHAyLngoKSwgcDIueSgpIC0gd2lkdGgg LyAyLCB3aWR0aCwgd2lkdGgpLCBRQnJ1c2goY29sb3IpKTsKICAgICAgICAgfQogCiAgICAgICAg IC8vIEV4YW1wbGU6IDgwIHBpeGVscyB3aXRoIGEgd2lkdGggb2YgMzAgcGl4ZWxzLgpAQCAtNzE4 LDcgKzcxOCw3IEBAIHN0YXRpYyBpbmxpbmUgdm9pZCBkcmF3Qm9yZGVybGVzc1JlY3RTaGFkb3co R3JhcGhpY3NDb250ZXh0KiBjb250ZXh0LCBRUGFpbnRlcioKICAgICBpZiAoY29udGV4dC0+Z2V0 U2hhZG93KHNoYWRvd1NpemUsIHNoYWRvd0JsdXIsIHNoYWRvd0NvbG9yKSkgewogICAgICAgICBG bG9hdFJlY3Qgc2hhZG93UmVjdChyZWN0KTsKICAgICAgICAgc2hhZG93UmVjdC5tb3ZlKHNoYWRv d1NpemUud2lkdGgoKSwgc2hhZG93U2l6ZS5oZWlnaHQoKSk7Ci0gICAgICAgIHAtPmZpbGxSZWN0 KHNoYWRvd1JlY3QsIHNoYWRvd0NvbG9yKTsKKyAgICAgICAgcC0+ZmlsbFJlY3Qoc2hhZG93UmVj dCwgUUJydXNoKHNoYWRvd0NvbG9yKSk7CiAgICAgfQogfQ== 40222 2009-09-28 01:37:31 -0700 2009-10-06 04:27:54 -0700 Use QColor(shadowColor) instead of QBrush(shadowColor) bug-29362-20090928173730.patch text/plain 3026 ukai ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg MDM2ZmI1ZS4uNGRkMGU0ZSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMCBAQAorMjAwOS0wOS0yOCAgRnVtaXRvc2hpIFVr YWkgIDx1a2FpQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBRdCBidWlsZCBmaXguCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yOTM2Mi4KKworICAgICAgICBJbiBRdCA0LjUsIGEgbmV3 IGZ1bmN0aW9uIFFQYWludGVyOjpmaWxsUmVjdChRUmVjdCwgUUNvbG9yKSBpcworICAgICAgICBp bnRyb2R1Y2VkIHRvIGF2b2lkIHRoZSBleHBlbnNpdmUgY29uc3RydWN0aW9uIG9mIFFCcnVzaC4K KyAgICAgICAgQnkgY2FzdGluZyBXZWJDb3JlOjpDb2xvciB0byBRQ29sb3IsIHdlIGNhbiBjb21w aWxlIG9uIFF0IDQuNAorICAgICAgICBhbmQgdXNlIG9wdGltaXphdGlvbiBmb3Igc29saWQgY29s b3IgZmlsbCBpbiBRdCA0LjUuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9xdC9HcmFw aGljc0NvbnRleHRRdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpHcmFwaGljc0NvbnRleHQ6OmRy YXdSZWN0KToKKyAgICAgICAgKFdlYkNvcmU6OkdyYXBoaWNzQ29udGV4dDo6ZHJhd0xpbmUpOgor ICAgICAgICAoV2ViQ29yZTo6ZHJhd0JvcmRlcmxlc3NSZWN0U2hhZG93KToKKwogMjAwOS0wOS0y NyAgU2FtIFdlaW5pZyAgPHNhbUB3ZWJraXQub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IERh biBCZXJuc3RlaW4uCmRpZmYgLS1naXQgYS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3F0L0dy YXBoaWNzQ29udGV4dFF0LmNwcCBiL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvcXQvR3JhcGhp Y3NDb250ZXh0UXQuY3BwCmluZGV4IDJmMzY3ZmEuLjIyOWE5ZWIgMTAwNjQ0Ci0tLSBhL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvcXQvR3JhcGhpY3NDb250ZXh0UXQuY3BwCisrKyBiL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvcXQvR3JhcGhpY3NDb250ZXh0UXQuY3BwCkBAIC00MjIsNyAr NDIyLDcgQEAgdm9pZCBHcmFwaGljc0NvbnRleHQ6OmRyYXdSZWN0KGNvbnN0IEludFJlY3QmIHJl Y3QpCiAgICAgICAgIEludFJlY3Qgc2hhZG93UmVjdCA9IHJlY3Q7CiAgICAgICAgIHNoYWRvd1Jl Y3QubW92ZShzaGFkb3dTaXplLndpZHRoKCksIHNoYWRvd1NpemUuaGVpZ2h0KCkpOwogICAgICAg ICBzaGFkb3dSZWN0LmluZmxhdGUoc3RhdGljX2Nhc3Q8aW50PihwLT5wZW4oKS53aWR0aEYoKSkp OwotICAgICAgICBwLT5maWxsUmVjdChzaGFkb3dSZWN0LCBzaGFkb3dDb2xvcik7CisgICAgICAg IHAtPmZpbGxSZWN0KHNoYWRvd1JlY3QsIFFDb2xvcihzaGFkb3dDb2xvcikpOwogICAgIH0KIAog ICAgIHAtPmRyYXdSZWN0KHJlY3QpOwpAQCAtNDgyLDExICs0ODIsMTEgQEAgdm9pZCBHcmFwaGlj c0NvbnRleHQ6OmRyYXdMaW5lKGNvbnN0IEludFBvaW50JiBwb2ludDEsIGNvbnN0IEludFBvaW50 JiBwb2ludDIpCiAgICAgICAgIC8vIERvIGEgcmVjdCBmaWxsIG9mIG91ciBlbmRwb2ludHMuICBU aGlzIGVuc3VyZXMgd2UgYWx3YXlzIGhhdmUgdGhlCiAgICAgICAgIC8vIGFwcGVhcmFuY2Ugb2Yg YmVpbmcgYSBib3JkZXIuICBXZSB0aGVuIGRyYXcgdGhlIGFjdHVhbCBkb3R0ZWQvZGFzaGVkIGxp bmUuCiAgICAgICAgIGlmIChpc1ZlcnRpY2FsTGluZSkgewotICAgICAgICAgICAgcC0+ZmlsbFJl Y3QoRmxvYXRSZWN0KHAxLngoKSAtIHdpZHRoIC8gMiwgcDEueSgpIC0gd2lkdGgsIHdpZHRoLCB3 aWR0aCksIGNvbG9yKTsKLSAgICAgICAgICAgIHAtPmZpbGxSZWN0KEZsb2F0UmVjdChwMi54KCkg LSB3aWR0aCAvIDIsIHAyLnkoKSwgd2lkdGgsIHdpZHRoKSwgY29sb3IpOworICAgICAgICAgICAg cC0+ZmlsbFJlY3QoRmxvYXRSZWN0KHAxLngoKSAtIHdpZHRoIC8gMiwgcDEueSgpIC0gd2lkdGgs IHdpZHRoLCB3aWR0aCksIFFDb2xvcihjb2xvcikpOworICAgICAgICAgICAgcC0+ZmlsbFJlY3Qo RmxvYXRSZWN0KHAyLngoKSAtIHdpZHRoIC8gMiwgcDIueSgpLCB3aWR0aCwgd2lkdGgpLCBRQ29s b3IoY29sb3IpKTsKICAgICAgICAgfSBlbHNlIHsKLSAgICAgICAgICAgIHAtPmZpbGxSZWN0KEZs b2F0UmVjdChwMS54KCkgLSB3aWR0aCwgcDEueSgpIC0gd2lkdGggLyAyLCB3aWR0aCwgd2lkdGgp LCBjb2xvcik7Ci0gICAgICAgICAgICBwLT5maWxsUmVjdChGbG9hdFJlY3QocDIueCgpLCBwMi55 KCkgLSB3aWR0aCAvIDIsIHdpZHRoLCB3aWR0aCksIGNvbG9yKTsKKyAgICAgICAgICAgIHAtPmZp bGxSZWN0KEZsb2F0UmVjdChwMS54KCkgLSB3aWR0aCwgcDEueSgpIC0gd2lkdGggLyAyLCB3aWR0 aCwgd2lkdGgpLCBRQ29sb3IoY29sb3IpKTsKKyAgICAgICAgICAgIHAtPmZpbGxSZWN0KEZsb2F0 UmVjdChwMi54KCksIHAyLnkoKSAtIHdpZHRoIC8gMiwgd2lkdGgsIHdpZHRoKSwgUUNvbG9yKGNv bG9yKSk7CiAgICAgICAgIH0KIAogICAgICAgICAvLyBFeGFtcGxlOiA4MCBwaXhlbHMgd2l0aCBh IHdpZHRoIG9mIDMwIHBpeGVscy4KQEAgLTcxOCw3ICs3MTgsNyBAQCBzdGF0aWMgaW5saW5lIHZv aWQgZHJhd0JvcmRlcmxlc3NSZWN0U2hhZG93KEdyYXBoaWNzQ29udGV4dCogY29udGV4dCwgUVBh aW50ZXIqCiAgICAgaWYgKGNvbnRleHQtPmdldFNoYWRvdyhzaGFkb3dTaXplLCBzaGFkb3dCbHVy LCBzaGFkb3dDb2xvcikpIHsKICAgICAgICAgRmxvYXRSZWN0IHNoYWRvd1JlY3QocmVjdCk7CiAg ICAgICAgIHNoYWRvd1JlY3QubW92ZShzaGFkb3dTaXplLndpZHRoKCksIHNoYWRvd1NpemUuaGVp Z2h0KCkpOwotICAgICAgICBwLT5maWxsUmVjdChzaGFkb3dSZWN0LCBzaGFkb3dDb2xvcik7Cisg ICAgICAgIHAtPmZpbGxSZWN0KHNoYWRvd1JlY3QsIFFDb2xvcihzaGFkb3dDb2xvcikpOwogICAg IH0KIH0=