From 5c0502b470bbb51ef52e86e892b31268fc8d0563 Mon Sep 17 00:00:00 2001 From: Maksim Shabunin Date: Fri, 13 Sep 2019 15:23:59 +0300 Subject: [PATCH] Fixed OSX build with Qt --- modules/highgui/src/window.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/modules/highgui/src/window.cpp b/modules/highgui/src/window.cpp index 80c449612d..877d6751c9 100644 --- a/modules/highgui/src/window.cpp +++ b/modules/highgui/src/window.cpp @@ -85,12 +85,12 @@ CV_IMPL void cvSetWindowProperty(const char* name, int prop_id, double prop_valu break; 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)); #elif defined(HAVE_COCOA) 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 break; @@ -175,12 +175,13 @@ CV_IMPL double cvGetWindowProperty(const char* name, int prop_id) break; case cv::WND_PROP_TOPMOST: - #if defined(HAVE_WIN32UI) + #if defined (HAVE_QT) + return -1; + #elif defined(HAVE_WIN32UI) return cvGetPropTopmost_W32(name); #elif defined(HAVE_COCOA) return cvGetPropTopmost_COCOA(name); #else - CV_LOG_WARNING(NULL, "Property WND_PROP_TOPMOST is not supported on current GUI backend"); return -1; #endif break;