qt5-base-5.15.12

2023-12-29 22:12:12 +03:00
parent 22d190455e
commit fa1a8d5802
11 changed files with 163 additions and 76 deletions
@@ -104,3 +104,27 @@ index 6a45e57be..0ccf59f3c 100644
             set(qm_dep "${ts_stamp_file}")
         else()
             set(qm_dep "${_abs_FILE}")
+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 =