diff options
| author | CyberLeo <cyberleo@cyberleo.net> | 2021-07-22 21:02:46 -0500 |
|---|---|---|
| committer | CyberLeo <cyberleo@cyberleo.net> | 2021-07-22 21:02:46 -0500 |
| commit | 59068642667b2748b2f24d18c58b1d2fdfed7619 (patch) | |
| tree | deca4d721637676253ed1270f252f8d389286151 /user/lokalize/lts.patch | |
| parent | 4a177049e3d486da3f54d346d63ea80699c08b5b (diff) | |
| parent | 50e523c03bbcb6be1298e3dedb0441b7e47ab2eb (diff) | |
| download | packages-59068642667b2748b2f24d18c58b1d2fdfed7619.tar.gz packages-59068642667b2748b2f24d18c58b1d2fdfed7619.tar.bz2 packages-59068642667b2748b2f24d18c58b1d2fdfed7619.tar.xz packages-59068642667b2748b2f24d18c58b1d2fdfed7619.zip | |
Merge branch 'master' into kpartx
Diffstat (limited to 'user/lokalize/lts.patch')
| -rw-r--r-- | user/lokalize/lts.patch | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/user/lokalize/lts.patch b/user/lokalize/lts.patch new file mode 100644 index 000000000..755fdd610 --- /dev/null +++ b/user/lokalize/lts.patch @@ -0,0 +1,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(); + } + |