Commit a2afd565 authored by Samuel Martin's avatar Samuel Martin Committed by Thomas Petazzoni
Browse files

package/opencv: add qt5 support 



Starting with the 2.4.6 release, OpenCV supports either Qt4 or Qt5 as GUI
toolkit, so add Qt5 in the GUI toolkit choice.

When Qt4 is enabled (and thus Qt5 is hidden and disabled), no need to
show a comment stating "Qt5 support needs Qt5", because Qt5 is not
selectable.

Conversely, when Qt5 is enabled and Qt4 is not, then no need to show a
comment stating "Qt4 support needs Qt4", because enabling Qt4 would
disable Qt5.

So, we only show the comments when neither toolkit is enabled.

Signed-off-by: default avatarSamuel Martin <s.martin49@gmail.com>
Cc: "Yann E. MORIN" <yann.morin.1998@free.fr>
[yann.morin.1998@free.fr: split-out the Qt5 hunk from the
 switch-selects-to-depends hunk]
Signed-off-by: default avatarYann E. MORIN <yann.morin.1998@free.fr>
Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
parent e6a24e24

package/opencv/Config.in

+15 −1
Original line number Diff line number Diff line
@@ -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

package/opencv/opencv.mk

+9 −2
Original line number Diff line number Diff line
@@ -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)