17 lines
1.2 KiB
Diff
17 lines
1.2 KiB
Diff
|
diff -up qtbase-opensource-src-5.3.0/configure.xkbcommon-x11 qtbase-opensource-src-5.3.0/configure
|
||
|
|
--- qtbase-opensource-src-5.3.0/configure.xkbcommon-x11 2014-05-15 12:12:04.000000000 -0500
|
||
|
|
+++ qtbase-opensource-src-5.3.0/configure 2014-05-27 09:48:23.038647709 -0500
|
||
|
|
@@ -5056,9 +5056,9 @@ ORIG_CFG_XKBCOMMON="$CFG_XKBCOMMON"
|
||
|
|
# currently only xcb platform plugin supports building xkbcommon
|
||
|
|
if [ "$CFG_XCB" != "no" ]; then
|
||
|
|
if [ "$CFG_XKBCOMMON" = "auto" ] || [ "$CFG_XKBCOMMON" = "system" ]; then
|
||
|
|
- if [ -n "$PKG_CONFIG" ] && $PKG_CONFIG --exists "xkbcommon xkbcommon-x11 >= $MIN_REQ_XKBCOMMON" 2>/dev/null; then
|
||
|
|
- QMAKE_CFLAGS_XKBCOMMON="`$PKG_CONFIG --cflags xkbcommon xkbcommon-x11 2>/dev/null`"
|
||
|
|
- QMAKE_LIBS_XKBCOMMON="`$PKG_CONFIG --libs xkbcommon xkbcommon-x11 2>/dev/null`"
|
||
|
|
+ if [ -n "$PKG_CONFIG" ] && $PKG_CONFIG --exists "xkbcommon >= $MIN_REQ_XKBCOMMON" 2>/dev/null; then
|
||
|
|
+ QMAKE_CFLAGS_XKBCOMMON="`$PKG_CONFIG --cflags xkbcommon 2>/dev/null`"
|
||
|
|
+ QMAKE_LIBS_XKBCOMMON="`$PKG_CONFIG --libs xkbcommon 2>/dev/null`"
|
||
|
|
|
||
|
|
QMakeVar set QMAKE_CFLAGS_XKBCOMMON "$QMAKE_CFLAGS_XKBCOMMON"
|
||
|
|
QMakeVar set QMAKE_LIBS_XKBCOMMON "$QMAKE_LIBS_XKBCOMMON"
|