Revert "qtbase: remove patches required for native(-sdk) only"
authorOtavio Salvador <otavio@ossystems.com.br>
Fri, 27 Feb 2015 16:23:08 +0000 (13:23 -0300)
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>
Fri, 24 Jul 2015 16:42:10 +0000 (13:42 -0300)
This reverts commit b4be9ded11fd6738f0edeb10bada3c83f82a88a0.

The change breaks qtxmlpatterns like:

,----
| ERROR: QA Issue: qtxmlpatterns: The compile log indicates that
|     host include and/or library paths were used.
|          Please check the log
|          '.../tmp/work/.../qtxmlpatterns/5.4.0-r0/temp/log.do_compile'
|          for more information. [compile-host-path]
`----

(From meta-qt5 rev: d02ea33262489f6892db857f9674d14a08f7ca54)

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
meta-qt5/recipes-qt/qt5/qtbase.inc

index da60b76..fd3e681 100644 (file)
@@ -5,6 +5,8 @@ SRC_URI += "\
     file://0001-Add-linux-oe-g-platform.patch \
     file://0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch \
     file://0003-Add-external-hostbindir-option.patch \
+    file://0004-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch \
+    file://0005-qt_module-Fix-pkgconfig-and-libtool-replacements.patch \
     file://0006-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch \
     file://0007-qeglplatformintegration-Undefine-CursorShape-from-X..patch \
     file://0008-configure-bump-path-length-from-256-to-512-character.patch \