diff options
| author | Tobias Hunger <tobias.hunger@qt.io> | 2018-11-28 14:07:31 (GMT) |
|---|---|---|
| committer | Tobias Hunger <tobias.hunger@gmail.com> | 2019-01-07 13:13:10 (GMT) |
| commit | 9045f6a30fc8ce21d2b2298c27ba1da41c23bbf3 (patch) | |
| tree | 776b38da996a97e82961e04893c1d090bd1683c4 /Source/cmQtAutoGenGlobalInitializer.cxx | |
| parent | c1e9b1c283caccd468adfafd0496edd63964b899 (diff) | |
| download | CMake-9045f6a30fc8ce21d2b2298c27ba1da41c23bbf3.zip CMake-9045f6a30fc8ce21d2b2298c27ba1da41c23bbf3.tar.gz CMake-9045f6a30fc8ce21d2b2298c27ba1da41c23bbf3.tar.bz2 | |
Autogen: Prepare for Qt 6
Handle Qt version > 5 in Qt AutoGen.
This patch does *NOT* include tests and documentation: There is no
Qt 6 yet. I still need this patch to work on a cmake based build
system for Qt 6.
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 5470ec3..0ed8af4 100644 --- a/Source/cmQtAutoGenGlobalInitializer.cxx +++ b/Source/cmQtAutoGenGlobalInitializer.cxx @@ -77,7 +77,8 @@ cmQtAutoGenGlobalInitializer::cmQtAutoGenGlobalInitializer( if (moc || uic || rcc) { // We support Qt4 and Qt5 auto qtVersion = cmQtAutoGenInitializer::GetQtVersion(target); - if ((qtVersion.Major == 4) || (qtVersion.Major == 5)) { + if ((qtVersion.Major == 4) || (qtVersion.Major == 5) || + (qtVersion.Major == 6)) { // Create autogen target initializer Initializers_.emplace_back(cm::make_unique<cmQtAutoGenInitializer>( this, target, qtVersion, moc, uic, rcc, globalAutoGenTarget, |