diff options
| author | Enrico Scholz <enrico.scholz@sigma-chemnitz.de> | 2013-12-04 12:18:13 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-12-05 14:24:42 +0000 |
| commit | c3c2cc4180118fef377b7f4ce92b920a6589cf48 (patch) | |
| tree | f79e9e0cd24962bfd861304799e9212cdc5e2857 /meta/recipes-qt/qt4 | |
| parent | 3456bd3ede27686faa95660e7af1565003165cee (diff) | |
| download | poky-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.inc | 2 | ||||
| -rw-r--r-- | meta/recipes-qt/qt4/qt4.inc | 2 |
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 | |||
| 3 | DESCRIPTION = "Qt is a versatile cross-platform application framework -- this is the X11 version." | 3 | DESCRIPTION = "Qt is a versatile cross-platform application framework -- this is the X11 version." |
| 4 | HOMEPAGE = "http://qt-project.org/" | 4 | HOMEPAGE = "http://qt-project.org/" |
| 5 | SECTION = "x11/libs" | 5 | SECTION = "x11/libs" |
| 6 | DEPENDS += "virtual/libgl virtual/libx11 fontconfig libxft libxext libxrender libxrandr libxcursor icu" | 6 | DEPENDS += "virtual/libgl virtual/libx11 fontconfig libxft libxext libxrender libxrandr libxcursor" |
| 7 | PROVIDES += "qt4-x11" | 7 | PROVIDES += "qt4-x11" |
| 8 | QT4DEPENDS = "" | 8 | QT4DEPENDS = "" |
| 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 @@ | |||
| 1 | inherit qmake_base | 1 | inherit qmake_base |
| 2 | 2 | ||
| 3 | DEPENDS += "qt4-tools-native freetype jpeg libpng zlib dbus openssl glib-2.0 gstreamer gst-plugins-base sqlite3 tiff" | 3 | DEPENDS += "qt4-tools-native freetype jpeg libpng zlib dbus openssl glib-2.0 gstreamer gst-plugins-base sqlite3 tiff icu" |
| 4 | DEPENDS += "${@base_contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)}" | 4 | DEPENDS += "${@base_contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)}" |
| 5 | 5 | ||
| 6 | require qt4_arch.inc | 6 | require qt4_arch.inc |