diff options
| author | Brad King <brad.king@kitware.com> | 2018-05-15 14:15:02 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2018-05-15 14:15:14 (GMT) |
| commit | 92ce7cc230eeb3deee0147bdd13215798889312e (patch) | |
| tree | 90e1fefe579e9070d4c8bf014ef7b4654f4eea38 /Help | |
| parent | 64234199ae6a49575b347c8eea296ea3087641cf (diff) | |
| parent | 9672d81ca3e51004f94bb2d9503e8b569565c8d0 (diff) | |
| download | CMake-92ce7cc230eeb3deee0147bdd13215798889312e.zip CMake-92ce7cc230eeb3deee0147bdd13215798889312e.tar.gz CMake-92ce7cc230eeb3deee0147bdd13215798889312e.tar.bz2 | |
Merge topic 'fix-automoc-warnings'
9672d81ca3 Qt4Macros: Don't AUTOMOC or AUTOUIC qt4-generated files
800b2fcf80 Qt4Macros: Use get_property/set_property
Acked-by: Kitware Robot <kwrobot@kitware.com>
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`. |