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

diff --cc cmake/OpenCVModule.cmake
Simple merge

diff --cc cmake/OpenCVUtils.cmake
Simple merge

diff --cc modules/core/CMakeLists.txt
Simple merge

diff --cc modules/core/src/ocl.cpp
Simple merge

diff --cc modules/dnn/include/opencv2/dnn/version.hpp
index 3b372f9,0000000..9b1c6e1
mode 100644,000000..100644
--- 1/modules/dnn/include/opencv2/dnn/version.hpp
--- /dev/null
+++ b/modules/dnn/include/opencv2/dnn/version.hpp
@@@ -1,21 -1,0 +1,21 @@@
- #define OPENCV_DNN_API_VERSION 20191024
 +// This file is part of OpenCV project.
 +// It is subject to the license terms in the LICENSE file found in the top-level directory
 +// of this distribution and at http://opencv.org/license.html.
 +
 +#ifndef OPENCV_DNN_VERSION_HPP
 +#define OPENCV_DNN_VERSION_HPP
 +
 +/// Use with major OpenCV version only.
++#define OPENCV_DNN_API_VERSION 20191111
 +
 +#if !defined CV_DOXYGEN && !defined CV_STATIC_ANALYSIS && !defined CV_DNN_DONT_ADD_INLINE_NS
 +#define CV__DNN_INLINE_NS __CV_CAT(dnn4_v, OPENCV_DNN_API_VERSION)
 +#define CV__DNN_INLINE_NS_BEGIN namespace CV__DNN_INLINE_NS {
 +#define CV__DNN_INLINE_NS_END }
 +namespace cv { namespace dnn { namespace CV__DNN_INLINE_NS { } using namespace CV__DNN_INLINE_NS; }}
 +#else
 +#define CV__DNN_INLINE_NS_BEGIN
 +#define CV__DNN_INLINE_NS_END
 +#endif
 +
 +#endif  // OPENCV_DNN_VERSION_HPP

diff --cc modules/dnn/src/dnn.cpp
Simple merge

diff --cc modules/dnn/src/layers/eltwise_layer.cpp
index c67b198,f077866..f65fda5
--- 1/modules/dnn/src/layers/eltwise_layer.cpp
--- 2/modules/dnn/src/layers/eltwise_layer.cpp
+++ b/modules/dnn/src/layers/eltwise_layer.cpp
@@@ -104,8 -101,7 +107,8 @@@ public
      virtual bool supportBackend(int backendId) CV_OVERRIDE
      {
          return backendId == DNN_BACKEND_OPENCV ||
-                backendId == DNN_BACKEND_CUDA ||
--               backendId == DNN_BACKEND_HALIDE ||
++               (backendId == DNN_BACKEND_CUDA && op != DIV) ||  // TODO: not implemented, see PR #15811
++               (backendId == DNN_BACKEND_HALIDE && op != DIV) ||  // TODO: not implemented, see PR #15811
                 (backendId == DNN_BACKEND_INFERENCE_ENGINE && !variableChannels &&
                  (preferableTarget != DNN_TARGET_OPENCL || coeffs.empty()));
      }

diff --cc modules/dnn/src/onnx/onnx_importer.cpp
Simple merge

diff --cc modules/dnn/test/test_misc.cpp
Simple merge

diff --cc modules/dnn/test/test_onnx_importer.cpp
Simple merge

diff --cc modules/videoio/src/cap_gstreamer.cpp
Simple merge