46027bea13
This updates the Spack QT package to enable building qt version 4 on MacOS. This includes the following changes to the qt package: * add version 4.8.7 * add option to build with or without shared libs * add options to disable tools, ssl, sql, and freetype support * add qt4-tools patch when building qt@4+tools * add option to build as a framework (only available on MacOS) * replace qt4-el-capitan patch with qt4-mac patch (which includes the edits from qt4-el-capitan) * apply qt4-pcre-include-conflict.patch only for version 4.8.6 (rather than all 4.x versions) * apply qt4-gcc-and-webkit.patch for 4.x versions before 4.8.7 and create a separate qt4-gcc-and-webkit-487.patch for version 4.8.7 * update patch function for qt@4 on MacOS to update configure variables relevant to Spack (e.g. PREFIX) * add option to build freetype with Spack, as a vendored dependency of QT, or not at all (default is to build with Spack) This includes the following edits outside of the qt package: * Update MacOS version utility function to return all parts of the Mac version (rather than just the first two) * gettext package: implement "libs" * python package: add gettext as a dependency
13 lines
648 B
Diff
13 lines
648 B
Diff
diff -r -u a/tools/linguist/linguist/messagemodel.cpp b/tools/linguist/linguist/messagemodel.cpp
|
|
--- a/tools/linguist/linguist/messagemodel.cpp 2015-05-07 10:14:39.000000000 -0400
|
|
+++ b/tools/linguist/linguist/messagemodel.cpp 2019-03-20 09:30:21.000000000 -0400
|
|
@@ -183,7 +183,7 @@
|
|
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()))
|
|
++inBoth;
|
|
}
|
|
}
|