qt5-tools rebuild
This commit is contained in:
@@ -1,13 +1,15 @@
|
|||||||
diff --git a/src/linguist/shared/qm.cpp b/src/linguist/shared/qm.cpp
|
diff --git a/src/assistant/qhelpgenerator/helpgenerator.cpp b/src/assistant/qhelpgenerator/helpgenerator.cpp
|
||||||
index 288607824..8c3fc3faf 100644
|
index feab1e2d5..cbfb82507 100644
|
||||||
--- a/src/linguist/shared/qm.cpp
|
--- a/src/assistant/qhelpgenerator/helpgenerator.cpp
|
||||||
+++ b/src/linguist/shared/qm.cpp
|
+++ b/src/assistant/qhelpgenerator/helpgenerator.cpp
|
||||||
@@ -552,7 +552,7 @@ bool loadQM(Translator &translator, QIODevice &dev, ConversionData &cd)
|
@@ -445,7 +445,9 @@ bool HelpGeneratorPrivate::insertFiles(const QStringList &files, const QString &
|
||||||
goto end;
|
if (filterSetId < 0)
|
||||||
case Tag_Translation: {
|
return false;
|
||||||
int len = read32(m);
|
++filterSetId;
|
||||||
- if (len % 1) {
|
- for (int attId : qAsConst(filterAtts)) {
|
||||||
+ if (len & 1) {
|
+ QList<int> attValues = filterAtts.values();
|
||||||
cd.appendError(QLatin1String("QM-Format error"));
|
+ std::sort(attValues.begin(), attValues.end());
|
||||||
return false;
|
+ for (int attId : qAsConst(attValues)) {
|
||||||
}
|
m_query->prepare(QLatin1String("INSERT INTO FileAttributeSetTable "
|
||||||
|
"VALUES(?, ?)"));
|
||||||
|
m_query->bindValue(0, filterSetId);
|
||||||
|
|||||||
@@ -22,7 +22,7 @@
|
|||||||
<Dependency versionFrom="5.15.5">qt5-declarative-devel</Dependency>
|
<Dependency versionFrom="5.15.5">qt5-declarative-devel</Dependency>
|
||||||
</BuildDependencies>
|
</BuildDependencies>
|
||||||
<Patches>
|
<Patches>
|
||||||
<!--Patch level="1">qt_kde.patch</Patch-->
|
<Patch level="1">qt_kde.patch</Patch>
|
||||||
</Patches>
|
</Patches>
|
||||||
</Source>
|
</Source>
|
||||||
|
|
||||||
@@ -188,6 +188,13 @@
|
|||||||
</Package>
|
</Package>
|
||||||
|
|
||||||
<History>
|
<History>
|
||||||
|
<Update release="35">
|
||||||
|
<Date>2022-08-24</Date>
|
||||||
|
<Version>5.15.5</Version>
|
||||||
|
<Comment>Rebuild.</Comment>
|
||||||
|
<Name>Mustafa Cinasal</Name>
|
||||||
|
<Email>muscnsl@gmail.com</Email>
|
||||||
|
</Update>
|
||||||
<Update release="34">
|
<Update release="34">
|
||||||
<Date>2022-07-05</Date>
|
<Date>2022-07-05</Date>
|
||||||
<Version>5.15.5</Version>
|
<Version>5.15.5</Version>
|
||||||
|
|||||||
Reference in New Issue
Block a user