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 /Tests | |
| 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 'Tests')
| -rw-r--r-- | Tests/QtAutogen/CommonTests.cmake | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Tests/QtAutogen/CommonTests.cmake b/Tests/QtAutogen/CommonTests.cmake index 01ed7e9..ef11ddf 100644 --- a/Tests/QtAutogen/CommonTests.cmake +++ b/Tests/QtAutogen/CommonTests.cmake @@ -23,9 +23,10 @@ endif() if(QT_TEST_ALLOW_QT_MACROS) ADD_AUTOGEN_TEST(MocCMP0071) endif() -if(QT_TEST_VERSION GREATER 4) - ADD_AUTOGEN_TEST(MocOsMacros) -endif() +# Disabled for issue #18669 +#if(QT_TEST_VERSION GREATER 4) +# ADD_AUTOGEN_TEST(MocOsMacros) +#endif() ADD_AUTOGEN_TEST(UicInclude uicInclude) ADD_AUTOGEN_TEST(UicInterface QtAutoUicInterface) ADD_AUTOGEN_TEST(ObjectLibrary someProgram) |