summaryrefslogtreecommitdiffstats
path: root/meta/recipes-qt
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2013-11-29 13:51:05 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-11-30 22:26:29 +0000
commitea03ed0e8da1110e5cd27365f7b1f3f071572d02 (patch)
tree4f37c71a3e0bd6ed2a555d1bc515f2affdefd25b /meta/recipes-qt
parent8337aa3795aa0b8f46c40827652f1f882988e36a (diff)
downloadpoky-ea03ed0e8da1110e5cd27365f7b1f3f071572d02.tar.gz
poky-ea03ed0e8da1110e5cd27365f7b1f3f071572d02.tar.bz2
poky-ea03ed0e8da1110e5cd27365f7b1f3f071572d02.zip
qt4-x11-free: depend on ICU
ICU presence is auto-detected at configure time and until recently (e68850 and d61230) was pulled into most builds through harfbuzz and beecrypt. Now it's floating and this leads to build failures. As in all likelihood the majority of people were building this with ICU enabled, add an explicit dependency. (From OE-Core rev: 46dcec6fd455584d9b5d0d7ff1e5b36fbe5a2d62) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-qt')
-rw-r--r--meta/recipes-qt/qt4/qt4-x11-free.inc2
-rw-r--r--meta/recipes-qt/qt4/qt4.inc2
2 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-qt/qt4/qt4-x11-free.inc b/meta/recipes-qt/qt4/qt4-x11-free.inc
index 369b3d5ae0..46869aa09f 100644
--- a/meta/recipes-qt/qt4/qt4-x11-free.inc
+++ b/meta/recipes-qt/qt4/qt4-x11-free.inc
@@ -3,7 +3,7 @@ require qt4.inc
DESCRIPTION = "Qt is a versatile cross-platform application framework -- this is the X11 version."
HOMEPAGE = "http://qt-project.org/"
SECTION = "x11/libs"
-DEPENDS += "virtual/libgl virtual/libx11 fontconfig libxft libxext libxrender libxrandr libxcursor"
+DEPENDS += "virtual/libgl virtual/libx11 fontconfig libxft libxext libxrender libxrandr libxcursor icu"
PROVIDES += "qt4-x11"
QT4DEPENDS = ""
diff --git a/meta/recipes-qt/qt4/qt4.inc b/meta/recipes-qt/qt4/qt4.inc
index 293eb8786c..659561ce87 100644
--- a/meta/recipes-qt/qt4/qt4.inc
+++ b/meta/recipes-qt/qt4/qt4.inc
@@ -23,7 +23,7 @@ QT_MULTIMEDIA ?= "${@base_contains('DISTRO_FEATURES', 'pulseaudio', '-pulseaudio
QT_CONFIG_FLAGS += "-release -no-cups -reduce-relocations \
-shared -no-nas-sound -no-nis \
-system-libjpeg -system-libpng -system-libtiff -system-zlib \
- -no-pch -stl -glib \
+ -no-pch -stl -glib -icu \
-no-rpath -silent \
${QT_DBUS} \
${QT_QT3SUPPORT} \