echo/CMake
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Autogen: Revert passing compiler implicit includes to moc

Browse Source 
Passing an incomplete list of compiler include directories causes
a regression in the KIO project (and probably others). We need to
disable it until the complete list is available (see #16291).

Fixes: #18669
Issue: #18041
This commit is contained in:
Sebastian Holtermann 2018-12-06 18:42:40 +01:00 committed by Brad King
parent 81bea69bd1
commit 4be7f38d57
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Source/cmQtAutoGenInitializer.cxx
View File

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

3
Tests/QtAutogen/Tests.cmake
View File

@ -39,7 +39,8 @@ endif()
# Qt5 only tests # Qt5 only tests
if(QT_TEST_VERSION GREATER 4) if(QT_TEST_VERSION GREATER 4)
ADD_AUTOGEN_TEST(MocMacroName mocMacroName) ADD_AUTOGEN_TEST(MocMacroName mocMacroName)
ADD_AUTOGEN_TEST(MocOsMacros) # Disabled for issue #18669
#ADD_AUTOGEN_TEST(MocOsMacros)
ADD_AUTOGEN_TEST(RerunMocPlugin) ADD_AUTOGEN_TEST(RerunMocPlugin)
if(APPLE) if(APPLE)
ADD_AUTOGEN_TEST(MacOsFW) ADD_AUTOGEN_TEST(MacOsFW)