From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: From: Marian Cichy Date: Thu, 2 Jan 2020 14:55:01 +0100 Message-Id: <20200102135503.9854-4-m.cichy@pengutronix.de> In-Reply-To: <20200102135503.9854-1-m.cichy@pengutronix.de> References: <20200102135503.9854-1-m.cichy@pengutronix.de> MIME-Version: 1.0 Subject: [ptxdist] [PATCH 4/6] OpenCV: Changed QT-Support from 4 to 5 List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ptxdist-bounces@pengutronix.de Sender: "ptxdist" To: ptxdist@pengutronix.de Cc: Marian Cichy Signed-off-by: Marian Cichy --- 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 1656f605a..c2d91f9b5 100644 --- a/rules/opencv.make +++ b/rules/opencv.make @@ -195,7 +195,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 ptxdist@pengutronix.de