diff options
author | Jonathan Liu <net147@gmail.com> | 2013-07-04 09:50:32 +1000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-07-05 15:44:13 +0100 |
commit | 0463e5c173fed7f081760dea6e8f1bbe4cdbb2e8 (patch) | |
tree | dbf652bc6adf22bc60c0fc5f9d77f21de9f5fa5b /meta/recipes-qt/qt4/qt4.inc | |
parent | 262fa7ee4608c02e41092d3dccaf81463dd4f833 (diff) | |
download | poky-0463e5c173fed7f081760dea6e8f1bbe4cdbb2e8.tar.gz |
qt4: upgrade to 4.8.5
Removed patches integrated upstream.
Added INSANE_SKIP libdir for examples packages as it includes plugin
shared libraries outside of libdir.
(From OE-Core rev: f119566477243ce43b727492dc78b9cb3dd76de4)
Signed-off-by: Jonathan Liu <net147@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-qt/qt4/qt4.inc')
-rw-r--r-- | meta/recipes-qt/qt4/qt4.inc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/meta/recipes-qt/qt4/qt4.inc b/meta/recipes-qt/qt4/qt4.inc index ebe0ea501b..81866ea6e9 100644 --- a/meta/recipes-qt/qt4/qt4.inc +++ b/meta/recipes-qt/qt4/qt4.inc | |||
@@ -185,6 +185,8 @@ FILES_${QT_BASE_NAME}-xmlpatterns = "${bindir}/xmlpatterns*" | |||
185 | FILES_${QT_BASE_NAME}-xmlpatterns-dbg = "${bindir}/.debug/xmlpatterns*" | 185 | FILES_${QT_BASE_NAME}-xmlpatterns-dbg = "${bindir}/.debug/xmlpatterns*" |
186 | FILES_${QT_BASE_NAME}-qml-plugins = "${libdir}/${QT_DIR_NAME}/imports/* ${libdir}/${QT_DIR_NAME}/plugins/qmltooling/*" | 186 | FILES_${QT_BASE_NAME}-qml-plugins = "${libdir}/${QT_DIR_NAME}/imports/* ${libdir}/${QT_DIR_NAME}/plugins/qmltooling/*" |
187 | FILES_${QT_BASE_NAME}-qml-plugins-dbg = "${libdir}/${QT_DIR_NAME}/imports/*/*/*/.debug/* ${libdir}/${QT_DIR_NAME}/imports/*/.debug ${libdir}/${QT_DIR_NAME}/plugins/qmltooling/.debug" | 187 | FILES_${QT_BASE_NAME}-qml-plugins-dbg = "${libdir}/${QT_DIR_NAME}/imports/*/*/*/.debug/* ${libdir}/${QT_DIR_NAME}/imports/*/.debug ${libdir}/${QT_DIR_NAME}/plugins/qmltooling/.debug" |
188 | INSANE_SKIP_${QT_BASE_NAME}-examples += "libdir" | ||
189 | INSANE_SKIP_${QT_BASE_NAME}-examples-dbg += "libdir" | ||
188 | 190 | ||
189 | # License options, to be set by the recipe if different values are needed | 191 | # License options, to be set by the recipe if different values are needed |
190 | QT_LICENSE_FILE ?= "" | 192 | QT_LICENSE_FILE ?= "" |