aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Mark Thompson <mark.thompson@starleaf.com>2019-03-08 18:33:39 +0000
committerGravatar Thomas Petazzoni <thomas.petazzoni@bootlin.com>2019-03-14 22:23:06 +0100
commit9ecadf14d65b84b9a5b4a37bd17c2c65e4906cbc (patch)
tree515f9e1d960a702d51c0977e837afd4892e41dfe
parent9a05759bf8060e58cdfcae9074208a702d1b0de7 (diff)
downloadbuildroot-9ecadf14d65b84b9a5b4a37bd17c2c65e4906cbc.tar.gz
buildroot-9ecadf14d65b84b9a5b4a37bd17c2c65e4906cbc.tar.bz2
package/qt5/qt5virtualkeyboard: install shared library
Between Qt 5.11 and 5.12 the virtual keyboard package gained a new top-level library, libQt5VirtualKeyboard.so, which is then used by all of the plugins it installs. This change makes Buildroot aware of the new library so that we install it to the target filesystem. Signed-off-by: Mark Thompson <mark.thompson@starleaf.com> [Thomas: move the definition of QT5VIRTUALKEYBOARD_INSTALL_TARGET_LIBS into a separate condition] Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
-rw-r--r--package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk7
1 files changed, 7 insertions, 0 deletions
diff --git a/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk b/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk
index 8ce3169774..3f1ebdbaa4 100644
--- a/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk
+++ b/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk
@@ -93,10 +93,17 @@ define QT5VIRTUALKEYBOARD_INSTALL_TARGET_EXAMPLES
endef
endif
+ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST):$(BR2_STATIC_LIBS),y:)
+define QT5VIRTUALKEYBOARD_INSTALL_TARGET_LIBS
+ cp -dpf $(STAGING_DIR)/usr/lib/libQt5VirtualKeyboard*.so.* $(TARGET_DIR)/usr/lib
+endef
+endif
+
define QT5VIRTUALKEYBOARD_INSTALL_TARGET_CMDS
mkdir -p $(TARGET_DIR)/usr/lib/qt/plugins/platforminputcontexts
cp -dpfr $(STAGING_DIR)/usr/lib/qt/plugins/platforminputcontexts/libqtvirtualkeyboardplugin.so \
$(TARGET_DIR)/usr/lib/qt/plugins/platforminputcontexts
+ $(QT5VIRTUALKEYBOARD_INSTALL_TARGET_LIBS)
$(QT5VIRTUALKEYBOARD_INSTALL_TARGET_QML)
$(QT5VIRTUALKEYBOARD_INSTALL_TARGET_3RDPARTY_PARTS)
$(QT5VIRTUALKEYBOARD_INSTALL_TARGET_EXAMPLES)