Merge remote-tracking branch 'upstream/3.4' into merge-3.4

2018-09-28 12:48:51 +03:00
parent 29e88e50ff 4b895a4d1f
commit a8b0db4e5d
77 changed files with 586 additions and 443 deletions
@@ -27,9 +27,6 @@ endif()
 project(cpp_samples)
 ocv_include_modules_recurse(${OPENCV_CPP_SAMPLES_REQUIRED_DEPS})
 file(GLOB_RECURSE cpp_samples RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.cpp)
-if(NOT HAVE_OPENGL)
-  ocv_list_filterout(cpp_samples Qt_sample)
-endif()
 if(NOT HAVE_opencv_cudaarithm OR NOT HAVE_opencv_cudafilters)
  ocv_list_filterout(cpp_samples "/gpu/")
 endif()