From: Marian Cichy <m.cichy@pengutronix.de>
To: ptxdist@pengutronix.de
Cc: Marian Cichy <m.cichy@pengutronix.de>
Subject: [ptxdist] [PATCH 4/6] OpenCV: Changed QT-Support from 4 to 5
Date: Thu, 2 Jan 2020 14:55:01 +0100 [thread overview]
Message-ID: <20200102135503.9854-4-m.cichy@pengutronix.de> (raw)
In-Reply-To: <20200102135503.9854-1-m.cichy@pengutronix.de>
Signed-off-by: Marian Cichy <m.cichy@pengutronix.de>
---
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
next prev parent reply other threads:[~2020-01-02 13:55 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-02 13:54 [ptxdist] [PATCH 1/6] OpenCV: Update to Version 4.1.2 Marian Cichy
2020-01-02 13:54 ` [ptxdist] [PATCH 2/6] OpenCV: Added flag to build and integrate Examples Marian Cichy
2020-01-06 11:32 ` Michael Olbrich
2020-01-02 13:55 ` [ptxdist] [PATCH 3/6] OpenCV: Clean up configure_helper output Marian Cichy
2020-01-06 13:55 ` Michael Olbrich
2020-01-02 13:55 ` Marian Cichy [this message]
2020-01-02 13:55 ` [ptxdist] [PATCH 5/6] OpenCV: added switch to turn on/off DNN support Marian Cichy
2020-01-02 13:55 ` [ptxdist] [PATCH 6/6] OpenCV: changed ptx/ifdef usage to ptx/onoff Marian Cichy
2020-01-06 13:57 ` Michael Olbrich
2020-01-06 16:10 ` [ptxdist] [PATCH 1/6] OpenCV: Update to Version 4.1.2 Michael Olbrich
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200102135503.9854-4-m.cichy@pengutronix.de \
--to=m.cichy@pengutronix.de \
--cc=ptxdist@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox