All of lore.kernel.org
 help / color / mirror / Atom feed
From: Peter Korsgaard <peter@korsgaard.com>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH 15/16] package/qwt: remove qt4 support
Date: Wed,  6 Feb 2019 15:10:57 +0100	[thread overview]
Message-ID: <20190206141058.24155-15-peter@korsgaard.com> (raw)
In-Reply-To: <20190206141058.24155-1-peter@korsgaard.com>

Qt4 support is about to be dropped, so remove the support from qwt as well.

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/qwt/Config.in | 20 ++++++++------------
 package/qwt/qwt.mk    | 10 ++--------
 2 files changed, 10 insertions(+), 20 deletions(-)

diff --git a/package/qwt/Config.in b/package/qwt/Config.in
index 041c2d102c..f4132c8638 100644
--- a/package/qwt/Config.in
+++ b/package/qwt/Config.in
@@ -1,10 +1,9 @@
 config BR2_PACKAGE_QWT
 	bool "qwt"
-	depends on BR2_PACKAGE_QT || BR2_PACKAGE_QT5
-	select BR2_PACKAGE_QT_GUI_MODULE if BR2_PACKAGE_QT
-	select BR2_PACKAGE_QT5BASE_GUI if BR2_PACKAGE_QT5
-	select BR2_PACKAGE_QT5BASE_WIDGETS if BR2_PACKAGE_QT5 # printsupport
-	select BR2_PACKAGE_QT5BASE_CONCURRENT if BR2_PACKAGE_QT5
+	depends on BR2_PACKAGE_QT5
+	select BR2_PACKAGE_QT5BASE
+	select BR2_PACKAGE_QT5BASE_WIDGETS # printsupport
+	select BR2_PACKAGE_QT5BASE_CONCURRENT
 	help
 	  Qwt is a graphics extension to the Qt GUI application
 	  framework. It provides a 2D plotting widget and more.
@@ -15,18 +14,15 @@ if BR2_PACKAGE_QWT
 
 config BR2_PACKAGE_QWT_SVG
 	bool "SVG support"
-	select BR2_PACKAGE_QT_SVG if BR2_PACKAGE_QT
-	select BR2_PACKAGE_QT5SVG if BR2_PACKAGE_QT5
+	select BR2_PACKAGE_QT5SVG
 
 config BR2_PACKAGE_QWT_MATHML
 	bool "MathML support"
 
 config BR2_PACKAGE_QWT_OPENGL
 	bool "OpenGL support"
-	depends on (BR2_PACKAGE_HAS_LIBGLES && BR2_PACKAGE_HAS_LIBEGL && BR2_PACKAGE_QT) || \
-		(BR2_PACKAGE_QT5_GL_AVAILABLE && BR2_PACKAGE_QT5)
-	select BR2_PACKAGE_QT_OPENGL if BR2_PACKAGE_QT
-	select BR2_PACKAGE_QT5BASE_OPENGL if BR2_PACKAGE_QT5
-	select BR2_PACKAGE_QT5BASE_OPENGL_LIB if BR2_PACKAGE_QT5
+	depends on BR2_PACKAGE_QT5_GL_AVAILABLE
+	select BR2_PACKAGE_QT5BASE_OPENGL
+	select BR2_PACKAGE_QT5BASE_OPENGL_LIB
 
 endif
diff --git a/package/qwt/qwt.mk b/package/qwt/qwt.mk
index 619453bfc9..f381ebbb7a 100644
--- a/package/qwt/qwt.mk
+++ b/package/qwt/qwt.mk
@@ -8,13 +8,7 @@ QWT_VERSION = 6.1.3
 QWT_SOURCE = qwt-$(QWT_VERSION).tar.bz2
 QWT_SITE = http://downloads.sourceforge.net/project/qwt/qwt/$(QWT_VERSION)
 QWT_INSTALL_STAGING = YES
-ifeq ($(BR2_PACKAGE_QT),y)
-QWT_DEPENDENCIES = qt
-QWT_QMAKE = $(QT_QMAKE)
-else ifeq ($(BR2_PACKAGE_QT5),y)
-QWT_DEPENDENCIES += qt5base
-QWT_QMAKE = $(QT5_QMAKE)
-endif
+QWT_DEPENDENCIES = qt5base
 
 QWT_LICENSE = LGPL-2.1 with exceptions
 QWT_LICENSE_FILES = COPYING
@@ -49,7 +43,7 @@ endif
 
 define QWT_CONFIGURE_CMDS
 	$(SED) $(QWT_CONFIG) $(@D)/qwtconfig.pri
-	(cd $(@D); $(TARGET_MAKE_ENV) $(QWT_QMAKE))
+	(cd $(@D); $(TARGET_MAKE_ENV) $(QT5_QMAKE))
 endef
 
 define QWT_BUILD_CMDS
-- 
2.11.0

  parent reply	other threads:[~2019-02-06 14:10 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-02-06 14:10 [Buildroot] [PATCH 01/16] package/gnuradio: remove qtgui option Peter Korsgaard
2019-02-06 14:10 ` [Buildroot] [PATCH 02/16] package/python-pyqt: remove package Peter Korsgaard
2019-02-06 14:10 ` [Buildroot] [PATCH 03/16] package/python-sip: remove qt4 support Peter Korsgaard
2019-02-06 14:10 ` [Buildroot] [PATCH 04/16] package/sdl: remove qtopia video driver option Peter Korsgaard
2019-02-06 14:10 ` [Buildroot] [PATCH 05/16] package/amd-catalyst: remove control center option Peter Korsgaard
2019-02-06 14:10 ` [Buildroot] [PATCH 06/16] package/opencv: remove qt backend option Peter Korsgaard
2019-02-06 14:10 ` [Buildroot] [PATCH 07/16] package/opencv3: " Peter Korsgaard
2019-02-06 14:10 ` [Buildroot] [PATCH 08/16] package/poppler: remove qt option Peter Korsgaard
2019-02-06 14:10 ` [Buildroot] [PATCH 09/16] package/pinentry: remove qt4 option Peter Korsgaard
2019-02-06 14:10 ` [Buildroot] [PATCH 10/16] package/qtuio: remove package Peter Korsgaard
2019-02-06 14:10 ` [Buildroot] [PATCH 11/16] package/libmediaart: remove qt4 support Peter Korsgaard
2019-02-06 14:10 ` [Buildroot] [PATCH 12/16] package/qextserialport: " Peter Korsgaard
2019-02-06 14:10 ` [Buildroot] [PATCH 13/16] package/gjson: " Peter Korsgaard
2019-02-06 14:10 ` [Buildroot] [PATCH 14/16] package/quazip: " Peter Korsgaard
2019-02-06 14:10 ` Peter Korsgaard [this message]
2019-02-06 14:10 ` [Buildroot] [PATCH 16/16] package/qt: remove package Peter Korsgaard
2019-02-06 14:39 ` [Buildroot] [PATCH 01/16] package/gnuradio: remove qtgui option Gwenhael Goavec-Merou
2019-02-06 14:52   ` Thomas Petazzoni
2019-02-06 14:54     ` Arnout Vandecappelle

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190206141058.24155-15-peter@korsgaard.com \
    --to=peter@korsgaard.com \
    --cc=buildroot@busybox.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.