diff options
| author | Stephen Kelly <steveire@gmail.com> | 2014-09-17 01:23:57 +0200 |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2014-09-18 09:41:16 +0200 |
| commit | e3c97a1914aa0a521b55b53ab1b0d71732c5e466 (patch) | |
| tree | 2bf4429537174c4457b7ba9b6cc431f3a7013c88 /Source/cmQtAutoGenerators.h | |
| parent | b8877b1d62599bba7a014e95fbbd670f177243ce (diff) | |
| download | cmake-e3c97a1914aa0a521b55b53ab1b0d71732c5e466.tar.gz | |
QtAutogen: Process all ui files in a source file (#14981).
Use a vector to store a list of matched ui_ includes, instead of
overwriting the previous match.
Diffstat (limited to 'Source/cmQtAutoGenerators.h')
| -rw-r--r-- | Source/cmQtAutoGenerators.h | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/Source/cmQtAutoGenerators.h b/Source/cmQtAutoGenerators.h index 9ddf64f1f7..5e4e082926 100644 --- a/Source/cmQtAutoGenerators.h +++ b/Source/cmQtAutoGenerators.h @@ -51,28 +51,28 @@ private: bool GenerateUi(const std::string& realName, const std::string& uiFileName); bool GenerateQrc(); void ParseCppFile(const std::string& absFilename, - const std::vector<std::string>& headerExtensions, - std::map<std::string, std::string>& includedMocs, - std::map<std::string, std::string>& includedUis); + const std::vector<std::string>& headerExtensions, + std::map<std::string, std::string>& includedMocs, + std::map<std::string, std::vector<std::string> >& includedUis); void StrictParseCppFile(const std::string& absFilename, - const std::vector<std::string>& headerExtensions, - std::map<std::string, std::string>& includedMocs, - std::map<std::string, std::string>& includedUis); + const std::vector<std::string>& headerExtensions, + std::map<std::string, std::string>& includedMocs, + std::map<std::string, std::vector<std::string> >& includedUis); void SearchHeadersForCppFile(const std::string& absFilename, const std::vector<std::string>& headerExtensions, std::set<std::string>& absHeaders); void ParseHeaders(const std::set<std::string>& absHeaders, - const std::map<std::string, std::string>& includedMocs, - std::map<std::string, std::string>& notIncludedMocs, - std::map<std::string, std::string>& includedUis); + const std::map<std::string, std::string>& includedMocs, + std::map<std::string, std::string>& notIncludedMocs, + std::map<std::string, std::vector<std::string> >& includedUis); void ParseForUic(const std::string& fileName, - const std::string& contentsString, - std::map<std::string, std::string>& includedUis); + const std::string& contentsString, + std::map<std::string, std::vector<std::string> >& includedUis); void ParseForUic(const std::string& fileName, - std::map<std::string, std::string>& includedUis); + std::map<std::string, std::vector<std::string> >& includedUis); void Init(); |