diff options
| author | Brad King <brad.king@kitware.com> | 2021-02-23 13:00:07 +0000 |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2021-02-23 08:00:12 -0500 |
| commit | 049c257e1d6f5a1d0deef166f1a8fa73da5680c3 (patch) | |
| tree | 47ac0998c79cdc4b646ddf0cacdad6422c5ffd78 | |
| parent | e9efa04d8da2b17f34a70d7b4be0d91a1c7574dc (diff) | |
| parent | a3df25c69494dafd9284c554858136465e1cf083 (diff) | |
| download | cmake-049c257e1d6f5a1d0deef166f1a8fa73da5680c3.tar.gz | |
Merge topic 'per-config-autogen-info-file' into release-3.20
a3df25c694 Autogen: Don't change the order of HEADERS array in AutogenInfo.json
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5840
| -rw-r--r-- | Source/cmQtAutoGenInitializer.cxx | 4 | ||||
| -rw-r--r-- | Source/cmQtAutoMocUic.cxx | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Source/cmQtAutoGenInitializer.cxx b/Source/cmQtAutoGenInitializer.cxx index bfe174c9e1..ba6c1c5618 100644 --- a/Source/cmQtAutoGenInitializer.cxx +++ b/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) { diff --git a/Source/cmQtAutoMocUic.cxx b/Source/cmQtAutoMocUic.cxx index 68d3c6cbc9..1e3bf06c0c 100644 --- a/Source/cmQtAutoMocUic.cxx +++ b/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(), |