diff options
| author | Eike Ziller <[email protected]> | 2019-05-17 09:42:58 +0200 |
|---|---|---|
| committer | Eike Ziller <[email protected]> | 2019-05-17 12:47:24 +0200 |
| commit | 829a08047fdf383e6dbbace85678053c281b0d34 (patch) | |
| tree | a87c8f62ce04166670117ca8af354f5a4ff4c948 /src/plugins/qmakeprojectmanager/qmakeparsernodes.h | |
| parent | 3f57cdfba9a3ea112420b7c720799f9ca267755c (diff) | |
| parent | 9cf336b4bce0744ad146f8c3a5f9fe02638461bd (diff) | |
Merge remote-tracking branch 'origin/4.9'
Conflicts:
src/plugins/qbsprojectmanager/qbsrunconfiguration.cpp
Change-Id: I473084232ab99c18e2316154656de0035af02628
Diffstat (limited to 'src/plugins/qmakeprojectmanager/qmakeparsernodes.h')
| -rw-r--r-- | src/plugins/qmakeprojectmanager/qmakeparsernodes.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/plugins/qmakeprojectmanager/qmakeparsernodes.h b/src/plugins/qmakeprojectmanager/qmakeparsernodes.h index fb343cd07f1..8147b19d5f2 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; |