diff options
| author | Brad King <brad.king@kitware.com> | 2018-12-07 13:04:55 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2018-12-07 13:04:55 (GMT) |
| commit | 3b4e86f26dddbdfd2cd172274ae7c1340f1eba29 (patch) | |
| tree | 4056647b098fbee735723bc5fa070f8b4f1f6137 /Source | |
| parent | 0becea2d6061e8fa49c5f6a00757efacdd93421a (diff) | |
| parent | 187481d4d988f45e05f2f7a6e89df89cd64ecfe9 (diff) | |
| download | CMake-3b4e86f26dddbdfd2cd172274ae7c1340f1eba29.zip CMake-3b4e86f26dddbdfd2cd172274ae7c1340f1eba29.tar.gz CMake-3b4e86f26dddbdfd2cd172274ae7c1340f1eba29.tar.bz2 | |
Merge branch 'backport-autogen_revert_implicit_includes' into release-3.13
Merge-request: !2709
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmQtAutoGenInitializer.cxx | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/Source/cmQtAutoGenInitializer.cxx b/Source/cmQtAutoGenInitializer.cxx index ba7a565..f9c8c7f 100644 --- a/Source/cmQtAutoGenInitializer.cxx +++ b/Source/cmQtAutoGenInitializer.cxx @@ -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 |