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

package/qwt: remove qt4 support

Browse Source 
Qt4 support is about to be dropped, so remove the support from qwt 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:57 +01:00 committed by Arnout Vandecappelle (Essensium/Mind)
parent 537948d06b
commit 3e99c8418a
2 changed files with 10 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
package/qwt/Config.in
View File

@ -1,10 +1,9 @@
config BR2_PACKAGE_QWT config BR2_PACKAGE_QWT
bool "qwt" bool "qwt"
depends on BR2_PACKAGE_QT || BR2_PACKAGE_QT5 depends on BR2_PACKAGE_QT5
select BR2_PACKAGE_QT_GUI_MODULE if BR2_PACKAGE_QT select BR2_PACKAGE_QT5BASE
select BR2_PACKAGE_QT5BASE_GUI if BR2_PACKAGE_QT5 select BR2_PACKAGE_QT5BASE_WIDGETS # printsupport
select BR2_PACKAGE_QT5BASE_WIDGETS if BR2_PACKAGE_QT5 # printsupport select BR2_PACKAGE_QT5BASE_CONCURRENT
select BR2_PACKAGE_QT5BASE_CONCURRENT if BR2_PACKAGE_QT5
help help
Qwt is a graphics extension to the Qt GUI application Qwt is a graphics extension to the Qt GUI application
framework. It provides a 2D plotting widget and more. framework. It provides a 2D plotting widget and more.
@ -15,18 +14,15 @@ if BR2_PACKAGE_QWT
config BR2_PACKAGE_QWT_SVG config BR2_PACKAGE_QWT_SVG
bool "SVG support" bool "SVG support"
select BR2_PACKAGE_QT_SVG if BR2_PACKAGE_QT select BR2_PACKAGE_QT5SVG
select BR2_PACKAGE_QT5SVG if BR2_PACKAGE_QT5
config BR2_PACKAGE_QWT_MATHML config BR2_PACKAGE_QWT_MATHML
bool "MathML support" bool "MathML support"
config BR2_PACKAGE_QWT_OPENGL config BR2_PACKAGE_QWT_OPENGL
bool "OpenGL support" bool "OpenGL support"
depends on (BR2_PACKAGE_HAS_LIBGLES && BR2_PACKAGE_HAS_LIBEGL && BR2_PACKAGE_QT) || \ depends on BR2_PACKAGE_QT5_GL_AVAILABLE
(BR2_PACKAGE_QT5_GL_AVAILABLE && BR2_PACKAGE_QT5) select BR2_PACKAGE_QT5BASE_OPENGL
select BR2_PACKAGE_QT_OPENGL if BR2_PACKAGE_QT select BR2_PACKAGE_QT5BASE_OPENGL_LIB
select BR2_PACKAGE_QT5BASE_OPENGL if BR2_PACKAGE_QT5
select BR2_PACKAGE_QT5BASE_OPENGL_LIB if BR2_PACKAGE_QT5
endif endif

10
package/qwt/qwt.mk
View File

@ -8,13 +8,7 @@ QWT_VERSION = 6.1.3
QWT_SOURCE = qwt-$(QWT_VERSION).tar.bz2 QWT_SOURCE = qwt-$(QWT_VERSION).tar.bz2
QWT_SITE = http://downloads.sourceforge.net/project/qwt/qwt/$(QWT_VERSION) QWT_SITE = http://downloads.sourceforge.net/project/qwt/qwt/$(QWT_VERSION)
QWT_INSTALL_STAGING = YES QWT_INSTALL_STAGING = YES
ifeq ($(BR2_PACKAGE_QT),y) QWT_DEPENDENCIES = qt5base
QWT_DEPENDENCIES = qt
QWT_QMAKE = $(QT_QMAKE)
else ifeq ($(BR2_PACKAGE_QT5),y)
QWT_DEPENDENCIES += qt5base
QWT_QMAKE = $(QT5_QMAKE)
endif
QWT_LICENSE = LGPL-2.1 with exceptions QWT_LICENSE = LGPL-2.1 with exceptions
QWT_LICENSE_FILES = COPYING QWT_LICENSE_FILES = COPYING
@ -49,7 +43,7 @@ endif
define QWT_CONFIGURE_CMDS define QWT_CONFIGURE_CMDS
$(SED) $(QWT_CONFIG) $(@D)/qwtconfig.pri $(SED) $(QWT_CONFIG) $(@D)/qwtconfig.pri
(cd $(@D); $(TARGET_MAKE_ENV) $(QWT_QMAKE)) (cd $(@D); $(TARGET_MAKE_ENV) $(QT5_QMAKE))
endef endef
define QWT_BUILD_CMDS define QWT_BUILD_CMDS