openwrt-mirror/video
1
0
Fork 0
mirror of https://github.com/openwrt/video.git synced 2025-12-21 19:14:35 +04:00
Code Issues Packages Projects Releases Wiki Activity

qt5base: fix plugin loading

Browse Source 
Do not use strip any more when it is selected because plugin loading
does not work for plugins build stripped with sstrip, use normal strip
instead.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
This commit is contained in:
Hauke Mehrtens
2016-07-23 22:06:21 +02:00
parent 9194f1f76b
commit f66892f71a
1 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
frameworks/qt5base/Makefile
View File

@@ -6,7 +6,6 @@
# #
# TODO / known bugs: # TODO / known bugs:
# - plugins don't work when sstrip is used for stripping
# - only framebuffer (linuxfb) support for now, XBC/DirectFB to come - thus no GL thus no qtquick2 / QML2, as it has a hard dependency on GL # - only framebuffer (linuxfb) support for now, XBC/DirectFB to come - thus no GL thus no qtquick2 / QML2, as it has a hard dependency on GL
# - host_build functionality seems to be broken - qmake doesn't switch to the host toolchain (linux-g++) when host_build gets invoked # - host_build functionality seems to be broken - qmake doesn't switch to the host toolchain (linux-g++) when host_build gets invoked
@@ -40,6 +39,22 @@ PKG_CONFIG_DEPENDS:= \
CONFIG_PACKAGE_qt5base-plugin-platforms-linuxfb \ CONFIG_PACKAGE_qt5base-plugin-platforms-linuxfb \
CONFIG_PACKAGE_qt5base-plugin-platforms-minimal CONFIG_PACKAGE_qt5base-plugin-platforms-minimal
# Do not use sstrip for QT5. When sstrip is used the QT5 plugin loading does
# not work, because of QT''s internal elf parser, see
# https://bugreports.qt.io/browse/QTBUG-52567
# Use the code from the gcc package to use strip instaed.
ifneq ($(CONFIG_USE_SSTRIP),)
STRIP:=$(TARGET_CROSS)strip $(call qstrip,$(CONFIG_STRIP_ARGS))
RSTRIP:= \
export CROSS="$(TARGET_CROSS)" \
$(if $(CONFIG_KERNEL_KALLSYMS),NO_RENAME=1) \
$(if $(CONFIG_KERNEL_PROFILING),KEEP_SYMBOLS=1); \
NM="$(TARGET_CROSS)nm" \
STRIP="$(STRIP)" \
STRIP_KMOD="$(SCRIPT_DIR)/strip-kmod.sh" \
$(SCRIPT_DIR)/rstrip.sh
endif
define Package/qt5base/Default define Package/qt5base/Default
SECTION:=video-frameworks SECTION:=video-frameworks
CATEGORY:=Video CATEGORY:=Video