diff options
| author | David Schulz <david.schulz@qt.io> | 2023-08-08 07:33:32 +0200 |
|---|---|---|
| committer | David Schulz <david.schulz@qt.io> | 2023-08-08 07:34:26 +0200 |
| commit | 0ece08c9dcac50e2adf7f9aa36ee8d5779c1aeea (patch) | |
| tree | bdf9b12b3fbdb0e4dfd16fd4e190281207a37635 /src | |
| parent | 66929b96a492e950c96999d343adef0f7e3fdfba (diff) | |
| parent | 467d94b7f402eb7b60e128f820893a14cf1fb91b (diff) | |
Merge remote-tracking branch 'origin/11.0'
Change-Id: Iad820911996f8daff6ce63b4f0267bd15d35d176
Diffstat (limited to 'src')
| -rw-r--r-- | src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp | 14 | ||||
| -rw-r--r-- | src/plugins/texteditor/textdocumentlayout.cpp | 2 |
2 files changed, 13 insertions, 3 deletions
diff --git a/src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp b/src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp index 4579ccdc94..2880caaccd 100644 --- a/src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp +++ b/src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp @@ -661,9 +661,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()); diff --git a/src/plugins/texteditor/textdocumentlayout.cpp b/src/plugins/texteditor/textdocumentlayout.cpp index 9caa5e5953..6efa145aac 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 { |