blob: 755fdd610c4429c689bb29787d860b44e7988d0d (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
|
12c12
< set(QT_MIN_VERSION "5.14.0")
---
> set(QT_MIN_VERSION "5.12.9")
--- lokalize-20.08.1/CMakeLists.txt.old 2020-09-01 06:29:46.000000000 +0000
+++ lokalize-20.08.1/CMakeLists.txt 2020-09-17 15:42:19.559171111 +0000
@@ -9,7 +9,7 @@
project(lokalize VERSION ${RELEASE_SERVICE_VERSION})
-set(QT_MIN_VERSION "5.14.0")
+set(QT_MIN_VERSION "5.12.9")
set(KF5_MIN_VERSION "5.71.0")
# search packages used
--- lokalize-20.08.1/src/glossary/glossaryview.cpp.old 2020-08-31 19:21:04.000000000 +0000
+++ lokalize-20.08.1/src/glossary/glossaryview.cpp 2020-09-18 02:08:40.084992048 +0000
@@ -166,7 +166,7 @@
bool found = false;
//m_flowLayout->setEnabled(false);
- foreach (const QByteArray& termId, QSet<QByteArray>(termIds.begin(), termIds.end())) {
+ foreach (const QByteArray& termId, termIds.toSet()) {
// now check which of them are really hits...
foreach (const QString& enTerm, glossary.terms(termId, sourceLangCode)) {
// ...and if so, which part of termEn list we must thank for match ...
--- lokalize-20.08.1/src/tests/projectmodeltest.cpp.old 2020-08-31 19:21:04.000000000 +0000
+++ lokalize-20.08.1/src/tests/projectmodeltest.cpp 2020-09-18 02:19:03.517276672 +0000
@@ -87,7 +87,7 @@
model->setUrl(QUrl::fromLocalFile(QFINDTESTDATA("data/dir-halftranslated")), {});
// Wait for signal
- while (!loaded.loadRelaxed()) {
+ while (!loaded.load()) {
QCoreApplication::processEvents();
}
|
