diff options
| author | Brad King <brad.king@kitware.com> | 2021-02-23 13:00:07 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2021-02-23 13:00:12 (GMT) |
| commit | 4052aa41c594cb199e01ec731a6eeef3fe65fef8 (patch) | |
| tree | 4de9746260f49e3d4578b30a4e9cc1f838ca59b5 /Source/cmQtAutoMocUic.cxx | |
| parent | bdf6a71c56803182adf6e8a39b3687f22c0704d6 (diff) | |
| parent | a3df25c69494dafd9284c554858136465e1cf083 (diff) | |
| download | CMake-4052aa41c594cb199e01ec731a6eeef3fe65fef8.zip CMake-4052aa41c594cb199e01ec731a6eeef3fe65fef8.tar.gz CMake-4052aa41c594cb199e01ec731a6eeef3fe65fef8.tar.bz2 | |
Merge topic 'per-config-autogen-info-file'
a3df25c694 Autogen: Don't change the order of HEADERS array in AutogenInfo.json
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5840
Diffstat (limited to 'Source/cmQtAutoMocUic.cxx')
| -rw-r--r-- | Source/cmQtAutoMocUic.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/cmQtAutoMocUic.cxx b/Source/cmQtAutoMocUic.cxx index 75611ac..02b32dd 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(), |