diff options
| author | Brad King <brad.king@kitware.com> | 2018-12-10 13:16:12 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2018-12-10 13:16:20 (GMT) |
| commit | 5f3b067bee1b30b6d74ef48f31e9e2bbb27cd27a (patch) | |
| tree | 764f4152b78436a1813e4cb252f83fb708f3c94c /Tests | |
| parent | 4b513c0ca31d5a90b283b794397e40168070e400 (diff) | |
| parent | e5a4007a3b4aefeb3d814adb75835adc6111e238 (diff) | |
| download | CMake-5f3b067bee1b30b6d74ef48f31e9e2bbb27cd27a.zip CMake-5f3b067bee1b30b6d74ef48f31e9e2bbb27cd27a.tar.gz CMake-5f3b067bee1b30b6d74ef48f31e9e2bbb27cd27a.tar.bz2 | |
Merge topic 'autogen_revert_implicit_includes'
e5a4007a3b Merge branch 'backport-autogen_revert_implicit_includes'
4be7f38d57 Autogen: Revert passing compiler implicit includes to moc
187481d4d9 Autogen: Revert passing compiler implicit includes to moc
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2709
Diffstat (limited to 'Tests')
| -rw-r--r-- | Tests/QtAutogen/Tests.cmake | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Tests/QtAutogen/Tests.cmake b/Tests/QtAutogen/Tests.cmake index 096d5e3..c53fb4f 100644 --- a/Tests/QtAutogen/Tests.cmake +++ b/Tests/QtAutogen/Tests.cmake @@ -39,7 +39,8 @@ endif() # Qt5 only tests if(QT_TEST_VERSION GREATER 4) ADD_AUTOGEN_TEST(MocMacroName mocMacroName) - ADD_AUTOGEN_TEST(MocOsMacros) + # Disabled for issue #18669 + #ADD_AUTOGEN_TEST(MocOsMacros) ADD_AUTOGEN_TEST(RerunMocPlugin) if(APPLE) ADD_AUTOGEN_TEST(MacOsFW) |