diff options
| author | Craig Scott <craig.scott@crascit.com> | 2021-02-22 16:11:26 +1100 |
|---|---|---|
| committer | Craig Scott <craig.scott@crascit.com> | 2021-02-22 16:11:26 +1100 |
| commit | a3df25c69494dafd9284c554858136465e1cf083 (patch) | |
| tree | 42250b280f5e538d2f8ebcf99181622fbe91d855 | |
| parent | 48410610a6636a73d4313479b7799c542b0d4553 (diff) | |
| download | cmake-a3df25c69494dafd9284c554858136465e1cf083.tar.gz | |
Autogen: Don't change the order of HEADERS array in AutogenInfo.json
Qt6 reads our internal AutogenInfo.json file. In 92d7b456e5
(Autogen: Add support for per-config sources, 2020-10-20), the
ordering of the HEADERS array elements was changed and this
broke their cmake_automoc_parser. We don't need to change the
order of the array elements, we can append to the existing ones
instead. Do this to allow their cmake_automoc_parser to continue
to work.
Fixes: #21823
| -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(), |