Rmys
62 lines
2.5 KiB
Diff
62 lines
2.5 KiB
Diff
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/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);
|
|
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
|
|
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 =
|