diff options
| author | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2014-11-01 23:15:11 +0100 |
|---|---|---|
| committer | Peter Korsgaard <peter@korsgaard.com> | 2014-11-03 23:06:23 +0100 |
| commit | 79d4063d78af7c0f21c6d3c1a0ee074976fde32b (patch) | |
| tree | 46834a12ac6ad391013e7612b16e83a71404dfbc | |
| parent | b8eaeaec8cf4d8bdfbea84d35fbd1e57dfc4ca45 (diff) | |
| download | buildroot-79d4063d78af7c0f21c6d3c1a0ee074976fde32b.tar.gz buildroot-79d4063d78af7c0f21c6d3c1a0ee074976fde32b.zip | |
qextserialport: allow building with Qt5
qextserialport builds fine with both Qt4 and Qt5, so this commit
enables it for Qt5.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
| -rw-r--r-- | package/qextserialport/Config.in | 4 | ||||
| -rw-r--r-- | package/qextserialport/qextserialport.mk | 10 |
2 files changed, 9 insertions, 5 deletions
diff --git a/package/qextserialport/Config.in b/package/qextserialport/Config.in index 4e92ecf3bb..ab05920b20 100644 --- a/package/qextserialport/Config.in +++ b/package/qextserialport/Config.in @@ -1,8 +1,6 @@ config BR2_PACKAGE_QEXTSERIALPORT bool "qextserialport" - # Qt is a big library, we don't want to select it - # automatically without the user knowing - depends on BR2_PACKAGE_QT + depends on BR2_PACKAGE_QT || BR2_PACKAGE_QT5 help A Qt library to manage serial ports diff --git a/package/qextserialport/qextserialport.mk b/package/qextserialport/qextserialport.mk index 85abe19e20..2949da98cd 100644 --- a/package/qextserialport/qextserialport.mk +++ b/package/qextserialport/qextserialport.mk @@ -10,13 +10,19 @@ QEXTSERIALPORT_SITE_METHOD = git QEXTSERIALPORT_LICENSE = MIT -QEXTSERIALPORT_DEPENDENCIES = qt - QEXTSERIALPORT_INSTALL_STAGING = YES +ifeq ($(BR2_PACKAGE_QT),y) +QEXTSERIALPORT_DEPENDENCIES += qt define QEXTSERIALPORT_CONFIGURE_CMDS (cd $(@D); $(TARGET_MAKE_ENV) $(QT_QMAKE)) endef +else ifeq ($(BR2_PACKAGE_QT5),y) +QEXTSERIALPORT_DEPENDENCIES += qt5base +define QEXTSERIALPORT_CONFIGURE_CMDS + (cd $(@D); $(TARGET_MAKE_ENV) $(QT5_QMAKE)) +endef +endif define QEXTSERIALPORT_BUILD_CMDS $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) |
