]> code.ossystems Code Review - openembedded-core.git/commit
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, 12 Dec 2013 17:02:33 +0000 (17:02 +0000)
commitec35d5b4b3d2eed7a141f2fd41d5ed7215e66dbf
tree070635ae3ab8f1560df3872169de68e26bf195a1
parenta2a200a3951cecd7dd43dee360e0260051c97416
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