Skip to content

Fixed OSX build with Qt#15518

Merged
opencv-pushbot merged 1 commit intoopencv:3.4from
mshabunin:fix-osx-qt
Sep 13, 2019
Merged

Fixed OSX build with Qt#15518
opencv-pushbot merged 1 commit intoopencv:3.4from
mshabunin:fix-osx-qt

Conversation

@mshabunin
Copy link
Copy Markdown
Contributor

related #14872

This pullrequest changes

On OSX HAVE_COCOA is always ON but window_cocoa.mm will be compiled only if Qt is disabled. More details in related PR.

This is a quick fix: we made property handler follow same scheme as CMake script. More complete fix would include reworking of CMake scripts together with code refactoring.

#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");
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I believe these messages are useful.

@opencv-pushbot opencv-pushbot merged commit 5c0502b into opencv:3.4 Sep 13, 2019
@alalek alalek mentioned this pull request Sep 13, 2019
@mshabunin mshabunin deleted the fix-osx-qt branch July 14, 2020 17:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants