diff options
| author | Duncan Barber <7744-dunquan@users.noreply.gitlab.kitware.com> | 2021-04-03 10:49:11 (GMT) |
|---|---|---|
| committer | Duncan Barber <7744-dunquan@users.noreply.gitlab.kitware.com> | 2021-04-10 17:33:22 (GMT) |
| commit | 0656bebeaecb85c2297b3d87634aed6ce8a80f34 (patch) | |
| tree | 9476de9c3ed5fca3708cd8945e5bc1fbb7f5eb11 | |
| parent | aa283fdba161eb458b02caaa9f0c32d97c648d6f (diff) | |
| download | CMake-0656bebeaecb85c2297b3d87634aed6ce8a80f34.zip CMake-0656bebeaecb85c2297b3d87634aed6ce8a80f34.tar.gz CMake-0656bebeaecb85c2297b3d87634aed6ce8a80f34.tar.bz2 | |
Autogen: Rename the variable for UI files with UIC options
Monitoring for UI file changes in the target sources will require keeping track of the files without options as well so this will improve clarity.
| -rw-r--r-- | Source/cmQtAutoGenInitializer.cxx | 5 | ||||
| -rw-r--r-- | Source/cmQtAutoGenInitializer.h | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/Source/cmQtAutoGenInitializer.cxx b/Source/cmQtAutoGenInitializer.cxx index e96ec63..f0c799e 100644 --- a/Source/cmQtAutoGenInitializer.cxx +++ b/Source/cmQtAutoGenInitializer.cxx @@ -936,7 +936,8 @@ bool cmQtAutoGenInitializer::InitScanFiles() // Check if the .ui file has uic options std::string const uicOpts = sf->GetSafeProperty(kw.AUTOUIC_OPTIONS); if (!uicOpts.empty()) { - this->Uic.UiFiles.emplace_back(fullPath, cmExpandedList(uicOpts)); + this->Uic.UiFilesWithOptions.emplace_back(fullPath, + cmExpandedList(uicOpts)); } auto uiHeaderRelativePath = cmSystemTools::RelativePath( @@ -1626,7 +1627,7 @@ bool cmQtAutoGenInitializer::SetupWriteAutogenInfo() uic_skip.insert(this->Uic.SkipUi.begin(), this->Uic.SkipUi.end()); info.SetArray("UIC_SKIP", uic_skip); - info.SetArrayArray("UIC_UI_FILES", this->Uic.UiFiles, + info.SetArrayArray("UIC_UI_FILES", this->Uic.UiFilesWithOptions, [](Json::Value& jval, UicT::UiFileT const& uiFile) { jval.resize(2u); jval[0u] = uiFile.first; diff --git a/Source/cmQtAutoGenInitializer.h b/Source/cmQtAutoGenInitializer.h index fdb65d3..9fe0cf0 100644 --- a/Source/cmQtAutoGenInitializer.h +++ b/Source/cmQtAutoGenInitializer.h @@ -236,7 +236,7 @@ private: : GenVarsT(GenT::UIC){}; std::set<std::string> SkipUi; - std::vector<UiFileT> UiFiles; + std::vector<UiFileT> UiFilesWithOptions; ConfigStrings<std::vector<std::string>> Options; std::vector<std::string> SearchPaths; std::vector<std::pair<ConfigString /*ui header*/, std::string /*genex*/>> |