projects
/
platform
/
upstream
/
opencv.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
d25ee8a
)
Small fix for using Qt 5.x with opencv_world
author
mevatron
<mevatron@gmail.com>
Fri, 6 Oct 2017 21:03:39 +0000
(16:03 -0500)
committer
GitHub
<noreply@github.com>
Fri, 6 Oct 2017 21:03:39 +0000
(16:03 -0500)
modules/highgui/CMakeLists.txt
patch
|
blob
|
history
diff --git
a/modules/highgui/CMakeLists.txt
b/modules/highgui/CMakeLists.txt
index
4fba298
..
c117043
100644
(file)
--- a/
modules/highgui/CMakeLists.txt
+++ b/
modules/highgui/CMakeLists.txt
@@
-42,9
+42,11
@@
if(HAVE_QT5)
set(CMAKE_INCLUDE_CURRENT_DIR ON)
QT5_ADD_RESOURCES(_RCC_OUTFILES ${CMAKE_CURRENT_LIST_DIR}/src/window_QT.qrc)
+ QT5_WRAP_CPP(_MOC_OUTFILES ${CMAKE_CURRENT_LIST_DIR}/src/window_QT.h)
list(APPEND highgui_srcs
${CMAKE_CURRENT_LIST_DIR}/src/window_QT.cpp
${CMAKE_CURRENT_LIST_DIR}/src/window_QT.h
+ ${_MOC_OUTFILES}
${_RCC_OUTFILES})
foreach(dt5_dep Core Gui Widgets Test Concurrent)