On 10/27/2015 04:41 PM, Brad King wrote:
> As of 3.4.0-rc2 the new work is to support future versions of Qt that
> drop the -list option.  You don't need to test anything with 5.1.
> 
> Well then CMake will break with a future version of Qt until it is
> taught to detect support for --list or lack of -list.

Please review these changes.  First we revert hard-coded `-list` in
the 3.4 release branch:

 Revert "cmQtAutoGenerators: Fix rcc invocation for Qt 5.0 and 5.1 (#15644)"
 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b935db3a

and in master:

 Revert "cmQtAutoGenerators: Fix rcc invocation for Qt 5.0 and 5.1 (#15644)"
 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=10e8ccf6

Then add the detection to get this fixed for 3.5:

 QtAutogen: Fix rcc invocation for Qt 5.0 and 5.1 (#15644)
 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e78fcc63

-Brad

-- 

Powered by www.kitware.com

Please keep messages on-topic and check the CMake FAQ at: 
http://www.cmake.org/Wiki/CMake_FAQ

Kitware offers various services to support the CMake community. For more 
information on each offering, please visit:

CMake Support: http://cmake.org/cmake/help/support.html
CMake Consulting: http://cmake.org/cmake/help/consulting.html
CMake Training Courses: http://cmake.org/cmake/help/training.html

Visit other Kitware open-source projects at 
http://www.kitware.com/opensource/opensource.html

Follow this link to subscribe/unsubscribe:
http://public.kitware.com/mailman/listinfo/cmake-developers

Reply via email to