[oe-commits] Hongxu Jia : qt-mobility: fix metaobjectbuilder build errors

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master
Commit: a4b9e424a7186bc3ba49c2566237600ed1682d7f
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=a4b9e424a7186bc3ba49c2566237600ed1682d7f

Author: Hongxu Jia <hongxu.jia at windriver.com>
Date:   Thu Feb 27 17:32:19 2014 +0800

qt-mobility: fix metaobjectbuilder build errors

Backport upstream patches to fix the build errors:

ipc/qmetaobjectbuilder.cpp:803:65: error: invalid conversion from \
'QMetaObjectExtraData::StaticMetacallFunction {aka void (*)(QObject*, \
QMetaObject::Call, int, void**)}' to 'QtMobility::QMetaObjectBuilder:: \
StaticMetacallFunction {aka int (*)(QMetaObject::Call, int, void**)} \

Upstream-commit:
http://qt.gitorious.org/qt-mobility/qt-mobility/commit/f102053b28009b3094b0e5777177208afa6097c5

Task-number: QTMOBILITY-1990

[YOCTO #4575]

Signed-off-by: Wenzong Fan <wenzong.fan at windriver.com>
Signed-off-by: Mark Hatle <mark.hatle at windriver.com>
Signed-off-by: Hongxu Jia <hongxu.jia at windriver.com>
Signed-off-by: Saul Wold <sgw at linux.intel.com>

---

 .../fix_metaobjectbuilder_build_err.patch          | 4707 ++++++++++++++++++++
 meta/recipes-qt/qt4/qt-mobility_1.2.0.inc          |    1 +
 2 files changed, 4708 insertions(+)

Diff:   http://git.openembedded.org/?p=openembedded-core.git/?a=commitdiff;h=a4b9e424a7186bc3ba49c2566237600ed1682d7f