diff --git a/package/qt5/qt5base/qmake.conf b/package/qt5/qt5base/qmake.conf.in similarity index 98% rename from package/qt5/qt5base/qmake.conf rename to package/qt5/qt5base/qmake.conf.in index 8b6debe583..d62ee7cebe 100644 --- a/package/qt5/qt5base/qmake.conf +++ b/package/qt5/qt5base/qmake.conf.in @@ -24,5 +24,7 @@ QMAKE_CFLAGS_ISYSTEM = # Architecturespecific configuration include(arch.conf) +@EGLFS_DEVICE@ + include(../common/linux_device_post.conf) load(qt_config) diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk index 76c129d2e4..a9a79ba087 100644 --- a/package/qt5/qt5base/qt5base.mk +++ b/package/qt5/qt5base/qt5base.mk @@ -242,10 +242,7 @@ QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_DBUS) += Qt5DBus ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST)$(BR2_PACKAGE_IMX_GPU_VIV),yy) # use vivante backend -define QT5BASE_CONFIGURE_QMAKE_CONFIG - echo "EGLFS_DEVICE_INTEGRATION = eglfs_viv" >> \ - $(@D)/mkspecs/devices/linux-buildroot-g++/qmake.conf -endef +QT5BASE_EGLFS_DEVICE = EGLFS_DEVICE_INTEGRATION = eglfs_viv endif ifneq ($(QT5BASE_CONFIG_FILE),) @@ -263,7 +260,9 @@ endef endif define QT5BASE_CONFIGURE_CMDS - $(INSTALL) -m 0644 -D $(QT5BASE_PKGDIR)/qmake.conf \ + mkdir -p $(@D)/mkspecs/devices/linux-buildroot-g++/ + sed 's/@EGLFS_DEVICE@/$(QT5BASE_EGLFS_DEVICE)/g' \ + $(QT5BASE_PKGDIR)/qmake.conf.in > \ $(@D)/mkspecs/devices/linux-buildroot-g++/qmake.conf $(QT5BASE_CONFIGURE_QMAKE_CONFIG) $(INSTALL) -m 0644 -D $(QT5BASE_PKGDIR)/qplatformdefs.h \