diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2020-01-14 08:36:21 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2020-01-28 16:16:11 (GMT) |
| commit | f765fdea032b820f82789485172616c1456fb815 (patch) | |
| tree | 07d332e7b821c01b107e66f8c2e48d8872ba0dbf /Source/cmQtAutoGenInitializer.cxx | |
| parent | f8c505d4b30aa636b013486913591060b2040716 (diff) | |
| download | CMake-f765fdea032b820f82789485172616c1456fb815.zip CMake-f765fdea032b820f82789485172616c1456fb815.tar.gz CMake-f765fdea032b820f82789485172616c1456fb815.tar.bz2 | |
AutoGen: Use moc's feature to output dependencies
In Qt version 5.15.0 moc learned to output the dependencies
of the generated file.
This commit enhances JobCompileMocT to read the dependency file
written by moc. The dependencies are stored in the same cache that's
used for the dependencies determined by dependency filters.
The dependency filter functionality is turned off if moc's dependency
output feature is used.
Fixes: #17750
Fixes: #19058
Diffstat (limited to 'Source/cmQtAutoGenInitializer.cxx')
| -rw-r--r-- | Source/cmQtAutoGenInitializer.cxx | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Source/cmQtAutoGenInitializer.cxx b/Source/cmQtAutoGenInitializer.cxx index ebb522b..d9b0aff 100644 --- a/Source/cmQtAutoGenInitializer.cxx +++ b/Source/cmQtAutoGenInitializer.cxx @@ -1409,6 +1409,7 @@ bool cmQtAutoGenInitializer::SetupWriteAutogenInfo() info.SetConfig("INCLUDE_DIR", this->Dir.Include); info.SetUInt("QT_VERSION_MAJOR", this->QtVersion.Major); + info.SetUInt("QT_VERSION_MINOR", this->QtVersion.Minor); info.Set("QT_MOC_EXECUTABLE", this->Moc.Executable); info.Set("QT_UIC_EXECUTABLE", this->Uic.Executable); |