diff options
| author | Martin Jansa <Martin.Jansa@gmail.com> | 2014-06-04 17:12:58 +0200 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2014-06-10 12:11:52 +0200 |
| commit | b4e270f9e2e5c632f0958af1a5131efb45bcd799 (patch) | |
| tree | 9c0fe3a4f0fda7c9de63b55e8d8549c55d166410 /recipes-qt/qt5/nativesdk-qtbase_git.bb | |
| parent | 06c25e6a6b9ff6f36f91412b2f8e10e8cd39bf3b (diff) | |
qtbase: Refresh patches to match with stable* branches on github.com/meta-qt5
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/nativesdk-qtbase_git.bb')
| -rw-r--r-- | recipes-qt/qt5/nativesdk-qtbase_git.bb | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb index 7c456931..252cadaf 100644 --- a/recipes-qt/qt5/nativesdk-qtbase_git.bb +++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb @@ -8,25 +8,28 @@ SRC_URI = "\ git://qt.gitorious.org/qt/${QT_MODULE}.git;branch=${QT_MODULE_BRANCH} \ " -# common with -native +# common with -native and -nativesdk SRC_URI += "\ file://0001-Add-linux-oe-g-platform.patch \ - file://0002-Add-external-hostbindir-option.patch \ - file://0003-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.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-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch \ - file://0001-Revert-Use-the-gcc-feature-in-simd.prf.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 \ + file://0009-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch \ + file://0010-Revert-Use-the-gcc-feature-in-simd.prf.patch \ " -# common with native version +# common with -native version SRC_URI += " \ - file://0006-Always-build-uic.patch \ + file://0011-Always-build-uic.patch \ " # specific for nativesdk version SRC_URI += " \ - file://0007-configure-preserve-built-qmake-and-swap-with-native-.patch \ - file://0008-configure-bump-path-length-from-256-to-512-character.patch \ + file://0012-configure-preserve-built-qmake-and-swap-with-native-.patch \ " -SRCREV = "267ba8b63e0fbf02cde4d2709397ed0e12f34ee2" +SRCREV = "80b6fbc2d9dfc753d6570e971aa4cf4f3420585c" |