From: Paul Eggleton <paul.eggleton@linux.intel.com>
Date: Fri, 20 Sep 2013 13:01:26 +0000 (+0100)
Subject: qt4-x11-free: disable QGtkStyle
X-Git-Tag: 2015-4~5051
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=6bef1e02dff6c6482791ab424d7e5dedeb840cf6;p=openembedded-core.git

qt4-x11-free: disable QGtkStyle

This currently leads to a floating dependency on GTK+. Since most users
in an embedded context won't need this, just disable it by default.

Fixes [YOCTO #5116].

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/recipes-qt/qt4/qt4-x11-free.inc b/meta/recipes-qt/qt4/qt4-x11-free.inc
index 4b29f55573..369b3d5ae0 100644
--- a/meta/recipes-qt/qt4/qt4-x11-free.inc
+++ b/meta/recipes-qt/qt4/qt4-x11-free.inc
@@ -12,7 +12,7 @@ INC_PR = "r50"
 QT_GLFLAGS ?= "${@base_contains('DISTRO_FEATURES', 'opengl', '-opengl', '-no-opengl', d)} "
 QT_GLFLAGS_qemux86 = "-opengl"
 QT_GLFLAGS_qemuppc = "-opengl"
-QT_X11_FLAGS ?= "-no-xinerama -no-xkb"
+QT_X11_FLAGS ?= "-no-xinerama -no-xkb -no-gtkstyle"
 QT_CONFIG_FLAGS += "${QT_X11_FLAGS}"
 QT_BASE_LIB  ?= "libqt"