diff options
| author | Laszlo Agocs <laszlo.agocs@qt.io> | 2016-07-27 08:42:22 +0200 |
|---|---|---|
| committer | Laszlo Agocs <laszlo.agocs@qt.io> | 2016-07-29 07:20:58 +0000 |
| commit | 4940194a35a5776aaaf7959441af58c0a4c04247 (patch) | |
| tree | d9703f499d1ccaf910f11ef8d1a4a28e693f30e2 /mkspecs | |
| parent | c8f29602d677b7f5bfdb7af71a5b7bc5b5e5f60d (diff) | |
Use pkg-config for RPi EGL detection
The config test for eglfs-brcm would fail otherwise on modern Yocto-based
sysroots, as these have no /opt/vc, but have a proper egl.pc that has the
include path and libs.
Task-number: QTBUG-50838
Change-Id: Ibe8dcfbfe9aabe00fd8c040e6e41a4479ccb39bb
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/devices/linux-rpi3-g++/qmake.conf | 7 |
1 files changed, 6 insertions, 1 deletions
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 |