diff options
| author | Sebastian Holtermann <sebholt@xwmw.org> | 2019-01-25 18:09:45 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2019-01-28 13:41:37 (GMT) |
| commit | 03dbb62d31d4a115fed09049cf6995ce89d2fabe (patch) | |
| tree | 4456169913dc7294122ecab14e38d9d566cc50f7 /Tests/QtAutogen/Tests.cmake | |
| parent | 5f34bdc7f9f1fd8cca69757b06b3de8fdb4930b7 (diff) | |
| download | CMake-03dbb62d31d4a115fed09049cf6995ce89d2fabe.zip CMake-03dbb62d31d4a115fed09049cf6995ce89d2fabe.tar.gz CMake-03dbb62d31d4a115fed09049cf6995ce89d2fabe.tar.bz2 | |
Autogen: Reenable passing compiler implicit include directories to moc
Since commit 5990ecb741 (Compute implicit include directories from
compiler output, 2018-12-07) we now have compiler implicit include
directory computation for gcc and clang. It should be safe now to pass
these to `moc`. This patch re-enables passing the compiler implicit
include directories to `moc`, which was disabled due to issue #18669.
Fixes: #18041
Issue: #18669
Diffstat (limited to 'Tests/QtAutogen/Tests.cmake')
| -rw-r--r-- | Tests/QtAutogen/Tests.cmake | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Tests/QtAutogen/Tests.cmake b/Tests/QtAutogen/Tests.cmake index c53fb4f..096d5e3 100644 --- a/Tests/QtAutogen/Tests.cmake +++ b/Tests/QtAutogen/Tests.cmake @@ -39,8 +39,7 @@ endif() # Qt5 only tests if(QT_TEST_VERSION GREATER 4) ADD_AUTOGEN_TEST(MocMacroName mocMacroName) - # Disabled for issue #18669 - #ADD_AUTOGEN_TEST(MocOsMacros) + ADD_AUTOGEN_TEST(MocOsMacros) ADD_AUTOGEN_TEST(RerunMocPlugin) if(APPLE) ADD_AUTOGEN_TEST(MacOsFW) |