Merge remote-tracking branch 'upstream/3.4' into merge-3.4
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Mon, 4 Oct 2021 19:41:00 +0000 (19:41 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Mon, 4 Oct 2021 19:50:01 +0000 (19:50 +0000)
commit87d4970e8b4b3251035fdf4a0101335ee5904a58
tree30b0ce00e9268225c8779a2ac8abb26ff9fdecdb
parent4938765eb3f9808ae4e08a006bb4e88eedc55a86
parentb1a772d19487c1477581d03ecbcd8e54c6fe074c
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
CMakeLists.txt
cmake/OpenCVDetectVTK.cmake
cmake/OpenCVFindLibsGUI.cmake
modules/core/src/parallel_impl.cpp
modules/highgui/CMakeLists.txt
modules/highgui/src/window_QT.cpp
modules/js/generator/embindgen.py
platforms/js/opencv_js.config.py