mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-06-07 17:44:04 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed OSX build with Qt

Browse Source
This commit is contained in:
Maksim Shabunin 2019-09-13 15:23:59 +03:00
parent 8609198b05
commit 5c0502b470
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -85,12 +85,12 @@ CV_IMPL void cvSetWindowProperty(const char* name, int prop_id, double prop_valu
break; break;
case cv::WND_PROP_TOPMOST: case cv::WND_PROP_TOPMOST:
#if defined(HAVE_WIN32UI) #if defined (HAVE_QT)
// nothing
#elif defined(HAVE_WIN32UI)
cvSetPropTopmost_W32(name, (prop_value != 0 ? true : false)); cvSetPropTopmost_W32(name, (prop_value != 0 ? true : false));
#elif defined(HAVE_COCOA) #elif defined(HAVE_COCOA)
cvSetPropTopmost_COCOA(name, (prop_value != 0 ? true : false)); cvSetPropTopmost_COCOA(name, (prop_value != 0 ? true : false));
#else
CV_LOG_WARNING(NULL, "Property WND_PROP_TOPMOST is not supported on current GUI backend");
#endif #endif
break; break;
@ -175,12 +175,13 @@ CV_IMPL double cvGetWindowProperty(const char* name, int prop_id)
break; break;
case cv::WND_PROP_TOPMOST: case cv::WND_PROP_TOPMOST:
#if defined(HAVE_WIN32UI) #if defined (HAVE_QT)
return -1;
#elif defined(HAVE_WIN32UI)
return cvGetPropTopmost_W32(name); return cvGetPropTopmost_W32(name);
#elif defined(HAVE_COCOA) #elif defined(HAVE_COCOA)
return cvGetPropTopmost_COCOA(name); return cvGetPropTopmost_COCOA(name);
#else #else
CV_LOG_WARNING(NULL, "Property WND_PROP_TOPMOST is not supported on current GUI backend");
return -1; return -1;
#endif #endif
break; break;