c0e685509d
* Wed Aug 19 2020 Kevin Kofler <Kevin@tigcc.ticalc.org> - 4.8.7-57 - Hardcode the compiler version in the build key once and for all It does not make sense to have to mess with the build key again and again at each GCC major version. GCC major versions no longer carry any ABI meaning as in the days of GCC 2.95 vs. 3.0. And nobody really uses a GCC older than 4.0 anymore. So we just hardcode the compiler version in the build key to "4". See also my corresponding Qt 3 patch from January 2019.
27 lines
1.3 KiB
Diff
27 lines
1.3 KiB
Diff
diff --git a/src/3rdparty/webkit/Source/WebCore/html/HTMLImageElement.cpp b/src/3rdparty/webkit/Source/WebCore/html/HTMLImageElement.cpp
|
|
index d66075e4..b51a27ad 100644
|
|
--- a/src/3rdparty/webkit/Source/WebCore/html/HTMLImageElement.cpp
|
|
+++ b/src/3rdparty/webkit/Source/WebCore/html/HTMLImageElement.cpp
|
|
@@ -74,7 +74,7 @@ PassRefPtr<HTMLImageElement> HTMLImageElement::createForJSConstructor(Document*
|
|
RefPtr<HTMLImageElement> image = adoptRef(new HTMLImageElement(imgTag, document));
|
|
if (optionalWidth)
|
|
image->setWidth(*optionalWidth);
|
|
- if (optionalHeight > 0)
|
|
+ if (optionalHeight != 0)
|
|
image->setHeight(*optionalHeight);
|
|
return image.release();
|
|
}
|
|
diff --git a/tools/linguist/linguist/messagemodel.cpp b/tools/linguist/linguist/messagemodel.cpp
|
|
index 61c5389f..8d43d14b 100644
|
|
--- a/tools/linguist/linguist/messagemodel.cpp
|
|
+++ b/tools/linguist/linguist/messagemodel.cpp
|
|
@@ -183,7 +183,7 @@ static int calcMergeScore(const DataModel *one, const DataModel *two)
|
|
if (ContextItem *c = one->findContext(oc->context())) {
|
|
for (int j = 0; j < oc->messageCount(); ++j) {
|
|
MessageItem *m = oc->messageItem(j);
|
|
- if (c->findMessage(m->text(), m->comment()) >= 0)
|
|
+ if (c->findMessage(m->text(), m->comment()) != 0)
|
|
++inBoth;
|
|
}
|
|
}
|