diff options
| author | Brad King <brad.king@kitware.com> | 2018-05-15 13:52:09 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2018-05-15 13:52:09 (GMT) |
| commit | 29d20e2e0ce6a189e0e8fbfa2f7355f94749e390 (patch) | |
| tree | 8e23f529dba916b3fc5509c966141f02bd403e92 /Help | |
| parent | 813bcc2997a5692e8d9e141cf12b662b8b4dfbac (diff) | |
| parent | 9672d81ca3e51004f94bb2d9503e8b569565c8d0 (diff) | |
| download | CMake-29d20e2e0ce6a189e0e8fbfa2f7355f94749e390.zip CMake-29d20e2e0ce6a189e0e8fbfa2f7355f94749e390.tar.gz CMake-29d20e2e0ce6a189e0e8fbfa2f7355f94749e390.tar.bz2 | |
Merge branch 'fix-automoc-warnings' into release-3.11
Merge-request: !2066
Diffstat (limited to 'Help')
| -rw-r--r-- | Help/release/3.11.rst | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/Help/release/3.11.rst b/Help/release/3.11.rst index 184497c..971b3e2 100644 --- a/Help/release/3.11.rst +++ b/Help/release/3.11.rst @@ -292,3 +292,9 @@ Changes made since CMake 3.11.0 include the following. it did prior to 3.11.0. This diagnostic was accidentally dropped from CMake 3.11.0 and 3.11.1 by the change to allow globally visible imported targets to be aliased. + +* The :module:`FindQt4` module ``qt4_wrap_cpp``, ``qt4_wrap_ui`` and + ``qt4_add_resources`` macros now set :prop_sf:`SKIP_AUTOMOC` and + :prop_sf:`SKIP_AUTOUIC` on their generated files. These files never + need to be processed by moc or uic, and we must say so explicitly to + account for policy :policy:`CMP0071`. |