mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-06-12 20:42:53 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix for #19870

Browse Source 
HAVE_QT and HAVE_WIN32UI can both be true at the same time
if HAVE_QT, window_w32.cpp is not included in the build, see CMakeLists.txt
This commit is contained in:
Christoph Rackwitz 2021-04-08 12:59:06 +02:00
parent 125b9f6057
commit f479935cda
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
modules/highgui/src/window.cpp
View File

@ -93,7 +93,9 @@ CV_IMPL void cvSetWindowProperty(const char* name, int prop_id, double prop_valu
break; break;
case cv::WND_PROP_VSYNC: case cv::WND_PROP_VSYNC:
#if defined (HAVE_WIN32UI) #if defined (HAVE_QT)
// nothing
#elif defined (HAVE_WIN32UI)
cvSetPropVsync_W32(name, (prop_value != 0)); cvSetPropVsync_W32(name, (prop_value != 0));
#else #else
// not implemented yet for other toolkits // not implemented yet for other toolkits
@ -191,7 +193,9 @@ CV_IMPL double cvGetWindowProperty(const char* name, int prop_id)
break; break;
case cv::WND_PROP_VSYNC: case cv::WND_PROP_VSYNC:
#if defined (HAVE_WIN32UI) #if defined (HAVE_QT)
return -1;
#elif defined (HAVE_WIN32UI)
return cvGetPropVsync_W32(name); return cvGetPropVsync_W32(name);
#else #else
return -1; return -1;