diff options
| -rw-r--r-- | Source/cmQtAutoGenerators.cxx | 12 | ||||
| -rw-r--r-- | Source/cmQtAutoGenerators.h | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/Source/cmQtAutoGenerators.cxx b/Source/cmQtAutoGenerators.cxx index f709932..7b81f4f 100644 --- a/Source/cmQtAutoGenerators.cxx +++ b/Source/cmQtAutoGenerators.cxx @@ -1052,7 +1052,10 @@ bool cmQtAutoGenerators::ReadAutogenInfoFile(cmMakefile* makefile, "AM_Qt5Core_VERSION_MAJOR"); } this->Sources = makefile->GetSafeDefinition("AM_SOURCES"); - this->RccSources = makefile->GetSafeDefinition("AM_RCC_SOURCES"); + { + std::string rccSources = makefile->GetSafeDefinition("AM_RCC_SOURCES"); + cmSystemTools::ExpandListArgument(rccSources, this->RccSources); + } this->SkipMoc = makefile->GetSafeDefinition("AM_SKIP_MOC"); this->SkipUic = makefile->GetSafeDefinition("AM_SKIP_UIC"); this->Headers = makefile->GetSafeDefinition("AM_HEADERS"); @@ -2074,11 +2077,8 @@ bool cmQtAutoGenerators::GenerateUi(const std::string& realName, bool cmQtAutoGenerators::GenerateQrc() { - std::vector<std::string> sourceFiles; - cmSystemTools::ExpandListArgument(this->RccSources, sourceFiles); - - for(std::vector<std::string>::const_iterator si = sourceFiles.begin(); - si != sourceFiles.end(); ++si) + for(std::vector<std::string>::const_iterator si = this->RccSources.begin(); + si != this->RccSources.end(); ++si) { std::string ext = cmsys::SystemTools::GetFilenameLastExtension(*si); diff --git a/Source/cmQtAutoGenerators.h b/Source/cmQtAutoGenerators.h index ffbd73e..ce27852 100644 --- a/Source/cmQtAutoGenerators.h +++ b/Source/cmQtAutoGenerators.h @@ -90,7 +90,7 @@ private: std::string QtMajorVersion; std::string Sources; - std::string RccSources; + std::vector<std::string> RccSources; std::string SkipMoc; std::string SkipUic; std::string Headers; |