jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-07-27 05:06:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

package/opencv3: remove qt backend option

Browse Source 
The qt backend option uses the obsolete qt4 package, which we are about to
remove, so remove the qt backend option as well.

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
This commit is contained in:
Peter Korsgaard 2019-02-06 15:10:49 +01:00 committed by Arnout Vandecappelle (Essensium/Mind)
parent 882ab1c2df
commit 3a3fdaebd9
3 changed files with 9 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Config.in.legacy
View File

@ -146,6 +146,12 @@ endif
comment "Legacy options removed in 2019.02" comment "Legacy options removed in 2019.02"
config BR2_PACKAGE_OPENCV3_WITH_QT
bool "opencv3 qt backend option removed"
select BR2_LEGACY
help
The opencv3 qt backend option was removed.
config BR2_PACKAGE_OPENCV_WITH_QT config BR2_PACKAGE_OPENCV_WITH_QT
bool "opencv qt backend option removed" bool "opencv qt backend option removed"
select BR2_LEGACY select BR2_LEGACY

16
package/opencv3/Config.in
View File

@ -82,20 +82,6 @@ comment "gtk3 support needs libgtk3"
depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on BR2_TOOLCHAIN_HAS_SYNC_4
depends on !BR2_PACKAGE_LIBGTK3 depends on !BR2_PACKAGE_LIBGTK3
config BR2_PACKAGE_OPENCV3_WITH_QT
bool "qt4"
depends on BR2_PACKAGE_QT
select BR2_PACKAGE_QT_STL
select BR2_PACKAGE_QT_GUI_MODULE
select BR2_PACKAGE_QT_TEST
help
Use Qt4 with QtTest and QtGui modules and STL support, as
GUI toolkit.
comment "qt4 support needs qt"
depends on BR2_USE_MMU # qt
depends on !BR2_PACKAGE_QT && !BR2_PACKAGE_QT5
config BR2_PACKAGE_OPENCV3_WITH_QT5 config BR2_PACKAGE_OPENCV3_WITH_QT5
bool "qt5" bool "qt5"
depends on BR2_PACKAGE_QT5 depends on BR2_PACKAGE_QT5
@ -108,7 +94,7 @@ config BR2_PACKAGE_OPENCV3_WITH_QT5
components, as GUI toolkit. components, as GUI toolkit.
comment "qt5 support needs qt5" comment "qt5 support needs qt5"
depends on !BR2_PACKAGE_QT && !BR2_PACKAGE_QT5 depends on !BR2_PACKAGE_QT5
endchoice endchoice

11
package/opencv3/opencv3.mk
View File

@ -288,18 +288,11 @@ else
OPENCV3_CONF_OPTS += -DWITH_PNG=OFF OPENCV3_CONF_OPTS += -DWITH_PNG=OFF
endif endif
ifeq ($(BR2_PACKAGE_OPENCV3_WITH_QT)$(BR2_PACKAGE_OPENCV3_WITH_QT5),)
OPENCV3_CONF_OPTS += -DWITH_QT=OFF
endif
ifeq ($(BR2_PACKAGE_OPENCV3_WITH_QT),y)
OPENCV3_CONF_OPTS += -DWITH_QT=4
OPENCV3_DEPENDENCIES += qt
endif
ifeq ($(BR2_PACKAGE_OPENCV3_WITH_QT5),y) ifeq ($(BR2_PACKAGE_OPENCV3_WITH_QT5),y)
OPENCV3_CONF_OPTS += -DWITH_QT=5 OPENCV3_CONF_OPTS += -DWITH_QT=5
OPENCV3_DEPENDENCIES += qt5base OPENCV3_DEPENDENCIES += qt5base
else
OPENCV3_CONF_OPTS += -DWITH_QT=OFF
endif endif
ifeq ($(BR2_PACKAGE_OPENCV3_WITH_TIFF),y) ifeq ($(BR2_PACKAGE_OPENCV3_WITH_TIFF),y)