diff options
| -rw-r--r-- | configure.json | 3 | ||||
| -rw-r--r-- | mkspecs/devices/linux-rpi3-g++/qmake.conf | 7 |
2 files changed, 8 insertions, 2 deletions
diff --git a/configure.json b/configure.json index 14ab0c206a..dd1ecb4829 100644 --- a/configure.json +++ b/configure.json @@ -709,7 +709,8 @@ "eglfs-brcm": { "description": "Broadcom EGL (Rasberry Pi)", "type": "compile", - "test": "qpa/eglfs-brcm" + "test": "qpa/eglfs-brcm", + "pkg-config-args": "egl" }, "eglfs-egldevice": { "description": "EGLDevice", diff --git a/mkspecs/devices/linux-rpi3-g++/qmake.conf b/mkspecs/devices/linux-rpi3-g++/qmake.conf index a660577565..10862ccd70 100644 --- a/mkspecs/devices/linux-rpi3-g++/qmake.conf +++ b/mkspecs/devices/linux-rpi3-g++/qmake.conf @@ -1,7 +1,12 @@ -# qmake configuration for the Raspberry Pi 3 (32-bit) using the Broadcom graphics stack +# qmake configuration for the Raspberry Pi 3 using the Broadcom graphics stack include(../common/linux_device_pre.conf) +# For modern Yocto-based sysroots that have the proper include and lib +# setup in egl.pc we will pull the necessary arguments from +# there. However, to support Raspbian and older stuff that has /opt/vc +# and possibly no pkg-config, have some static values as well: + # I consider it a bug that this is required, but our EGL config.test _requires_ it QMAKE_LFLAGS += -Wl,-rpath-link,$$[QT_SYSROOT]/opt/vc/lib |