Skip to content

Commit 92a0808

Browse files
committed
Merge pull request opencv#9815 from alalek:issue_9813
2 parents 29b0ef4 + 3ae7515 commit 92a0808

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

modules/highgui/CMakeLists.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,9 @@ file(GLOB highgui_ext_hdrs
3838
list(REMOVE_ITEM highgui_ext_hdrs "${CMAKE_CURRENT_LIST_DIR}/include/opencv2/${name}/highgui_winrt.hpp")
3939

4040
if(HAVE_QT5)
41-
set(CMAKE_AUTOMOC ON)
41+
# "Automoc" doesn't work properly with opencv_world build, use QT5_WRAP_CPP() directly
42+
#set(CMAKE_AUTOMOC ON)
43+
4244
set(CMAKE_INCLUDE_CURRENT_DIR ON)
4345

4446
QT5_ADD_RESOURCES(_RCC_OUTFILES ${CMAKE_CURRENT_LIST_DIR}/src/window_QT.qrc)

0 commit comments

Comments
 (0)