From c4e15769ec43ff46ec08f639c1f09f9fd8872225 Mon Sep 17 00:00:00 2001
From: Cristian Adam <cristian.adam@qt.io>
Date: Fri, 4 Aug 2023 16:46:42 +0200
Subject: [PATCH 1/2] CMakePM: Fix AUTOUIC ui_header.h file code completion

The wrong header was reported to the extraCompiler when AUTOUIC was set.

Fixes: QTCREATORBUG-28787
Change-Id: I92d37e56ee5e45229545184e4f4911764834ed67
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
---
 .../cmakeprojectmanager/cmakebuildsystem.cpp       | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp b/src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp
index 9abb3597d15..329048b19cc 100644
--- a/src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp
@@ -654,9 +654,17 @@ FilePaths CMakeBuildSystem::filesGeneratedFrom(const FilePath &sourceFile) const
     FilePath generatedFilePath = buildConfiguration()->buildDirectory().resolvePath(relativePath);
 
     if (sourceFile.suffix() == "ui") {
-        generatedFilePath = generatedFilePath
-                                .pathAppended("ui_" + sourceFile.completeBaseName() + ".h");
-        return {generatedFilePath};
+        const QString generatedFileSuffix = "ui_" + sourceFile.completeBaseName() + ".h";
+
+        // If AUTOUIC reports the generated header file name, use that path
+        FilePaths generatedFilePaths = this->project()->files([generatedFileSuffix](const Node *n) {
+            return Project::GeneratedFiles(n) && n->filePath().endsWith(generatedFileSuffix);
+        });
+
+        if (generatedFilePaths.empty())
+            generatedFilePaths = {generatedFilePath.pathAppended(generatedFileSuffix)};
+
+        return generatedFilePaths;
     }
     if (sourceFile.suffix() == "scxml") {
         generatedFilePath = generatedFilePath.pathAppended(sourceFile.completeBaseName());

From 467d94b7f402eb7b60e128f820893a14cf1fb91b Mon Sep 17 00:00:00 2001
From: Orgad Shaneh <orgad.shaneh@audiocodes.com>
Date: Sat, 5 Aug 2023 23:51:00 +0300
Subject: [PATCH 2/2] TextEditor: Fix compilation without tests

Amends 66d49e6a53a9.

Change-Id: I09acb6d7e2aaf94cbf09242b7199ef5922f3e510
Reviewed-by: David Schulz <david.schulz@qt.io>
---
 src/plugins/texteditor/textdocumentlayout.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/plugins/texteditor/textdocumentlayout.cpp b/src/plugins/texteditor/textdocumentlayout.cpp
index a1a04e44479..d16befe9ab5 100644
--- a/src/plugins/texteditor/textdocumentlayout.cpp
+++ b/src/plugins/texteditor/textdocumentlayout.cpp
@@ -11,7 +11,9 @@
 #include <utils/temporarydirectory.h>
 
 #include <QDebug>
+#ifdef WITH_TESTS
 #include <QTest>
+#endif
 
 namespace TextEditor {