summaryrefslogtreecommitdiffstats
path: root/meta/recipes-qt/qt4
diff options
context:
space:
mode:
authorEnrico Scholz <enrico.scholz@sigma-chemnitz.de>2013-12-04 12:18:13 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-12-05 14:24:42 +0000
commitc3c2cc4180118fef377b7f4ce92b920a6589cf48 (patch)
treef79e9e0cd24962bfd861304799e9212cdc5e2857 /meta/recipes-qt/qt4
parent3456bd3ede27686faa95660e7af1565003165cee (diff)
downloadpoky-c3c2cc4180118fef377b7f4ce92b920a6589cf48.tar.gz
qt4: fixed dependency on icu
Commit 46dcec6fd455584d9b5d0d7ff1e5b36fbe5a2d62 added 'icu' to DEPENDS in qt4-x11 only, but enabled icu globally in qt4.inc. This breaks build of qt4-embedded because this recipe does not have such a DEPENDS but uses qt4.inc: | icu.cpp:42:28: fatal error: unicode/utypes.h: No such file or directory | #include <unicode/utypes.h> | ^ | compilation terminated. | make: *** [icu.o] Error 1 Patch moves the 'icu' dependency into qt4.inc. (From OE-Core rev: adb6e64d69fc947f2c8fa708dcbe854fd2b574f8) Signed-off-by: Enrico Scholz <enrico.scholz@sigma-chemnitz.de> Cc: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-qt/qt4')
-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 46869aa09f..369b3d5ae0 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
3DESCRIPTION = "Qt is a versatile cross-platform application framework -- this is the X11 version." 3DESCRIPTION = "Qt is a versatile cross-platform application framework -- this is the X11 version."
4HOMEPAGE = "http://qt-project.org/" 4HOMEPAGE = "http://qt-project.org/"
5SECTION = "x11/libs" 5SECTION = "x11/libs"
6DEPENDS += "virtual/libgl virtual/libx11 fontconfig libxft libxext libxrender libxrandr libxcursor icu" 6DEPENDS += "virtual/libgl virtual/libx11 fontconfig libxft libxext libxrender libxrandr libxcursor"
7PROVIDES += "qt4-x11" 7PROVIDES += "qt4-x11"
8QT4DEPENDS = "" 8QT4DEPENDS = ""
9 9
diff --git a/meta/recipes-qt/qt4/qt4.inc b/meta/recipes-qt/qt4/qt4.inc
index 659561ce87..9a10138e94 100644
--- a/meta/recipes-qt/qt4/qt4.inc
+++ b/meta/recipes-qt/qt4/qt4.inc
@@ -1,6 +1,6 @@
1inherit qmake_base 1inherit qmake_base
2 2
3DEPENDS += "qt4-tools-native freetype jpeg libpng zlib dbus openssl glib-2.0 gstreamer gst-plugins-base sqlite3 tiff" 3DEPENDS += "qt4-tools-native freetype jpeg libpng zlib dbus openssl glib-2.0 gstreamer gst-plugins-base sqlite3 tiff icu"
4DEPENDS += "${@base_contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)}" 4DEPENDS += "${@base_contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)}"
5 5
6require qt4_arch.inc 6require qt4_arch.inc