Merge topic 'per-config-autogen-info-file'

a3df25c694 Autogen: Don't change the order of HEADERS array in AutogenInfo.json

Acked-by: Kitware Robot <[email protected]>
Merge-request: !5840

Source/cmQtAutoGenInitializer.cxx

@@ -1568,8 +1568,8 @@ bool cmQtAutoGenInitializer::SetupWriteAutogenInfo()
                        jval[0u] = muf->FullPath;
                        jval[1u] = cmStrCat(muf->MocIt ? 'M' : 'm',
                                            muf->UicIt ? 'U' : 'u');
-                       jval[2u] = cfgArray(muf->Configs);
-                       jval[3u] = this->GetMocBuildPath(*muf);
+                       jval[2u] = this->GetMocBuildPath(*muf);
+                       jval[3u] = cfgArray(muf->Configs);
                      });
   info.SetArrayArray(
     "SOURCES", sources, [&cfgArray](Json::Value& jval, MUFile const* muf) {

Source/cmQtAutoMocUic.cxx

@@ -2520,8 +2520,8 @@ bool cmQtAutoMocUicT::InitFromInfo(InfoT const& info)
 
       Json::Value const& entryName = entry[0u];
       Json::Value const& entryFlags = entry[1u];
-      Json::Value const& entryConfigs = entry[2u];
-      Json::Value const& entryBuild = entry[3u];
+      Json::Value const& entryBuild = entry[2u];
+      Json::Value const& entryConfigs = entry[3u];
       if (testEntry(entryName.isString(),
                     "JSON value for name is not a string.") ||
           testEntry(entryFlags.isString(),