Added Qt help generation support

diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
index b0ac11f..70ee3d0 100644 (file)
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -129,6 +129,11 @@ if(BUILD_DOCS AND DOXYGEN_FOUND)
   set(CMAKE_DOXYGEN_MAIN_REFERENCE "${refs_main}")
   set(CMAKE_DOXYGEN_EXTRA_REFERENCE "${refs_extra}")
   set(CMAKE_EXTRA_BIB_FILES "${bibfile} ${paths_bib}")
+  if (CMAKE_DOXYGEN_GENERATE_QHP)
+    set(CMAKE_DOXYGEN_GENERATE_QHP "YES")
+  else()
+    set(CMAKE_DOXYGEN_GENERATE_QHP "NO")
+  endif()
 
   list(APPEND CMAKE_DOXYGEN_HTML_FILES "${CMAKE_CURRENT_SOURCE_DIR}/opencv.ico")
   list(APPEND CMAKE_DOXYGEN_HTML_FILES "${CMAKE_CURRENT_SOURCE_DIR}/pattern.png")

diff --git a/doc/Doxyfile.in b/doc/Doxyfile.in
index 05cc273..8b310a2 100644 (file)
--- a/doc/Doxyfile.in
+++ b/doc/Doxyfile.in
@@ -148,10 +148,10 @@ GENERATE_CHI           = NO
 CHM_INDEX_ENCODING     =
 BINARY_TOC             = NO
 TOC_EXPAND             = NO
-GENERATE_QHP           = NO
-QCH_FILE               =
-QHP_NAMESPACE          = org.doxygen.Project
-QHP_VIRTUAL_FOLDER     = doc
+GENERATE_QHP           = @CMAKE_DOXYGEN_GENERATE_QHP@
+QCH_FILE               = ../opencv-@OPENCV_VERSION@.qch
+QHP_NAMESPACE          = org.itseez.opencv.@OPENCV_VERSION@
+QHP_VIRTUAL_FOLDER     = opencv
 QHP_CUST_FILTER_NAME   =
 QHP_CUST_FILTER_ATTRS  =
 QHP_SECT_FILTER_ATTRS  =

diff --git a/modules/cudaimgproc/include/opencv2/cudaimgproc.hpp b/modules/cudaimgproc/include/opencv2/cudaimgproc.hpp
index 1ec288f..a5fbfb8 100644 (file)
--- a/modules/cudaimgproc/include/opencv2/cudaimgproc.hpp
+++ b/modules/cudaimgproc/include/opencv2/cudaimgproc.hpp
@@ -89,7 +89,7 @@ performance.
  */
 CV_EXPORTS void cvtColor(InputArray src, OutputArray dst, int code, int dcn = 0, Stream& stream = Stream::Null());
 
-enum
+enum DemosaicTypes
 {
     //! Bayer Demosaicing (Malvar, He, and Cutler)
     COLOR_BayerBG2BGR_MHT = 256,
@@ -156,7 +156,7 @@ CV_EXPORTS void swapChannels(InputOutputArray image, const int dstOrder[4], Stre
  */
 CV_EXPORTS void gammaCorrection(InputArray src, OutputArray dst, bool forward = true, Stream& stream = Stream::Null());
 
-enum { ALPHA_OVER, ALPHA_IN, ALPHA_OUT, ALPHA_ATOP, ALPHA_XOR, ALPHA_PLUS, ALPHA_OVER_PREMUL, ALPHA_IN_PREMUL, ALPHA_OUT_PREMUL,
+enum AlphaCompTypes { ALPHA_OVER, ALPHA_IN, ALPHA_OUT, ALPHA_ATOP, ALPHA_XOR, ALPHA_PLUS, ALPHA_OVER_PREMUL, ALPHA_IN_PREMUL, ALPHA_OUT_PREMUL,
        ALPHA_ATOP_PREMUL, ALPHA_XOR_PREMUL, ALPHA_PLUS_PREMUL, ALPHA_PREMUL};
 
 /** @brief Composites two images using alpha opacity values contained in each image.

diff --git a/modules/imgproc/include/opencv2/imgproc.hpp b/modules/imgproc/include/opencv2/imgproc.hpp
index e67922e..28025c1 100644 (file)
--- a/modules/imgproc/include/opencv2/imgproc.hpp
+++ b/modules/imgproc/include/opencv2/imgproc.hpp
@@ -271,7 +271,8 @@ enum InterpolationFlags{
     WARP_INVERSE_MAP     = 16
 };
 
-enum { INTER_BITS      = 5,
+enum InterpolationMasks {
+       INTER_BITS      = 5,
        INTER_BITS2     = INTER_BITS * 2,
        INTER_TAB_SIZE  = 1 << INTER_BITS,
        INTER_TAB_SIZE2 = INTER_TAB_SIZE * INTER_TAB_SIZE
@@ -329,7 +330,8 @@ enum AdaptiveThresholdTypes {
 };
 
 //! cv::undistort mode
-enum { PROJ_SPHERICAL_ORTHO  = 0,
+enum UndistortTypes {
+       PROJ_SPHERICAL_ORTHO  = 0,
        PROJ_SPHERICAL_EQRECT = 1
      };
 

diff --git a/modules/photo/include/opencv2/photo/photo_c.h b/modules/photo/include/opencv2/photo/photo_c.h
index 908e0a1..07ca9b3 100644 (file)
--- a/modules/photo/include/opencv2/photo/photo_c.h
+++ b/modules/photo/include/opencv2/photo/photo_c.h
@@ -54,7 +54,7 @@ extern "C" {
   */
 
 /* Inpainting algorithms */
-enum
+enum InpaintingModes
 {
     CV_INPAINT_NS      =0,
     CV_INPAINT_TELEA   =1