diff options
| author | Brad King <brad.king@kitware.com> | 2014-03-26 17:24:43 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2014-03-26 17:24:43 (GMT) |
| commit | edb506b8625ac06cd73c0b1b2696ac4bb65d184a (patch) | |
| tree | f501643c9aefa3eb58aa050043bcae57679265d6 /Source/cmQtAutoGenerators.h | |
| parent | 098a39f21c140c69bed26dc6914591c76b69c7e2 (diff) | |
| parent | 71a11252e95797113ecb1a969386f496b7d4861b (diff) | |
| download | CMake-edb506b8625ac06cd73c0b1b2696ac4bb65d184a.zip CMake-edb506b8625ac06cd73c0b1b2696ac4bb65d184a.tar.gz CMake-edb506b8625ac06cd73c0b1b2696ac4bb65d184a.tar.bz2 | |
Merge topic 'fix-Qt-Autogen'
71a11252 QtAutogen: Fix use of multiple ui files in a single target.
261acd91 QtAutogen: Use the basename for resource files.
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 a593dd5..8003795 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, |