dilim/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-08-04 23:00:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'backport-autogen_revert_implicit_includes' into release-3.13

Browse Source 
Merge-request: !2709
This commit is contained in:
Brad King
2018-12-07 08:04:55 -05:00
parent 0becea2d60 187481d4d9
commit 3b4e86f26d
3 changed files with 24 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Source/cmQtAutoGenInitializer.cxx
View File

@@ -386,9 +386,13 @@ bool cmQtAutoGenInitializer::InitMoc()
// Moc includes
{
bool const appendImplicit = (this->QtVersion.Major == 5);
auto GetIncludeDirs =
[this, localGen, appendImplicit](std::string const& cfg) -> std::string {
// We need to disable this until we have all implicit includes available.
// See issue #18669.
// bool const appendImplicit = (this->QtVersion.Major == 5);
auto GetIncludeDirs = [this,
localGen](std::string const& cfg) -> std::string {
bool const appendImplicit = false;
// Get the include dirs for this target, without stripping the implicit
// include dirs off, see
// https://gitlab.kitware.com/cmake/cmake/issues/13667