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
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
|
From 0dabe2dd2492553c33eb62f94712e668c3ec2d8c Mon Sep 17 00:00:00 2001
From: Albert Astals Cid <aacid@kde.org>
Date: Thu, 16 Jun 2022 09:52:54 +0200
Subject: [PATCH 1/3] Ensure FileAttributeSetTable is filled ordered so we get
the same qch file each time
This is part of making all of Qt reproducible
Change-Id: I1a4120cab6844887fb4b48edb238b8f1b55f0eb9
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
(cherry picked from commit 45dc9fa0221a3aadc9925eead484f012a62a6a58)
---
src/assistant/qhelpgenerator/helpgenerator.cpp | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/assistant/qhelpgenerator/helpgenerator.cpp b/src/assistant/qhelpgenerator/helpgenerator.cpp
index feab1e2d5..cbfb82507 100644
--- a/src/assistant/qhelpgenerator/helpgenerator.cpp
+++ b/src/assistant/qhelpgenerator/helpgenerator.cpp
@@ -445,7 +445,9 @@ bool HelpGeneratorPrivate::insertFiles(const QStringList &files, const QString &
if (filterSetId < 0)
return false;
++filterSetId;
- for (int attId : qAsConst(filterAtts)) {
+ QList<int> attValues = filterAtts.values();
+ std::sort(attValues.begin(), attValues.end());
+ for (int attId : qAsConst(attValues)) {
m_query->prepare(QLatin1String("INSERT INTO FileAttributeSetTable "
"VALUES(?, ?)"));
m_query->bindValue(0, filterSetId);
--
2.49.0
From 3512c3ac72abce0c44fdfe1657a8e32a8603efe7 Mon Sep 17 00:00:00 2001
From: Andreas Sturmlechner <asturm@gentoo.org>
Date: Fri, 18 Mar 2022 12:43:18 +0100
Subject: [PATCH 2/3] Drop superfluous network dependency from
assistant/{help,qhelpgenerator}.pro
Upstream's cmake equivalent commit is a9804f1a6496eccb79fb006fe4c9247eee1c4cec
See also:
https://codereview.qt-project.org/gitweb?p=qt%2Fqttools.git;a=commit;h=a9804f1a6496eccb79fb006fe4c9247eee1c4cec
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
---
src/assistant/help/help.pro | 1 -
src/assistant/qhelpgenerator/qhelpgenerator.pro | 2 +-
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/src/assistant/help/help.pro b/src/assistant/help/help.pro
index 800c4a38d..7556f451b 100644
--- a/src/assistant/help/help.pro
+++ b/src/assistant/help/help.pro
@@ -1,7 +1,6 @@
TARGET = QtHelp
QT = core-private gui widgets sql
-QT_PRIVATE = network
DEFINES += QHELP_LIB
diff --git a/src/assistant/qhelpgenerator/qhelpgenerator.pro b/src/assistant/qhelpgenerator/qhelpgenerator.pro
index bb22000c8..415347a00 100644
--- a/src/assistant/qhelpgenerator/qhelpgenerator.pro
+++ b/src/assistant/qhelpgenerator/qhelpgenerator.pro
@@ -1,4 +1,4 @@
-QT += network help-private
+QT += help-private
QTPLUGIN.platforms = qminimal
QTPLUGIN.sqldrivers = qsqlite
--
2.49.0
From e02ce0dfa692913bd5dcc50917f7e21f5a41cd2b Mon Sep 17 00:00:00 2001
From: Topi Reinio <topi.reinio@qt.io>
Date: Mon, 16 Jan 2023 09:31:24 +0000
Subject: [PATCH 3/3] qdoc: Ensure the generated temporary header file is
closed properly
Use the correct scope for the QFile object used for writing the
temporary header file; this ensures that the associated QTextStream
object is destroyed first and its contents flushed before destroying
the QFile, potentially leading to truncated writes to the file.
Pick-to: 6.5 6.4 6.2 5.15
Done-with: Simon Geisseler
Fixes: QTBUG-109614
Change-Id: Ic6a68c0b52219ce607a5116c730862ee0cb37f04
Reviewed-by: Luca Di Sera <luca.disera@qt.io>
(cherry picked from commit 0d8837c4103f941297adc3c76cb0ae6f67b6e34b)
---
src/qdoc/clangcodeparser.cpp | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/src/qdoc/clangcodeparser.cpp b/src/qdoc/clangcodeparser.cpp
index 539a603da..a41b99cec 100644
--- a/src/qdoc/clangcodeparser.cpp
+++ b/src/qdoc/clangcodeparser.cpp
@@ -1395,8 +1395,7 @@ void ClangCodeParser::buildPCH()
args_.push_back("-xc++");
CXTranslationUnit tu;
QString tmpHeader = pchFileDir_->path() + "/" + module;
- QFile tmpHeaderFile(tmpHeader);
- if (tmpHeaderFile.open(QIODevice::Text | QIODevice::WriteOnly)) {
+ { QFile tmpHeaderFile(tmpHeader); if (tmpHeaderFile.open(QIODevice::Text | QIODevice::WriteOnly)) {
QTextStream out(&tmpHeaderFile);
if (header.isEmpty()) {
for (auto it = allHeaders_.constKeyValueBegin();
@@ -1421,8 +1420,7 @@ void ClangCodeParser::buildPCH()
out << line << "\n";
}
}
- tmpHeaderFile.close();
- }
+ } }
if (printParsingErrors_ == 0)
qCWarning(lcQdoc) << "clang not printing errors; include paths were guessed";
CXErrorCode err =
--
2.49.0
|
