diff options
| -rw-r--r-- | package/opencv/Config.in | 16 | ||||
| -rw-r--r-- | package/opencv/opencv.mk | 11 |
2 files changed, 24 insertions, 3 deletions
diff --git a/package/opencv/Config.in b/package/opencv/Config.in index 5dd39ca8da..5e8f189457 100644 --- a/package/opencv/Config.in +++ b/package/opencv/Config.in @@ -81,7 +81,21 @@ config BR2_PACKAGE_OPENCV_WITH_QT comment "qt4 support needs qt" depends on BR2_USE_MMU # qt - depends on !BR2_PACKAGE_QT + depends on !BR2_PACKAGE_QT && !BR2_PACKAGE_QT5 + +config BR2_PACKAGE_OPENCV_WITH_QT5 + bool "qt5" + depends on BR2_PACKAGE_QT5 + select BR2_PACKAGE_QT5BASE + select BR2_PACKAGE_QT5BASE_CONCURRENT + select BR2_PACKAGE_QT5BASE_GUI + select BR2_PACKAGE_QT5BASE_WIDGETS + help + Use Qt5 with base, concurrent, test, gui and widgets components, as GUI + toolkit. + +comment "qt5 support needs qt5" + depends on !BR2_PACKAGE_QT && !BR2_PACKAGE_QT5 endchoice diff --git a/package/opencv/opencv.mk b/package/opencv/opencv.mk index 0e5cf7746c..98e1614f2a 100644 --- a/package/opencv/opencv.mk +++ b/package/opencv/opencv.mk @@ -266,11 +266,18 @@ else OPENCV_CONF_OPTS += -DWITH_PNG=OFF endif +ifeq ($(BR2_PACKAGE_OPENCV_WITH_QT)$(BR2_PACKAGE_OPENCV_WITH_QT5),) +OPENCV_CONF_OPTS += -DWITH_QT=OFF +endif + ifeq ($(BR2_PACKAGE_OPENCV_WITH_QT),y) OPENCV_CONF_OPTS += -DWITH_QT=4 OPENCV_DEPENDENCIES += qt -else -OPENCV_CONF_OPTS += -DWITH_QT=OFF +endif + +ifeq ($(BR2_PACKAGE_OPENCV_WITH_QT5),y) +OPENCV_CONF_OPTS += -DWITH_QT=5 +OPENCV_DEPENDENCIES += qt5base endif ifeq ($(BR2_PACKAGE_OPENCV_WITH_TIFF),y) |
