diff options
| author | Brad King <brad.king@kitware.com> | 2021-04-26 15:31:47 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2021-04-26 15:31:54 (GMT) |
| commit | e69a3287256d5fb7f6f2a150f5e96ff7bcb0d9b7 (patch) | |
| tree | a88934f93475ff3a0d7efb903d69342ac206ad66 /Source/cmQtAutoGenGlobalInitializer.cxx | |
| parent | 6aabf2790c4e4f904aeaa166bf6a7abdd2f290e3 (diff) | |
| parent | 5b0ea5874a3322e57156b329b340bf283673c207 (diff) | |
| download | CMake-e69a3287256d5fb7f6f2a150f5e96ff7bcb0d9b7.zip CMake-e69a3287256d5fb7f6f2a150f5e96ff7bcb0d9b7.tar.gz CMake-e69a3287256d5fb7f6f2a150f5e96ff7bcb0d9b7.tar.bz2 | |
Merge topic 'autogen-moc-version'
5b0ea5874a AutoGen: Retrieve Qt version from moc as fallback
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6027
Diffstat (limited to 'Source/cmQtAutoGenGlobalInitializer.cxx')
| -rw-r--r-- | Source/cmQtAutoGenGlobalInitializer.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Source/cmQtAutoGenGlobalInitializer.cxx b/Source/cmQtAutoGenGlobalInitializer.cxx index f8d18f2..153cb6d 100644 --- a/Source/cmQtAutoGenGlobalInitializer.cxx +++ b/Source/cmQtAutoGenGlobalInitializer.cxx @@ -119,7 +119,8 @@ cmQtAutoGenGlobalInitializer::cmQtAutoGenGlobalInitializer( target->GetSafeProperty(this->kw().AUTORCC_EXECUTABLE); // We support Qt4, Qt5 and Qt6 - auto qtVersion = cmQtAutoGenInitializer::GetQtVersion(target.get()); + auto qtVersion = + cmQtAutoGenInitializer::GetQtVersion(target.get(), mocExec); bool const validQt = (qtVersion.first.Major == 4) || (qtVersion.first.Major == 5) || (qtVersion.first.Major == 6); |