Browse Source

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.
Duncan Barber 4 years ago
parent
commit
0656bebeae
2 changed files with 4 additions and 3 deletions
  1. 3 2
      Source/cmQtAutoGenInitializer.cxx
  2. 1 1
      Source/cmQtAutoGenInitializer.h

+ 3 - 2
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;

+ 1 - 1
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*/>>