diff options
| author | Jørgen Lind <jorgen.lind@nokia.com> | 2011-03-03 17:40:42 (GMT) |
|---|---|---|
| committer | Jørgen Lind <jorgen.lind@nokia.com> | 2011-03-03 17:40:42 (GMT) |
| commit | 85b3a869fd69cfe14d05edd1fd17f913ba73dd52 (patch) | |
| tree | 7c45d69da25c3997adea17c12a06d7df64215f8d | |
| parent | d585a66127f9ea13a07675e87fe0066037643df5 (diff) | |
| download | Qt-85b3a869fd69cfe14d05edd1fd17f913ba73dd52.zip Qt-85b3a869fd69cfe14d05edd1fd17f913ba73dd52.tar.gz Qt-85b3a869fd69cfe14d05edd1fd17f913ba73dd52.tar.bz2 | |
Lighthouse: Add xkbcommon to pkg-config configuration of wayland
| -rwxr-xr-x | configure | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -6173,10 +6173,10 @@ if [ "$PLATFORM_QPA" = "yes" ]; then fi - if [ -n "$PKG_CONFIG" ] && $PKG_CONFIG --exists wayland-client 2>/dev/null; then - QMAKE_CFLAGS_WAYLAND=`$PKG_CONFIG --cflags wayland-client 2>/dev/null` - QMAKE_LIBS_WAYLAND=`$PKG_CONFIG --libs wayland-client 2>/dev/null` - QMAKE_INCDIR_WAYLAND=`$PKG_CONFIG --variable=includedir wayland-client 2>/dev/null` + if [ -n "$PKG_CONFIG" ] && $PKG_CONFIG --exists wayland-client xkbcommon 2>/dev/null; then + QMAKE_CFLAGS_WAYLAND=`$PKG_CONFIG --cflags wayland-client xkbcommon 2>/dev/null` + QMAKE_LIBS_WAYLAND=`$PKG_CONFIG --libs wayland-client xkbcommon 2>/dev/null` + QMAKE_INCDIR_WAYLAND=`$PKG_CONFIG --variable=includedir wayland-client xkbcommon 2>/dev/null` fi # QMake variables set here override those in the mkspec. Therefore we only set the variables here if they are not zero. |