diff options
| author | Jørgen Lind <jorgen.lind@nokia.com> | 2011-03-16 14:11:40 (GMT) |
|---|---|---|
| committer | Jørgen Lind <jorgen.lind@nokia.com> | 2011-03-16 14:53:16 (GMT) |
| commit | f2f545a37982e44c3a9e614b64bf484294c13756 (patch) | |
| tree | 866c720256cc429d2e423d474651a11fea6229a9 | |
| parent | ce8fd88984f3da545de8132b6094ed519bdbaa11 (diff) | |
| download | Qt-f2f545a37982e44c3a9e614b64bf484294c13756.zip Qt-f2f545a37982e44c3a9e614b64bf484294c13756.tar.gz Qt-f2f545a37982e44c3a9e614b64bf484294c13756.tar.bz2 | |
Lighthouse: Make sure we don't use xkbcommon
when we don't have it
| -rwxr-xr-x | configure | 18 | ||||
| -rw-r--r-- | mkspecs/common/linux.conf | 3 |
2 files changed, 16 insertions, 5 deletions
@@ -6181,10 +6181,18 @@ if [ "$PLATFORM_QPA" = "yes" ]; then fi - 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` + 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` + QMAKE_LIBDIR_WAYLAND=`$PKG_CONFIG --variable=libdir wayland-client 2>/dev/null` + + if [ -n "$PKG_CONFIG" ] && $PKG_CONFIG --exists xkbcommon 2>/dev/null; then + QMAKE_CFLAGS_WAYLAND=$QMAKE_CFLAGS_WAYLAND `$PKG_CONFIG --cflags xkbcommon 2>/dev/null` + QMAKE_LIBS_WAYLAND=$QMAKE_LIBS_WAYLAND `$PKG_CONFIG --libs xkbcommon 2>/dev/null` + else + QMAKE_DEFINES_WAYLAND=QT_NO_WAYLAND_XKB + fi fi # QMake variables set here override those in the mkspec. Therefore we only set the variables here if they are not zero. @@ -6192,6 +6200,8 @@ if [ "$PLATFORM_QPA" = "yes" ]; then QMakeVar set QMAKE_CFLAGS_WAYLAND "$QMAKE_CFLAGS_WAYLAND" QMakeVar set QMAKE_INCDIR_WAYLAND "$QMAKE_INCDIR_WAYLAND" QMakeVar set QMAKE_LIBS_WAYLAND "$QMAKE_LIBS_WAYLAND" + QMakeVar set QMAKE_LIBDIR_WAYLAND "$QMAKE_LIBDIR_WAYLAND" + QMakeVar set QMAKE_DEFINES_WAYLAND " $QMAKE_DEFINES_WAYLAND" fi if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/qpa/wayland "Wayland" $L_FLAGS $I_FLAGS $l_FLAGS $QMAKE_CFLAGS_WAYLAND -I$QMAKE_INCDIR_WAYLAND $QMAKE_LIBS_WAYLAND; then diff --git a/mkspecs/common/linux.conf b/mkspecs/common/linux.conf index 283cf83..d60533e 100644 --- a/mkspecs/common/linux.conf +++ b/mkspecs/common/linux.conf @@ -37,7 +37,8 @@ QMAKE_LIBS_THREAD = -lpthread QMAKE_CFLAGS_WAYLAND = QMAKE_INCDIR_WAYLAND = -QMAKE_LIBS_WAYLAND = -lwayland-client -lxkbcommon +QMAKE_LIBS_WAYLAND = +QMAKE_LIBDIR_WAYLAND = QMAKE_DEFINES_WAYLAND = QMAKE_MOC = $$[QT_INSTALL_BINS]/moc |