1 --- qt-everywhere-opensource-src-4.8.7/src/3rdparty/webkit/Source/WebCore/html/HTMLImageElement.cpp~ 2015-05-07 16:14:47.000000000 +0200
2 +++ qt-everywhere-opensource-src-4.8.7/src/3rdparty/webkit/Source/WebCore/html/HTMLImageElement.cpp 2021-08-16 18:44:52.721008091 +0200
4 RefPtr<HTMLImageElement> image = adoptRef(new HTMLImageElement(imgTag, document));
6 image->setWidth(*optionalWidth);
7 - if (optionalHeight > 0)
8 + if (optionalHeight != 0)
9 image->setHeight(*optionalHeight);
10 return image.release();
12 --- qt-everywhere-opensource-src-4.8.7/tools/linguist/linguist/messagemodel.cpp~ 2015-05-07 16:14:39.000000000 +0200
13 +++ qt-everywhere-opensource-src-4.8.7/tools/linguist/linguist/messagemodel.cpp 2021-08-17 10:08:13.701417706 +0200
15 if (ContextItem *c = one->findContext(oc->context())) {
16 for (int j = 0; j < oc->messageCount(); ++j) {
17 MessageItem *m = oc->messageItem(j);
18 - if (c->findMessage(m->text(), m->comment()) >= 0)
19 + if (c->findMessage(m->text(), m->comment()) != 0)