From b1b52ac6746f5e7d935ecb106e48a87b656447c0 Mon Sep 17 00:00:00 2001
From: Christian Kandeler <christian.kandeler@qt.io>
Date: Mon, 6 May 2019 16:46:03 +0200
Subject: [PATCH] QmakeProjectManager: Do not ignore files from included .pri
 files

... when setting up extra compilers.
For example, the code model was not able to resolve included ui_*.h
files in a project that wasn't built yet, if the respective FORMS
declaration came from a .pri file.

Fixes: QTCREATORBUG-22395
Change-Id: I75c4b2b38fec209519adb563d579ecd3a17fe042
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
---
 .../qmakeprojectmanager/qmakeparsernodes.cpp      | 15 ++++++++++++---
 .../qmakeprojectmanager/qmakeparsernodes.h        |  4 ++++
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/src/plugins/qmakeprojectmanager/qmakeparsernodes.cpp b/src/plugins/qmakeprojectmanager/qmakeparsernodes.cpp
index 7b050a5ed64..dad44e2f6ba 100644
--- a/src/plugins/qmakeprojectmanager/qmakeparsernodes.cpp
+++ b/src/plugins/qmakeprojectmanager/qmakeparsernodes.cpp
@@ -234,6 +234,16 @@ QSet<FileName> QmakePriFile::files(const FileType &type) const
     return m_files.value(type);
 }
 
+const QSet<FileName> QmakePriFile::collectFiles(const FileType &type) const
+{
+    QSet<FileName> allFiles = files(type);
+    for (const QmakePriFile * const priFile : qAsConst(m_children)) {
+        if (!dynamic_cast<const QmakeProFile *>(priFile))
+            allFiles.unite(priFile->collectFiles(type));
+    }
+    return allFiles;
+}
+
 QmakePriFile::~QmakePriFile()
 {
     watchFolders( {} );
@@ -1958,11 +1968,10 @@ QList<ExtraCompiler *> QmakeProFile::extraCompilers() const
 void QmakeProFile::setupExtraCompiler(const FileName &buildDir,
                                        const FileType &fileType, ExtraCompilerFactory *factory)
 {
-    foreach (const FileName &fn, files(fileType)) {
+    for (const FileName &fn : collectFiles(fileType)) {
         const FileNameList generated = generatedFiles(buildDir, fn, fileType);
-        if (!generated.isEmpty()) {
+        if (!generated.isEmpty())
             m_extraCompilers.append(factory->create(m_project, fn, generated));
-        }
     }
 }
 
diff --git a/src/plugins/qmakeprojectmanager/qmakeparsernodes.h b/src/plugins/qmakeprojectmanager/qmakeparsernodes.h
index 68b406fe63a..4c5b7048eb2 100644
--- a/src/plugins/qmakeprojectmanager/qmakeparsernodes.h
+++ b/src/plugins/qmakeprojectmanager/qmakeparsernodes.h
@@ -133,8 +133,12 @@ public:
 
     void makeEmpty();
 
+    // Files of the specified type declared in this file.
     QSet<Utils::FileName> files(const ProjectExplorer::FileType &type) const;
 
+    // Files of the specified type declared in this file and in included .pri files.
+    const QSet<Utils::FileName> collectFiles(const ProjectExplorer::FileType &type) const;
+
     void update(const Internal::QmakePriFileEvalResult &result);
 
     bool canAddSubProject(const QString &proFilePath) const;