Signed-off-by: Marian Cichy <[email protected]>
---
rules/opencv.in | 7 +++----
rules/opencv.make | 2 +-
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/rules/opencv.in b/rules/opencv.in
index ac096d60c..415db9e1e 100644
--- a/rules/opencv.in
+++ b/rules/opencv.in
@@ -8,10 +8,9 @@ menuconfig OPENCV
select ZLIB
select LIBPNG
select LIBJPEG
- select QT4 if OPENCV_QT
- select QT4_BUILD_QTESTLIB if OPENCV_QT
- select QT4_BUILD_GUI if OPENCV_QT
- select QT4_STL if OPENCV_QT
+ select QT5 if OPENCV_QT
+ select QT5_TEST if OPENCV_QT
+ select QT5_GUI if OPENCV_QT
select GSTREAMER if OPENCV_GSTREAMER
select V4L_UTILS if OPENCV_V4L_LIBV4L2
select V4L_UTILS_LIBV4L1 if OPENCV_V4L_LIBV4L2
diff --git a/rules/opencv.make b/rules/opencv.make
index a8c4057c2..f2a16f213 100644
--- a/rules/opencv.make
+++ b/rules/opencv.make
@@ -170,7 +170,7 @@ OPENCV_CONF_OPT := \
-DWITH_PROTOBUF=ON \
-DWITH_PTHREADS_PF:BOOL=OFF \
-DWITH_PVAPI:BOOL=OFF \
- -DWITH_QT:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_QT,4,OFF) \
+ -DWITH_QT:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_QT,5,OFF) \
-DWITH_QUIRC=ON \
-DWITH_TBB:BOOL=OFF \
-DWITH_TIFF:BOOL=OFF \
--
2.20.1
_______________________________________________
ptxdist mailing list
[email protected]