From eff2e3cbd66d5492812b1b17d9f45a4e7dedac9f Mon Sep 17 00:00:00 2001 From: Thomas Senyk Date: Thu, 27 Mar 2014 15:33:07 +0100 Subject: [PATCH] qtbase.inc: add -no-xkbcommon If one builds with xkb, both -no-xkb and -no-xkbcommon should be set. Without -no-xkbcommon you'll get link-errors for libcomposeplatforminputcontextplugin.so (From meta-qt5 rev: 82595860225ee056e1291282c7bd4b0d4ed8036d) Signed-off-by: Martin Jansa Signed-off-by: Patrick Ohly --- meta-qt5/recipes-qt/qt5/qtbase.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-qt5/recipes-qt/qt5/qtbase.inc b/meta-qt5/recipes-qt/qt5/qtbase.inc index f521db5..3768871 100644 --- a/meta-qt5/recipes-qt/qt5/qtbase.inc +++ b/meta-qt5/recipes-qt/qt5/qtbase.inc @@ -105,7 +105,7 @@ PACKAGECONFIG[xsync] = "-xsync,-no-xsync" PACKAGECONFIG[xvideo] = "-xvideo,-no-xvideo" PACKAGECONFIG[openvg] = "-openvg,-no-openvg" PACKAGECONFIG[iconv] = "-iconv,-no-iconv,virtual/libiconv" -PACKAGECONFIG[xkb] = "-xkb,-no-xkb,libxkbcommon" +PACKAGECONFIG[xkb] = "-xkb,-no-xkb -no-xkbcommon,libxkbcommon" PACKAGECONFIG[evdev] = "-evdev,-no-evdev" PACKAGECONFIG[mtdev] = "-mtdev,-no-mtdev,mtdev" # depends on glib -- 2.7.4