NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

package/opencv: add qt5 support

Browse Source 
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: Samuel 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: Yann E. MORIN <yann.morin.1998@free.fr>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
Samuel Martin 2015-07-05 23:54:46 +02:00 committed by Thomas Petazzoni
parent e6a24e2446
commit a2afd56594
2 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
package/opencv/Config.in
View File

@ -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

11
package/opencv/opencv.mk
View File

@ -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)