1
0
Эх сурвалжийг харах

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 жил өмнө
parent
commit
0656bebeae

+ 3 - 2
Source/cmQtAutoGenInitializer.cxx

@@ -936,7 +936,8 @@ bool cmQtAutoGenInitializer::InitScanFiles()
           // Check if the .ui file has uic options
           // Check if the .ui file has uic options
           std::string const uicOpts = sf->GetSafeProperty(kw.AUTOUIC_OPTIONS);
           std::string const uicOpts = sf->GetSafeProperty(kw.AUTOUIC_OPTIONS);
           if (!uicOpts.empty()) {
           if (!uicOpts.empty()) {
-            this->Uic.UiFiles.emplace_back(fullPath, cmExpandedList(uicOpts));
+            this->Uic.UiFilesWithOptions.emplace_back(fullPath,
+                                                      cmExpandedList(uicOpts));
           }
           }
 
 
           auto uiHeaderRelativePath = cmSystemTools::RelativePath(
           auto uiHeaderRelativePath = cmSystemTools::RelativePath(
@@ -1626,7 +1627,7 @@ bool cmQtAutoGenInitializer::SetupWriteAutogenInfo()
     uic_skip.insert(this->Uic.SkipUi.begin(), this->Uic.SkipUi.end());
     uic_skip.insert(this->Uic.SkipUi.begin(), this->Uic.SkipUi.end());
 
 
     info.SetArray("UIC_SKIP", uic_skip);
     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) {
                        [](Json::Value& jval, UicT::UiFileT const& uiFile) {
                          jval.resize(2u);
                          jval.resize(2u);
                          jval[0u] = uiFile.first;
                          jval[0u] = uiFile.first;

+ 1 - 1
Source/cmQtAutoGenInitializer.h

@@ -236,7 +236,7 @@ private:
       : GenVarsT(GenT::UIC){};
       : GenVarsT(GenT::UIC){};
 
 
     std::set<std::string> SkipUi;
     std::set<std::string> SkipUi;
-    std::vector<UiFileT> UiFiles;
+    std::vector<UiFileT> UiFilesWithOptions;
     ConfigStrings<std::vector<std::string>> Options;
     ConfigStrings<std::vector<std::string>> Options;
     std::vector<std::string> SearchPaths;
     std::vector<std::string> SearchPaths;
     std::vector<std::pair<ConfigString /*ui header*/, std::string /*genex*/>>
     std::vector<std::pair<ConfigString /*ui header*/, std::string /*genex*/>>