Skip to content

Commit 5c0502b

Browse files
committed
Fixed OSX build with Qt
1 parent 8609198 commit 5c0502b

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

modules/highgui/src/window.cpp

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -85,12 +85,12 @@ CV_IMPL void cvSetWindowProperty(const char* name, int prop_id, double prop_valu
8585
break;
8686

8787
case cv::WND_PROP_TOPMOST:
88-
#if defined(HAVE_WIN32UI)
88+
#if defined (HAVE_QT)
89+
// nothing
90+
#elif defined(HAVE_WIN32UI)
8991
cvSetPropTopmost_W32(name, (prop_value != 0 ? true : false));
9092
#elif defined(HAVE_COCOA)
9193
cvSetPropTopmost_COCOA(name, (prop_value != 0 ? true : false));
92-
#else
93-
CV_LOG_WARNING(NULL, "Property WND_PROP_TOPMOST is not supported on current GUI backend");
9494
#endif
9595
break;
9696

@@ -175,12 +175,13 @@ CV_IMPL double cvGetWindowProperty(const char* name, int prop_id)
175175
break;
176176

177177
case cv::WND_PROP_TOPMOST:
178-
#if defined(HAVE_WIN32UI)
178+
#if defined (HAVE_QT)
179+
return -1;
180+
#elif defined(HAVE_WIN32UI)
179181
return cvGetPropTopmost_W32(name);
180182
#elif defined(HAVE_COCOA)
181183
return cvGetPropTopmost_COCOA(name);
182184
#else
183-
CV_LOG_WARNING(NULL, "Property WND_PROP_TOPMOST is not supported on current GUI backend");
184185
return -1;
185186
#endif
186187
break;

0 commit comments

Comments
 (0)