diff options
| author |   Hongxu Jia <hongxu.jia@windriver.com> | 2014-02-27 17:32:19 +0800 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-02-28 13:52:42 +0000 |
| commit | a4b9e424a7186bc3ba49c2566237600ed1682d7f (patch) | |
| tree | 2fee19e6bac992623978d4da259149dae97a2686 /meta/recipes-qt/qt4/qt-mobility_1.2.0.inc | |
| parent | 96b7f6ede9bce0917ed543385f526436fea26787 (diff) | |
| download | openembedded-core-a4b9e424a7186bc3ba49c2566237600ed1682d7f.tar.gz | |
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@windriver.com>
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta/recipes-qt/qt4/qt-mobility_1.2.0.inc')
| -rw-r--r-- | meta/recipes-qt/qt4/qt-mobility_1.2.0.inc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/meta/recipes-qt/qt4/qt-mobility_1.2.0.inc b/meta/recipes-qt/qt4/qt-mobility_1.2.0.inc index 062702ff5a..72d361ea9d 100644 --- a/meta/recipes-qt/qt4/qt-mobility_1.2.0.inc +++ b/meta/recipes-qt/qt4/qt-mobility_1.2.0.inc @@ -18,6 +18,7 @@ SRC_URI = "http://get.qt.nokia.com/qt/add-ons/qt-mobility-opensource-src-${PV}.t file://qt-mobility-no-opengl.patch \ file://gcc-scope.patch \ file://qt-mobility-no-xvideo.patch \ + file://fix_metaobjectbuilder_build_err.patch \ file://0001-fix-embedded-usage-doesn-t-work-outside-of-Qt.patch \ " |