diff options
| author | Stephen Kelly <steveire@gmail.com> | 2014-03-25 00:26:27 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2014-03-25 00:39:03 (GMT) |
| commit | 71a11252e95797113ecb1a969386f496b7d4861b (patch) | |
| tree | b5cac8379fc7a3aa35a055ded585498195e7b930 /Source/cmQtAutoGenerators.h | |
| parent | 261acd91093ba5f2bf79f38a9632887ab2dd5f1c (diff) | |
| download | CMake-71a11252e95797113ecb1a969386f496b7d4861b.zip CMake-71a11252e95797113ecb1a969386f496b7d4861b.tar.gz CMake-71a11252e95797113ecb1a969386f496b7d4861b.tar.bz2 | |
QtAutogen: Fix use of multiple ui files in a single target.
Don't store a mapping of the directory to the ui file. The directory
will be a unique key, allowing only one ui file to be specified.
Use the source file name instead as the mapping key.
Diffstat (limited to 'Source/cmQtAutoGenerators.h')
| -rw-r--r-- | Source/cmQtAutoGenerators.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/cmQtAutoGenerators.h b/Source/cmQtAutoGenerators.h index 2840fbf..9ddf64f 100644 --- a/Source/cmQtAutoGenerators.h +++ b/Source/cmQtAutoGenerators.h @@ -48,7 +48,7 @@ private: bool RunAutogen(cmMakefile* makefile); bool GenerateMoc(const std::string& sourceFile, const std::string& mocFileName); - bool GenerateUi(const std::string& path, const std::string& uiFileName); + bool GenerateUi(const std::string& realName, const std::string& uiFileName); bool GenerateQrc(); void ParseCppFile(const std::string& absFilename, const std::vector<std::string>& headerExtensions, |