aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Peter Korsgaard <peter@korsgaard.com>2019-02-06 15:10:54 +0100
committerGravatar Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>2019-02-06 15:41:36 +0100
commit122f8cf1cb4a54a2585d7fa022df10ab529e4261 (patch)
tree29df881961d30155e0ed548e54d0c00778c8414c
parent723e10c414b26f1b4a8b92de691a3d045e4cb379 (diff)
downloadbuildroot-122f8cf1cb4a54a2585d7fa022df10ab529e4261.tar.gz
buildroot-122f8cf1cb4a54a2585d7fa022df10ab529e4261.tar.bz2
package/qextserialport: remove qt4 support
Qt4 support is about to be dropped, so remove the support from qextserialport as well. Signed-off-by: Peter Korsgaard <peter@korsgaard.com> Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
-rw-r--r--package/qextserialport/Config.in2
-rw-r--r--package/qextserialport/qextserialport.mk10
2 files changed, 3 insertions, 9 deletions
diff --git a/package/qextserialport/Config.in b/package/qextserialport/Config.in
index 4e7ef13784..f880d335e5 100644
--- a/package/qextserialport/Config.in
+++ b/package/qextserialport/Config.in
@@ -1,6 +1,6 @@
config BR2_PACKAGE_QEXTSERIALPORT
bool "qextserialport"
- depends on BR2_PACKAGE_QT || BR2_PACKAGE_QT5
+ depends on BR2_PACKAGE_QT5
help
A Qt library to manage serial ports
diff --git a/package/qextserialport/qextserialport.mk b/package/qextserialport/qextserialport.mk
index e3e325ce6c..ecaff21efc 100644
--- a/package/qextserialport/qextserialport.mk
+++ b/package/qextserialport/qextserialport.mk
@@ -14,16 +14,10 @@ ifeq ($(BR2_STATIC_LIBS),y)
QEXTSERIALPORT_CONF_OPTS += CONFIG+=qesp_static
endif
-ifeq ($(BR2_PACKAGE_QT),y)
-QEXTSERIALPORT_DEPENDENCIES += qt
-QEXTSERIALPORT_QMAKE = $(QT_QMAKE)
-else ifeq ($(BR2_PACKAGE_QT5),y)
-QEXTSERIALPORT_DEPENDENCIES += qt5base
-QEXTSERIALPORT_QMAKE = $(QT5_QMAKE)
-endif
+QEXTSERIALPORT_DEPENDENCIES = qt5base
define QEXTSERIALPORT_CONFIGURE_CMDS
- cd $(@D); $(TARGET_MAKE_ENV) $(QEXTSERIALPORT_QMAKE) $(QEXTSERIALPORT_CONF_OPTS)
+ cd $(@D); $(TARGET_MAKE_ENV) $(QT5_QMAKE) $(QEXTSERIALPORT_CONF_OPTS)
endef
define QEXTSERIALPORT_BUILD_CMDS