qt4: fixed dependency on icu
authorEnrico Scholz <enrico.scholz@sigma-chemnitz.de>
Wed, 4 Dec 2013 11:18:13 +0000 (12:18 +0100)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Thu, 5 Dec 2013 14:24:42 +0000 (14:24 +0000)
commit242759808f580756c9e1be0c31816152b1deb122
tree76886902950523edacd270a19d685e37f22ff0c0
parenta718cebd9adc3dd585cd3ff66297b674e19365d8
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>
meta/recipes-qt/qt4/qt4-x11-free.inc
meta/recipes-qt/qt4/qt4.inc