* [PATCH 0/1] Upgrade qt4 from 4.8.6 to 4.8.7
@ 2015-06-02 7:52 Kai Kang
2015-06-02 7:52 ` [PATCH 1/1] qt4: upgrade " Kai Kang
0 siblings, 1 reply; 4+ messages in thread
From: Kai Kang @ 2015-06-02 7:52 UTC (permalink / raw)
To: openembedded-core
Built for qemux86-64 and qemuarm:
1 bitbake qt4-native qt4-embedded qt4-x11-free nativesdk-qt4-tools
2 bitbake world
The following changes since commit 81f09295b09bd705669bbf0d92a76513ad40f17b:
bitbake: data_smart: fixup3 (2015-06-01 22:22:22 +0100)
are available in the git repository at:
git://git.yoctoproject.org/poky-contrib kangkai/qt4
http://git.yoctoproject.org/cgit.cgi//log/?h=kangkai/qt4
Kai Kang (1):
qt4: upgrade to 4.8.7
meta/recipes-qt/qt4/nativesdk-qt4-tools.inc | 2 -
...tools_4.8.6.bb => nativesdk-qt4-tools_4.8.7.bb} | 4 +-
.../0029-aarch64_arm64_fix_arch_detection.patch | 53 ---
.../0030-aarch64_arm64_qatomic_support.patch | 491 ---------------------
.../qt4/qt4-4.8.6/0031-aarch64_arm64_mkspecs.patch | 124 ------
.../qt4/qt4-4.8.6/0032-aarch64_add_header.patch | 18 -
...ion-by-zero-when-processing-malformed-BMP.patch | 44 --
.../qt4/{qt4-4.8.6.inc => qt4-4.8.7.inc} | 9 +-
...o-allow-to-set-qt.conf-from-the-outside-u.patch | 0
...tty_qws-fix-build-with-old-kernel-headers.patch | 0
...003-webkit2-set-OUTPUT_DIR-value-if-empty.patch | 0
...make-is-already-built-in-qt4-tools-native.patch | 0
...e-set-LFLAGS-to-pick-up-zlib-from-staging.patch | 0
...se-OE_QMAKE_-values-to-specify-Qt-utility.patch | 0
...-const-usage-that-causes-compile-failure-.patch | 0
...llow-building-a-separate-qmake-for-the-ta.patch | 0
...e-fix-source-file-references-in-qmake.pri.patch | 0
...ack-to-not-use-the-pg_config-of-the-host-.patch | 20 +-
.../0011-freetype-host-includes.patch | 0
.../0012-Add-2bpp-support.patch | 0
.../0013-configure-add-crossarch-option.patch | 22 +-
...tions-fix-phony-translation-linking-error.patch | 0
...-configure-add-nostrip-for-debug-packages.patch | 0
.../0016-configure-eval-QMAKE_CXX.patch | 0
...nsure-we-identify-the-compiler-as-g-in-co.patch | 0
...ure-make-pulseaudio-a-configurable-option.patch | 0
...xes-for-gcc-4.7.0-particularly-on-qemux86.patch | 0
...ake-qt4-native-work-with-long-building-pa.patch | 0
...ls.pro-disable-qmeegographicssystemhelper.patch | 0
.../0028-Don-t-crash-on-broken-GIF-images.patch | 0
...figure-support-c-0x-standard-for-directfd.patch | 0
.../Fix-QWSLock-invalid-argument-logs.patch | 0
.../add_check_for_aarch64_32.patch | 0
.../qt4/{qt4-4.8.6 => qt4-4.8.7}/g++.conf | 0
.../qt4/{qt4-4.8.6 => qt4-4.8.7}/linux.conf | 0
.../recipes-qt/qt4/{qt4-4.8.6 => qt4-4.8.7}/qte.sh | 0
meta/recipes-qt/qt4/qt4-embedded.inc | 1 -
...qt4-embedded_4.8.6.bb => qt4-embedded_4.8.7.bb} | 0
meta/recipes-qt/qt4/qt4-native.inc | 6 -
meta/recipes-qt/qt4/qt4-native_4.8.6.bb | 6 -
meta/recipes-qt/qt4/qt4-native_4.8.7.bb | 6 +
meta/recipes-qt/qt4/qt4-x11-free.inc | 2 -
...qt4-x11-free_4.8.6.bb => qt4-x11-free_4.8.7.bb} | 0
43 files changed, 35 insertions(+), 773 deletions(-)
rename meta/recipes-qt/qt4/{nativesdk-qt4-tools_4.8.6.bb => nativesdk-qt4-tools_4.8.7.bb} (44%)
delete mode 100644 meta/recipes-qt/qt4/qt4-4.8.6/0029-aarch64_arm64_fix_arch_detection.patch
delete mode 100644 meta/recipes-qt/qt4/qt4-4.8.6/0030-aarch64_arm64_qatomic_support.patch
delete mode 100644 meta/recipes-qt/qt4/qt4-4.8.6/0031-aarch64_arm64_mkspecs.patch
delete mode 100644 meta/recipes-qt/qt4/qt4-4.8.6/0032-aarch64_add_header.patch
delete mode 100644 meta/recipes-qt/qt4/qt4-4.8.6/0034-Fix-a-division-by-zero-when-processing-malformed-BMP.patch
rename meta/recipes-qt/qt4/{qt4-4.8.6.inc => qt4-4.8.7.inc} (87%)
rename meta/recipes-qt/qt4/{qt4-4.8.6 => qt4-4.8.7}/0001-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch (100%)
rename meta/recipes-qt/qt4/{qt4-4.8.6 => qt4-4.8.7}/0002-qkbdtty_qws-fix-build-with-old-kernel-headers.patch (100%)
rename meta/recipes-qt/qt4/{qt4-4.8.6 => qt4-4.8.7}/0003-webkit2-set-OUTPUT_DIR-value-if-empty.patch (100%)
rename meta/recipes-qt/qt4/{qt4-4.8.6 => qt4-4.8.7}/0004-configure-qmake-is-already-built-in-qt4-tools-native.patch (100%)
rename meta/recipes-qt/qt4/{qt4-4.8.6 => qt4-4.8.7}/0005-configure-set-LFLAGS-to-pick-up-zlib-from-staging.patch (100%)
rename meta/recipes-qt/qt4/{qt4-4.8.6 => qt4-4.8.7}/0006-configure-Use-OE_QMAKE_-values-to-specify-Qt-utility.patch (100%)
rename meta/recipes-qt/qt4/{qt4-4.8.6 => qt4-4.8.7}/0007-dbus-Remove-const-usage-that-causes-compile-failure-.patch (100%)
rename meta/recipes-qt/qt4/{qt4-4.8.6 => qt4-4.8.7}/0008-qmake.pro-Allow-building-a-separate-qmake-for-the-ta.patch (100%)
rename meta/recipes-qt/qt4/{qt4-4.8.6 => qt4-4.8.7}/0009-qmake-fix-source-file-references-in-qmake.pri.patch (100%)
rename meta/recipes-qt/qt4/{qt4-4.8.6 => qt4-4.8.7}/0010-configure-Hack-to-not-use-the-pg_config-of-the-host-.patch (65%)
rename meta/recipes-qt/qt4/{qt4-4.8.6 => qt4-4.8.7}/0011-freetype-host-includes.patch (100%)
rename meta/recipes-qt/qt4/{qt4-4.8.6 => qt4-4.8.7}/0012-Add-2bpp-support.patch (100%)
rename meta/recipes-qt/qt4/{qt4-4.8.6 => qt4-4.8.7}/0013-configure-add-crossarch-option.patch (76%)
rename meta/recipes-qt/qt4/{qt4-4.8.6 => qt4-4.8.7}/0014-translations-fix-phony-translation-linking-error.patch (100%)
rename meta/recipes-qt/qt4/{qt4-4.8.6 => qt4-4.8.7}/0015-configure-add-nostrip-for-debug-packages.patch (100%)
rename meta/recipes-qt/qt4/{qt4-4.8.6 => qt4-4.8.7}/0016-configure-eval-QMAKE_CXX.patch (100%)
rename meta/recipes-qt/qt4/{qt4-4.8.6 => qt4-4.8.7}/0017-configure-ensure-we-identify-the-compiler-as-g-in-co.patch (100%)
rename meta/recipes-qt/qt4/{qt4-4.8.6 => qt4-4.8.7}/0018-configure-make-pulseaudio-a-configurable-option.patch (100%)
rename meta/recipes-qt/qt4/{qt4-4.8.6 => qt4-4.8.7}/0019-Fixes-for-gcc-4.7.0-particularly-on-qemux86.patch (100%)
rename meta/recipes-qt/qt4/{qt4-4.8.6 => qt4-4.8.7}/0021-configure-make-qt4-native-work-with-long-building-pa.patch (100%)
rename meta/recipes-qt/qt4/{qt4-4.8.6 => qt4-4.8.7}/0027-tools.pro-disable-qmeegographicssystemhelper.patch (100%)
rename meta/recipes-qt/qt4/{qt4-4.8.6 => qt4-4.8.7}/0028-Don-t-crash-on-broken-GIF-images.patch (100%)
rename meta/recipes-qt/qt4/{qt4-4.8.6 => qt4-4.8.7}/0033-configure-support-c-0x-standard-for-directfd.patch (100%)
rename meta/recipes-qt/qt4/{qt4-4.8.6 => qt4-4.8.7}/Fix-QWSLock-invalid-argument-logs.patch (100%)
rename meta/recipes-qt/qt4/{qt4-4.8.6 => qt4-4.8.7}/add_check_for_aarch64_32.patch (100%)
rename meta/recipes-qt/qt4/{qt4-4.8.6 => qt4-4.8.7}/g++.conf (100%)
rename meta/recipes-qt/qt4/{qt4-4.8.6 => qt4-4.8.7}/linux.conf (100%)
rename meta/recipes-qt/qt4/{qt4-4.8.6 => qt4-4.8.7}/qte.sh (100%)
rename meta/recipes-qt/qt4/{qt4-embedded_4.8.6.bb => qt4-embedded_4.8.7.bb} (100%)
delete mode 100644 meta/recipes-qt/qt4/qt4-native_4.8.6.bb
create mode 100644 meta/recipes-qt/qt4/qt4-native_4.8.7.bb
rename meta/recipes-qt/qt4/{qt4-x11-free_4.8.6.bb => qt4-x11-free_4.8.7.bb} (100%)
--
1.9.1
^ permalink raw reply [flat|nested] 4+ messages in thread* [PATCH 1/1] qt4: upgrade to 4.8.7 2015-06-02 7:52 [PATCH 0/1] Upgrade qt4 from 4.8.6 to 4.8.7 Kai Kang @ 2015-06-02 7:52 ` Kai Kang 2015-06-02 10:18 ` Burton, Ross 0 siblings, 1 reply; 4+ messages in thread From: Kai Kang @ 2015-06-02 7:52 UTC (permalink / raw) To: openembedded-core Upgrade qt4 packages from version 4.8.6 to 4.8.7. * remove arm64 related patches which are merged * remove 0034-Fix-a-division-by-zero-when-processing-malformed-BMP.patch which is backported. * update 0010-configure-Hack-to-not-use-the-pg_config-of-the-host-.patch and 0013-configure-add-crossarch-option.patch for new version * remove useless variable INC_PR Signed-off-by: Kai Kang <kai.kang@windriver.com> --- meta/recipes-qt/qt4/nativesdk-qt4-tools.inc | 2 - ...tools_4.8.6.bb => nativesdk-qt4-tools_4.8.7.bb} | 4 +- .../0029-aarch64_arm64_fix_arch_detection.patch | 53 --- .../0030-aarch64_arm64_qatomic_support.patch | 491 --------------------- .../qt4/qt4-4.8.6/0031-aarch64_arm64_mkspecs.patch | 124 ------ .../qt4/qt4-4.8.6/0032-aarch64_add_header.patch | 18 - ...ion-by-zero-when-processing-malformed-BMP.patch | 44 -- .../qt4/{qt4-4.8.6.inc => qt4-4.8.7.inc} | 9 +- ...o-allow-to-set-qt.conf-from-the-outside-u.patch | 0 ...tty_qws-fix-build-with-old-kernel-headers.patch | 0 ...003-webkit2-set-OUTPUT_DIR-value-if-empty.patch | 0 ...make-is-already-built-in-qt4-tools-native.patch | 0 ...e-set-LFLAGS-to-pick-up-zlib-from-staging.patch | 0 ...se-OE_QMAKE_-values-to-specify-Qt-utility.patch | 0 ...-const-usage-that-causes-compile-failure-.patch | 0 ...llow-building-a-separate-qmake-for-the-ta.patch | 0 ...e-fix-source-file-references-in-qmake.pri.patch | 0 ...ack-to-not-use-the-pg_config-of-the-host-.patch | 20 +- .../0011-freetype-host-includes.patch | 0 .../0012-Add-2bpp-support.patch | 0 .../0013-configure-add-crossarch-option.patch | 22 +- ...tions-fix-phony-translation-linking-error.patch | 0 ...-configure-add-nostrip-for-debug-packages.patch | 0 .../0016-configure-eval-QMAKE_CXX.patch | 0 ...nsure-we-identify-the-compiler-as-g-in-co.patch | 0 ...ure-make-pulseaudio-a-configurable-option.patch | 0 ...xes-for-gcc-4.7.0-particularly-on-qemux86.patch | 0 ...ake-qt4-native-work-with-long-building-pa.patch | 0 ...ls.pro-disable-qmeegographicssystemhelper.patch | 0 .../0028-Don-t-crash-on-broken-GIF-images.patch | 0 ...figure-support-c-0x-standard-for-directfd.patch | 0 .../Fix-QWSLock-invalid-argument-logs.patch | 0 .../add_check_for_aarch64_32.patch | 0 .../qt4/{qt4-4.8.6 => qt4-4.8.7}/g++.conf | 0 .../qt4/{qt4-4.8.6 => qt4-4.8.7}/linux.conf | 0 .../recipes-qt/qt4/{qt4-4.8.6 => qt4-4.8.7}/qte.sh | 0 meta/recipes-qt/qt4/qt4-embedded.inc | 1 - ...qt4-embedded_4.8.6.bb => qt4-embedded_4.8.7.bb} | 0 meta/recipes-qt/qt4/qt4-native.inc | 6 - meta/recipes-qt/qt4/qt4-native_4.8.6.bb | 6 - meta/recipes-qt/qt4/qt4-native_4.8.7.bb | 6 + meta/recipes-qt/qt4/qt4-x11-free.inc | 2 - ...qt4-x11-free_4.8.6.bb => qt4-x11-free_4.8.7.bb} | 0 43 files changed, 35 insertions(+), 773 deletions(-) rename meta/recipes-qt/qt4/{nativesdk-qt4-tools_4.8.6.bb => nativesdk-qt4-tools_4.8.7.bb} (44%) delete mode 100644 meta/recipes-qt/qt4/qt4-4.8.6/0029-aarch64_arm64_fix_arch_detection.patch delete mode 100644 meta/recipes-qt/qt4/qt4-4.8.6/0030-aarch64_arm64_qatomic_support.patch delete mode 100644 meta/recipes-qt/qt4/qt4-4.8.6/0031-aarch64_arm64_mkspecs.patch delete mode 100644 meta/recipes-qt/qt4/qt4-4.8.6/0032-aarch64_add_header.patch delete mode 100644 meta/recipes-qt/qt4/qt4-4.8.6/0034-Fix-a-division-by-zero-when-processing-malformed-BMP.patch rename meta/recipes-qt/qt4/{qt4-4.8.6.inc => qt4-4.8.7.inc} (87%) rename meta/recipes-qt/qt4/{qt4-4.8.6 => qt4-4.8.7}/0001-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch (100%) rename meta/recipes-qt/qt4/{qt4-4.8.6 => qt4-4.8.7}/0002-qkbdtty_qws-fix-build-with-old-kernel-headers.patch (100%) rename meta/recipes-qt/qt4/{qt4-4.8.6 => qt4-4.8.7}/0003-webkit2-set-OUTPUT_DIR-value-if-empty.patch (100%) rename meta/recipes-qt/qt4/{qt4-4.8.6 => qt4-4.8.7}/0004-configure-qmake-is-already-built-in-qt4-tools-native.patch (100%) rename meta/recipes-qt/qt4/{qt4-4.8.6 => qt4-4.8.7}/0005-configure-set-LFLAGS-to-pick-up-zlib-from-staging.patch (100%) rename meta/recipes-qt/qt4/{qt4-4.8.6 => qt4-4.8.7}/0006-configure-Use-OE_QMAKE_-values-to-specify-Qt-utility.patch (100%) rename meta/recipes-qt/qt4/{qt4-4.8.6 => qt4-4.8.7}/0007-dbus-Remove-const-usage-that-causes-compile-failure-.patch (100%) rename meta/recipes-qt/qt4/{qt4-4.8.6 => qt4-4.8.7}/0008-qmake.pro-Allow-building-a-separate-qmake-for-the-ta.patch (100%) rename meta/recipes-qt/qt4/{qt4-4.8.6 => qt4-4.8.7}/0009-qmake-fix-source-file-references-in-qmake.pri.patch (100%) rename meta/recipes-qt/qt4/{qt4-4.8.6 => qt4-4.8.7}/0010-configure-Hack-to-not-use-the-pg_config-of-the-host-.patch (65%) rename meta/recipes-qt/qt4/{qt4-4.8.6 => qt4-4.8.7}/0011-freetype-host-includes.patch (100%) rename meta/recipes-qt/qt4/{qt4-4.8.6 => qt4-4.8.7}/0012-Add-2bpp-support.patch (100%) rename meta/recipes-qt/qt4/{qt4-4.8.6 => qt4-4.8.7}/0013-configure-add-crossarch-option.patch (76%) rename meta/recipes-qt/qt4/{qt4-4.8.6 => qt4-4.8.7}/0014-translations-fix-phony-translation-linking-error.patch (100%) rename meta/recipes-qt/qt4/{qt4-4.8.6 => qt4-4.8.7}/0015-configure-add-nostrip-for-debug-packages.patch (100%) rename meta/recipes-qt/qt4/{qt4-4.8.6 => qt4-4.8.7}/0016-configure-eval-QMAKE_CXX.patch (100%) rename meta/recipes-qt/qt4/{qt4-4.8.6 => qt4-4.8.7}/0017-configure-ensure-we-identify-the-compiler-as-g-in-co.patch (100%) rename meta/recipes-qt/qt4/{qt4-4.8.6 => qt4-4.8.7}/0018-configure-make-pulseaudio-a-configurable-option.patch (100%) rename meta/recipes-qt/qt4/{qt4-4.8.6 => qt4-4.8.7}/0019-Fixes-for-gcc-4.7.0-particularly-on-qemux86.patch (100%) rename meta/recipes-qt/qt4/{qt4-4.8.6 => qt4-4.8.7}/0021-configure-make-qt4-native-work-with-long-building-pa.patch (100%) rename meta/recipes-qt/qt4/{qt4-4.8.6 => qt4-4.8.7}/0027-tools.pro-disable-qmeegographicssystemhelper.patch (100%) rename meta/recipes-qt/qt4/{qt4-4.8.6 => qt4-4.8.7}/0028-Don-t-crash-on-broken-GIF-images.patch (100%) rename meta/recipes-qt/qt4/{qt4-4.8.6 => qt4-4.8.7}/0033-configure-support-c-0x-standard-for-directfd.patch (100%) rename meta/recipes-qt/qt4/{qt4-4.8.6 => qt4-4.8.7}/Fix-QWSLock-invalid-argument-logs.patch (100%) rename meta/recipes-qt/qt4/{qt4-4.8.6 => qt4-4.8.7}/add_check_for_aarch64_32.patch (100%) rename meta/recipes-qt/qt4/{qt4-4.8.6 => qt4-4.8.7}/g++.conf (100%) rename meta/recipes-qt/qt4/{qt4-4.8.6 => qt4-4.8.7}/linux.conf (100%) rename meta/recipes-qt/qt4/{qt4-4.8.6 => qt4-4.8.7}/qte.sh (100%) rename meta/recipes-qt/qt4/{qt4-embedded_4.8.6.bb => qt4-embedded_4.8.7.bb} (100%) delete mode 100644 meta/recipes-qt/qt4/qt4-native_4.8.6.bb create mode 100644 meta/recipes-qt/qt4/qt4-native_4.8.7.bb rename meta/recipes-qt/qt4/{qt4-x11-free_4.8.6.bb => qt4-x11-free_4.8.7.bb} (100%) diff --git a/meta/recipes-qt/qt4/nativesdk-qt4-tools.inc b/meta/recipes-qt/qt4/nativesdk-qt4-tools.inc index 1c9ee2e..aa84e3d 100644 --- a/meta/recipes-qt/qt4/nativesdk-qt4-tools.inc +++ b/meta/recipes-qt/qt4/nativesdk-qt4-tools.inc @@ -4,8 +4,6 @@ SECTION = "libs" HOMEPAGE = "http://qt-project.org/" LICENSE = "LGPLv2.1 | GPLv3" -INC_PR = "r13" - FILESEXTRAPATHS =. "${FILE_DIRNAME}/qt4-${PV}:" inherit nativesdk qmake2 diff --git a/meta/recipes-qt/qt4/nativesdk-qt4-tools_4.8.6.bb b/meta/recipes-qt/qt4/nativesdk-qt4-tools_4.8.7.bb similarity index 44% rename from meta/recipes-qt/qt4/nativesdk-qt4-tools_4.8.6.bb rename to meta/recipes-qt/qt4/nativesdk-qt4-tools_4.8.7.bb index 00526b8..90ba07c 100644 --- a/meta/recipes-qt/qt4/nativesdk-qt4-tools_4.8.6.bb +++ b/meta/recipes-qt/qt4/nativesdk-qt4-tools_4.8.7.bb @@ -2,5 +2,5 @@ require nativesdk-qt4-tools.inc SRC_URI += "file://0009-qmake-fix-source-file-references-in-qmake.pri.patch" -SRC_URI[md5sum] = "2edbe4d6c2eff33ef91732602f3518eb" -SRC_URI[sha256sum] = "8b14dd91b52862e09b8e6a963507b74bc2580787d171feda197badfa7034032c" +SRC_URI[md5sum] = "d990ee66bf7ab0c785589776f35ba6ad" +SRC_URI[sha256sum] = "e2882295097e47fe089f8ac741a95fef47e0a73a3f3cdf21b56990638f626ea0" diff --git a/meta/recipes-qt/qt4/qt4-4.8.6/0029-aarch64_arm64_fix_arch_detection.patch b/meta/recipes-qt/qt4/qt4-4.8.6/0029-aarch64_arm64_fix_arch_detection.patch deleted file mode 100644 index fbd32b1..0000000 --- a/meta/recipes-qt/qt4/qt4-4.8.6/0029-aarch64_arm64_fix_arch_detection.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 800abbba658203fc8e746e3fc780a297cd4110cf Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Lisandro=20Dami=C3=A1n=20Nicanor=20P=C3=A9rez=20Meyer?= - <perezmeyer@gmail.com> -Date: Wed, 20 Aug 2014 17:52:49 -0300 -Subject: [PATCH] Fix AArch64/arm64 detection. - -The detection needs to go before arm, else the system will detect AArch64/arm64 -as arm. - -This patch comes from Wookey, he has agreed to put it under BSD or Expat -to allow it's inclusion in here: -<https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=735488#255> - -Change-Id: Ic2171c03fca8bb871347940fa3a2bc467776f797 - - -Upstream-Status: Pending - -Signed-off-by: Kai Kang <kai.kang@windriver.com> ---- - configure | 12 ++++++------ - 1 file changed, 6 insertions(+), 6 deletions(-) - -diff --git a/configure b/configure -index a9ba7c8..eb88b72 100755 ---- a/configure -+++ b/configure -@@ -3241,17 +3241,17 @@ if [ -z "${CFG_HOST_ARCH}" ]; then - fi - CFG_HOST_ARCH=s390 - ;; -- *:*:arm*) -+ *:*:aarch64*|*:*:arm64*) - if [ "$OPT_VERBOSE" = "yes" ]; then -- echo " ARM (arm)" -+ echo " AArch64 (aarch64)" - fi -- CFG_HOST_ARCH=arm -+ CFG_HOST_ARCH=aarch64 - ;; -- *:*:aarch64*) -+ *:*:arm*) - if [ "$OPT_VERBOSE" = "yes" ]; then -- echo " AArch64 (aarch64)" -+ echo " ARM (arm)" - fi -- CFG_HOST_ARCH=aarch64 -+ CFG_HOST_ARCH=arm - ;; - Linux:*:sparc*) - if [ "$OPT_VERBOSE" = "yes" ]; then --- -2.1.0 diff --git a/meta/recipes-qt/qt4/qt4-4.8.6/0030-aarch64_arm64_qatomic_support.patch b/meta/recipes-qt/qt4/qt4-4.8.6/0030-aarch64_arm64_qatomic_support.patch deleted file mode 100644 index ba4c2a6..0000000 --- a/meta/recipes-qt/qt4/qt4-4.8.6/0030-aarch64_arm64_qatomic_support.patch +++ /dev/null @@ -1,491 +0,0 @@ -From 294010b562c9846bb2bc4ee9c63ff78adc7c1f4f Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Lisandro=20Dami=C3=A1n=20Nicanor=20P=C3=A9rez=20Meyer?= - <perezmeyer@gmail.com> -Date: Sat, 15 Mar 2014 15:40:49 -0300 -Subject: [PATCH] Add qatomic support for AArch64 (aka arm64). - -Patch by Mark Salter <msalter@redhat.com> -licensed under BSD: - -<https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=735488#195> - -This patch is known to not be the most correct way -to implement them, as it seems to be possible to do it in a faster way, -but should work non the less until we can provide something better. - -Change-Id: Ib392b27dc54691fd4c2ea9896240ad71fb8128cc - - -Upstream-Status: Pending - -Signed-off-by: Kai Kang <kai.kang@windriver.com> - ---- - src/corelib/arch/aarch64/arch.pri | 4 + - src/corelib/arch/aarch64/qatomic_aarch64.cpp | 70 ++++++ - src/corelib/arch/arch.pri | 4 +- - src/corelib/arch/qatomic_aarch64.h | 335 +++++++++++++++++++++++++++ - src/corelib/arch/qatomic_arch.h | 2 + - 5 files changed, 414 insertions(+), 1 deletion(-) - create mode 100644 src/corelib/arch/aarch64/arch.pri - create mode 100644 src/corelib/arch/aarch64/qatomic_aarch64.cpp - create mode 100644 src/corelib/arch/qatomic_aarch64.h - -diff --git a/src/corelib/arch/aarch64/arch.pri b/src/corelib/arch/aarch64/arch.pri -new file mode 100644 -index 0000000..63523d9 ---- /dev/null -+++ b/src/corelib/arch/aarch64/arch.pri -@@ -0,0 +1,4 @@ -+# -+# AArch64 architecture -+# -+SOURCES += $$QT_ARCH_CPP/qatomic_aarch64.cpp -diff --git a/src/corelib/arch/aarch64/qatomic_aarch64.cpp b/src/corelib/arch/aarch64/qatomic_aarch64.cpp -new file mode 100644 -index 0000000..fc851b9 ---- /dev/null -+++ b/src/corelib/arch/aarch64/qatomic_aarch64.cpp -@@ -0,0 +1,70 @@ -+/**************************************************************************** -+** -+** Copyright (C) 2012, 2013 Digia Plc and/or its subsidiary(-ies). -+** Contact: http://www.qt-project.org/legal -+** -+** This file is part of the QtCore module of the Qt Toolkit. -+** -+** $QT_BEGIN_LICENSE:LGPL$ -+** Commercial License Usage -+** Licensees holding valid commercial Qt licenses may use this file in -+** accordance with the commercial license agreement provided with the -+** Software or, alternatively, in accordance with the terms contained in -+** a written agreement between you and Digia. For licensing terms and -+** conditions see http://qt.digia.com/licensing. For further information -+** use the contact form at http://qt.digia.com/contact-us. -+** -+** GNU Lesser General Public License Usage -+** Alternatively, this file may be used under the terms of the GNU Lesser -+** General Public License version 2.1 as published by the Free Software -+** Foundation and appearing in the file LICENSE.LGPL included in the -+** packaging of this file. Please review the following information to -+** ensure the GNU Lesser General Public License version 2.1 requirements -+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -+** -+** In addition, as a special exception, Digia gives you certain additional -+** rights. These rights are described in the Digia Qt LGPL Exception -+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -+** -+** GNU General Public License Usage -+** Alternatively, this file may be used under the terms of the GNU -+** General Public License version 3.0 as published by the Free Software -+** Foundation and appearing in the file LICENSE.GPL included in the -+** packaging of this file. Please review the following information to -+** ensure the GNU General Public License version 3.0 requirements will be -+** met: http://www.gnu.org/copyleft/gpl.html. -+** -+** -+** $QT_END_LICENSE$ -+** -+****************************************************************************/ -+ -+#include <QtCore/qglobal.h> -+ -+#include <unistd.h> -+#ifdef _POSIX_PRIORITY_SCHEDULING -+# include <sched.h> -+#endif -+#include <time.h> -+ -+QT_BEGIN_NAMESPACE -+ -+QT_USE_NAMESPACE -+ -+Q_CORE_EXPORT void qt_atomic_yield(int *count) -+{ -+#ifdef _POSIX_PRIORITY_SCHEDULING -+ if ((*count)++ < 50) { -+ sched_yield(); -+ } else -+#endif -+ { -+ struct timespec tm; -+ tm.tv_sec = 0; -+ tm.tv_nsec = 2000001; -+ nanosleep(&tm, NULL); -+ *count = 0; -+ } -+} -+ -+QT_END_NAMESPACE -diff --git a/src/corelib/arch/arch.pri b/src/corelib/arch/arch.pri -index cd23e5e..f50fca7 100644 ---- a/src/corelib/arch/arch.pri -+++ b/src/corelib/arch/arch.pri -@@ -31,7 +31,9 @@ integrity:HEADERS += arch/qatomic_integrity.h - arch/qatomic_s390.h \ - arch/qatomic_x86_64.h \ - arch/qatomic_sh.h \ -- arch/qatomic_sh4a.h -+ arch/qatomic_sh4a.h \ -+ arch/qatomic_aarch64.h \ -+ - - QT_ARCH_CPP = $$QT_SOURCE_TREE/src/corelib/arch/$$QT_ARCH - DEPENDPATH += $$QT_ARCH_CPP -diff --git a/src/corelib/arch/qatomic_aarch64.h b/src/corelib/arch/qatomic_aarch64.h -new file mode 100644 -index 0000000..de61ca8 ---- /dev/null -+++ b/src/corelib/arch/qatomic_aarch64.h -@@ -0,0 +1,335 @@ -+/**************************************************************************** -+** -+** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). -+** Contact: http://www.qt-project.org/legal -+** -+** This file is part of the QtCore module of the Qt Toolkit. -+** -+** $QT_BEGIN_LICENSE:LGPL$ -+** Commercial License Usage -+** Licensees holding valid commercial Qt licenses may use this file in -+** accordance with the commercial license agreement provided with the -+** Software or, alternatively, in accordance with the terms contained in -+** a written agreement between you and Digia. For licensing terms and -+** conditions see http://qt.digia.com/licensing. For further information -+** use the contact form at http://qt.digia.com/contact-us. -+** -+** GNU Lesser General Public License Usage -+** Alternatively, this file may be used under the terms of the GNU Lesser -+** General Public License version 2.1 as published by the Free Software -+** Foundation and appearing in the file LICENSE.LGPL included in the -+** packaging of this file. Please review the following information to -+** ensure the GNU Lesser General Public License version 2.1 requirements -+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -+** -+** In addition, as a special exception, Digia gives you certain additional -+** rights. These rights are described in the Digia Qt LGPL Exception -+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -+** -+** GNU General Public License Usage -+** Alternatively, this file may be used under the terms of the GNU -+** General Public License version 3.0 as published by the Free Software -+** Foundation and appearing in the file LICENSE.GPL included in the -+** packaging of this file. Please review the following information to -+** ensure the GNU General Public License version 3.0 requirements will be -+** met: http://www.gnu.org/copyleft/gpl.html. -+** -+** -+** $QT_END_LICENSE$ -+** -+****************************************************************************/ -+ -+#ifndef QATOMIC_AARCH64_H -+#define QATOMIC_AARCH64_H -+ -+QT_BEGIN_HEADER -+ -+QT_BEGIN_NAMESPACE -+ -+#define Q_ATOMIC_INT_REFERENCE_COUNTING_IS_ALWAYS_NATIVE -+ -+inline bool QBasicAtomicInt::isReferenceCountingNative() -+{ return true; } -+inline bool QBasicAtomicInt::isReferenceCountingWaitFree() -+{ return false; } -+ -+#define Q_ATOMIC_INT_TEST_AND_SET_IS_ALWAYS_NATIVE -+ -+inline bool QBasicAtomicInt::isTestAndSetNative() -+{ return true; } -+inline bool QBasicAtomicInt::isTestAndSetWaitFree() -+{ return false; } -+ -+#define Q_ATOMIC_INT_FETCH_AND_STORE_IS_ALWAYS_NATIVE -+ -+inline bool QBasicAtomicInt::isFetchAndStoreNative() -+{ return true; } -+inline bool QBasicAtomicInt::isFetchAndStoreWaitFree() -+{ return false; } -+ -+#define Q_ATOMIC_INT_FETCH_AND_ADD_IS_ALWAYS_NATIVE -+ -+inline bool QBasicAtomicInt::isFetchAndAddNative() -+{ return true; } -+inline bool QBasicAtomicInt::isFetchAndAddWaitFree() -+{ return false; } -+ -+#define Q_ATOMIC_POINTER_TEST_AND_SET_IS_ALWAYS_NATIVE -+ -+template <typename T> -+Q_INLINE_TEMPLATE bool QBasicAtomicPointer<T>::isTestAndSetNative() -+{ return true; } -+template <typename T> -+Q_INLINE_TEMPLATE bool QBasicAtomicPointer<T>::isTestAndSetWaitFree() -+{ return false; } -+ -+#define Q_ATOMIC_POINTER_FETCH_AND_STORE_IS_ALWAYS_NATIVE -+ -+template <typename T> -+Q_INLINE_TEMPLATE bool QBasicAtomicPointer<T>::isFetchAndStoreNative() -+{ return true; } -+template <typename T> -+Q_INLINE_TEMPLATE bool QBasicAtomicPointer<T>::isFetchAndStoreWaitFree() -+{ return false; } -+ -+#define Q_ATOMIC_POINTER_FETCH_AND_ADD_IS_ALWAYS_NATIVE -+ -+template <typename T> -+Q_INLINE_TEMPLATE bool QBasicAtomicPointer<T>::isFetchAndAddNative() -+{ return true; } -+template <typename T> -+Q_INLINE_TEMPLATE bool QBasicAtomicPointer<T>::isFetchAndAddWaitFree() -+{ return false; } -+ -+#ifndef Q_DATA_MEMORY_BARRIER -+# define Q_DATA_MEMORY_BARRIER asm volatile("dmb sy\n":::"memory") -+#endif -+#ifndef Q_COMPILER_MEMORY_BARRIER -+# define Q_COMPILER_MEMORY_BARRIER asm volatile("":::"memory") -+#endif -+ -+inline bool QBasicAtomicInt::ref() -+{ -+ int newValue; -+ -+ Q_COMPILER_MEMORY_BARRIER; -+ newValue = __atomic_add_fetch(&_q_value, 1, __ATOMIC_ACQ_REL); -+ Q_COMPILER_MEMORY_BARRIER; -+ -+ return newValue != 0; -+} -+ -+inline bool QBasicAtomicInt::deref() -+{ -+ int newValue; -+ -+ Q_COMPILER_MEMORY_BARRIER; -+ newValue = __atomic_sub_fetch(&_q_value, 1, __ATOMIC_ACQ_REL); -+ Q_COMPILER_MEMORY_BARRIER; -+ -+ return newValue != 0; -+} -+ -+inline bool QBasicAtomicInt::testAndSetRelaxed(int expectedValue, int newValue) -+{ -+ bool val; -+ -+ Q_COMPILER_MEMORY_BARRIER; -+ val = __atomic_compare_exchange_n (&_q_value, &expectedValue, newValue, -+ false, __ATOMIC_RELAXED, __ATOMIC_RELAXED); -+ Q_COMPILER_MEMORY_BARRIER; -+ return val; -+} -+ -+inline int QBasicAtomicInt::fetchAndStoreRelaxed(int newValue) -+{ -+ int val; -+ Q_COMPILER_MEMORY_BARRIER; -+ val = __atomic_exchange_n(&_q_value, newValue, __ATOMIC_RELAXED); -+ Q_COMPILER_MEMORY_BARRIER; -+ return val; -+} -+ -+inline int QBasicAtomicInt::fetchAndAddRelaxed(int valueToAdd) -+{ -+ int val; -+ Q_COMPILER_MEMORY_BARRIER; -+ val = __atomic_fetch_add(&_q_value, valueToAdd, __ATOMIC_RELAXED); -+ Q_COMPILER_MEMORY_BARRIER; -+ return val; -+} -+ -+template <typename T> -+Q_INLINE_TEMPLATE bool QBasicAtomicPointer<T>::testAndSetRelaxed(T *expectedValue, T *newValue) -+{ -+ bool val; -+ Q_COMPILER_MEMORY_BARRIER; -+ val = __atomic_compare_exchange_n (&_q_value, &expectedValue, newValue, -+ false, __ATOMIC_RELAXED, __ATOMIC_RELAXED); -+ Q_COMPILER_MEMORY_BARRIER; -+ return val; -+} -+ -+template <typename T> -+Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndStoreRelaxed(T *newValue) -+{ -+ T *val; -+ Q_COMPILER_MEMORY_BARRIER; -+ val = __atomic_exchange_n(&_q_value, newValue, __ATOMIC_RELAXED); -+ Q_COMPILER_MEMORY_BARRIER; -+ return val; -+} -+ -+template <typename T> -+Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndAddRelaxed(qptrdiff valueToAdd) -+{ -+ T *val; -+ Q_COMPILER_MEMORY_BARRIER; -+ val = __atomic_fetch_add(&_q_value, valueToAdd, __ATOMIC_RELAXED); -+ Q_COMPILER_MEMORY_BARRIER; -+ return val; -+} -+ -+inline bool QBasicAtomicInt::testAndSetAcquire(int expectedValue, int newValue) -+{ -+ bool returnValue = testAndSetRelaxed(expectedValue, newValue); -+ Q_DATA_MEMORY_BARRIER; -+ return returnValue; -+} -+ -+inline bool QBasicAtomicInt::testAndSetRelease(int expectedValue, int newValue) -+{ -+ Q_DATA_MEMORY_BARRIER; -+ return testAndSetRelaxed(expectedValue, newValue); -+} -+ -+inline bool QBasicAtomicInt::testAndSetOrdered(int expectedValue, int newValue) -+{ -+ Q_DATA_MEMORY_BARRIER; -+ bool returnValue = testAndSetRelaxed(expectedValue, newValue); -+ Q_COMPILER_MEMORY_BARRIER; -+ return returnValue; -+} -+ -+inline int QBasicAtomicInt::fetchAndStoreAcquire(int newValue) -+{ -+ int returnValue = fetchAndStoreRelaxed(newValue); -+ Q_DATA_MEMORY_BARRIER; -+ return returnValue; -+} -+ -+inline int QBasicAtomicInt::fetchAndStoreRelease(int newValue) -+{ -+ Q_DATA_MEMORY_BARRIER; -+ return fetchAndStoreRelaxed(newValue); -+} -+ -+inline int QBasicAtomicInt::fetchAndStoreOrdered(int newValue) -+{ -+ Q_DATA_MEMORY_BARRIER; -+ int returnValue = fetchAndStoreRelaxed(newValue); -+ Q_COMPILER_MEMORY_BARRIER; -+ return returnValue; -+} -+ -+inline int QBasicAtomicInt::fetchAndAddAcquire(int valueToAdd) -+{ -+ int returnValue = fetchAndAddRelaxed(valueToAdd); -+ Q_DATA_MEMORY_BARRIER; -+ return returnValue; -+} -+ -+inline int QBasicAtomicInt::fetchAndAddRelease(int valueToAdd) -+{ -+ Q_DATA_MEMORY_BARRIER; -+ return fetchAndAddRelaxed(valueToAdd); -+} -+ -+inline int QBasicAtomicInt::fetchAndAddOrdered(int valueToAdd) -+{ -+ Q_DATA_MEMORY_BARRIER; -+ int returnValue = fetchAndAddRelaxed(valueToAdd); -+ Q_COMPILER_MEMORY_BARRIER; -+ return returnValue; -+} -+ -+template <typename T> -+Q_INLINE_TEMPLATE bool QBasicAtomicPointer<T>::testAndSetAcquire(T *expectedValue, T *newValue) -+{ -+ bool returnValue = testAndSetRelaxed(expectedValue, newValue); -+ Q_DATA_MEMORY_BARRIER; -+ return returnValue; -+} -+ -+template <typename T> -+Q_INLINE_TEMPLATE bool QBasicAtomicPointer<T>::testAndSetRelease(T *expectedValue, T *newValue) -+{ -+ Q_DATA_MEMORY_BARRIER; -+ return testAndSetRelaxed(expectedValue, newValue); -+} -+ -+template <typename T> -+Q_INLINE_TEMPLATE bool QBasicAtomicPointer<T>::testAndSetOrdered(T *expectedValue, T *newValue) -+{ -+ Q_DATA_MEMORY_BARRIER; -+ bool returnValue = testAndSetAcquire(expectedValue, newValue); -+ Q_COMPILER_MEMORY_BARRIER; -+ return returnValue; -+} -+ -+template <typename T> -+Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndStoreAcquire(T *newValue) -+{ -+ T *returnValue = fetchAndStoreRelaxed(newValue); -+ Q_DATA_MEMORY_BARRIER; -+ return returnValue; -+} -+ -+template <typename T> -+Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndStoreRelease(T *newValue) -+{ -+ Q_DATA_MEMORY_BARRIER; -+ return fetchAndStoreRelaxed(newValue); -+} -+ -+template <typename T> -+Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndStoreOrdered(T *newValue) -+{ -+ Q_DATA_MEMORY_BARRIER; -+ T *returnValue = fetchAndStoreRelaxed(newValue); -+ Q_COMPILER_MEMORY_BARRIER; -+ return returnValue; -+} -+ -+template <typename T> -+Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndAddAcquire(qptrdiff valueToAdd) -+{ -+ T *returnValue = fetchAndAddRelaxed(valueToAdd); -+ Q_DATA_MEMORY_BARRIER; -+ return returnValue; -+} -+ -+template <typename T> -+Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndAddRelease(qptrdiff valueToAdd) -+{ -+ Q_DATA_MEMORY_BARRIER; -+ return fetchAndAddRelaxed(valueToAdd); -+} -+ -+template <typename T> -+Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndAddOrdered(qptrdiff valueToAdd) -+{ -+ Q_DATA_MEMORY_BARRIER; -+ T *returnValue = fetchAndAddRelaxed(valueToAdd); -+ Q_COMPILER_MEMORY_BARRIER; -+ return returnValue; -+} -+ -+#undef Q_DATA_MEMORY_BARRIER -+#undef Q_COMPILER_MEMORY_BARRIER -+ -+QT_END_NAMESPACE -+ -+QT_END_HEADER -+ -+#endif // QATOMIC_AARCH64_H -diff --git a/src/corelib/arch/qatomic_arch.h b/src/corelib/arch/qatomic_arch.h -index 141726c..3e96926 100644 ---- a/src/corelib/arch/qatomic_arch.h -+++ b/src/corelib/arch/qatomic_arch.h -@@ -94,6 +94,8 @@ QT_BEGIN_HEADER - # include "QtCore/qatomic_sh4a.h" - #elif defined(QT_ARCH_NACL) - # include "QtCore/qatomic_generic.h" -+#elif defined(QT_ARCH_AARCH64) -+# include "QtCore/qatomic_aarch64.h" - #else - # error "Qt has not been ported to this architecture" - #endif --- -2.1.0 - diff --git a/meta/recipes-qt/qt4/qt4-4.8.6/0031-aarch64_arm64_mkspecs.patch b/meta/recipes-qt/qt4/qt4-4.8.6/0031-aarch64_arm64_mkspecs.patch deleted file mode 100644 index a01e7ad..0000000 --- a/meta/recipes-qt/qt4/qt4-4.8.6/0031-aarch64_arm64_mkspecs.patch +++ /dev/null @@ -1,124 +0,0 @@ -From 7090fc80ff630712a90de92403190f647dd38a39 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Lisandro=20Dami=C3=A1n=20Nicanor=20P=C3=A9rez=20Meyer?= - <perezmeyer@gmail.com> -Date: Sat, 15 Mar 2014 15:35:00 -0300 -Subject: [PATCH] mkspecs for AArch64 (aka arm64). - -Patch by Marcin Juszkiewicz <marcin@juszkiewicz.com.pl> -licensed under either Public Domain or BSD: - -<https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=735488#179> - -Change-Id: I21f17953234cfb176bac023e52ecdc927fc5c1a9 - - -Upstream-Status: Pending - -Signed-off-by: Kai Kang <kai.kang@windriver.com> - ---- - configure | 3 +++ - mkspecs/linux-g++-aarch64/qmake.conf | 27 ++++++++++++++++++++ - mkspecs/linux-g++-aarch64/qplatformdefs.h | 42 +++++++++++++++++++++++++++++++ - 3 files changed, 72 insertions(+) - create mode 100644 mkspecs/linux-g++-aarch64/qmake.conf - create mode 100644 mkspecs/linux-g++-aarch64/qplatformdefs.h - -diff --git a/configure b/configure -index a9ba7c8..e57d053 100755 ---- a/configure -+++ b/configure -@@ -2808,6 +2808,9 @@ if [ "$CFG_EMBEDDED" != "no" ]; then - *86_64) - PLATFORM=qws/linux-x86_64-g++ - ;; -+ aarch64) -+ PLATFORM=linux-aarch64-g++ -+ ;; - *) - PLATFORM=qws/linux-generic-g++ - ;; -diff --git a/mkspecs/linux-g++-aarch64/qmake.conf b/mkspecs/linux-g++-aarch64/qmake.conf -new file mode 100644 -index 0000000..ebc0a92 ---- /dev/null -+++ b/mkspecs/linux-g++-aarch64/qmake.conf -@@ -0,0 +1,27 @@ -+# -+# qmake configuration for linux-g++ -+# -+# Written for GNU/Linux platforms that have both lib and lib64 directories, -+# like the AMD Opteron. -+# -+ -+MAKEFILE_GENERATOR = UNIX -+TARGET_PLATFORM = unix -+TEMPLATE = app -+CONFIG += qt warn_on release incremental link_prl gdb_dwarf_index -+QT += core gui -+QMAKE_INCREMENTAL_STYLE = sublib -+ -+QMAKE_CFLAGS = -+QMAKE_LFLAGS = -+ -+QMAKE_CFLAGS_RELEASE += -O2 -+ -+include(../common/linux.conf) -+include(../common/gcc-base-unix.conf) -+include(../common/g++-unix.conf) -+ -+QMAKE_LIBDIR_X11 = /usr/X11R6/lib64 -+QMAKE_LIBDIR_OPENGL = /usr/X11R6/lib64 -+ -+load(qt_config) -diff --git a/mkspecs/linux-g++-aarch64/qplatformdefs.h b/mkspecs/linux-g++-aarch64/qplatformdefs.h -new file mode 100644 -index 0000000..562128b ---- /dev/null -+++ b/mkspecs/linux-g++-aarch64/qplatformdefs.h -@@ -0,0 +1,42 @@ -+/**************************************************************************** -+** -+** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). -+** Contact: http://www.qt-project.org/legal -+** -+** This file is part of the qmake spec of the Qt Toolkit. -+** -+** $QT_BEGIN_LICENSE:LGPL$ -+** Commercial License Usage -+** Licensees holding valid commercial Qt licenses may use this file in -+** accordance with the commercial license agreement provided with the -+** Software or, alternatively, in accordance with the terms contained in -+** a written agreement between you and Digia. For licensing terms and -+** conditions see http://qt.digia.com/licensing. For further information -+** use the contact form at http://qt.digia.com/contact-us. -+** -+** GNU Lesser General Public License Usage -+** Alternatively, this file may be used under the terms of the GNU Lesser -+** General Public License version 2.1 as published by the Free Software -+** Foundation and appearing in the file LICENSE.LGPL included in the -+** packaging of this file. Please review the following information to -+** ensure the GNU Lesser General Public License version 2.1 requirements -+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -+** -+** In addition, as a special exception, Digia gives you certain additional -+** rights. These rights are described in the Digia Qt LGPL Exception -+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -+** -+** GNU General Public License Usage -+** Alternatively, this file may be used under the terms of the GNU -+** General Public License version 3.0 as published by the Free Software -+** Foundation and appearing in the file LICENSE.GPL included in the -+** packaging of this file. Please review the following information to -+** ensure the GNU General Public License version 3.0 requirements will be -+** met: http://www.gnu.org/copyleft/gpl.html. -+** -+** -+** $QT_END_LICENSE$ -+** -+****************************************************************************/ -+ -+#include "../linux-g++/qplatformdefs.h" --- -2.1.0 - diff --git a/meta/recipes-qt/qt4/qt4-4.8.6/0032-aarch64_add_header.patch b/meta/recipes-qt/qt4/qt4-4.8.6/0032-aarch64_add_header.patch deleted file mode 100644 index 7132224..0000000 --- a/meta/recipes-qt/qt4/qt4-4.8.6/0032-aarch64_add_header.patch +++ /dev/null @@ -1,18 +0,0 @@ -Add missing header for aarch64. And install ../corelib/arch/qatomic_aarch64.h. - -Upstream-Status: Pending - -Signed-off-by: Kai Kang <kai.kang@windriver.com> ---- -diff -Nru qt-everywhere-opensource-src-4.8.6.orig/include/QtCore/qatomic_aarch64.h qt-everywhere-opensource-src-4.8.6/include/QtCore/qatomic_aarch64.h ---- qt-everywhere-opensource-src-4.8.6.orig/include/QtCore/qatomic_aarch64.h 1970-01-01 08:30:00.000000000 +0830 -+++ qt-everywhere-opensource-src-4.8.6/include/QtCore/qatomic_aarch64.h 2014-09-09 17:18:03.768352551 +0800 -@@ -0,0 +1 @@ -+#include "../../src/corelib/arch/qatomic_aarch64.h" ---- qt-everywhere-opensource-src-4.8.6/include/QtCore/headers.pri.orig 2014-09-09 18:05:37.100430311 +0800 -+++ qt-everywhere-opensource-src-4.8.6/include/QtCore/headers.pri 2014-09-09 18:05:59.112430911 +0800 -@@ -1,3 +1,3 @@ --SYNCQT.HEADER_FILES = ../corelib/statemachine/qabstractstate.h ../corelib/statemachine/qabstracttransition.h ../corelib/statemachine/qeventtransition.h ../corelib/statemachine/qfinalstate.h ../corelib/statemachine/qhistorystate.h ../corelib/statemachine/qsignaltransition.h ../corelib/statemachine/qstate.h ../corelib/statemachine/qstatemachine.h ../corelib/arch/qatomic_alpha.h ../corelib/arch/qatomic_arch.h ../corelib/arch/qatomic_arm.h ../corelib/arch/qatomic_armv5.h ../corelib/arch/qatomic_armv6.h ../corelib/arch/qatomic_armv7.h ../corelib/arch/qatomic_avr32.h ../corelib/arch/qatomic_bfin.h ../corelib/arch/qatomic_bootstrap.h ../corelib/arch/qatomic_generic.h ../corelib/arch/qatomic_i386.h ../corelib/arch/qatomic_ia64.h ../corelib/arch/qatomic_integrity.h ../corelib/arch/qatomic_m68k.h ../corelib/arch/qatomic_macosx.h ../corelib/arch/qatomic_mips.h ../corelib/arch/qatomic_parisc.h ../corelib/arch/qatomic_powerpc.h ../corelib/arch/qatomic_s390.h ../corelib/arch/qatomic_sh.h ../corelib/arch/qatomic_sh4a.h ../corelib/arch/qatomic_sparc.h ../corelib/arch/qatomic_symbian.h ../corelib/arch/qatomic_vxworks.h ../corelib/arch/qatomic_windows.h ../corelib/arch/qatomic_windowsce.h ../corelib/arch/qatomic_x86_64.h ../corelib/thread/qatomic.h ../corelib/thread/qbasicatomic.h ../corelib/thread/qmutex.h ../corelib/thread/qreadwritelock.h ../corelib/thread/qsemaphore.h ../corelib/thread/qthread.h ../corelib/thread/qthreadstorage.h ../corelib/thread/qwaitcondition.h ../corelib/xml/qxmlstream.h ../corelib/concurrent/qfuture.h ../corelib/concurrent/qfutureinterface.h ../corelib/concurrent/qfuturesynchronizer.h ../corelib/concurrent/qfuturewatcher.h ../corelib/concurrent/qrunnable.h ../corelib/concurrent/qtconcurrentcompilertest.h ../corelib/concurrent/qtconcurrentexception.h ../corelib/concurrent/qtconcurrentfilter.h ../corelib/concurrent/qtconcurrentfilterkernel.h ../corelib/concurrent/qtconcurrentfunctionwrappers.h ../corelib/concurrent/qtconcurrentiteratekernel.h ../corelib/concurrent/qtconcurrentmap.h ../corelib/concurrent/qtconcurrentmapkernel.h ../corelib/concurrent/qtconcurrentmedian.h ../corelib/concurrent/qtconcurrentreducekernel.h ../corelib/concurrent/qtconcurrentresultstore.h ../corelib/concurrent/qtconcurrentrun.h ../corelib/concurrent/qtconcurrentrunbase.h ../corelib/concurrent/qtconcurrentstoredfunctioncall.h ../corelib/concurrent/qtconcurrentthreadengine.h ../corelib/concurrent/qthreadpool.h ../corelib/kernel/qabstracteventdispatcher.h ../corelib/kernel/qabstractitemmodel.h ../corelib/kernel/qbasictimer.h ../corelib/kernel/qcoreapplication.h ../corelib/kernel/qcoreevent.h ../corelib/kernel/qeventloop.h ../corelib/kernel/qfunctions_nacl.h ../corelib/kernel/qfunctions_vxworks.h ../corelib/kernel/qfunctions_wince.h ../corelib/kernel/qmath.h ../corelib/kernel/qmetaobject.h ../corelib/kernel/qmetatype.h ../corelib/kernel/qmimedata.h ../corelib/kernel/qobject.h ../corelib/kernel/qobjectcleanuphandler.h ../corelib/kernel/qobjectdefs.h ../corelib/kernel/qpointer.h ../corelib/kernel/qsharedmemory.h ../corelib/kernel/qsignalmapper.h ../corelib/kernel/qsocketnotifier.h ../corelib/kernel/qsystemsemaphore.h ../corelib/kernel/qtimer.h ../corelib/kernel/qtranslator.h ../corelib/kernel/qvariant.h ../corelib/plugin/qfactoryinterface.h ../corelib/plugin/qlibrary.h ../corelib/plugin/qplugin.h ../corelib/plugin/qpluginloader.h ../corelib/plugin/quuid.h ../corelib/global/qconfig-dist.h ../corelib/global/qconfig-large.h ../corelib/global/qconfig-medium.h ../corelib/global/qconfig-minimal.h ../corelib/global/qconfig-nacl.h ../corelib/global/qconfig-small.h ../corelib/global/qendian.h ../corelib/global/qfeatures.h ../corelib/global/qglobal.h ../corelib/global/qlibraryinfo.h ../corelib/global/qnamespace.h ../corelib/global/qnumeric.h ../corelib/global/qt_windows.h ../corelib/global/qconfig.h ../corelib/codecs/qtextcodec.h ../corelib/codecs/qtextcodecplugin.h ../corelib/io/qabstractfileengine.h ../corelib/io/qbuffer.h ../corelib/io/qdatastream.h ../corelib/io/qdebug.h ../corelib/io/qdir.h ../corelib/io/qdiriterator.h ../corelib/io/qfile.h ../corelib/io/qfileinfo.h ../corelib/io/qfilesystemwatcher.h ../corelib/io/qfsfileengine.h ../corelib/io/qiodevice.h ../corelib/io/qprocess.h ../corelib/io/qresource.h ../corelib/io/qsettings.h ../corelib/io/qtemporaryfile.h ../corelib/io/qtextstream.h ../corelib/io/qurl.h ../corelib/animation/qabstractanimation.h ../corelib/animation/qanimationgroup.h ../corelib/animation/qparallelanimationgroup.h ../corelib/animation/qpauseanimation.h ../corelib/animation/qpropertyanimation.h ../corelib/animation/qsequentialanimationgroup.h ../corelib/animation/qvariantanimation.h ../corelib/tools/qalgorithms.h ../corelib/tools/qbitarray.h ../corelib/tools/qbytearray.h ../corelib/tools/qbytearraymatcher.h ../corelib/tools/qcache.h ../corelib/tools/qchar.h ../corelib/tools/qcontainerfwd.h ../corelib/tools/qcontiguouscache.h ../corelib/tools/qcryptographichash.h ../corelib/tools/qdatetime.h ../corelib/tools/qeasingcurve.h ../corelib/tools/qelapsedtimer.h ../corelib/tools/qhash.h ../corelib/tools/qiterator.h ../corelib/tools/qline.h ../corelib/tools/qlinkedlist.h ../corelib/tools/qlist.h ../corelib/tools/qlocale.h ../corelib/tools/qlocale_blackberry.h ../corelib/tools/qmap.h ../corelib/tools/qmargins.h ../corelib/tools/qpair.h ../corelib/tools/qpoint.h ../corelib/tools/qqueue.h ../corelib/tools/qrect.h ../corelib/tools/qregexp.h ../corelib/tools/qscopedpointer.h ../corelib/tools/qscopedvaluerollback.h ../corelib/tools/qset.h ../corelib/tools/qshareddata.h ../corelib/tools/qsharedpointer.h ../corelib/tools/qsharedpointer_impl.h ../corelib/tools/qsize.h ../corelib/tools/qstack.h ../corelib/tools/qstring.h ../corelib/tools/qstringbuilder.h ../corelib/tools/qstringlist.h ../corelib/tools/qstringmatcher.h ../corelib/tools/qtextboundaryfinder.h ../corelib/tools/qtimeline.h ../corelib/tools/qvarlengtharray.h ../corelib/tools/qvector.h ../../include/QtCore/QtCore -+SYNCQT.HEADER_FILES = ../corelib/statemachine/qabstractstate.h ../corelib/statemachine/qabstracttransition.h ../corelib/statemachine/qeventtransition.h ../corelib/statemachine/qfinalstate.h ../corelib/statemachine/qhistorystate.h ../corelib/statemachine/qsignaltransition.h ../corelib/statemachine/qstate.h ../corelib/statemachine/qstatemachine.h ../corelib/arch/qatomic_alpha.h ../corelib/arch/qatomic_arch.h ../corelib/arch/qatomic_arm.h ../corelib/arch/qatomic_armv5.h ../corelib/arch/qatomic_armv6.h ../corelib/arch/qatomic_armv7.h ../corelib/arch/qatomic_aarch64.h ../corelib/arch/qatomic_avr32.h ../corelib/arch/qatomic_bfin.h ../corelib/arch/qatomic_bootstrap.h ../corelib/arch/qatomic_generic.h ../corelib/arch/qatomic_i386.h ../corelib/arch/qatomic_ia64.h ../corelib/arch/qatomic_integrity.h ../corelib/arch/qatomic_m68k.h ../corelib/arch/qatomic_macosx.h ../corelib/arch/qatomic_mips.h ../corelib/arch/qatomic_parisc.h ../corelib/arch/qatomic_powerpc.h ../corelib/arch/qatomic_s390.h ../corelib/arch/qatomic_sh.h ../corelib/arch/qatomic_sh4a.h ../corelib/arch/qatomic_sparc.h ../corelib/arch/qatomic_symbian.h ../corelib/arch/qatomic_vxworks.h ../corelib/arch/qatomic_windows.h ../corelib/arch/qatomic_windowsce.h ../corelib/arch/qatomic_x86_64.h ../corelib/thread/qatomic.h ../corelib/thread/qbasicatomic.h ../corelib/thread/qmutex.h ../corelib/thread/qreadwritelock.h ../corelib/thread/qsemaphore.h ../corelib/thread/qthread.h ../corelib/thread/qthreadstorage.h ../corelib/thread/qwaitcondition.h ../corelib/xml/qxmlstream.h ../corelib/concurrent/qfuture.h ../corelib/concurrent/qfutureinterface.h ../corelib/concurrent/qfuturesynchronizer.h ../corelib/concurrent/qfuturewatcher.h ../corelib/concurrent/qrunnable.h ../corelib/concurrent/qtconcurrentcompilertest.h ../corelib/concurrent/qtconcurrentexception.h ../corelib/concurrent/qtconcurrentfilter.h ../corelib/concurrent/qtconcurrentfilterkernel.h ../corelib/concurrent/qtconcurrentfunctionwrappers.h ../corelib/concurrent/qtconcurrentiteratekernel.h ../corelib/concurrent/qtconcurrentmap.h ../corelib/concurrent/qtconcurrentmapkernel.h ../corelib/concurrent/qtconcurrentmedian.h ../corelib/concurrent/qtconcurrentreducekernel.h ../corelib/concurrent/qtconcurrentresultstore.h ../corelib/concurrent/qtconcurrentrun.h ../corelib/concurrent/qtconcurrentrunbase.h ../corelib/concurrent/qtconcurrentstoredfunctioncall.h ../corelib/concurrent/qtconcurrentthreadengine.h ../corelib/concurrent/qthreadpool.h ../corelib/kernel/qabstracteventdispatcher.h ../corelib/kernel/qabstractitemmodel.h ../corelib/kernel/qbasictimer.h ../corelib/kernel/qcoreapplication.h ../corelib/kernel/qcoreevent.h ../corelib/kernel/qeventloop.h ../corelib/kernel/qfunctions_nacl.h ../corelib/kernel/qfunctions_vxworks.h ../corelib/kernel/qfunctions_wince.h ../corelib/kernel/qmath.h ../corelib/kernel/qmetaobject.h ../corelib/kernel/qmetatype.h ../corelib/kernel/qmimedata.h ../corelib/kernel/qobject.h ../corelib/kernel/qobjectcleanuphandler.h ../corelib/kernel/qobjectdefs.h ../corelib/kernel/qpointer.h ../corelib/kernel/qsharedmemory.h ../corelib/kernel/qsignalmapper.h ../corelib/kernel/qsocketnotifier.h ../corelib/kernel/qsystemsemaphore.h ../corelib/kernel/qtimer.h ../corelib/kernel/qtranslator.h ../corelib/kernel/qvariant.h ../corelib/plugin/qfactoryinterface.h ../corelib/plugin/qlibrary.h ../corelib/plugin/qplugin.h ../corelib/plugin/qpluginloader.h ../corelib/plugin/quuid.h ../corelib/global/qconfig-dist.h ../corelib/global/qconfig-large.h ../corelib/global/qconfig-medium.h ../corelib/global/qconfig-minimal.h ../corelib/global/qconfig-nacl.h ../corelib/global/qconfig-small.h ../corelib/global/qendian.h ../corelib/global/qfeatures.h ../corelib/global/qglobal.h ../corelib/global/qlibraryinfo.h ../corelib/global/qnamespace.h ../corelib/global/qnumeric.h ../corelib/global/qt_windows.h ../corelib/global/qconfig.h ../corelib/codecs/qtextcodec.h ../corelib/codecs/qtextcodecplugin.h ../corelib/io/qabstractfileengine.h ../corelib/io/qbuffer.h ../corelib/io/qdatastream.h ../corelib/io/qdebug.h ../corelib/io/qdir.h ../corelib/io/qdiriterator.h ../corelib/io/qfile.h ../corelib/io/qfileinfo.h ../corelib/io/qfilesystemwatcher.h ../corelib/io/qfsfileengine.h ../corelib/io/qiodevice.h ../corelib/io/qprocess.h ../corelib/io/qresource.h ../corelib/io/qsettings.h ../corelib/io/qtemporaryfile.h ../corelib/io/qtextstream.h ../corelib/io/qurl.h ../corelib/animation/qabstractanimation.h ../corelib/animation/qanimationgroup.h ../corelib/animation/qparallelanimationgroup.h ../corelib/animation/qpauseanimation.h ../corelib/animation/qpropertyanimation.h ../corelib/animation/qsequentialanimationgroup.h ../corelib/animation/qvariantanimation.h ../corelib/tools/qalgorithms.h ../corelib/tools/qbitarray.h ../corelib/tools/qbytearray.h ../corelib/tools/qbytearraymatcher.h ../corelib/tools/qcache.h ../corelib/tools/qchar.h ../corelib/tools/qcontainerfwd.h ../corelib/tools/qcontiguouscache.h ../corelib/tools/qcryptographichash.h ../corelib/tools/qdatetime.h ../corelib/tools/qeasingcurve.h ../corelib/tools/qelapsedtimer.h ../corelib/tools/qhash.h ../corelib/tools/qiterator.h ../corelib/tools/qline.h ../corelib/tools/qlinkedlist.h ../corelib/tools/qlist.h ../corelib/tools/qlocale.h ../corelib/tools/qlocale_blackberry.h ../corelib/tools/qmap.h ../corelib/tools/qmargins.h ../corelib/tools/qpair.h ../corelib/tools/qpoint.h ../corelib/tools/qqueue.h ../corelib/tools/qrect.h ../corelib/tools/qregexp.h ../corelib/tools/qscopedpointer.h ../corelib/tools/qscopedvaluerollback.h ../corelib/tools/qset.h ../corelib/tools/qshareddata.h ../corelib/tools/qsharedpointer.h ../corelib/tools/qsharedpointer_impl.h ../corelib/tools/qsize.h ../corelib/tools/qstack.h ../corelib/tools/qstring.h ../corelib/tools/qstringbuilder.h ../corelib/tools/qstringlist.h ../corelib/tools/qstringmatcher.h ../corelib/tools/qtextboundaryfinder.h ../corelib/tools/qtimeline.h ../corelib/tools/qvarlengtharray.h ../corelib/tools/qvector.h ../../include/QtCore/QtCore - SYNCQT.HEADER_CLASSES = ../../include/QtCore/QAbstractState ../../include/QtCore/QAbstractTransition ../../include/QtCore/QEventTransition ../../include/QtCore/QFinalState ../../include/QtCore/QHistoryState ../../include/QtCore/QSignalTransition ../../include/QtCore/QState ../../include/QtCore/QStateMachine ../../include/QtCore/QAtomicInt ../../include/QtCore/QAtomicPointer ../../include/QtCore/QBasicAtomicInt ../../include/QtCore/QBasicAtomicPointer ../../include/QtCore/QMutex ../../include/QtCore/QMutexLocker ../../include/QtCore/QMutexData ../../include/QtCore/QReadWriteLock ../../include/QtCore/QReadLocker ../../include/QtCore/QWriteLocker ../../include/QtCore/QSemaphore ../../include/QtCore/QThread ../../include/QtCore/QThreadStorageData ../../include/QtCore/QThreadStorage ../../include/QtCore/QWaitCondition ../../include/QtCore/QXmlStreamStringRef ../../include/QtCore/QXmlStreamAttribute ../../include/QtCore/QXmlStreamAttributes ../../include/QtCore/QXmlStreamNamespaceDeclaration ../../include/QtCore/QXmlStreamNamespaceDeclarations ../../include/QtCore/QXmlStreamNotationDeclaration ../../include/QtCore/QXmlStreamNotationDeclarations ../../include/QtCore/QXmlStreamEntityDeclaration ../../include/QtCore/QXmlStreamEntityDeclarations ../../include/QtCore/QXmlStreamEntityResolver ../../include/QtCore/QXmlStreamReader ../../include/QtCore/QXmlStreamWriter ../../include/QtCore/QFuture ../../include/QtCore/QFutureIterator ../../include/QtCore/QMutableFutureIterator ../../include/QtCore/QFutureInterfaceBase ../../include/QtCore/QFutureInterface ../../include/QtCore/QFutureSynchronizer ../../include/QtCore/QFutureWatcherBase ../../include/QtCore/QFutureWatcher ../../include/QtCore/QRunnable ../../include/QtCore/QtConcurrentFilter ../../include/QtCore/QtConcurrentMap ../../include/QtCore/QtConcurrentRun ../../include/QtCore/QThreadPool ../../include/QtCore/QAbstractEventDispatcher ../../include/QtCore/QModelIndex ../../include/QtCore/QPersistentModelIndex ../../include/QtCore/QModelIndexList ../../include/QtCore/QAbstractItemModel ../../include/QtCore/QAbstractTableModel ../../include/QtCore/QAbstractListModel ../../include/QtCore/QBasicTimer ../../include/QtCore/QCoreApplication ../../include/QtCore/QtCleanUpFunction ../../include/QtCore/QEvent ../../include/QtCore/QTimerEvent ../../include/QtCore/QChildEvent ../../include/QtCore/QCustomEvent ../../include/QtCore/QDynamicPropertyChangeEvent ../../include/QtCore/QEventLoop ../../include/QtCore/QMetaMethod ../../include/QtCore/QMetaEnum ../../include/QtCore/QMetaProperty ../../include/QtCore/QMetaClassInfo ../../include/QtCore/QMetaType ../../include/QtCore/QMetaTypeId ../../include/QtCore/QMetaTypeId2 ../../include/QtCore/QMimeData ../../include/QtCore/QObjectList ../../include/QtCore/QObjectData ../../include/QtCore/QObject ../../include/QtCore/QObjectUserData ../../include/QtCore/QObjectCleanupHandler ../../include/QtCore/QGenericArgument ../../include/QtCore/QGenericReturnArgument ../../include/QtCore/QArgument ../../include/QtCore/QReturnArgument ../../include/QtCore/QMetaObject ../../include/QtCore/QMetaObjectAccessor ../../include/QtCore/QMetaObjectExtraData ../../include/QtCore/QPointer ../../include/QtCore/QSharedMemory ../../include/QtCore/QSignalMapper ../../include/QtCore/QSocketNotifier ../../include/QtCore/QSystemSemaphore ../../include/QtCore/QTimer ../../include/QtCore/QTranslator ../../include/QtCore/QVariant ../../include/QtCore/QVariantList ../../include/QtCore/QVariantMap ../../include/QtCore/QVariantHash ../../include/QtCore/QVariantComparisonHelper ../../include/QtCore/QFactoryInterface ../../include/QtCore/QLibrary ../../include/QtCore/QtPlugin ../../include/QtCore/QtPluginInstanceFunction ../../include/QtCore/QPluginLoader ../../include/QtCore/QUuid ../../include/QtCore/QtEndian ../../include/QtCore/QtGlobal ../../include/QtCore/QIntegerForSize ../../include/QtCore/QNoImplicitBoolCast ../../include/QtCore/Q_INT8 ../../include/QtCore/Q_UINT8 ../../include/QtCore/Q_INT16 ../../include/QtCore/Q_UINT16 ../../include/QtCore/Q_INT32 ../../include/QtCore/Q_UINT32 ../../include/QtCore/Q_INT64 ../../include/QtCore/Q_UINT64 ../../include/QtCore/Q_LLONG ../../include/QtCore/Q_ULLONG ../../include/QtCore/Q_LONG ../../include/QtCore/Q_ULONG ../../include/QtCore/QSysInfo ../../include/QtCore/QtMsgHandler ../../include/QtCore/QGlobalStatic ../../include/QtCore/QGlobalStaticDeleter ../../include/QtCore/QBool ../../include/QtCore/QTypeInfo ../../include/QtCore/QFlag ../../include/QtCore/QIncompatibleFlag ../../include/QtCore/QFlags ../../include/QtCore/QForeachContainer ../../include/QtCore/QForeachContainerBase ../../include/QtCore/QLibraryInfo ../../include/QtCore/Qt ../../include/QtCore/QInternal ../../include/QtCore/QCOORD ../../include/QtCore/QtConfig ../../include/QtCore/QTextCodec ../../include/QtCore/QTextEncoder ../../include/QtCore/QTextDecoder ../../include/QtCore/QTextCodecFactoryInterface ../../include/QtCore/QTextCodecPlugin ../../include/QtCore/QAbstractFileEngine ../../include/QtCore/QAbstractFileEngineHandler ../../include/QtCore/QAbstractFileEngineIterator ../../include/QtCore/QBuffer ../../include/QtCore/QDataStream ../../include/QtCore/QtDebug ../../include/QtCore/QDebug ../../include/QtCore/QNoDebug ../../include/QtCore/QDir ../../include/QtCore/QDirIterator ../../include/QtCore/QFile ../../include/QtCore/QFileInfo ../../include/QtCore/QFileInfoList ../../include/QtCore/QFileInfoListIterator ../../include/QtCore/QFileSystemWatcher ../../include/QtCore/QFSFileEngine ../../include/QtCore/QIODevice ../../include/QtCore/Q_PID ../../include/QtCore/QProcessEnvironment ../../include/QtCore/QProcess ../../include/QtCore/QResource ../../include/QtCore/QSettings ../../include/QtCore/QTemporaryFile ../../include/QtCore/QTextStream ../../include/QtCore/QTextStreamFunction ../../include/QtCore/QTextStreamManipulator ../../include/QtCore/QTS ../../include/QtCore/QTextIStream ../../include/QtCore/QTextOStream ../../include/QtCore/QUrl ../../include/QtCore/QAbstractAnimation ../../include/QtCore/QAnimationDriver ../../include/QtCore/QAnimationGroup ../../include/QtCore/QParallelAnimationGroup ../../include/QtCore/QPauseAnimation ../../include/QtCore/QPropertyAnimation ../../include/QtCore/QSequentialAnimationGroup ../../include/QtCore/QVariantAnimation ../../include/QtCore/QtAlgorithms ../../include/QtCore/QBitArray ../../include/QtCore/QBitRef ../../include/QtCore/QByteArray ../../include/QtCore/QByteRef ../../include/QtCore/QByteArrayMatcher ../../include/QtCore/QCache ../../include/QtCore/QLatin1Char ../../include/QtCore/QChar ../../include/QtCore/QtContainerFwd ../../include/QtCore/QContiguousCacheData ../../include/QtCore/QContiguousCacheTypedData ../../include/QtCore/QContiguousCache ../../include/QtCore/QCryptographicHash ../../include/QtCore/QDate ../../include/QtCore/QTime ../../include/QtCore/QDateTime ../../include/QtCore/QEasingCurve ../../include/QtCore/QElapsedTimer ../../include/QtCore/QHashData ../../include/QtCore/QHashDummyValue ../../include/QtCore/QHashDummyNode ../../include/QtCore/QHashNode ../../include/QtCore/QHash ../../include/QtCore/QMultiHash ../../include/QtCore/QHashIterator ../../include/QtCore/QMutableHashIterator ../../include/QtCore/QLine ../../include/QtCore/QLineF ../../include/QtCore/QLinkedListData ../../include/QtCore/QLinkedListNode ../../include/QtCore/QLinkedList ../../include/QtCore/QLinkedListIterator ../../include/QtCore/QMutableLinkedListIterator ../../include/QtCore/QListData ../../include/QtCore/QList ../../include/QtCore/QListIterator ../../include/QtCore/QMutableListIterator ../../include/QtCore/QSystemLocale ../../include/QtCore/QLocale ../../include/QtCore/QBBSystemLocaleData ../../include/QtCore/QMapData ../../include/QtCore/QMapNode ../../include/QtCore/QMapPayloadNode ../../include/QtCore/QMap ../../include/QtCore/QMultiMap ../../include/QtCore/QMapIterator ../../include/QtCore/QMutableMapIterator ../../include/QtCore/QMargins ../../include/QtCore/QPair ../../include/QtCore/QPoint ../../include/QtCore/QPointF ../../include/QtCore/QQueue ../../include/QtCore/QRect ../../include/QtCore/QRectF ../../include/QtCore/QRegExp ../../include/QtCore/QScopedPointerDeleter ../../include/QtCore/QScopedPointerArrayDeleter ../../include/QtCore/QScopedPointerPodDeleter ../../include/QtCore/QScopedPointer ../../include/QtCore/QScopedArrayPointer ../../include/QtCore/QScopedValueRollback ../../include/QtCore/QSet ../../include/QtCore/QSetIterator ../../include/QtCore/QMutableSetIterator ../../include/QtCore/QSharedData ../../include/QtCore/QSharedDataPointer ../../include/QtCore/QExplicitlySharedDataPointer ../../include/QtCore/QSharedPointer ../../include/QtCore/QWeakPointer ../../include/QtCore/QSize ../../include/QtCore/QSizeF ../../include/QtCore/QStack ../../include/QtCore/QStdWString ../../include/QtCore/QString ../../include/QtCore/QLatin1String ../../include/QtCore/QCharRef ../../include/QtCore/QConstString ../../include/QtCore/QStringRef ../../include/QtCore/QLatin1Literal ../../include/QtCore/QAbstractConcatenable ../../include/QtCore/QConcatenable ../../include/QtCore/QStringBuilder ../../include/QtCore/QStringListIterator ../../include/QtCore/QMutableStringListIterator ../../include/QtCore/QStringList ../../include/QtCore/QStringMatcher ../../include/QtCore/QTextBoundaryFinder ../../include/QtCore/QTimeLine ../../include/QtCore/QVarLengthArray ../../include/QtCore/QVectorData ../../include/QtCore/QVectorTypedData ../../include/QtCore/QVector ../../include/QtCore/QVectorIterator ../../include/QtCore/QMutableVectorIterator - SYNCQT.PRIVATE_HEADER_FILES = ../corelib/statemachine/qabstractstate_p.h ../corelib/statemachine/qabstracttransition_p.h ../corelib/statemachine/qeventtransition_p.h ../corelib/statemachine/qhistorystate_p.h ../corelib/statemachine/qsignaleventgenerator_p.h ../corelib/statemachine/qsignaltransition_p.h ../corelib/statemachine/qstate_p.h ../corelib/statemachine/qstatemachine_p.h ../corelib/thread/qmutex_p.h ../corelib/thread/qmutexpool_p.h ../corelib/thread/qorderedmutexlocker_p.h ../corelib/thread/qreadwritelock_p.h ../corelib/thread/qthread_p.h ../corelib/xml/qxmlstream_p.h ../corelib/xml/qxmlutils_p.h ../corelib/concurrent/qfutureinterface_p.h ../corelib/concurrent/qfuturewatcher_p.h ../corelib/concurrent/qthreadpool_p.h ../corelib/kernel/qabstracteventdispatcher_p.h ../corelib/kernel/qabstractitemmodel_p.h ../corelib/kernel/qcore_mac_p.h ../corelib/kernel/qcore_symbian_p.h ../corelib/kernel/qcore_unix_p.h ../corelib/kernel/qcoreapplication_p.h ../corelib/kernel/qcorecmdlineargs_p.h ../corelib/kernel/qcoreglobaldata_p.h ../corelib/kernel/qcrashhandler_p.h ../corelib/kernel/qeventdispatcher_blackberry_p.h ../corelib/kernel/qeventdispatcher_glib_p.h ../corelib/kernel/qeventdispatcher_symbian_p.h ../corelib/kernel/qeventdispatcher_unix_p.h ../corelib/kernel/qeventdispatcher_win_p.h ../corelib/kernel/qfunctions_p.h ../corelib/kernel/qmetaobject_p.h ../corelib/kernel/qobject_p.h ../corelib/kernel/qsharedmemory_p.h ../corelib/kernel/qsystemerror_p.h ../corelib/kernel/qsystemsemaphore_p.h ../corelib/kernel/qtranslator_p.h ../corelib/kernel/qvariant_p.h ../corelib/kernel/qwineventnotifier_p.h ../corelib/plugin/qelfparser_p.h ../corelib/plugin/qfactoryloader_p.h ../corelib/plugin/qlibrary_p.h ../corelib/plugin/qsystemlibrary_p.h ../corelib/global/qnumeric_p.h ../corelib/global/qt_pch.h ../corelib/codecs/qfontlaocodec_p.h ../corelib/codecs/qiconvcodec_p.h ../corelib/codecs/qisciicodec_p.h ../corelib/codecs/qlatincodec_p.h ../corelib/codecs/qsimplecodec_p.h ../corelib/codecs/qtextcodec_p.h ../corelib/codecs/qtsciicodec_p.h ../corelib/codecs/qutfcodec_p.h ../corelib/io/qabstractfileengine_p.h ../corelib/io/qdatastream_p.h ../corelib/io/qdataurl_p.h ../corelib/io/qdir_p.h ../corelib/io/qfile_p.h ../corelib/io/qfileinfo_p.h ../corelib/io/qfilesystemengine_p.h ../corelib/io/qfilesystementry_p.h ../corelib/io/qfilesystemiterator_p.h ../corelib/io/qfilesystemmetadata_p.h ../corelib/io/qfilesystemwatcher_dnotify_p.h ../corelib/io/qfilesystemwatcher_fsevents_p.h ../corelib/io/qfilesystemwatcher_inotify_p.h ../corelib/io/qfilesystemwatcher_kqueue_p.h ../corelib/io/qfilesystemwatcher_p.h ../corelib/io/qfilesystemwatcher_symbian_p.h ../corelib/io/qfilesystemwatcher_win_p.h ../corelib/io/qfsfileengine_iterator_p.h ../corelib/io/qfsfileengine_p.h ../corelib/io/qiodevice_p.h ../corelib/io/qnoncontiguousbytedevice_p.h ../corelib/io/qprocess_p.h ../corelib/io/qresource_iterator_p.h ../corelib/io/qresource_p.h ../corelib/io/qsettings_p.h ../corelib/io/qtldurl_p.h ../corelib/io/qurltlds_p.h ../corelib/io/qwindowspipewriter_p.h ../corelib/animation/qabstractanimation_p.h ../corelib/animation/qanimationgroup_p.h ../corelib/animation/qparallelanimationgroup_p.h ../corelib/animation/qpropertyanimation_p.h ../corelib/animation/qsequentialanimationgroup_p.h ../corelib/animation/qvariantanimation_p.h ../corelib/tools/qbytedata_p.h ../corelib/tools/qdatetime_p.h ../corelib/tools/qharfbuzz_p.h ../corelib/tools/qlocale_data_p.h ../corelib/tools/qlocale_p.h ../corelib/tools/qlocale_tools_p.h ../corelib/tools/qpodlist_p.h ../corelib/tools/qringbuffer_p.h ../corelib/tools/qscopedpointer_p.h ../corelib/tools/qsimd_p.h ../corelib/tools/qtools_p.h ../corelib/tools/qunicodetables_p.h diff --git a/meta/recipes-qt/qt4/qt4-4.8.6/0034-Fix-a-division-by-zero-when-processing-malformed-BMP.patch b/meta/recipes-qt/qt4/qt4-4.8.6/0034-Fix-a-division-by-zero-when-processing-malformed-BMP.patch deleted file mode 100644 index 8ff4ad5..0000000 --- a/meta/recipes-qt/qt4/qt4-4.8.6/0034-Fix-a-division-by-zero-when-processing-malformed-BMP.patch +++ /dev/null @@ -1,44 +0,0 @@ -From e50aa2252cdd5cb53eef7d8c4503c7edff634f68 Mon Sep 17 00:00:00 2001 -From: "Richard J. Moore" <rich@kde.org> -Date: Tue, 24 Feb 2015 19:02:35 +0000 -Subject: [PATCH] Fix a division by zero when processing malformed BMP files. - -This fixes a division by 0 when processing a maliciously crafted BMP -file. No impact beyond DoS. - -Backport of 661f6bfd032dacc62841037732816a583640e187 - -Upstream-Status: Backport - -Task-number: QTBUG-44547 -Change-Id: I43f06e752b11cb50669101460902a82b885ae618 -Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> -Signed-off-by: Jonathan Liu <net147@gmail.com> ---- - src/gui/image/qbmphandler.cpp | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/src/gui/image/qbmphandler.cpp b/src/gui/image/qbmphandler.cpp -index b22e842..30fa9e0 100644 ---- a/src/gui/image/qbmphandler.cpp -+++ b/src/gui/image/qbmphandler.cpp -@@ -319,10 +319,16 @@ static bool read_dib_body(QDataStream &s, const BMP_INFOHDR &bi, int offset, int - } - } else if (comp == BMP_BITFIELDS && (nbits == 16 || nbits == 32)) { - red_shift = calc_shift(red_mask); -+ if (((red_mask >> red_shift) + 1) == 0) -+ return false; - red_scale = 256 / ((red_mask >> red_shift) + 1); - green_shift = calc_shift(green_mask); -+ if (((green_mask >> green_shift) + 1) == 0) -+ return false; - green_scale = 256 / ((green_mask >> green_shift) + 1); - blue_shift = calc_shift(blue_mask); -+ if (((blue_mask >> blue_shift) + 1) == 0) -+ return false; - blue_scale = 256 / ((blue_mask >> blue_shift) + 1); - } else if (comp == BMP_RGB && (nbits == 24 || nbits == 32)) { - blue_mask = 0x000000ff; --- -2.3.1 - diff --git a/meta/recipes-qt/qt4/qt4-4.8.6.inc b/meta/recipes-qt/qt4/qt4-4.8.7.inc similarity index 87% rename from meta/recipes-qt/qt4/qt4-4.8.6.inc rename to meta/recipes-qt/qt4/qt4-4.8.7.inc index 0cb7f80..2f580cc 100644 --- a/meta/recipes-qt/qt4/qt4-4.8.6.inc +++ b/meta/recipes-qt/qt4/qt4-4.8.7.inc @@ -22,19 +22,14 @@ SRC_URI = "http://download.qt-project.org/official_releases/qt/4.8/${PV}/qt-ever file://0019-Fixes-for-gcc-4.7.0-particularly-on-qemux86.patch \ file://0027-tools.pro-disable-qmeegographicssystemhelper.patch \ file://0028-Don-t-crash-on-broken-GIF-images.patch \ - file://0029-aarch64_arm64_fix_arch_detection.patch \ - file://0030-aarch64_arm64_qatomic_support.patch \ - file://0031-aarch64_arm64_mkspecs.patch \ - file://0032-aarch64_add_header.patch \ - file://0034-Fix-a-division-by-zero-when-processing-malformed-BMP.patch \ file://Fix-QWSLock-invalid-argument-logs.patch \ file://add_check_for_aarch64_32.patch \ file://g++.conf \ file://linux.conf \ " -SRC_URI[md5sum] = "2edbe4d6c2eff33ef91732602f3518eb" -SRC_URI[sha256sum] = "8b14dd91b52862e09b8e6a963507b74bc2580787d171feda197badfa7034032c" +SRC_URI[md5sum] = "d990ee66bf7ab0c785589776f35ba6ad" +SRC_URI[sha256sum] = "e2882295097e47fe089f8ac741a95fef47e0a73a3f3cdf21b56990638f626ea0" S = "${WORKDIR}/qt-everywhere-opensource-src-${PV}" diff --git a/meta/recipes-qt/qt4/qt4-4.8.6/0001-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch b/meta/recipes-qt/qt4/qt4-4.8.7/0001-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch similarity index 100% rename from meta/recipes-qt/qt4/qt4-4.8.6/0001-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch rename to meta/recipes-qt/qt4/qt4-4.8.7/0001-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch diff --git a/meta/recipes-qt/qt4/qt4-4.8.6/0002-qkbdtty_qws-fix-build-with-old-kernel-headers.patch b/meta/recipes-qt/qt4/qt4-4.8.7/0002-qkbdtty_qws-fix-build-with-old-kernel-headers.patch similarity index 100% rename from meta/recipes-qt/qt4/qt4-4.8.6/0002-qkbdtty_qws-fix-build-with-old-kernel-headers.patch rename to meta/recipes-qt/qt4/qt4-4.8.7/0002-qkbdtty_qws-fix-build-with-old-kernel-headers.patch diff --git a/meta/recipes-qt/qt4/qt4-4.8.6/0003-webkit2-set-OUTPUT_DIR-value-if-empty.patch b/meta/recipes-qt/qt4/qt4-4.8.7/0003-webkit2-set-OUTPUT_DIR-value-if-empty.patch similarity index 100% rename from meta/recipes-qt/qt4/qt4-4.8.6/0003-webkit2-set-OUTPUT_DIR-value-if-empty.patch rename to meta/recipes-qt/qt4/qt4-4.8.7/0003-webkit2-set-OUTPUT_DIR-value-if-empty.patch diff --git a/meta/recipes-qt/qt4/qt4-4.8.6/0004-configure-qmake-is-already-built-in-qt4-tools-native.patch b/meta/recipes-qt/qt4/qt4-4.8.7/0004-configure-qmake-is-already-built-in-qt4-tools-native.patch similarity index 100% rename from meta/recipes-qt/qt4/qt4-4.8.6/0004-configure-qmake-is-already-built-in-qt4-tools-native.patch rename to meta/recipes-qt/qt4/qt4-4.8.7/0004-configure-qmake-is-already-built-in-qt4-tools-native.patch diff --git a/meta/recipes-qt/qt4/qt4-4.8.6/0005-configure-set-LFLAGS-to-pick-up-zlib-from-staging.patch b/meta/recipes-qt/qt4/qt4-4.8.7/0005-configure-set-LFLAGS-to-pick-up-zlib-from-staging.patch similarity index 100% rename from meta/recipes-qt/qt4/qt4-4.8.6/0005-configure-set-LFLAGS-to-pick-up-zlib-from-staging.patch rename to meta/recipes-qt/qt4/qt4-4.8.7/0005-configure-set-LFLAGS-to-pick-up-zlib-from-staging.patch diff --git a/meta/recipes-qt/qt4/qt4-4.8.6/0006-configure-Use-OE_QMAKE_-values-to-specify-Qt-utility.patch b/meta/recipes-qt/qt4/qt4-4.8.7/0006-configure-Use-OE_QMAKE_-values-to-specify-Qt-utility.patch similarity index 100% rename from meta/recipes-qt/qt4/qt4-4.8.6/0006-configure-Use-OE_QMAKE_-values-to-specify-Qt-utility.patch rename to meta/recipes-qt/qt4/qt4-4.8.7/0006-configure-Use-OE_QMAKE_-values-to-specify-Qt-utility.patch diff --git a/meta/recipes-qt/qt4/qt4-4.8.6/0007-dbus-Remove-const-usage-that-causes-compile-failure-.patch b/meta/recipes-qt/qt4/qt4-4.8.7/0007-dbus-Remove-const-usage-that-causes-compile-failure-.patch similarity index 100% rename from meta/recipes-qt/qt4/qt4-4.8.6/0007-dbus-Remove-const-usage-that-causes-compile-failure-.patch rename to meta/recipes-qt/qt4/qt4-4.8.7/0007-dbus-Remove-const-usage-that-causes-compile-failure-.patch diff --git a/meta/recipes-qt/qt4/qt4-4.8.6/0008-qmake.pro-Allow-building-a-separate-qmake-for-the-ta.patch b/meta/recipes-qt/qt4/qt4-4.8.7/0008-qmake.pro-Allow-building-a-separate-qmake-for-the-ta.patch similarity index 100% rename from meta/recipes-qt/qt4/qt4-4.8.6/0008-qmake.pro-Allow-building-a-separate-qmake-for-the-ta.patch rename to meta/recipes-qt/qt4/qt4-4.8.7/0008-qmake.pro-Allow-building-a-separate-qmake-for-the-ta.patch diff --git a/meta/recipes-qt/qt4/qt4-4.8.6/0009-qmake-fix-source-file-references-in-qmake.pri.patch b/meta/recipes-qt/qt4/qt4-4.8.7/0009-qmake-fix-source-file-references-in-qmake.pri.patch similarity index 100% rename from meta/recipes-qt/qt4/qt4-4.8.6/0009-qmake-fix-source-file-references-in-qmake.pri.patch rename to meta/recipes-qt/qt4/qt4-4.8.7/0009-qmake-fix-source-file-references-in-qmake.pri.patch diff --git a/meta/recipes-qt/qt4/qt4-4.8.6/0010-configure-Hack-to-not-use-the-pg_config-of-the-host-.patch b/meta/recipes-qt/qt4/qt4-4.8.7/0010-configure-Hack-to-not-use-the-pg_config-of-the-host-.patch similarity index 65% rename from meta/recipes-qt/qt4/qt4-4.8.6/0010-configure-Hack-to-not-use-the-pg_config-of-the-host-.patch rename to meta/recipes-qt/qt4/qt4-4.8.7/0010-configure-Hack-to-not-use-the-pg_config-of-the-host-.patch index 1d2ddab..ca6a0b8 100644 --- a/meta/recipes-qt/qt4/qt4-4.8.6/0010-configure-Hack-to-not-use-the-pg_config-of-the-host-.patch +++ b/meta/recipes-qt/qt4/qt4-4.8.7/0010-configure-Hack-to-not-use-the-pg_config-of-the-host-.patch @@ -14,6 +14,10 @@ will pad. Upstream-Status: Inappropriate [configuration] Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> + +Update for qt 4.8.7. + +Signed-off-by: Kai Kang <kai.kang@windriver.com> --- configure | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) @@ -22,17 +26,17 @@ diff --git a/configure b/configure index db4d044..35a8fe7 100755 --- a/configure +++ b/configure -@@ -5511,10 +5511,10 @@ for _SQLDR in $CFG_SQL_AVAILABLE; do - psql) +@@ -5574,10 +5574,10 @@ if [ "$CFG_SQL_psql" != "no" ]; then + [ -z "$CFG_PSQL_CONFIG" ] && CFG_PSQL_CONFIG=`"$WHICH" pg_config` # Be careful not to use native pg_config when cross building. -- if [ "$XPLATFORM_MINGW" != "yes" ] && "$WHICH" pg_config >/dev/null 2>&1; then -- QT_CFLAGS_PSQL=`pg_config --includedir 2>/dev/null` -- QT_LFLAGS_PSQL=`pg_config --libdir 2>/dev/null` +- if [ "$XPLATFORM_MINGW" != "yes" ] && [ -x "$CFG_PSQL_CONFIG" ]; then +- QT_CFLAGS_PSQL=`$CFG_PSQL_CONFIG --includedir 2>/dev/null` +- QT_LFLAGS_PSQL=`$CFG_PSQL_CONFIG --libdir 2>/dev/null` - fi -+# if [ "$XPLATFORM_MINGW" != "yes" ] && "$WHICH" pg_config >/dev/null 2>&1; then -+# QT_CFLAGS_PSQL=`pg_config --includedir 2>/dev/null` -+# QT_LFLAGS_PSQL=`pg_config --libdir 2>/dev/null` ++# if [ "$XPLATFORM_MINGW" != "yes" ] && [ -x "$CFG_PSQL_CONFIG" ]; then ++# QT_CFLAGS_PSQL=`$CFG_PSQL_CONFIG --includedir 2>/dev/null` ++# QT_LFLAGS_PSQL=`$CFG_PSQL_CONFIG --libdir 2>/dev/null` +# fi [ -z "$QT_CFLAGS_PSQL" ] || QT_CFLAGS_PSQL="-I$QT_CFLAGS_PSQL" [ -z "$QT_LFLAGS_PSQL" ] || QT_LFLAGS_PSQL="-L$QT_LFLAGS_PSQL" diff --git a/meta/recipes-qt/qt4/qt4-4.8.6/0011-freetype-host-includes.patch b/meta/recipes-qt/qt4/qt4-4.8.7/0011-freetype-host-includes.patch similarity index 100% rename from meta/recipes-qt/qt4/qt4-4.8.6/0011-freetype-host-includes.patch rename to meta/recipes-qt/qt4/qt4-4.8.7/0011-freetype-host-includes.patch diff --git a/meta/recipes-qt/qt4/qt4-4.8.6/0012-Add-2bpp-support.patch b/meta/recipes-qt/qt4/qt4-4.8.7/0012-Add-2bpp-support.patch similarity index 100% rename from meta/recipes-qt/qt4/qt4-4.8.6/0012-Add-2bpp-support.patch rename to meta/recipes-qt/qt4/qt4-4.8.7/0012-Add-2bpp-support.patch diff --git a/meta/recipes-qt/qt4/qt4-4.8.6/0013-configure-add-crossarch-option.patch b/meta/recipes-qt/qt4/qt4-4.8.7/0013-configure-add-crossarch-option.patch similarity index 76% rename from meta/recipes-qt/qt4/qt4-4.8.6/0013-configure-add-crossarch-option.patch rename to meta/recipes-qt/qt4/qt4-4.8.7/0013-configure-add-crossarch-option.patch index aa464fd..762cdaf 100644 --- a/meta/recipes-qt/qt4/qt4-4.8.6/0013-configure-add-crossarch-option.patch +++ b/meta/recipes-qt/qt4/qt4-4.8.7/0013-configure-add-crossarch-option.patch @@ -6,34 +6,38 @@ Subject: [PATCH 13/21] configure: add "-crossarch" option Upstream-Status: Pending Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> + +Update for qt 4.8.7 + +Signed-off-by: Kai Kang <kai.kang@windriver.com> --- configure | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/configure b/configure -index 79c1c7b..7983c3d 100755 +index 4eb4a3d..a4dacec 100755 --- a/configure +++ b/configure -@@ -1153,7 +1153,7 @@ while [ "$#" -gt 0 ]; do +@@ -1160,7 +1160,7 @@ while [ "$#" -gt 0 ]; do shift VAL=$1 ;; -- -prefix|-docdir|-headerdir|-plugindir|-importdir|-datadir|-libdir|-bindir|-translationdir|-sysconfdir|-examplesdir|-demosdir|-depths|-make|-nomake|-platform|-xplatform|-device-option|-buildkey|-sdk|-arch|-host-arch|-mysql_config|-sysroot) -+ -prefix|-docdir|-headerdir|-plugindir|-importdir|-datadir|-libdir|-bindir|-translationdir|-sysconfdir|-examplesdir|-demosdir|-depths|-make|-nomake|-platform|-xplatform|-device-option|-buildkey|-sdk|-arch|-host-arch|-mysql_config|-sysroot|-crossarch) +- -prefix|-docdir|-headerdir|-plugindir|-importdir|-datadir|-libdir|-bindir|-translationdir|-sysconfdir|-examplesdir|-demosdir|-depths|-make|-nomake|-platform|-xplatform|-device-option|-buildkey|-sdk|-arch|-host-arch|-mysql_config|-psql_config|-sysroot) ++ -prefix|-docdir|-headerdir|-plugindir|-importdir|-datadir|-libdir|-bindir|-translationdir|-sysconfdir|-examplesdir|-demosdir|-depths|-make|-nomake|-platform|-xplatform|-device-option|-buildkey|-sdk|-arch|-host-arch|-mysql_config|-psql_config|-sysroot|-crossarch) VAR=`echo $1 | sed "s,^-\(.*\),\1,"` shift VAL="$1" -@@ -1709,6 +1709,9 @@ while [ "$#" -gt 0 ]; do +@@ -1719,6 +1719,9 @@ while [ "$#" -gt 0 ]; do DEV_VAL=`echo $VAL | sed "s,^.*=\(.*\),\1,"` DeviceVar set $DEV_VAR $DEV_VAL ;; -+ crossarch) -+ CROSSARCH="$VAL" -+ ;; ++ crossarch) ++ CROSSARCH="$VAL" ++ ;; debug-and-release) if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then CFG_DEBUG_RELEASE="$VAL" -@@ -3324,6 +3327,8 @@ arm*) +@@ -3333,6 +3336,8 @@ arm*) ;; esac diff --git a/meta/recipes-qt/qt4/qt4-4.8.6/0014-translations-fix-phony-translation-linking-error.patch b/meta/recipes-qt/qt4/qt4-4.8.7/0014-translations-fix-phony-translation-linking-error.patch similarity index 100% rename from meta/recipes-qt/qt4/qt4-4.8.6/0014-translations-fix-phony-translation-linking-error.patch rename to meta/recipes-qt/qt4/qt4-4.8.7/0014-translations-fix-phony-translation-linking-error.patch diff --git a/meta/recipes-qt/qt4/qt4-4.8.6/0015-configure-add-nostrip-for-debug-packages.patch b/meta/recipes-qt/qt4/qt4-4.8.7/0015-configure-add-nostrip-for-debug-packages.patch similarity index 100% rename from meta/recipes-qt/qt4/qt4-4.8.6/0015-configure-add-nostrip-for-debug-packages.patch rename to meta/recipes-qt/qt4/qt4-4.8.7/0015-configure-add-nostrip-for-debug-packages.patch diff --git a/meta/recipes-qt/qt4/qt4-4.8.6/0016-configure-eval-QMAKE_CXX.patch b/meta/recipes-qt/qt4/qt4-4.8.7/0016-configure-eval-QMAKE_CXX.patch similarity index 100% rename from meta/recipes-qt/qt4/qt4-4.8.6/0016-configure-eval-QMAKE_CXX.patch rename to meta/recipes-qt/qt4/qt4-4.8.7/0016-configure-eval-QMAKE_CXX.patch diff --git a/meta/recipes-qt/qt4/qt4-4.8.6/0017-configure-ensure-we-identify-the-compiler-as-g-in-co.patch b/meta/recipes-qt/qt4/qt4-4.8.7/0017-configure-ensure-we-identify-the-compiler-as-g-in-co.patch similarity index 100% rename from meta/recipes-qt/qt4/qt4-4.8.6/0017-configure-ensure-we-identify-the-compiler-as-g-in-co.patch rename to meta/recipes-qt/qt4/qt4-4.8.7/0017-configure-ensure-we-identify-the-compiler-as-g-in-co.patch diff --git a/meta/recipes-qt/qt4/qt4-4.8.6/0018-configure-make-pulseaudio-a-configurable-option.patch b/meta/recipes-qt/qt4/qt4-4.8.7/0018-configure-make-pulseaudio-a-configurable-option.patch similarity index 100% rename from meta/recipes-qt/qt4/qt4-4.8.6/0018-configure-make-pulseaudio-a-configurable-option.patch rename to meta/recipes-qt/qt4/qt4-4.8.7/0018-configure-make-pulseaudio-a-configurable-option.patch diff --git a/meta/recipes-qt/qt4/qt4-4.8.6/0019-Fixes-for-gcc-4.7.0-particularly-on-qemux86.patch b/meta/recipes-qt/qt4/qt4-4.8.7/0019-Fixes-for-gcc-4.7.0-particularly-on-qemux86.patch similarity index 100% rename from meta/recipes-qt/qt4/qt4-4.8.6/0019-Fixes-for-gcc-4.7.0-particularly-on-qemux86.patch rename to meta/recipes-qt/qt4/qt4-4.8.7/0019-Fixes-for-gcc-4.7.0-particularly-on-qemux86.patch diff --git a/meta/recipes-qt/qt4/qt4-4.8.6/0021-configure-make-qt4-native-work-with-long-building-pa.patch b/meta/recipes-qt/qt4/qt4-4.8.7/0021-configure-make-qt4-native-work-with-long-building-pa.patch similarity index 100% rename from meta/recipes-qt/qt4/qt4-4.8.6/0021-configure-make-qt4-native-work-with-long-building-pa.patch rename to meta/recipes-qt/qt4/qt4-4.8.7/0021-configure-make-qt4-native-work-with-long-building-pa.patch diff --git a/meta/recipes-qt/qt4/qt4-4.8.6/0027-tools.pro-disable-qmeegographicssystemhelper.patch b/meta/recipes-qt/qt4/qt4-4.8.7/0027-tools.pro-disable-qmeegographicssystemhelper.patch similarity index 100% rename from meta/recipes-qt/qt4/qt4-4.8.6/0027-tools.pro-disable-qmeegographicssystemhelper.patch rename to meta/recipes-qt/qt4/qt4-4.8.7/0027-tools.pro-disable-qmeegographicssystemhelper.patch diff --git a/meta/recipes-qt/qt4/qt4-4.8.6/0028-Don-t-crash-on-broken-GIF-images.patch b/meta/recipes-qt/qt4/qt4-4.8.7/0028-Don-t-crash-on-broken-GIF-images.patch similarity index 100% rename from meta/recipes-qt/qt4/qt4-4.8.6/0028-Don-t-crash-on-broken-GIF-images.patch rename to meta/recipes-qt/qt4/qt4-4.8.7/0028-Don-t-crash-on-broken-GIF-images.patch diff --git a/meta/recipes-qt/qt4/qt4-4.8.6/0033-configure-support-c-0x-standard-for-directfd.patch b/meta/recipes-qt/qt4/qt4-4.8.7/0033-configure-support-c-0x-standard-for-directfd.patch similarity index 100% rename from meta/recipes-qt/qt4/qt4-4.8.6/0033-configure-support-c-0x-standard-for-directfd.patch rename to meta/recipes-qt/qt4/qt4-4.8.7/0033-configure-support-c-0x-standard-for-directfd.patch diff --git a/meta/recipes-qt/qt4/qt4-4.8.6/Fix-QWSLock-invalid-argument-logs.patch b/meta/recipes-qt/qt4/qt4-4.8.7/Fix-QWSLock-invalid-argument-logs.patch similarity index 100% rename from meta/recipes-qt/qt4/qt4-4.8.6/Fix-QWSLock-invalid-argument-logs.patch rename to meta/recipes-qt/qt4/qt4-4.8.7/Fix-QWSLock-invalid-argument-logs.patch diff --git a/meta/recipes-qt/qt4/qt4-4.8.6/add_check_for_aarch64_32.patch b/meta/recipes-qt/qt4/qt4-4.8.7/add_check_for_aarch64_32.patch similarity index 100% rename from meta/recipes-qt/qt4/qt4-4.8.6/add_check_for_aarch64_32.patch rename to meta/recipes-qt/qt4/qt4-4.8.7/add_check_for_aarch64_32.patch diff --git a/meta/recipes-qt/qt4/qt4-4.8.6/g++.conf b/meta/recipes-qt/qt4/qt4-4.8.7/g++.conf similarity index 100% rename from meta/recipes-qt/qt4/qt4-4.8.6/g++.conf rename to meta/recipes-qt/qt4/qt4-4.8.7/g++.conf diff --git a/meta/recipes-qt/qt4/qt4-4.8.6/linux.conf b/meta/recipes-qt/qt4/qt4-4.8.7/linux.conf similarity index 100% rename from meta/recipes-qt/qt4/qt4-4.8.6/linux.conf rename to meta/recipes-qt/qt4/qt4-4.8.7/linux.conf diff --git a/meta/recipes-qt/qt4/qt4-4.8.6/qte.sh b/meta/recipes-qt/qt4/qt4-4.8.7/qte.sh similarity index 100% rename from meta/recipes-qt/qt4/qt4-4.8.6/qte.sh rename to meta/recipes-qt/qt4/qt4-4.8.7/qte.sh diff --git a/meta/recipes-qt/qt4/qt4-embedded.inc b/meta/recipes-qt/qt4/qt4-embedded.inc index ef5cf2c..a769065 100644 --- a/meta/recipes-qt/qt4/qt4-embedded.inc +++ b/meta/recipes-qt/qt4/qt4-embedded.inc @@ -3,7 +3,6 @@ DESCRIPTION = "Qt is a versatile cross-platform application framework -- this is SECTION = "libs" HOMEPAGE = "http://qt-project.org/" DEPENDS += "directfb tslib" -INC_PR = "r52" QT4EDEPENDS = "" QT_BASE_LIB ?= "libqt-embedded" diff --git a/meta/recipes-qt/qt4/qt4-embedded_4.8.6.bb b/meta/recipes-qt/qt4/qt4-embedded_4.8.7.bb similarity index 100% rename from meta/recipes-qt/qt4/qt4-embedded_4.8.6.bb rename to meta/recipes-qt/qt4/qt4-embedded_4.8.7.bb diff --git a/meta/recipes-qt/qt4/qt4-native.inc b/meta/recipes-qt/qt4/qt4-native.inc index 70bda73..2a41f8a 100644 --- a/meta/recipes-qt/qt4/qt4-native.inc +++ b/meta/recipes-qt/qt4/qt4-native.inc @@ -9,8 +9,6 @@ LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=fbc093901857fcd118f065f900982c24 \ file://LICENSE.GPL3;md5=6e1694ee338db410417517884918d4d2 \ file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6" -INC_PR = "r20" - inherit native SRC_URI = "http://download.qt-project.org/official_releases/qt/4.8/${PV}/qt-everywhere-opensource-src-${PV}.tar.gz \ @@ -18,10 +16,6 @@ SRC_URI = "http://download.qt-project.org/official_releases/qt/4.8/${PV}/qt-ever file://0002-qkbdtty_qws-fix-build-with-old-kernel-headers.patch \ file://0003-webkit2-set-OUTPUT_DIR-value-if-empty.patch \ file://0021-configure-make-qt4-native-work-with-long-building-pa.patch \ - file://0029-aarch64_arm64_fix_arch_detection.patch \ - file://0030-aarch64_arm64_qatomic_support.patch \ - file://0031-aarch64_arm64_mkspecs.patch \ - file://0032-aarch64_add_header.patch \ file://g++.conf \ file://linux.conf \ " diff --git a/meta/recipes-qt/qt4/qt4-native_4.8.6.bb b/meta/recipes-qt/qt4/qt4-native_4.8.6.bb deleted file mode 100644 index d874d32..0000000 --- a/meta/recipes-qt/qt4/qt4-native_4.8.6.bb +++ /dev/null @@ -1,6 +0,0 @@ -require qt4-native.inc - -TOBUILD := "src/tools/bootstrap ${TOBUILD}" - -SRC_URI[md5sum] = "2edbe4d6c2eff33ef91732602f3518eb" -SRC_URI[sha256sum] = "8b14dd91b52862e09b8e6a963507b74bc2580787d171feda197badfa7034032c" diff --git a/meta/recipes-qt/qt4/qt4-native_4.8.7.bb b/meta/recipes-qt/qt4/qt4-native_4.8.7.bb new file mode 100644 index 0000000..494d663 --- /dev/null +++ b/meta/recipes-qt/qt4/qt4-native_4.8.7.bb @@ -0,0 +1,6 @@ +require qt4-native.inc + +TOBUILD := "src/tools/bootstrap ${TOBUILD}" + +SRC_URI[md5sum] = "d990ee66bf7ab0c785589776f35ba6ad" +SRC_URI[sha256sum] = "e2882295097e47fe089f8ac741a95fef47e0a73a3f3cdf21b56990638f626ea0" diff --git a/meta/recipes-qt/qt4/qt4-x11-free.inc b/meta/recipes-qt/qt4/qt4-x11-free.inc index 835fc96..f6a1737 100644 --- a/meta/recipes-qt/qt4/qt4-x11-free.inc +++ b/meta/recipes-qt/qt4/qt4-x11-free.inc @@ -9,8 +9,6 @@ DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'virtual/libgl', ' PROVIDES += "qt4-x11" QT4DEPENDS = "" -INC_PR = "r50" - QT_GLFLAGS ?= "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', '-opengl', '-no-opengl', d)} " QT_GLFLAGS_qemux86 = "-opengl" QT_GLFLAGS_qemuppc = "-opengl" diff --git a/meta/recipes-qt/qt4/qt4-x11-free_4.8.6.bb b/meta/recipes-qt/qt4/qt4-x11-free_4.8.7.bb similarity index 100% rename from meta/recipes-qt/qt4/qt4-x11-free_4.8.6.bb rename to meta/recipes-qt/qt4/qt4-x11-free_4.8.7.bb -- 1.9.1 ^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH 1/1] qt4: upgrade to 4.8.7 2015-06-02 7:52 ` [PATCH 1/1] qt4: upgrade " Kai Kang @ 2015-06-02 10:18 ` Burton, Ross 2015-06-02 10:19 ` Burton, Ross 0 siblings, 1 reply; 4+ messages in thread From: Burton, Ross @ 2015-06-02 10:18 UTC (permalink / raw) To: Kai Kang; +Cc: OE-core [-- Attachment #1: Type: text/plain, Size: 86019 bytes --] Hi Kai, This doesn't apply against master since the GStreamer 0.10 removal patches landed, can you rebase? Ross On 2 June 2015 at 08:52, Kai Kang <kai.kang@windriver.com> wrote: > Upgrade qt4 packages from version 4.8.6 to 4.8.7. > > * remove arm64 related patches which are merged > * remove 0034-Fix-a-division-by-zero-when-processing-malformed-BMP.patch > which is backported. > * update 0010-configure-Hack-to-not-use-the-pg_config-of-the-host-.patch > and 0013-configure-add-crossarch-option.patch for new version > * remove useless variable INC_PR > > Signed-off-by: Kai Kang <kai.kang@windriver.com> > --- > meta/recipes-qt/qt4/nativesdk-qt4-tools.inc | 2 - > ...tools_4.8.6.bb => nativesdk-qt4-tools_4.8.7.bb} | 4 +- > .../0029-aarch64_arm64_fix_arch_detection.patch | 53 --- > .../0030-aarch64_arm64_qatomic_support.patch | 491 > --------------------- > .../qt4/qt4-4.8.6/0031-aarch64_arm64_mkspecs.patch | 124 ------ > .../qt4/qt4-4.8.6/0032-aarch64_add_header.patch | 18 - > ...ion-by-zero-when-processing-malformed-BMP.patch | 44 -- > .../qt4/{qt4-4.8.6.inc => qt4-4.8.7.inc} | 9 +- > ...o-allow-to-set-qt.conf-from-the-outside-u.patch | 0 > ...tty_qws-fix-build-with-old-kernel-headers.patch | 0 > ...003-webkit2-set-OUTPUT_DIR-value-if-empty.patch | 0 > ...make-is-already-built-in-qt4-tools-native.patch | 0 > ...e-set-LFLAGS-to-pick-up-zlib-from-staging.patch | 0 > ...se-OE_QMAKE_-values-to-specify-Qt-utility.patch | 0 > ...-const-usage-that-causes-compile-failure-.patch | 0 > ...llow-building-a-separate-qmake-for-the-ta.patch | 0 > ...e-fix-source-file-references-in-qmake.pri.patch | 0 > ...ack-to-not-use-the-pg_config-of-the-host-.patch | 20 +- > .../0011-freetype-host-includes.patch | 0 > .../0012-Add-2bpp-support.patch | 0 > .../0013-configure-add-crossarch-option.patch | 22 +- > ...tions-fix-phony-translation-linking-error.patch | 0 > ...-configure-add-nostrip-for-debug-packages.patch | 0 > .../0016-configure-eval-QMAKE_CXX.patch | 0 > ...nsure-we-identify-the-compiler-as-g-in-co.patch | 0 > ...ure-make-pulseaudio-a-configurable-option.patch | 0 > ...xes-for-gcc-4.7.0-particularly-on-qemux86.patch | 0 > ...ake-qt4-native-work-with-long-building-pa.patch | 0 > ...ls.pro-disable-qmeegographicssystemhelper.patch | 0 > .../0028-Don-t-crash-on-broken-GIF-images.patch | 0 > ...figure-support-c-0x-standard-for-directfd.patch | 0 > .../Fix-QWSLock-invalid-argument-logs.patch | 0 > .../add_check_for_aarch64_32.patch | 0 > .../qt4/{qt4-4.8.6 => qt4-4.8.7}/g++.conf | 0 > .../qt4/{qt4-4.8.6 => qt4-4.8.7}/linux.conf | 0 > .../recipes-qt/qt4/{qt4-4.8.6 => qt4-4.8.7}/qte.sh | 0 > meta/recipes-qt/qt4/qt4-embedded.inc | 1 - > ...qt4-embedded_4.8.6.bb => qt4-embedded_4.8.7.bb} | 0 > meta/recipes-qt/qt4/qt4-native.inc | 6 - > meta/recipes-qt/qt4/qt4-native_4.8.6.bb | 6 - > meta/recipes-qt/qt4/qt4-native_4.8.7.bb | 6 + > meta/recipes-qt/qt4/qt4-x11-free.inc | 2 - > ...qt4-x11-free_4.8.6.bb => qt4-x11-free_4.8.7.bb} | 0 > 43 files changed, 35 insertions(+), 773 deletions(-) > rename meta/recipes-qt/qt4/{nativesdk-qt4-tools_4.8.6.bb => > nativesdk-qt4-tools_4.8.7.bb} (44%) > delete mode 100644 > meta/recipes-qt/qt4/qt4-4.8.6/0029-aarch64_arm64_fix_arch_detection.patch > delete mode 100644 > meta/recipes-qt/qt4/qt4-4.8.6/0030-aarch64_arm64_qatomic_support.patch > delete mode 100644 > meta/recipes-qt/qt4/qt4-4.8.6/0031-aarch64_arm64_mkspecs.patch > delete mode 100644 > meta/recipes-qt/qt4/qt4-4.8.6/0032-aarch64_add_header.patch > delete mode 100644 > meta/recipes-qt/qt4/qt4-4.8.6/0034-Fix-a-division-by-zero-when-processing-malformed-BMP.patch > rename meta/recipes-qt/qt4/{qt4-4.8.6.inc => qt4-4.8.7.inc} (87%) > rename meta/recipes-qt/qt4/{qt4-4.8.6 => > qt4-4.8.7}/0001-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch > (100%) > rename meta/recipes-qt/qt4/{qt4-4.8.6 => > qt4-4.8.7}/0002-qkbdtty_qws-fix-build-with-old-kernel-headers.patch (100%) > rename meta/recipes-qt/qt4/{qt4-4.8.6 => > qt4-4.8.7}/0003-webkit2-set-OUTPUT_DIR-value-if-empty.patch (100%) > rename meta/recipes-qt/qt4/{qt4-4.8.6 => > qt4-4.8.7}/0004-configure-qmake-is-already-built-in-qt4-tools-native.patch > (100%) > rename meta/recipes-qt/qt4/{qt4-4.8.6 => > qt4-4.8.7}/0005-configure-set-LFLAGS-to-pick-up-zlib-from-staging.patch > (100%) > rename meta/recipes-qt/qt4/{qt4-4.8.6 => > qt4-4.8.7}/0006-configure-Use-OE_QMAKE_-values-to-specify-Qt-utility.patch > (100%) > rename meta/recipes-qt/qt4/{qt4-4.8.6 => > qt4-4.8.7}/0007-dbus-Remove-const-usage-that-causes-compile-failure-.patch > (100%) > rename meta/recipes-qt/qt4/{qt4-4.8.6 => > qt4-4.8.7}/0008-qmake.pro-Allow-building-a-separate-qmake-for-the-ta.patch > (100%) > rename meta/recipes-qt/qt4/{qt4-4.8.6 => > qt4-4.8.7}/0009-qmake-fix-source-file-references-in-qmake.pri.patch (100%) > rename meta/recipes-qt/qt4/{qt4-4.8.6 => > qt4-4.8.7}/0010-configure-Hack-to-not-use-the-pg_config-of-the-host-.patch > (65%) > rename meta/recipes-qt/qt4/{qt4-4.8.6 => > qt4-4.8.7}/0011-freetype-host-includes.patch (100%) > rename meta/recipes-qt/qt4/{qt4-4.8.6 => > qt4-4.8.7}/0012-Add-2bpp-support.patch (100%) > rename meta/recipes-qt/qt4/{qt4-4.8.6 => > qt4-4.8.7}/0013-configure-add-crossarch-option.patch (76%) > rename meta/recipes-qt/qt4/{qt4-4.8.6 => > qt4-4.8.7}/0014-translations-fix-phony-translation-linking-error.patch > (100%) > rename meta/recipes-qt/qt4/{qt4-4.8.6 => > qt4-4.8.7}/0015-configure-add-nostrip-for-debug-packages.patch (100%) > rename meta/recipes-qt/qt4/{qt4-4.8.6 => > qt4-4.8.7}/0016-configure-eval-QMAKE_CXX.patch (100%) > rename meta/recipes-qt/qt4/{qt4-4.8.6 => > qt4-4.8.7}/0017-configure-ensure-we-identify-the-compiler-as-g-in-co.patch > (100%) > rename meta/recipes-qt/qt4/{qt4-4.8.6 => > qt4-4.8.7}/0018-configure-make-pulseaudio-a-configurable-option.patch (100%) > rename meta/recipes-qt/qt4/{qt4-4.8.6 => > qt4-4.8.7}/0019-Fixes-for-gcc-4.7.0-particularly-on-qemux86.patch (100%) > rename meta/recipes-qt/qt4/{qt4-4.8.6 => > qt4-4.8.7}/0021-configure-make-qt4-native-work-with-long-building-pa.patch > (100%) > rename meta/recipes-qt/qt4/{qt4-4.8.6 => > qt4-4.8.7}/0027-tools.pro-disable-qmeegographicssystemhelper.patch (100%) > rename meta/recipes-qt/qt4/{qt4-4.8.6 => > qt4-4.8.7}/0028-Don-t-crash-on-broken-GIF-images.patch (100%) > rename meta/recipes-qt/qt4/{qt4-4.8.6 => > qt4-4.8.7}/0033-configure-support-c-0x-standard-for-directfd.patch (100%) > rename meta/recipes-qt/qt4/{qt4-4.8.6 => > qt4-4.8.7}/Fix-QWSLock-invalid-argument-logs.patch (100%) > rename meta/recipes-qt/qt4/{qt4-4.8.6 => > qt4-4.8.7}/add_check_for_aarch64_32.patch (100%) > rename meta/recipes-qt/qt4/{qt4-4.8.6 => qt4-4.8.7}/g++.conf (100%) > rename meta/recipes-qt/qt4/{qt4-4.8.6 => qt4-4.8.7}/linux.conf (100%) > rename meta/recipes-qt/qt4/{qt4-4.8.6 => qt4-4.8.7}/qte.sh (100%) > rename meta/recipes-qt/qt4/{qt4-embedded_4.8.6.bb => > qt4-embedded_4.8.7.bb} (100%) > delete mode 100644 meta/recipes-qt/qt4/qt4-native_4.8.6.bb > create mode 100644 meta/recipes-qt/qt4/qt4-native_4.8.7.bb > rename meta/recipes-qt/qt4/{qt4-x11-free_4.8.6.bb => > qt4-x11-free_4.8.7.bb} (100%) > > diff --git a/meta/recipes-qt/qt4/nativesdk-qt4-tools.inc > b/meta/recipes-qt/qt4/nativesdk-qt4-tools.inc > index 1c9ee2e..aa84e3d 100644 > --- a/meta/recipes-qt/qt4/nativesdk-qt4-tools.inc > +++ b/meta/recipes-qt/qt4/nativesdk-qt4-tools.inc > @@ -4,8 +4,6 @@ SECTION = "libs" > HOMEPAGE = "http://qt-project.org/" > LICENSE = "LGPLv2.1 | GPLv3" > > -INC_PR = "r13" > - > FILESEXTRAPATHS =. "${FILE_DIRNAME}/qt4-${PV}:" > > inherit nativesdk qmake2 > diff --git a/meta/recipes-qt/qt4/nativesdk-qt4-tools_4.8.6.bb > b/meta/recipes-qt/qt4/nativesdk-qt4-tools_4.8.7.bb > similarity index 44% > rename from meta/recipes-qt/qt4/nativesdk-qt4-tools_4.8.6.bb > rename to meta/recipes-qt/qt4/nativesdk-qt4-tools_4.8.7.bb > index 00526b8..90ba07c 100644 > --- a/meta/recipes-qt/qt4/nativesdk-qt4-tools_4.8.6.bb > +++ b/meta/recipes-qt/qt4/nativesdk-qt4-tools_4.8.7.bb > @@ -2,5 +2,5 @@ require nativesdk-qt4-tools.inc > > SRC_URI += > "file://0009-qmake-fix-source-file-references-in-qmake.pri.patch" > > -SRC_URI[md5sum] = "2edbe4d6c2eff33ef91732602f3518eb" > -SRC_URI[sha256sum] = > "8b14dd91b52862e09b8e6a963507b74bc2580787d171feda197badfa7034032c" > +SRC_URI[md5sum] = "d990ee66bf7ab0c785589776f35ba6ad" > +SRC_URI[sha256sum] = > "e2882295097e47fe089f8ac741a95fef47e0a73a3f3cdf21b56990638f626ea0" > diff --git > a/meta/recipes-qt/qt4/qt4-4.8.6/0029-aarch64_arm64_fix_arch_detection.patch > b/meta/recipes-qt/qt4/qt4-4.8.6/0029-aarch64_arm64_fix_arch_detection.patch > deleted file mode 100644 > index fbd32b1..0000000 > --- > a/meta/recipes-qt/qt4/qt4-4.8.6/0029-aarch64_arm64_fix_arch_detection.patch > +++ /dev/null > @@ -1,53 +0,0 @@ > -From 800abbba658203fc8e746e3fc780a297cd4110cf Mon Sep 17 00:00:00 2001 > -From: =?UTF-8?q?Lisandro=20Dami=C3=A1n=20Nicanor=20P=C3=A9rez=20Meyer?= > - <perezmeyer@gmail.com> > -Date: Wed, 20 Aug 2014 17:52:49 -0300 > -Subject: [PATCH] Fix AArch64/arm64 detection. > - > -The detection needs to go before arm, else the system will detect > AArch64/arm64 > -as arm. > - > -This patch comes from Wookey, he has agreed to put it under BSD or Expat > -to allow it's inclusion in here: > -<https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=735488#255> > - > -Change-Id: Ic2171c03fca8bb871347940fa3a2bc467776f797 > - > - > -Upstream-Status: Pending > - > -Signed-off-by: Kai Kang <kai.kang@windriver.com> > ---- > - configure | 12 ++++++------ > - 1 file changed, 6 insertions(+), 6 deletions(-) > - > -diff --git a/configure b/configure > -index a9ba7c8..eb88b72 100755 > ---- a/configure > -+++ b/configure > -@@ -3241,17 +3241,17 @@ if [ -z "${CFG_HOST_ARCH}" ]; then > - fi > - CFG_HOST_ARCH=s390 > - ;; > -- *:*:arm*) > -+ *:*:aarch64*|*:*:arm64*) > - if [ "$OPT_VERBOSE" = "yes" ]; then > -- echo " ARM (arm)" > -+ echo " AArch64 (aarch64)" > - fi > -- CFG_HOST_ARCH=arm > -+ CFG_HOST_ARCH=aarch64 > - ;; > -- *:*:aarch64*) > -+ *:*:arm*) > - if [ "$OPT_VERBOSE" = "yes" ]; then > -- echo " AArch64 (aarch64)" > -+ echo " ARM (arm)" > - fi > -- CFG_HOST_ARCH=aarch64 > -+ CFG_HOST_ARCH=arm > - ;; > - Linux:*:sparc*) > - if [ "$OPT_VERBOSE" = "yes" ]; then > --- > -2.1.0 > diff --git > a/meta/recipes-qt/qt4/qt4-4.8.6/0030-aarch64_arm64_qatomic_support.patch > b/meta/recipes-qt/qt4/qt4-4.8.6/0030-aarch64_arm64_qatomic_support.patch > deleted file mode 100644 > index ba4c2a6..0000000 > --- > a/meta/recipes-qt/qt4/qt4-4.8.6/0030-aarch64_arm64_qatomic_support.patch > +++ /dev/null > @@ -1,491 +0,0 @@ > -From 294010b562c9846bb2bc4ee9c63ff78adc7c1f4f Mon Sep 17 00:00:00 2001 > -From: =?UTF-8?q?Lisandro=20Dami=C3=A1n=20Nicanor=20P=C3=A9rez=20Meyer?= > - <perezmeyer@gmail.com> > -Date: Sat, 15 Mar 2014 15:40:49 -0300 > -Subject: [PATCH] Add qatomic support for AArch64 (aka arm64). > - > -Patch by Mark Salter <msalter@redhat.com> > -licensed under BSD: > - > -<https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=735488#195> > - > -This patch is known to not be the most correct way > -to implement them, as it seems to be possible to do it in a faster way, > -but should work non the less until we can provide something better. > - > -Change-Id: Ib392b27dc54691fd4c2ea9896240ad71fb8128cc > - > - > -Upstream-Status: Pending > - > -Signed-off-by: Kai Kang <kai.kang@windriver.com> > - > ---- > - src/corelib/arch/aarch64/arch.pri | 4 + > - src/corelib/arch/aarch64/qatomic_aarch64.cpp | 70 ++++++ > - src/corelib/arch/arch.pri | 4 +- > - src/corelib/arch/qatomic_aarch64.h | 335 > +++++++++++++++++++++++++++ > - src/corelib/arch/qatomic_arch.h | 2 + > - 5 files changed, 414 insertions(+), 1 deletion(-) > - create mode 100644 src/corelib/arch/aarch64/arch.pri > - create mode 100644 src/corelib/arch/aarch64/qatomic_aarch64.cpp > - create mode 100644 src/corelib/arch/qatomic_aarch64.h > - > -diff --git a/src/corelib/arch/aarch64/arch.pri > b/src/corelib/arch/aarch64/arch.pri > -new file mode 100644 > -index 0000000..63523d9 > ---- /dev/null > -+++ b/src/corelib/arch/aarch64/arch.pri > -@@ -0,0 +1,4 @@ > -+# > -+# AArch64 architecture > -+# > -+SOURCES += $$QT_ARCH_CPP/qatomic_aarch64.cpp > -diff --git a/src/corelib/arch/aarch64/qatomic_aarch64.cpp > b/src/corelib/arch/aarch64/qatomic_aarch64.cpp > -new file mode 100644 > -index 0000000..fc851b9 > ---- /dev/null > -+++ b/src/corelib/arch/aarch64/qatomic_aarch64.cpp > -@@ -0,0 +1,70 @@ > > -+/**************************************************************************** > -+** > -+** Copyright (C) 2012, 2013 Digia Plc and/or its subsidiary(-ies). > -+** Contact: http://www.qt-project.org/legal > -+** > -+** This file is part of the QtCore module of the Qt Toolkit. > -+** > -+** $QT_BEGIN_LICENSE:LGPL$ > -+** Commercial License Usage > -+** Licensees holding valid commercial Qt licenses may use this file in > -+** accordance with the commercial license agreement provided with the > -+** Software or, alternatively, in accordance with the terms contained in > -+** a written agreement between you and Digia. For licensing terms and > -+** conditions see http://qt.digia.com/licensing. For further > information > -+** use the contact form at http://qt.digia.com/contact-us. > -+** > -+** GNU Lesser General Public License Usage > -+** Alternatively, this file may be used under the terms of the GNU Lesser > -+** General Public License version 2.1 as published by the Free Software > -+** Foundation and appearing in the file LICENSE.LGPL included in the > -+** packaging of this file. Please review the following information to > -+** ensure the GNU Lesser General Public License version 2.1 requirements > -+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. > -+** > -+** In addition, as a special exception, Digia gives you certain > additional > -+** rights. These rights are described in the Digia Qt LGPL Exception > -+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. > -+** > -+** GNU General Public License Usage > -+** Alternatively, this file may be used under the terms of the GNU > -+** General Public License version 3.0 as published by the Free Software > -+** Foundation and appearing in the file LICENSE.GPL included in the > -+** packaging of this file. Please review the following information to > -+** ensure the GNU General Public License version 3.0 requirements will be > -+** met: http://www.gnu.org/copyleft/gpl.html. > -+** > -+** > -+** $QT_END_LICENSE$ > -+** > > -+****************************************************************************/ > -+ > -+#include <QtCore/qglobal.h> > -+ > -+#include <unistd.h> > -+#ifdef _POSIX_PRIORITY_SCHEDULING > -+# include <sched.h> > -+#endif > -+#include <time.h> > -+ > -+QT_BEGIN_NAMESPACE > -+ > -+QT_USE_NAMESPACE > -+ > -+Q_CORE_EXPORT void qt_atomic_yield(int *count) > -+{ > -+#ifdef _POSIX_PRIORITY_SCHEDULING > -+ if ((*count)++ < 50) { > -+ sched_yield(); > -+ } else > -+#endif > -+ { > -+ struct timespec tm; > -+ tm.tv_sec = 0; > -+ tm.tv_nsec = 2000001; > -+ nanosleep(&tm, NULL); > -+ *count = 0; > -+ } > -+} > -+ > -+QT_END_NAMESPACE > -diff --git a/src/corelib/arch/arch.pri b/src/corelib/arch/arch.pri > -index cd23e5e..f50fca7 100644 > ---- a/src/corelib/arch/arch.pri > -+++ b/src/corelib/arch/arch.pri > -@@ -31,7 +31,9 @@ integrity:HEADERS += arch/qatomic_integrity.h > - arch/qatomic_s390.h \ > - arch/qatomic_x86_64.h \ > - arch/qatomic_sh.h \ > -- arch/qatomic_sh4a.h > -+ arch/qatomic_sh4a.h \ > -+ arch/qatomic_aarch64.h \ > -+ > - > - QT_ARCH_CPP = $$QT_SOURCE_TREE/src/corelib/arch/$$QT_ARCH > - DEPENDPATH += $$QT_ARCH_CPP > -diff --git a/src/corelib/arch/qatomic_aarch64.h > b/src/corelib/arch/qatomic_aarch64.h > -new file mode 100644 > -index 0000000..de61ca8 > ---- /dev/null > -+++ b/src/corelib/arch/qatomic_aarch64.h > -@@ -0,0 +1,335 @@ > > -+/**************************************************************************** > -+** > -+** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). > -+** Contact: http://www.qt-project.org/legal > -+** > -+** This file is part of the QtCore module of the Qt Toolkit. > -+** > -+** $QT_BEGIN_LICENSE:LGPL$ > -+** Commercial License Usage > -+** Licensees holding valid commercial Qt licenses may use this file in > -+** accordance with the commercial license agreement provided with the > -+** Software or, alternatively, in accordance with the terms contained in > -+** a written agreement between you and Digia. For licensing terms and > -+** conditions see http://qt.digia.com/licensing. For further > information > -+** use the contact form at http://qt.digia.com/contact-us. > -+** > -+** GNU Lesser General Public License Usage > -+** Alternatively, this file may be used under the terms of the GNU Lesser > -+** General Public License version 2.1 as published by the Free Software > -+** Foundation and appearing in the file LICENSE.LGPL included in the > -+** packaging of this file. Please review the following information to > -+** ensure the GNU Lesser General Public License version 2.1 requirements > -+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. > -+** > -+** In addition, as a special exception, Digia gives you certain > additional > -+** rights. These rights are described in the Digia Qt LGPL Exception > -+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. > -+** > -+** GNU General Public License Usage > -+** Alternatively, this file may be used under the terms of the GNU > -+** General Public License version 3.0 as published by the Free Software > -+** Foundation and appearing in the file LICENSE.GPL included in the > -+** packaging of this file. Please review the following information to > -+** ensure the GNU General Public License version 3.0 requirements will be > -+** met: http://www.gnu.org/copyleft/gpl.html. > -+** > -+** > -+** $QT_END_LICENSE$ > -+** > > -+****************************************************************************/ > -+ > -+#ifndef QATOMIC_AARCH64_H > -+#define QATOMIC_AARCH64_H > -+ > -+QT_BEGIN_HEADER > -+ > -+QT_BEGIN_NAMESPACE > -+ > -+#define Q_ATOMIC_INT_REFERENCE_COUNTING_IS_ALWAYS_NATIVE > -+ > -+inline bool QBasicAtomicInt::isReferenceCountingNative() > -+{ return true; } > -+inline bool QBasicAtomicInt::isReferenceCountingWaitFree() > -+{ return false; } > -+ > -+#define Q_ATOMIC_INT_TEST_AND_SET_IS_ALWAYS_NATIVE > -+ > -+inline bool QBasicAtomicInt::isTestAndSetNative() > -+{ return true; } > -+inline bool QBasicAtomicInt::isTestAndSetWaitFree() > -+{ return false; } > -+ > -+#define Q_ATOMIC_INT_FETCH_AND_STORE_IS_ALWAYS_NATIVE > -+ > -+inline bool QBasicAtomicInt::isFetchAndStoreNative() > -+{ return true; } > -+inline bool QBasicAtomicInt::isFetchAndStoreWaitFree() > -+{ return false; } > -+ > -+#define Q_ATOMIC_INT_FETCH_AND_ADD_IS_ALWAYS_NATIVE > -+ > -+inline bool QBasicAtomicInt::isFetchAndAddNative() > -+{ return true; } > -+inline bool QBasicAtomicInt::isFetchAndAddWaitFree() > -+{ return false; } > -+ > -+#define Q_ATOMIC_POINTER_TEST_AND_SET_IS_ALWAYS_NATIVE > -+ > -+template <typename T> > -+Q_INLINE_TEMPLATE bool QBasicAtomicPointer<T>::isTestAndSetNative() > -+{ return true; } > -+template <typename T> > -+Q_INLINE_TEMPLATE bool QBasicAtomicPointer<T>::isTestAndSetWaitFree() > -+{ return false; } > -+ > -+#define Q_ATOMIC_POINTER_FETCH_AND_STORE_IS_ALWAYS_NATIVE > -+ > -+template <typename T> > -+Q_INLINE_TEMPLATE bool QBasicAtomicPointer<T>::isFetchAndStoreNative() > -+{ return true; } > -+template <typename T> > -+Q_INLINE_TEMPLATE bool QBasicAtomicPointer<T>::isFetchAndStoreWaitFree() > -+{ return false; } > -+ > -+#define Q_ATOMIC_POINTER_FETCH_AND_ADD_IS_ALWAYS_NATIVE > -+ > -+template <typename T> > -+Q_INLINE_TEMPLATE bool QBasicAtomicPointer<T>::isFetchAndAddNative() > -+{ return true; } > -+template <typename T> > -+Q_INLINE_TEMPLATE bool QBasicAtomicPointer<T>::isFetchAndAddWaitFree() > -+{ return false; } > -+ > -+#ifndef Q_DATA_MEMORY_BARRIER > -+# define Q_DATA_MEMORY_BARRIER asm volatile("dmb sy\n":::"memory") > -+#endif > -+#ifndef Q_COMPILER_MEMORY_BARRIER > -+# define Q_COMPILER_MEMORY_BARRIER asm volatile("":::"memory") > -+#endif > -+ > -+inline bool QBasicAtomicInt::ref() > -+{ > -+ int newValue; > -+ > -+ Q_COMPILER_MEMORY_BARRIER; > -+ newValue = __atomic_add_fetch(&_q_value, 1, __ATOMIC_ACQ_REL); > -+ Q_COMPILER_MEMORY_BARRIER; > -+ > -+ return newValue != 0; > -+} > -+ > -+inline bool QBasicAtomicInt::deref() > -+{ > -+ int newValue; > -+ > -+ Q_COMPILER_MEMORY_BARRIER; > -+ newValue = __atomic_sub_fetch(&_q_value, 1, __ATOMIC_ACQ_REL); > -+ Q_COMPILER_MEMORY_BARRIER; > -+ > -+ return newValue != 0; > -+} > -+ > -+inline bool QBasicAtomicInt::testAndSetRelaxed(int expectedValue, int > newValue) > -+{ > -+ bool val; > -+ > -+ Q_COMPILER_MEMORY_BARRIER; > -+ val = __atomic_compare_exchange_n (&_q_value, &expectedValue, > newValue, > -+ false, __ATOMIC_RELAXED, > __ATOMIC_RELAXED); > -+ Q_COMPILER_MEMORY_BARRIER; > -+ return val; > -+} > -+ > -+inline int QBasicAtomicInt::fetchAndStoreRelaxed(int newValue) > -+{ > -+ int val; > -+ Q_COMPILER_MEMORY_BARRIER; > -+ val = __atomic_exchange_n(&_q_value, newValue, __ATOMIC_RELAXED); > -+ Q_COMPILER_MEMORY_BARRIER; > -+ return val; > -+} > -+ > -+inline int QBasicAtomicInt::fetchAndAddRelaxed(int valueToAdd) > -+{ > -+ int val; > -+ Q_COMPILER_MEMORY_BARRIER; > -+ val = __atomic_fetch_add(&_q_value, valueToAdd, __ATOMIC_RELAXED); > -+ Q_COMPILER_MEMORY_BARRIER; > -+ return val; > -+} > -+ > -+template <typename T> > -+Q_INLINE_TEMPLATE bool QBasicAtomicPointer<T>::testAndSetRelaxed(T > *expectedValue, T *newValue) > -+{ > -+ bool val; > -+ Q_COMPILER_MEMORY_BARRIER; > -+ val = __atomic_compare_exchange_n (&_q_value, &expectedValue, > newValue, > -+ false, __ATOMIC_RELAXED, > __ATOMIC_RELAXED); > -+ Q_COMPILER_MEMORY_BARRIER; > -+ return val; > -+} > -+ > -+template <typename T> > -+Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndStoreRelaxed(T > *newValue) > -+{ > -+ T *val; > -+ Q_COMPILER_MEMORY_BARRIER; > -+ val = __atomic_exchange_n(&_q_value, newValue, __ATOMIC_RELAXED); > -+ Q_COMPILER_MEMORY_BARRIER; > -+ return val; > -+} > -+ > -+template <typename T> > -+Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndAddRelaxed(qptrdiff > valueToAdd) > -+{ > -+ T *val; > -+ Q_COMPILER_MEMORY_BARRIER; > -+ val = __atomic_fetch_add(&_q_value, valueToAdd, __ATOMIC_RELAXED); > -+ Q_COMPILER_MEMORY_BARRIER; > -+ return val; > -+} > -+ > -+inline bool QBasicAtomicInt::testAndSetAcquire(int expectedValue, int > newValue) > -+{ > -+ bool returnValue = testAndSetRelaxed(expectedValue, newValue); > -+ Q_DATA_MEMORY_BARRIER; > -+ return returnValue; > -+} > -+ > -+inline bool QBasicAtomicInt::testAndSetRelease(int expectedValue, int > newValue) > -+{ > -+ Q_DATA_MEMORY_BARRIER; > -+ return testAndSetRelaxed(expectedValue, newValue); > -+} > -+ > -+inline bool QBasicAtomicInt::testAndSetOrdered(int expectedValue, int > newValue) > -+{ > -+ Q_DATA_MEMORY_BARRIER; > -+ bool returnValue = testAndSetRelaxed(expectedValue, newValue); > -+ Q_COMPILER_MEMORY_BARRIER; > -+ return returnValue; > -+} > -+ > -+inline int QBasicAtomicInt::fetchAndStoreAcquire(int newValue) > -+{ > -+ int returnValue = fetchAndStoreRelaxed(newValue); > -+ Q_DATA_MEMORY_BARRIER; > -+ return returnValue; > -+} > -+ > -+inline int QBasicAtomicInt::fetchAndStoreRelease(int newValue) > -+{ > -+ Q_DATA_MEMORY_BARRIER; > -+ return fetchAndStoreRelaxed(newValue); > -+} > -+ > -+inline int QBasicAtomicInt::fetchAndStoreOrdered(int newValue) > -+{ > -+ Q_DATA_MEMORY_BARRIER; > -+ int returnValue = fetchAndStoreRelaxed(newValue); > -+ Q_COMPILER_MEMORY_BARRIER; > -+ return returnValue; > -+} > -+ > -+inline int QBasicAtomicInt::fetchAndAddAcquire(int valueToAdd) > -+{ > -+ int returnValue = fetchAndAddRelaxed(valueToAdd); > -+ Q_DATA_MEMORY_BARRIER; > -+ return returnValue; > -+} > -+ > -+inline int QBasicAtomicInt::fetchAndAddRelease(int valueToAdd) > -+{ > -+ Q_DATA_MEMORY_BARRIER; > -+ return fetchAndAddRelaxed(valueToAdd); > -+} > -+ > -+inline int QBasicAtomicInt::fetchAndAddOrdered(int valueToAdd) > -+{ > -+ Q_DATA_MEMORY_BARRIER; > -+ int returnValue = fetchAndAddRelaxed(valueToAdd); > -+ Q_COMPILER_MEMORY_BARRIER; > -+ return returnValue; > -+} > -+ > -+template <typename T> > -+Q_INLINE_TEMPLATE bool QBasicAtomicPointer<T>::testAndSetAcquire(T > *expectedValue, T *newValue) > -+{ > -+ bool returnValue = testAndSetRelaxed(expectedValue, newValue); > -+ Q_DATA_MEMORY_BARRIER; > -+ return returnValue; > -+} > -+ > -+template <typename T> > -+Q_INLINE_TEMPLATE bool QBasicAtomicPointer<T>::testAndSetRelease(T > *expectedValue, T *newValue) > -+{ > -+ Q_DATA_MEMORY_BARRIER; > -+ return testAndSetRelaxed(expectedValue, newValue); > -+} > -+ > -+template <typename T> > -+Q_INLINE_TEMPLATE bool QBasicAtomicPointer<T>::testAndSetOrdered(T > *expectedValue, T *newValue) > -+{ > -+ Q_DATA_MEMORY_BARRIER; > -+ bool returnValue = testAndSetAcquire(expectedValue, newValue); > -+ Q_COMPILER_MEMORY_BARRIER; > -+ return returnValue; > -+} > -+ > -+template <typename T> > -+Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndStoreAcquire(T > *newValue) > -+{ > -+ T *returnValue = fetchAndStoreRelaxed(newValue); > -+ Q_DATA_MEMORY_BARRIER; > -+ return returnValue; > -+} > -+ > -+template <typename T> > -+Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndStoreRelease(T > *newValue) > -+{ > -+ Q_DATA_MEMORY_BARRIER; > -+ return fetchAndStoreRelaxed(newValue); > -+} > -+ > -+template <typename T> > -+Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndStoreOrdered(T > *newValue) > -+{ > -+ Q_DATA_MEMORY_BARRIER; > -+ T *returnValue = fetchAndStoreRelaxed(newValue); > -+ Q_COMPILER_MEMORY_BARRIER; > -+ return returnValue; > -+} > -+ > -+template <typename T> > -+Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndAddAcquire(qptrdiff > valueToAdd) > -+{ > -+ T *returnValue = fetchAndAddRelaxed(valueToAdd); > -+ Q_DATA_MEMORY_BARRIER; > -+ return returnValue; > -+} > -+ > -+template <typename T> > -+Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndAddRelease(qptrdiff > valueToAdd) > -+{ > -+ Q_DATA_MEMORY_BARRIER; > -+ return fetchAndAddRelaxed(valueToAdd); > -+} > -+ > -+template <typename T> > -+Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndAddOrdered(qptrdiff > valueToAdd) > -+{ > -+ Q_DATA_MEMORY_BARRIER; > -+ T *returnValue = fetchAndAddRelaxed(valueToAdd); > -+ Q_COMPILER_MEMORY_BARRIER; > -+ return returnValue; > -+} > -+ > -+#undef Q_DATA_MEMORY_BARRIER > -+#undef Q_COMPILER_MEMORY_BARRIER > -+ > -+QT_END_NAMESPACE > -+ > -+QT_END_HEADER > -+ > -+#endif // QATOMIC_AARCH64_H > -diff --git a/src/corelib/arch/qatomic_arch.h > b/src/corelib/arch/qatomic_arch.h > -index 141726c..3e96926 100644 > ---- a/src/corelib/arch/qatomic_arch.h > -+++ b/src/corelib/arch/qatomic_arch.h > -@@ -94,6 +94,8 @@ QT_BEGIN_HEADER > - # include "QtCore/qatomic_sh4a.h" > - #elif defined(QT_ARCH_NACL) > - # include "QtCore/qatomic_generic.h" > -+#elif defined(QT_ARCH_AARCH64) > -+# include "QtCore/qatomic_aarch64.h" > - #else > - # error "Qt has not been ported to this architecture" > - #endif > --- > -2.1.0 > - > diff --git > a/meta/recipes-qt/qt4/qt4-4.8.6/0031-aarch64_arm64_mkspecs.patch > b/meta/recipes-qt/qt4/qt4-4.8.6/0031-aarch64_arm64_mkspecs.patch > deleted file mode 100644 > index a01e7ad..0000000 > --- a/meta/recipes-qt/qt4/qt4-4.8.6/0031-aarch64_arm64_mkspecs.patch > +++ /dev/null > @@ -1,124 +0,0 @@ > -From 7090fc80ff630712a90de92403190f647dd38a39 Mon Sep 17 00:00:00 2001 > -From: =?UTF-8?q?Lisandro=20Dami=C3=A1n=20Nicanor=20P=C3=A9rez=20Meyer?= > - <perezmeyer@gmail.com> > -Date: Sat, 15 Mar 2014 15:35:00 -0300 > -Subject: [PATCH] mkspecs for AArch64 (aka arm64). > - > -Patch by Marcin Juszkiewicz <marcin@juszkiewicz.com.pl> > -licensed under either Public Domain or BSD: > - > -<https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=735488#179> > - > -Change-Id: I21f17953234cfb176bac023e52ecdc927fc5c1a9 > - > - > -Upstream-Status: Pending > - > -Signed-off-by: Kai Kang <kai.kang@windriver.com> > - > ---- > - configure | 3 +++ > - mkspecs/linux-g++-aarch64/qmake.conf | 27 ++++++++++++++++++++ > - mkspecs/linux-g++-aarch64/qplatformdefs.h | 42 > +++++++++++++++++++++++++++++++ > - 3 files changed, 72 insertions(+) > - create mode 100644 mkspecs/linux-g++-aarch64/qmake.conf > - create mode 100644 mkspecs/linux-g++-aarch64/qplatformdefs.h > - > -diff --git a/configure b/configure > -index a9ba7c8..e57d053 100755 > ---- a/configure > -+++ b/configure > -@@ -2808,6 +2808,9 @@ if [ "$CFG_EMBEDDED" != "no" ]; then > - *86_64) > - PLATFORM=qws/linux-x86_64-g++ > - ;; > -+ aarch64) > -+ PLATFORM=linux-aarch64-g++ > -+ ;; > - *) > - PLATFORM=qws/linux-generic-g++ > - ;; > -diff --git a/mkspecs/linux-g++-aarch64/qmake.conf > b/mkspecs/linux-g++-aarch64/qmake.conf > -new file mode 100644 > -index 0000000..ebc0a92 > ---- /dev/null > -+++ b/mkspecs/linux-g++-aarch64/qmake.conf > -@@ -0,0 +1,27 @@ > -+# > -+# qmake configuration for linux-g++ > -+# > -+# Written for GNU/Linux platforms that have both lib and lib64 > directories, > -+# like the AMD Opteron. > -+# > -+ > -+MAKEFILE_GENERATOR = UNIX > -+TARGET_PLATFORM = unix > -+TEMPLATE = app > -+CONFIG += qt warn_on release incremental link_prl > gdb_dwarf_index > -+QT += core gui > -+QMAKE_INCREMENTAL_STYLE = sublib > -+ > -+QMAKE_CFLAGS = > -+QMAKE_LFLAGS = > -+ > -+QMAKE_CFLAGS_RELEASE += -O2 > -+ > -+include(../common/linux.conf) > -+include(../common/gcc-base-unix.conf) > -+include(../common/g++-unix.conf) > -+ > -+QMAKE_LIBDIR_X11 = /usr/X11R6/lib64 > -+QMAKE_LIBDIR_OPENGL = /usr/X11R6/lib64 > -+ > -+load(qt_config) > -diff --git a/mkspecs/linux-g++-aarch64/qplatformdefs.h > b/mkspecs/linux-g++-aarch64/qplatformdefs.h > -new file mode 100644 > -index 0000000..562128b > ---- /dev/null > -+++ b/mkspecs/linux-g++-aarch64/qplatformdefs.h > -@@ -0,0 +1,42 @@ > > -+/**************************************************************************** > -+** > -+** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). > -+** Contact: http://www.qt-project.org/legal > -+** > -+** This file is part of the qmake spec of the Qt Toolkit. > -+** > -+** $QT_BEGIN_LICENSE:LGPL$ > -+** Commercial License Usage > -+** Licensees holding valid commercial Qt licenses may use this file in > -+** accordance with the commercial license agreement provided with the > -+** Software or, alternatively, in accordance with the terms contained in > -+** a written agreement between you and Digia. For licensing terms and > -+** conditions see http://qt.digia.com/licensing. For further > information > -+** use the contact form at http://qt.digia.com/contact-us. > -+** > -+** GNU Lesser General Public License Usage > -+** Alternatively, this file may be used under the terms of the GNU Lesser > -+** General Public License version 2.1 as published by the Free Software > -+** Foundation and appearing in the file LICENSE.LGPL included in the > -+** packaging of this file. Please review the following information to > -+** ensure the GNU Lesser General Public License version 2.1 requirements > -+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. > -+** > -+** In addition, as a special exception, Digia gives you certain > additional > -+** rights. These rights are described in the Digia Qt LGPL Exception > -+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. > -+** > -+** GNU General Public License Usage > -+** Alternatively, this file may be used under the terms of the GNU > -+** General Public License version 3.0 as published by the Free Software > -+** Foundation and appearing in the file LICENSE.GPL included in the > -+** packaging of this file. Please review the following information to > -+** ensure the GNU General Public License version 3.0 requirements will be > -+** met: http://www.gnu.org/copyleft/gpl.html. > -+** > -+** > -+** $QT_END_LICENSE$ > -+** > > -+****************************************************************************/ > -+ > -+#include "../linux-g++/qplatformdefs.h" > --- > -2.1.0 > - > diff --git a/meta/recipes-qt/qt4/qt4-4.8.6/0032-aarch64_add_header.patch > b/meta/recipes-qt/qt4/qt4-4.8.6/0032-aarch64_add_header.patch > deleted file mode 100644 > index 7132224..0000000 > --- a/meta/recipes-qt/qt4/qt4-4.8.6/0032-aarch64_add_header.patch > +++ /dev/null > @@ -1,18 +0,0 @@ > -Add missing header for aarch64. And install > ../corelib/arch/qatomic_aarch64.h. > - > -Upstream-Status: Pending > - > -Signed-off-by: Kai Kang <kai.kang@windriver.com> > ---- > -diff -Nru > qt-everywhere-opensource-src-4.8.6.orig/include/QtCore/qatomic_aarch64.h > qt-everywhere-opensource-src-4.8.6/include/QtCore/qatomic_aarch64.h > ---- > qt-everywhere-opensource-src-4.8.6.orig/include/QtCore/qatomic_aarch64.h > 1970-01-01 08:30:00.000000000 +0830 > -+++ qt-everywhere-opensource-src-4.8.6/include/QtCore/qatomic_aarch64.h > 2014-09-09 17:18:03.768352551 +0800 > -@@ -0,0 +1 @@ > -+#include "../../src/corelib/arch/qatomic_aarch64.h" > ---- qt-everywhere-opensource-src-4.8.6/include/QtCore/headers.pri.orig > 2014-09-09 18:05:37.100430311 +0800 > -+++ qt-everywhere-opensource-src-4.8.6/include/QtCore/headers.pri > 2014-09-09 18:05:59.112430911 +0800 > -@@ -1,3 +1,3 @@ > --SYNCQT.HEADER_FILES = ../corelib/statemachine/qabstractstate.h > ../corelib/statemachine/qabstracttransition.h > ../corelib/statemachine/qeventtransition.h > ../corelib/statemachine/qfinalstate.h > ../corelib/statemachine/qhistorystate.h > ../corelib/statemachine/qsignaltransition.h > ../corelib/statemachine/qstate.h ../corelib/statemachine/qstatemachine.h > ../corelib/arch/qatomic_alpha.h ../corelib/arch/qatomic_arch.h > ../corelib/arch/qatomic_arm.h ../corelib/arch/qatomic_armv5.h > ../corelib/arch/qatomic_armv6.h ../corelib/arch/qatomic_armv7.h > ../corelib/arch/qatomic_avr32.h ../corelib/arch/qatomic_bfin.h > ../corelib/arch/qatomic_bootstrap.h ../corelib/arch/qatomic_generic.h > ../corelib/arch/qatomic_i386.h ../corelib/arch/qatomic_ia64.h > ../corelib/arch/qatomic_integrity.h ../corelib/arch/qatomic_m68k.h > ../corelib/arch/qatomic_macosx.h ../corelib/arch/qatomic_mips.h > ../corelib/arch/qatomic_parisc.h ../corelib/arch/qatomic_powerpc.h > ../corelib/arch/qatomic_s390.h ../corelib/arch/qatomic_sh.h > ../corelib/arch/qatomic_sh4a.h ../corelib/arch/qatomic_sparc.h > ../corelib/arch/qatomic_symbian.h ../corelib/arch/qatomic_vxworks.h > ../corelib/arch/qatomic_windows.h ../corelib/arch/qatomic_windowsce.h > ../corelib/arch/qatomic_x86_64.h ../corelib/thread/qatomic.h > ../corelib/thread/qbasicatomic.h ../corelib/thread/qmutex.h > ../corelib/thread/qreadwritelock.h ../corelib/thread/qsemaphore.h > ../corelib/thread/qthread.h ../corelib/thread/qthreadstorage.h > ../corelib/thread/qwaitcondition.h ../corelib/xml/qxmlstream.h > ../corelib/concurrent/qfuture.h ../corelib/concurrent/qfutureinterface.h > ../corelib/concurrent/qfuturesynchronizer.h > ../corelib/concurrent/qfuturewatcher.h ../corelib/concurrent/qrunnable.h > ../corelib/concurrent/qtconcurrentcompilertest.h > ../corelib/concurrent/qtconcurrentexception.h > ../corelib/concurrent/qtconcurrentfilter.h > ../corelib/concurrent/qtconcurrentfilterkernel.h > ../corelib/concurrent/qtconcurrentfunctionwrappers.h > ../corelib/concurrent/qtconcurrentiterateker > nel.h ../corelib/concurrent/qtconcurrentmap.h > ../corelib/concurrent/qtconcurrentmapkernel.h > ../corelib/concurrent/qtconcurrentmedian.h > ../corelib/concurrent/qtconcurrentreducekernel.h > ../corelib/concurrent/qtconcurrentresultstore.h > ../corelib/concurrent/qtconcurrentrun.h > ../corelib/concurrent/qtconcurrentrunbase.h > ../corelib/concurrent/qtconcurrentstoredfunctioncall.h > ../corelib/concurrent/qtconcurrentthreadengine.h > ../corelib/concurrent/qthreadpool.h > ../corelib/kernel/qabstracteventdispatcher.h > ../corelib/kernel/qabstractitemmodel.h ../corelib/kernel/qbasictimer.h > ../corelib/kernel/qcoreapplication.h ../corelib/kernel/qcoreevent.h > ../corelib/kernel/qeventloop.h ../corelib/kernel/qfunctions_nacl.h > ../corelib/kernel/qfunctions_vxworks.h ../corelib/kernel/qfunctions_wince.h > ../corelib/kernel/qmath.h ../corelib/kernel/qmetaobject.h > ../corelib/kernel/qmetatype.h ../corelib/kernel/qmimedata.h > ../corelib/kernel/qobject.h ../corelib/kernel/qobjectcleanuphandler.h > ../corelib/kernel/ > qobjectdefs.h ../corelib/kernel/qpointer.h > ../corelib/kernel/qsharedmemory.h ../corelib/kernel/qsignalmapper.h > ../corelib/kernel/qsocketnotifier.h ../corelib/kernel/qsystemsemaphore.h > ../corelib/kernel/qtimer.h ../corelib/kernel/qtranslator.h > ../corelib/kernel/qvariant.h ../corelib/plugin/qfactoryinterface.h > ../corelib/plugin/qlibrary.h ../corelib/plugin/qplugin.h > ../corelib/plugin/qpluginloader.h ../corelib/plugin/quuid.h > ../corelib/global/qconfig-dist.h ../corelib/global/qconfig-large.h > ../corelib/global/qconfig-medium.h ../corelib/global/qconfig-minimal.h > ../corelib/global/qconfig-nacl.h ../corelib/global/qconfig-small.h > ../corelib/global/qendian.h ../corelib/global/qfeatures.h > ../corelib/global/qglobal.h ../corelib/global/qlibraryinfo.h > ../corelib/global/qnamespace.h ../corelib/global/qnumeric.h > ../corelib/global/qt_windows.h ../corelib/global/qconfig.h > ../corelib/codecs/qtextcodec.h ../corelib/codecs/qtextcodecplugin.h > ../corelib/io/qabstractfileengine.h ../corelib/io/q > buffer.h ../corelib/io/qdatastream.h ../corelib/io/qdebug.h > ../corelib/io/qdir.h ../corelib/io/qdiriterator.h ../corelib/io/qfile.h > ../corelib/io/qfileinfo.h ../corelib/io/qfilesystemwatcher.h > ../corelib/io/qfsfileengine.h ../corelib/io/qiodevice.h > ../corelib/io/qprocess.h ../corelib/io/qresource.h > ../corelib/io/qsettings.h ../corelib/io/qtemporaryfile.h > ../corelib/io/qtextstream.h ../corelib/io/qurl.h > ../corelib/animation/qabstractanimation.h > ../corelib/animation/qanimationgroup.h > ../corelib/animation/qparallelanimationgroup.h > ../corelib/animation/qpauseanimation.h > ../corelib/animation/qpropertyanimation.h > ../corelib/animation/qsequentialanimationgroup.h > ../corelib/animation/qvariantanimation.h ../corelib/tools/qalgorithms.h > ../corelib/tools/qbitarray.h ../corelib/tools/qbytearray.h > ../corelib/tools/qbytearraymatcher.h ../corelib/tools/qcache.h > ../corelib/tools/qchar.h ../corelib/tools/qcontainerfwd.h > ../corelib/tools/qcontiguouscache.h ../corelib/tools/qcryptographichash.h > ../corelib/tools/qdatetime.h ../corelib/tools/qeasingcurve.h > ../corelib/tools/qelapsedtimer.h ../corelib/tools/qhash.h > ../corelib/tools/qiterator.h ../corelib/tools/qline.h > ../corelib/tools/qlinkedlist.h ../corelib/tools/qlist.h > ../corelib/tools/qlocale.h ../corelib/tools/qlocale_blackberry.h > ../corelib/tools/qmap.h ../corelib/tools/qmargins.h > ../corelib/tools/qpair.h ../corelib/tools/qpoint.h > ../corelib/tools/qqueue.h ../corelib/tools/qrect.h > ../corelib/tools/qregexp.h ../corelib/tools/qscopedpointer.h > ../corelib/tools/qscopedvaluerollback.h ../corelib/tools/qset.h > ../corelib/tools/qshareddata.h ../corelib/tools/qsharedpointer.h > ../corelib/tools/qsharedpointer_impl.h ../corelib/tools/qsize.h > ../corelib/tools/qstack.h ../corelib/tools/qstring.h > ../corelib/tools/qstringbuilder.h ../corelib/tools/qstringlist.h > ../corelib/tools/qstringmatcher.h ../corelib/tools/qtextboundaryfinder.h > ../corelib/tools/qtimeline.h ../corelib/tools/qvarlengtharray.h > ../corelib/tools/qvector.h ../. > ./include/QtCore/QtCore > -+SYNCQT.HEADER_FILES = ../corelib/statemachine/qabstractstate.h > ../corelib/statemachine/qabstracttransition.h > ../corelib/statemachine/qeventtransition.h > ../corelib/statemachine/qfinalstate.h > ../corelib/statemachine/qhistorystate.h > ../corelib/statemachine/qsignaltransition.h > ../corelib/statemachine/qstate.h ../corelib/statemachine/qstatemachine.h > ../corelib/arch/qatomic_alpha.h ../corelib/arch/qatomic_arch.h > ../corelib/arch/qatomic_arm.h ../corelib/arch/qatomic_armv5.h > ../corelib/arch/qatomic_armv6.h ../corelib/arch/qatomic_armv7.h > ../corelib/arch/qatomic_aarch64.h ../corelib/arch/qatomic_avr32.h > ../corelib/arch/qatomic_bfin.h ../corelib/arch/qatomic_bootstrap.h > ../corelib/arch/qatomic_generic.h ../corelib/arch/qatomic_i386.h > ../corelib/arch/qatomic_ia64.h ../corelib/arch/qatomic_integrity.h > ../corelib/arch/qatomic_m68k.h ../corelib/arch/qatomic_macosx.h > ../corelib/arch/qatomic_mips.h ../corelib/arch/qatomic_parisc.h > ../corelib/arch/qatomic_powerpc.h ../corelib/arch/qatomic_s > 390.h ../corelib/arch/qatomic_sh.h ../corelib/arch/qatomic_sh4a.h > ../corelib/arch/qatomic_sparc.h ../corelib/arch/qatomic_symbian.h > ../corelib/arch/qatomic_vxworks.h ../corelib/arch/qatomic_windows.h > ../corelib/arch/qatomic_windowsce.h ../corelib/arch/qatomic_x86_64.h > ../corelib/thread/qatomic.h ../corelib/thread/qbasicatomic.h > ../corelib/thread/qmutex.h ../corelib/thread/qreadwritelock.h > ../corelib/thread/qsemaphore.h ../corelib/thread/qthread.h > ../corelib/thread/qthreadstorage.h ../corelib/thread/qwaitcondition.h > ../corelib/xml/qxmlstream.h ../corelib/concurrent/qfuture.h > ../corelib/concurrent/qfutureinterface.h > ../corelib/concurrent/qfuturesynchronizer.h > ../corelib/concurrent/qfuturewatcher.h ../corelib/concurrent/qrunnable.h > ../corelib/concurrent/qtconcurrentcompilertest.h > ../corelib/concurrent/qtconcurrentexception.h > ../corelib/concurrent/qtconcurrentfilter.h > ../corelib/concurrent/qtconcurrentfilterkernel.h > ../corelib/concurrent/qtconcurrentfunctionwrappers.h ../corelib > /concurrent/qtconcurrentiteratekernel.h > ../corelib/concurrent/qtconcurrentmap.h > ../corelib/concurrent/qtconcurrentmapkernel.h > ../corelib/concurrent/qtconcurrentmedian.h > ../corelib/concurrent/qtconcurrentreducekernel.h > ../corelib/concurrent/qtconcurrentresultstore.h > ../corelib/concurrent/qtconcurrentrun.h > ../corelib/concurrent/qtconcurrentrunbase.h > ../corelib/concurrent/qtconcurrentstoredfunctioncall.h > ../corelib/concurrent/qtconcurrentthreadengine.h > ../corelib/concurrent/qthreadpool.h > ../corelib/kernel/qabstracteventdispatcher.h > ../corelib/kernel/qabstractitemmodel.h ../corelib/kernel/qbasictimer.h > ../corelib/kernel/qcoreapplication.h ../corelib/kernel/qcoreevent.h > ../corelib/kernel/qeventloop.h ../corelib/kernel/qfunctions_nacl.h > ../corelib/kernel/qfunctions_vxworks.h ../corelib/kernel/qfunctions_wince.h > ../corelib/kernel/qmath.h ../corelib/kernel/qmetaobject.h > ../corelib/kernel/qmetatype.h ../corelib/kernel/qmimedata.h > ../corelib/kernel/qobject.h ../corelib/kernel/qobjectc > leanuphandler.h ../corelib/kernel/qobjectdefs.h > ../corelib/kernel/qpointer.h ../corelib/kernel/qsharedmemory.h > ../corelib/kernel/qsignalmapper.h ../corelib/kernel/qsocketnotifier.h > ../corelib/kernel/qsystemsemaphore.h ../corelib/kernel/qtimer.h > ../corelib/kernel/qtranslator.h ../corelib/kernel/qvariant.h > ../corelib/plugin/qfactoryinterface.h ../corelib/plugin/qlibrary.h > ../corelib/plugin/qplugin.h ../corelib/plugin/qpluginloader.h > ../corelib/plugin/quuid.h ../corelib/global/qconfig-dist.h > ../corelib/global/qconfig-large.h ../corelib/global/qconfig-medium.h > ../corelib/global/qconfig-minimal.h ../corelib/global/qconfig-nacl.h > ../corelib/global/qconfig-small.h ../corelib/global/qendian.h > ../corelib/global/qfeatures.h ../corelib/global/qglobal.h > ../corelib/global/qlibraryinfo.h ../corelib/global/qnamespace.h > ../corelib/global/qnumeric.h ../corelib/global/qt_windows.h > ../corelib/global/qconfig.h ../corelib/codecs/qtextcodec.h > ../corelib/codecs/qtextcodecplugin.h ../corelib/io/qab > stractfileengine.h ../corelib/io/qbuffer.h ../corelib/io/qdatastream.h > ../corelib/io/qdebug.h ../corelib/io/qdir.h ../corelib/io/qdiriterator.h > ../corelib/io/qfile.h ../corelib/io/qfileinfo.h > ../corelib/io/qfilesystemwatcher.h ../corelib/io/qfsfileengine.h > ../corelib/io/qiodevice.h ../corelib/io/qprocess.h > ../corelib/io/qresource.h ../corelib/io/qsettings.h > ../corelib/io/qtemporaryfile.h ../corelib/io/qtextstream.h > ../corelib/io/qurl.h ../corelib/animation/qabstractanimation.h > ../corelib/animation/qanimationgroup.h > ../corelib/animation/qparallelanimationgroup.h > ../corelib/animation/qpauseanimation.h > ../corelib/animation/qpropertyanimation.h > ../corelib/animation/qsequentialanimationgroup.h > ../corelib/animation/qvariantanimation.h ../corelib/tools/qalgorithms.h > ../corelib/tools/qbitarray.h ../corelib/tools/qbytearray.h > ../corelib/tools/qbytearraymatcher.h ../corelib/tools/qcache.h > ../corelib/tools/qchar.h ../corelib/tools/qcontainerfwd.h > ../corelib/tools/qcontiguouscache.h ../ > corelib/tools/qcryptographichash.h ../corelib/tools/qdatetime.h > ../corelib/tools/qeasingcurve.h ../corelib/tools/qelapsedtimer.h > ../corelib/tools/qhash.h ../corelib/tools/qiterator.h > ../corelib/tools/qline.h ../corelib/tools/qlinkedlist.h > ../corelib/tools/qlist.h ../corelib/tools/qlocale.h > ../corelib/tools/qlocale_blackberry.h ../corelib/tools/qmap.h > ../corelib/tools/qmargins.h ../corelib/tools/qpair.h > ../corelib/tools/qpoint.h ../corelib/tools/qqueue.h > ../corelib/tools/qrect.h ../corelib/tools/qregexp.h > ../corelib/tools/qscopedpointer.h ../corelib/tools/qscopedvaluerollback.h > ../corelib/tools/qset.h ../corelib/tools/qshareddata.h > ../corelib/tools/qsharedpointer.h ../corelib/tools/qsharedpointer_impl.h > ../corelib/tools/qsize.h ../corelib/tools/qstack.h > ../corelib/tools/qstring.h ../corelib/tools/qstringbuilder.h > ../corelib/tools/qstringlist.h ../corelib/tools/qstringmatcher.h > ../corelib/tools/qtextboundaryfinder.h ../corelib/tools/qtimeline.h > ../corelib/tools/qvarlengtharray > .h ../corelib/tools/qvector.h ../../include/QtCore/QtCore > - SYNCQT.HEADER_CLASSES = ../../include/QtCore/QAbstractState > ../../include/QtCore/QAbstractTransition > ../../include/QtCore/QEventTransition ../../include/QtCore/QFinalState > ../../include/QtCore/QHistoryState ../../include/QtCore/QSignalTransition > ../../include/QtCore/QState ../../include/QtCore/QStateMachine > ../../include/QtCore/QAtomicInt ../../include/QtCore/QAtomicPointer > ../../include/QtCore/QBasicAtomicInt > ../../include/QtCore/QBasicAtomicPointer ../../include/QtCore/QMutex > ../../include/QtCore/QMutexLocker ../../include/QtCore/QMutexData > ../../include/QtCore/QReadWriteLock ../../include/QtCore/QReadLocker > ../../include/QtCore/QWriteLocker ../../include/QtCore/QSemaphore > ../../include/QtCore/QThread ../../include/QtCore/QThreadStorageData > ../../include/QtCore/QThreadStorage ../../include/QtCore/QWaitCondition > ../../include/QtCore/QXmlStreamStringRef > ../../include/QtCore/QXmlStreamAttribute > ../../include/QtCore/QXmlStreamAttributes > ../../include/QtCore/QXmlStreamNamespac > eDeclaration ../../include/QtCore/QXmlStreamNamespaceDeclarations > ../../include/QtCore/QXmlStreamNotationDeclaration > ../../include/QtCore/QXmlStreamNotationDeclarations > ../../include/QtCore/QXmlStreamEntityDeclaration > ../../include/QtCore/QXmlStreamEntityDeclarations > ../../include/QtCore/QXmlStreamEntityResolver > ../../include/QtCore/QXmlStreamReader ../../include/QtCore/QXmlStreamWriter > ../../include/QtCore/QFuture ../../include/QtCore/QFutureIterator > ../../include/QtCore/QMutableFutureIterator > ../../include/QtCore/QFutureInterfaceBase > ../../include/QtCore/QFutureInterface > ../../include/QtCore/QFutureSynchronizer > ../../include/QtCore/QFutureWatcherBase ../../include/QtCore/QFutureWatcher > ../../include/QtCore/QRunnable ../../include/QtCore/QtConcurrentFilter > ../../include/QtCore/QtConcurrentMap ../../include/QtCore/QtConcurrentRun > ../../include/QtCore/QThreadPool > ../../include/QtCore/QAbstractEventDispatcher > ../../include/QtCore/QModelIndex ../../include/QtCore/QPersistentMod > elIndex ../../include/QtCore/QModelIndexList > ../../include/QtCore/QAbstractItemModel > ../../include/QtCore/QAbstractTableModel > ../../include/QtCore/QAbstractListModel ../../include/QtCore/QBasicTimer > ../../include/QtCore/QCoreApplication > ../../include/QtCore/QtCleanUpFunction ../../include/QtCore/QEvent > ../../include/QtCore/QTimerEvent ../../include/QtCore/QChildEvent > ../../include/QtCore/QCustomEvent > ../../include/QtCore/QDynamicPropertyChangeEvent > ../../include/QtCore/QEventLoop ../../include/QtCore/QMetaMethod > ../../include/QtCore/QMetaEnum ../../include/QtCore/QMetaProperty > ../../include/QtCore/QMetaClassInfo ../../include/QtCore/QMetaType > ../../include/QtCore/QMetaTypeId ../../include/QtCore/QMetaTypeId2 > ../../include/QtCore/QMimeData ../../include/QtCore/QObjectList > ../../include/QtCore/QObjectData ../../include/QtCore/QObject > ../../include/QtCore/QObjectUserData > ../../include/QtCore/QObjectCleanupHandler > ../../include/QtCore/QGenericArgument ../../include/QtCore/QGener > icReturnArgument ../../include/QtCore/QArgument > ../../include/QtCore/QReturnArgument ../../include/QtCore/QMetaObject > ../../include/QtCore/QMetaObjectAccessor > ../../include/QtCore/QMetaObjectExtraData ../../include/QtCore/QPointer > ../../include/QtCore/QSharedMemory ../../include/QtCore/QSignalMapper > ../../include/QtCore/QSocketNotifier ../../include/QtCore/QSystemSemaphore > ../../include/QtCore/QTimer ../../include/QtCore/QTranslator > ../../include/QtCore/QVariant ../../include/QtCore/QVariantList > ../../include/QtCore/QVariantMap ../../include/QtCore/QVariantHash > ../../include/QtCore/QVariantComparisonHelper > ../../include/QtCore/QFactoryInterface ../../include/QtCore/QLibrary > ../../include/QtCore/QtPlugin ../../include/QtCore/QtPluginInstanceFunction > ../../include/QtCore/QPluginLoader ../../include/QtCore/QUuid > ../../include/QtCore/QtEndian ../../include/QtCore/QtGlobal > ../../include/QtCore/QIntegerForSize > ../../include/QtCore/QNoImplicitBoolCast ../../include/QtCore/Q_INT8 .. > /../include/QtCore/Q_UINT8 ../../include/QtCore/Q_INT16 > ../../include/QtCore/Q_UINT16 ../../include/QtCore/Q_INT32 > ../../include/QtCore/Q_UINT32 ../../include/QtCore/Q_INT64 > ../../include/QtCore/Q_UINT64 ../../include/QtCore/Q_LLONG > ../../include/QtCore/Q_ULLONG ../../include/QtCore/Q_LONG > ../../include/QtCore/Q_ULONG ../../include/QtCore/QSysInfo > ../../include/QtCore/QtMsgHandler ../../include/QtCore/QGlobalStatic > ../../include/QtCore/QGlobalStaticDeleter ../../include/QtCore/QBool > ../../include/QtCore/QTypeInfo ../../include/QtCore/QFlag > ../../include/QtCore/QIncompatibleFlag ../../include/QtCore/QFlags > ../../include/QtCore/QForeachContainer > ../../include/QtCore/QForeachContainerBase > ../../include/QtCore/QLibraryInfo ../../include/QtCore/Qt > ../../include/QtCore/QInternal ../../include/QtCore/QCOORD > ../../include/QtCore/QtConfig ../../include/QtCore/QTextCodec > ../../include/QtCore/QTextEncoder ../../include/QtCore/QTextDecoder > ../../include/QtCore/QTextCodecFactoryInterface > ../../include/QtCore/QTextCodecPlugin > ../../include/QtCore/QAbstractFileEngine > ../../include/QtCore/QAbstractFileEngineHandler > ../../include/QtCore/QAbstractFileEngineIterator > ../../include/QtCore/QBuffer ../../include/QtCore/QDataStream > ../../include/QtCore/QtDebug ../../include/QtCore/QDebug > ../../include/QtCore/QNoDebug ../../include/QtCore/QDir > ../../include/QtCore/QDirIterator ../../include/QtCore/QFile > ../../include/QtCore/QFileInfo ../../include/QtCore/QFileInfoList > ../../include/QtCore/QFileInfoListIterator > ../../include/QtCore/QFileSystemWatcher ../../include/QtCore/QFSFileEngine > ../../include/QtCore/QIODevice ../../include/QtCore/Q_PID > ../../include/QtCore/QProcessEnvironment ../../include/QtCore/QProcess > ../../include/QtCore/QResource ../../include/QtCore/QSettings > ../../include/QtCore/QTemporaryFile ../../include/QtCore/QTextStream > ../../include/QtCore/QTextStreamFunction > ../../include/QtCore/QTextStreamManipulator ../../include/QtCore/QTS > ../../include/QtCore/Q > TextIStream ../../include/QtCore/QTextOStream ../../include/QtCore/QUrl > ../../include/QtCore/QAbstractAnimation > ../../include/QtCore/QAnimationDriver ../../include/QtCore/QAnimationGroup > ../../include/QtCore/QParallelAnimationGroup > ../../include/QtCore/QPauseAnimation > ../../include/QtCore/QPropertyAnimation > ../../include/QtCore/QSequentialAnimationGroup > ../../include/QtCore/QVariantAnimation ../../include/QtCore/QtAlgorithms > ../../include/QtCore/QBitArray ../../include/QtCore/QBitRef > ../../include/QtCore/QByteArray ../../include/QtCore/QByteRef > ../../include/QtCore/QByteArrayMatcher ../../include/QtCore/QCache > ../../include/QtCore/QLatin1Char ../../include/QtCore/QChar > ../../include/QtCore/QtContainerFwd > ../../include/QtCore/QContiguousCacheData > ../../include/QtCore/QContiguousCacheTypedData > ../../include/QtCore/QContiguousCache > ../../include/QtCore/QCryptographicHash ../../include/QtCore/QDate > ../../include/QtCore/QTime ../../include/QtCore/QDateTime > ../../include/QtCore/QE > asingCurve ../../include/QtCore/QElapsedTimer > ../../include/QtCore/QHashData ../../include/QtCore/QHashDummyValue > ../../include/QtCore/QHashDummyNode ../../include/QtCore/QHashNode > ../../include/QtCore/QHash ../../include/QtCore/QMultiHash > ../../include/QtCore/QHashIterator > ../../include/QtCore/QMutableHashIterator ../../include/QtCore/QLine > ../../include/QtCore/QLineF ../../include/QtCore/QLinkedListData > ../../include/QtCore/QLinkedListNode ../../include/QtCore/QLinkedList > ../../include/QtCore/QLinkedListIterator > ../../include/QtCore/QMutableLinkedListIterator > ../../include/QtCore/QListData ../../include/QtCore/QList > ../../include/QtCore/QListIterator > ../../include/QtCore/QMutableListIterator > ../../include/QtCore/QSystemLocale ../../include/QtCore/QLocale > ../../include/QtCore/QBBSystemLocaleData ../../include/QtCore/QMapData > ../../include/QtCore/QMapNode ../../include/QtCore/QMapPayloadNode > ../../include/QtCore/QMap ../../include/QtCore/QMultiMap > ../../include/QtCore/QMapIt > erator ../../include/QtCore/QMutableMapIterator > ../../include/QtCore/QMargins ../../include/QtCore/QPair > ../../include/QtCore/QPoint ../../include/QtCore/QPointF > ../../include/QtCore/QQueue ../../include/QtCore/QRect > ../../include/QtCore/QRectF ../../include/QtCore/QRegExp > ../../include/QtCore/QScopedPointerDeleter > ../../include/QtCore/QScopedPointerArrayDeleter > ../../include/QtCore/QScopedPointerPodDeleter > ../../include/QtCore/QScopedPointer > ../../include/QtCore/QScopedArrayPointer > ../../include/QtCore/QScopedValueRollback ../../include/QtCore/QSet > ../../include/QtCore/QSetIterator ../../include/QtCore/QMutableSetIterator > ../../include/QtCore/QSharedData ../../include/QtCore/QSharedDataPointer > ../../include/QtCore/QExplicitlySharedDataPointer > ../../include/QtCore/QSharedPointer ../../include/QtCore/QWeakPointer > ../../include/QtCore/QSize ../../include/QtCore/QSizeF > ../../include/QtCore/QStack ../../include/QtCore/QStdWString > ../../include/QtCore/QString ../../include/QtCore > /QLatin1String ../../include/QtCore/QCharRef > ../../include/QtCore/QConstString ../../include/QtCore/QStringRef > ../../include/QtCore/QLatin1Literal > ../../include/QtCore/QAbstractConcatenable > ../../include/QtCore/QConcatenable ../../include/QtCore/QStringBuilder > ../../include/QtCore/QStringListIterator > ../../include/QtCore/QMutableStringListIterator > ../../include/QtCore/QStringList ../../include/QtCore/QStringMatcher > ../../include/QtCore/QTextBoundaryFinder ../../include/QtCore/QTimeLine > ../../include/QtCore/QVarLengthArray ../../include/QtCore/QVectorData > ../../include/QtCore/QVectorTypedData ../../include/QtCore/QVector > ../../include/QtCore/QVectorIterator > ../../include/QtCore/QMutableVectorIterator > - SYNCQT.PRIVATE_HEADER_FILES = ../corelib/statemachine/qabstractstate_p.h > ../corelib/statemachine/qabstracttransition_p.h > ../corelib/statemachine/qeventtransition_p.h > ../corelib/statemachine/qhistorystate_p.h > ../corelib/statemachine/qsignaleventgenerator_p.h > ../corelib/statemachine/qsignaltransition_p.h > ../corelib/statemachine/qstate_p.h > ../corelib/statemachine/qstatemachine_p.h ../corelib/thread/qmutex_p.h > ../corelib/thread/qmutexpool_p.h ../corelib/thread/qorderedmutexlocker_p.h > ../corelib/thread/qreadwritelock_p.h ../corelib/thread/qthread_p.h > ../corelib/xml/qxmlstream_p.h ../corelib/xml/qxmlutils_p.h > ../corelib/concurrent/qfutureinterface_p.h > ../corelib/concurrent/qfuturewatcher_p.h > ../corelib/concurrent/qthreadpool_p.h > ../corelib/kernel/qabstracteventdispatcher_p.h > ../corelib/kernel/qabstractitemmodel_p.h ../corelib/kernel/qcore_mac_p.h > ../corelib/kernel/qcore_symbian_p.h ../corelib/kernel/qcore_unix_p.h > ../corelib/kernel/qcoreapplication_p.h ../corelib/kernel/qcorecmdl > ineargs_p.h ../corelib/kernel/qcoreglobaldata_p.h > ../corelib/kernel/qcrashhandler_p.h > ../corelib/kernel/qeventdispatcher_blackberry_p.h > ../corelib/kernel/qeventdispatcher_glib_p.h > ../corelib/kernel/qeventdispatcher_symbian_p.h > ../corelib/kernel/qeventdispatcher_unix_p.h > ../corelib/kernel/qeventdispatcher_win_p.h ../corelib/kernel/qfunctions_p.h > ../corelib/kernel/qmetaobject_p.h ../corelib/kernel/qobject_p.h > ../corelib/kernel/qsharedmemory_p.h ../corelib/kernel/qsystemerror_p.h > ../corelib/kernel/qsystemsemaphore_p.h ../corelib/kernel/qtranslator_p.h > ../corelib/kernel/qvariant_p.h ../corelib/kernel/qwineventnotifier_p.h > ../corelib/plugin/qelfparser_p.h ../corelib/plugin/qfactoryloader_p.h > ../corelib/plugin/qlibrary_p.h ../corelib/plugin/qsystemlibrary_p.h > ../corelib/global/qnumeric_p.h ../corelib/global/qt_pch.h > ../corelib/codecs/qfontlaocodec_p.h ../corelib/codecs/qiconvcodec_p.h > ../corelib/codecs/qisciicodec_p.h ../corelib/codecs/qlatincodec_p.h > ../corelib/codecs/qsimplecode > c_p.h ../corelib/codecs/qtextcodec_p.h ../corelib/codecs/qtsciicodec_p.h > ../corelib/codecs/qutfcodec_p.h ../corelib/io/qabstractfileengine_p.h > ../corelib/io/qdatastream_p.h ../corelib/io/qdataurl_p.h > ../corelib/io/qdir_p.h ../corelib/io/qfile_p.h ../corelib/io/qfileinfo_p.h > ../corelib/io/qfilesystemengine_p.h ../corelib/io/qfilesystementry_p.h > ../corelib/io/qfilesystemiterator_p.h ../corelib/io/qfilesystemmetadata_p.h > ../corelib/io/qfilesystemwatcher_dnotify_p.h > ../corelib/io/qfilesystemwatcher_fsevents_p.h > ../corelib/io/qfilesystemwatcher_inotify_p.h > ../corelib/io/qfilesystemwatcher_kqueue_p.h > ../corelib/io/qfilesystemwatcher_p.h > ../corelib/io/qfilesystemwatcher_symbian_p.h > ../corelib/io/qfilesystemwatcher_win_p.h > ../corelib/io/qfsfileengine_iterator_p.h ../corelib/io/qfsfileengine_p.h > ../corelib/io/qiodevice_p.h ../corelib/io/qnoncontiguousbytedevice_p.h > ../corelib/io/qprocess_p.h ../corelib/io/qresource_iterator_p.h > ../corelib/io/qresource_p.h ../corelib/io/qsettings_p.h > ../corelib/io/qtldurl_p.h ../corelib/io/qurltlds_p.h > ../corelib/io/qwindowspipewriter_p.h > ../corelib/animation/qabstractanimation_p.h > ../corelib/animation/qanimationgroup_p.h > ../corelib/animation/qparallelanimationgroup_p.h > ../corelib/animation/qpropertyanimation_p.h > ../corelib/animation/qsequentialanimationgroup_p.h > ../corelib/animation/qvariantanimation_p.h ../corelib/tools/qbytedata_p.h > ../corelib/tools/qdatetime_p.h ../corelib/tools/qharfbuzz_p.h > ../corelib/tools/qlocale_data_p.h ../corelib/tools/qlocale_p.h > ../corelib/tools/qlocale_tools_p.h ../corelib/tools/qpodlist_p.h > ../corelib/tools/qringbuffer_p.h ../corelib/tools/qscopedpointer_p.h > ../corelib/tools/qsimd_p.h ../corelib/tools/qtools_p.h > ../corelib/tools/qunicodetables_p.h > diff --git > a/meta/recipes-qt/qt4/qt4-4.8.6/0034-Fix-a-division-by-zero-when-processing-malformed-BMP.patch > b/meta/recipes-qt/qt4/qt4-4.8.6/0034-Fix-a-division-by-zero-when-processing-malformed-BMP.patch > deleted file mode 100644 > index 8ff4ad5..0000000 > --- > a/meta/recipes-qt/qt4/qt4-4.8.6/0034-Fix-a-division-by-zero-when-processing-malformed-BMP.patch > +++ /dev/null > @@ -1,44 +0,0 @@ > -From e50aa2252cdd5cb53eef7d8c4503c7edff634f68 Mon Sep 17 00:00:00 2001 > -From: "Richard J. Moore" <rich@kde.org> > -Date: Tue, 24 Feb 2015 19:02:35 +0000 > -Subject: [PATCH] Fix a division by zero when processing malformed BMP > files. > - > -This fixes a division by 0 when processing a maliciously crafted BMP > -file. No impact beyond DoS. > - > -Backport of 661f6bfd032dacc62841037732816a583640e187 > - > -Upstream-Status: Backport > - > -Task-number: QTBUG-44547 > -Change-Id: I43f06e752b11cb50669101460902a82b885ae618 > -Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> > -Signed-off-by: Jonathan Liu <net147@gmail.com> > ---- > - src/gui/image/qbmphandler.cpp | 6 ++++++ > - 1 file changed, 6 insertions(+) > - > -diff --git a/src/gui/image/qbmphandler.cpp b/src/gui/image/qbmphandler.cpp > -index b22e842..30fa9e0 100644 > ---- a/src/gui/image/qbmphandler.cpp > -+++ b/src/gui/image/qbmphandler.cpp > -@@ -319,10 +319,16 @@ static bool read_dib_body(QDataStream &s, const > BMP_INFOHDR &bi, int offset, int > - } > - } else if (comp == BMP_BITFIELDS && (nbits == 16 || nbits == 32)) { > - red_shift = calc_shift(red_mask); > -+ if (((red_mask >> red_shift) + 1) == 0) > -+ return false; > - red_scale = 256 / ((red_mask >> red_shift) + 1); > - green_shift = calc_shift(green_mask); > -+ if (((green_mask >> green_shift) + 1) == 0) > -+ return false; > - green_scale = 256 / ((green_mask >> green_shift) + 1); > - blue_shift = calc_shift(blue_mask); > -+ if (((blue_mask >> blue_shift) + 1) == 0) > -+ return false; > - blue_scale = 256 / ((blue_mask >> blue_shift) + 1); > - } else if (comp == BMP_RGB && (nbits == 24 || nbits == 32)) { > - blue_mask = 0x000000ff; > --- > -2.3.1 > - > diff --git a/meta/recipes-qt/qt4/qt4-4.8.6.inc > b/meta/recipes-qt/qt4/qt4-4.8.7.inc > similarity index 87% > rename from meta/recipes-qt/qt4/qt4-4.8.6.inc > rename to meta/recipes-qt/qt4/qt4-4.8.7.inc > index 0cb7f80..2f580cc 100644 > --- a/meta/recipes-qt/qt4/qt4-4.8.6.inc > +++ b/meta/recipes-qt/qt4/qt4-4.8.7.inc > @@ -22,19 +22,14 @@ SRC_URI = " > http://download.qt-project.org/official_releases/qt/4.8/${PV}/qt-ever > file://0019-Fixes-for-gcc-4.7.0-particularly-on-qemux86.patch \ > file://0027-tools.pro-disable-qmeegographicssystemhelper.patch > \ > file://0028-Don-t-crash-on-broken-GIF-images.patch \ > - file://0029-aarch64_arm64_fix_arch_detection.patch \ > - file://0030-aarch64_arm64_qatomic_support.patch \ > - file://0031-aarch64_arm64_mkspecs.patch \ > - file://0032-aarch64_add_header.patch \ > - > file://0034-Fix-a-division-by-zero-when-processing-malformed-BMP.patch \ > file://Fix-QWSLock-invalid-argument-logs.patch \ > file://add_check_for_aarch64_32.patch \ > file://g++.conf \ > file://linux.conf \ > " > > -SRC_URI[md5sum] = "2edbe4d6c2eff33ef91732602f3518eb" > -SRC_URI[sha256sum] = > "8b14dd91b52862e09b8e6a963507b74bc2580787d171feda197badfa7034032c" > +SRC_URI[md5sum] = "d990ee66bf7ab0c785589776f35ba6ad" > +SRC_URI[sha256sum] = > "e2882295097e47fe089f8ac741a95fef47e0a73a3f3cdf21b56990638f626ea0" > > S = "${WORKDIR}/qt-everywhere-opensource-src-${PV}" > > diff --git > a/meta/recipes-qt/qt4/qt4-4.8.6/0001-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch > b/meta/recipes-qt/qt4/qt4-4.8.7/0001-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch > similarity index 100% > rename from > meta/recipes-qt/qt4/qt4-4.8.6/0001-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch > rename to > meta/recipes-qt/qt4/qt4-4.8.7/0001-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch > diff --git > a/meta/recipes-qt/qt4/qt4-4.8.6/0002-qkbdtty_qws-fix-build-with-old-kernel-headers.patch > b/meta/recipes-qt/qt4/qt4-4.8.7/0002-qkbdtty_qws-fix-build-with-old-kernel-headers.patch > similarity index 100% > rename from > meta/recipes-qt/qt4/qt4-4.8.6/0002-qkbdtty_qws-fix-build-with-old-kernel-headers.patch > rename to > meta/recipes-qt/qt4/qt4-4.8.7/0002-qkbdtty_qws-fix-build-with-old-kernel-headers.patch > diff --git > a/meta/recipes-qt/qt4/qt4-4.8.6/0003-webkit2-set-OUTPUT_DIR-value-if-empty.patch > b/meta/recipes-qt/qt4/qt4-4.8.7/0003-webkit2-set-OUTPUT_DIR-value-if-empty.patch > similarity index 100% > rename from > meta/recipes-qt/qt4/qt4-4.8.6/0003-webkit2-set-OUTPUT_DIR-value-if-empty.patch > rename to > meta/recipes-qt/qt4/qt4-4.8.7/0003-webkit2-set-OUTPUT_DIR-value-if-empty.patch > diff --git > a/meta/recipes-qt/qt4/qt4-4.8.6/0004-configure-qmake-is-already-built-in-qt4-tools-native.patch > b/meta/recipes-qt/qt4/qt4-4.8.7/0004-configure-qmake-is-already-built-in-qt4-tools-native.patch > similarity index 100% > rename from > meta/recipes-qt/qt4/qt4-4.8.6/0004-configure-qmake-is-already-built-in-qt4-tools-native.patch > rename to > meta/recipes-qt/qt4/qt4-4.8.7/0004-configure-qmake-is-already-built-in-qt4-tools-native.patch > diff --git > a/meta/recipes-qt/qt4/qt4-4.8.6/0005-configure-set-LFLAGS-to-pick-up-zlib-from-staging.patch > b/meta/recipes-qt/qt4/qt4-4.8.7/0005-configure-set-LFLAGS-to-pick-up-zlib-from-staging.patch > similarity index 100% > rename from > meta/recipes-qt/qt4/qt4-4.8.6/0005-configure-set-LFLAGS-to-pick-up-zlib-from-staging.patch > rename to > meta/recipes-qt/qt4/qt4-4.8.7/0005-configure-set-LFLAGS-to-pick-up-zlib-from-staging.patch > diff --git > a/meta/recipes-qt/qt4/qt4-4.8.6/0006-configure-Use-OE_QMAKE_-values-to-specify-Qt-utility.patch > b/meta/recipes-qt/qt4/qt4-4.8.7/0006-configure-Use-OE_QMAKE_-values-to-specify-Qt-utility.patch > similarity index 100% > rename from > meta/recipes-qt/qt4/qt4-4.8.6/0006-configure-Use-OE_QMAKE_-values-to-specify-Qt-utility.patch > rename to > meta/recipes-qt/qt4/qt4-4.8.7/0006-configure-Use-OE_QMAKE_-values-to-specify-Qt-utility.patch > diff --git > a/meta/recipes-qt/qt4/qt4-4.8.6/0007-dbus-Remove-const-usage-that-causes-compile-failure-.patch > b/meta/recipes-qt/qt4/qt4-4.8.7/0007-dbus-Remove-const-usage-that-causes-compile-failure-.patch > similarity index 100% > rename from > meta/recipes-qt/qt4/qt4-4.8.6/0007-dbus-Remove-const-usage-that-causes-compile-failure-.patch > rename to > meta/recipes-qt/qt4/qt4-4.8.7/0007-dbus-Remove-const-usage-that-causes-compile-failure-.patch > diff --git > a/meta/recipes-qt/qt4/qt4-4.8.6/0008-qmake.pro-Allow-building-a-separate-qmake-for-the-ta.patch > b/meta/recipes-qt/qt4/qt4-4.8.7/0008-qmake.pro-Allow-building-a-separate-qmake-for-the-ta.patch > similarity index 100% > rename from > meta/recipes-qt/qt4/qt4-4.8.6/0008-qmake.pro-Allow-building-a-separate-qmake-for-the-ta.patch > rename to > meta/recipes-qt/qt4/qt4-4.8.7/0008-qmake.pro-Allow-building-a-separate-qmake-for-the-ta.patch > diff --git > a/meta/recipes-qt/qt4/qt4-4.8.6/0009-qmake-fix-source-file-references-in-qmake.pri.patch > b/meta/recipes-qt/qt4/qt4-4.8.7/0009-qmake-fix-source-file-references-in-qmake.pri.patch > similarity index 100% > rename from > meta/recipes-qt/qt4/qt4-4.8.6/0009-qmake-fix-source-file-references-in-qmake.pri.patch > rename to > meta/recipes-qt/qt4/qt4-4.8.7/0009-qmake-fix-source-file-references-in-qmake.pri.patch > diff --git > a/meta/recipes-qt/qt4/qt4-4.8.6/0010-configure-Hack-to-not-use-the-pg_config-of-the-host-.patch > b/meta/recipes-qt/qt4/qt4-4.8.7/0010-configure-Hack-to-not-use-the-pg_config-of-the-host-.patch > similarity index 65% > rename from > meta/recipes-qt/qt4/qt4-4.8.6/0010-configure-Hack-to-not-use-the-pg_config-of-the-host-.patch > rename to > meta/recipes-qt/qt4/qt4-4.8.7/0010-configure-Hack-to-not-use-the-pg_config-of-the-host-.patch > index 1d2ddab..ca6a0b8 100644 > --- > a/meta/recipes-qt/qt4/qt4-4.8.6/0010-configure-Hack-to-not-use-the-pg_config-of-the-host-.patch > +++ > b/meta/recipes-qt/qt4/qt4-4.8.7/0010-configure-Hack-to-not-use-the-pg_config-of-the-host-.patch > @@ -14,6 +14,10 @@ will pad. > Upstream-Status: Inappropriate [configuration] > > Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> > + > +Update for qt 4.8.7. > + > +Signed-off-by: Kai Kang <kai.kang@windriver.com> > --- > configure | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > @@ -22,17 +26,17 @@ diff --git a/configure b/configure > index db4d044..35a8fe7 100755 > --- a/configure > +++ b/configure > -@@ -5511,10 +5511,10 @@ for _SQLDR in $CFG_SQL_AVAILABLE; do > - psql) > +@@ -5574,10 +5574,10 @@ > if [ "$CFG_SQL_psql" != "no" ]; then > + [ -z "$CFG_PSQL_CONFIG" ] && CFG_PSQL_CONFIG=`"$WHICH" > pg_config` > # Be careful not to use native pg_config when cross > building. > -- if [ "$XPLATFORM_MINGW" != "yes" ] && "$WHICH" pg_config > >/dev/null 2>&1; then > -- QT_CFLAGS_PSQL=`pg_config --includedir 2>/dev/null` > -- QT_LFLAGS_PSQL=`pg_config --libdir 2>/dev/null` > +- if [ "$XPLATFORM_MINGW" != "yes" ] && [ -x > "$CFG_PSQL_CONFIG" ]; then > +- QT_CFLAGS_PSQL=`$CFG_PSQL_CONFIG --includedir > 2>/dev/null` > +- QT_LFLAGS_PSQL=`$CFG_PSQL_CONFIG --libdir > 2>/dev/null` > - fi > -+# if [ "$XPLATFORM_MINGW" != "yes" ] && "$WHICH" > pg_config >/dev/null 2>&1; then > -+# QT_CFLAGS_PSQL=`pg_config --includedir 2>/dev/null` > -+# QT_LFLAGS_PSQL=`pg_config --libdir 2>/dev/null` > ++# if [ "$XPLATFORM_MINGW" != "yes" ] && [ -x > "$CFG_PSQL_CONFIG" ]; then > ++# QT_CFLAGS_PSQL=`$CFG_PSQL_CONFIG --includedir > 2>/dev/null` > ++# QT_LFLAGS_PSQL=`$CFG_PSQL_CONFIG --libdir > 2>/dev/null` > +# fi > [ -z "$QT_CFLAGS_PSQL" ] || > QT_CFLAGS_PSQL="-I$QT_CFLAGS_PSQL" > [ -z "$QT_LFLAGS_PSQL" ] || > QT_LFLAGS_PSQL="-L$QT_LFLAGS_PSQL" > diff --git > a/meta/recipes-qt/qt4/qt4-4.8.6/0011-freetype-host-includes.patch > b/meta/recipes-qt/qt4/qt4-4.8.7/0011-freetype-host-includes.patch > similarity index 100% > rename from meta/recipes-qt/qt4/qt4-4.8.6/0011-freetype-host-includes.patch > rename to meta/recipes-qt/qt4/qt4-4.8.7/0011-freetype-host-includes.patch > diff --git a/meta/recipes-qt/qt4/qt4-4.8.6/0012-Add-2bpp-support.patch > b/meta/recipes-qt/qt4/qt4-4.8.7/0012-Add-2bpp-support.patch > similarity index 100% > rename from meta/recipes-qt/qt4/qt4-4.8.6/0012-Add-2bpp-support.patch > rename to meta/recipes-qt/qt4/qt4-4.8.7/0012-Add-2bpp-support.patch > diff --git > a/meta/recipes-qt/qt4/qt4-4.8.6/0013-configure-add-crossarch-option.patch > b/meta/recipes-qt/qt4/qt4-4.8.7/0013-configure-add-crossarch-option.patch > similarity index 76% > rename from > meta/recipes-qt/qt4/qt4-4.8.6/0013-configure-add-crossarch-option.patch > rename to > meta/recipes-qt/qt4/qt4-4.8.7/0013-configure-add-crossarch-option.patch > index aa464fd..762cdaf 100644 > --- > a/meta/recipes-qt/qt4/qt4-4.8.6/0013-configure-add-crossarch-option.patch > +++ > b/meta/recipes-qt/qt4/qt4-4.8.7/0013-configure-add-crossarch-option.patch > @@ -6,34 +6,38 @@ Subject: [PATCH 13/21] configure: add "-crossarch" option > Upstream-Status: Pending > > Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> > + > +Update for qt 4.8.7 > + > +Signed-off-by: Kai Kang <kai.kang@windriver.com> > --- > configure | 7 ++++++- > 1 file changed, 6 insertions(+), 1 deletion(-) > > diff --git a/configure b/configure > -index 79c1c7b..7983c3d 100755 > +index 4eb4a3d..a4dacec 100755 > --- a/configure > +++ b/configure > -@@ -1153,7 +1153,7 @@ while [ "$#" -gt 0 ]; do > +@@ -1160,7 +1160,7 @@ while [ "$#" -gt 0 ]; do > shift > VAL=$1 > ;; > -- > -prefix|-docdir|-headerdir|-plugindir|-importdir|-datadir|-libdir|-bindir|-translationdir|-sysconfdir|-examplesdir|-demosdir|-depths|-make|-nomake|-platform|-xplatform|-device-option|-buildkey|-sdk|-arch|-host-arch|-mysql_config|-sysroot) > -+ > -prefix|-docdir|-headerdir|-plugindir|-importdir|-datadir|-libdir|-bindir|-translationdir|-sysconfdir|-examplesdir|-demosdir|-depths|-make|-nomake|-platform|-xplatform|-device-option|-buildkey|-sdk|-arch|-host-arch|-mysql_config|-sysroot|-crossarch) > +- > -prefix|-docdir|-headerdir|-plugindir|-importdir|-datadir|-libdir|-bindir|-translationdir|-sysconfdir|-examplesdir|-demosdir|-depths|-make|-nomake|-platform|-xplatform|-device-option|-buildkey|-sdk|-arch|-host-arch|-mysql_config|-psql_config|-sysroot) > ++ > -prefix|-docdir|-headerdir|-plugindir|-importdir|-datadir|-libdir|-bindir|-translationdir|-sysconfdir|-examplesdir|-demosdir|-depths|-make|-nomake|-platform|-xplatform|-device-option|-buildkey|-sdk|-arch|-host-arch|-mysql_config|-psql_config|-sysroot|-crossarch) > VAR=`echo $1 | sed "s,^-\(.*\),\1,"` > shift > VAL="$1" > -@@ -1709,6 +1709,9 @@ while [ "$#" -gt 0 ]; do > +@@ -1719,6 +1719,9 @@ while [ "$#" -gt 0 ]; do > DEV_VAL=`echo $VAL | sed "s,^.*=\(.*\),\1,"` > DeviceVar set $DEV_VAR $DEV_VAL > ;; > -+ crossarch) > -+ CROSSARCH="$VAL" > -+ ;; > ++ crossarch) > ++ CROSSARCH="$VAL" > ++ ;; > debug-and-release) > if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then > CFG_DEBUG_RELEASE="$VAL" > -@@ -3324,6 +3327,8 @@ arm*) > +@@ -3333,6 +3336,8 @@ arm*) > ;; > esac > > diff --git > a/meta/recipes-qt/qt4/qt4-4.8.6/0014-translations-fix-phony-translation-linking-error.patch > b/meta/recipes-qt/qt4/qt4-4.8.7/0014-translations-fix-phony-translation-linking-error.patch > similarity index 100% > rename from > meta/recipes-qt/qt4/qt4-4.8.6/0014-translations-fix-phony-translation-linking-error.patch > rename to > meta/recipes-qt/qt4/qt4-4.8.7/0014-translations-fix-phony-translation-linking-error.patch > diff --git > a/meta/recipes-qt/qt4/qt4-4.8.6/0015-configure-add-nostrip-for-debug-packages.patch > b/meta/recipes-qt/qt4/qt4-4.8.7/0015-configure-add-nostrip-for-debug-packages.patch > similarity index 100% > rename from > meta/recipes-qt/qt4/qt4-4.8.6/0015-configure-add-nostrip-for-debug-packages.patch > rename to > meta/recipes-qt/qt4/qt4-4.8.7/0015-configure-add-nostrip-for-debug-packages.patch > diff --git > a/meta/recipes-qt/qt4/qt4-4.8.6/0016-configure-eval-QMAKE_CXX.patch > b/meta/recipes-qt/qt4/qt4-4.8.7/0016-configure-eval-QMAKE_CXX.patch > similarity index 100% > rename from > meta/recipes-qt/qt4/qt4-4.8.6/0016-configure-eval-QMAKE_CXX.patch > rename to meta/recipes-qt/qt4/qt4-4.8.7/0016-configure-eval-QMAKE_CXX.patch > diff --git > a/meta/recipes-qt/qt4/qt4-4.8.6/0017-configure-ensure-we-identify-the-compiler-as-g-in-co.patch > b/meta/recipes-qt/qt4/qt4-4.8.7/0017-configure-ensure-we-identify-the-compiler-as-g-in-co.patch > similarity index 100% > rename from > meta/recipes-qt/qt4/qt4-4.8.6/0017-configure-ensure-we-identify-the-compiler-as-g-in-co.patch > rename to > meta/recipes-qt/qt4/qt4-4.8.7/0017-configure-ensure-we-identify-the-compiler-as-g-in-co.patch > diff --git > a/meta/recipes-qt/qt4/qt4-4.8.6/0018-configure-make-pulseaudio-a-configurable-option.patch > b/meta/recipes-qt/qt4/qt4-4.8.7/0018-configure-make-pulseaudio-a-configurable-option.patch > similarity index 100% > rename from > meta/recipes-qt/qt4/qt4-4.8.6/0018-configure-make-pulseaudio-a-configurable-option.patch > rename to > meta/recipes-qt/qt4/qt4-4.8.7/0018-configure-make-pulseaudio-a-configurable-option.patch > diff --git > a/meta/recipes-qt/qt4/qt4-4.8.6/0019-Fixes-for-gcc-4.7.0-particularly-on-qemux86.patch > b/meta/recipes-qt/qt4/qt4-4.8.7/0019-Fixes-for-gcc-4.7.0-particularly-on-qemux86.patch > similarity index 100% > rename from > meta/recipes-qt/qt4/qt4-4.8.6/0019-Fixes-for-gcc-4.7.0-particularly-on-qemux86.patch > rename to > meta/recipes-qt/qt4/qt4-4.8.7/0019-Fixes-for-gcc-4.7.0-particularly-on-qemux86.patch > diff --git > a/meta/recipes-qt/qt4/qt4-4.8.6/0021-configure-make-qt4-native-work-with-long-building-pa.patch > b/meta/recipes-qt/qt4/qt4-4.8.7/0021-configure-make-qt4-native-work-with-long-building-pa.patch > similarity index 100% > rename from > meta/recipes-qt/qt4/qt4-4.8.6/0021-configure-make-qt4-native-work-with-long-building-pa.patch > rename to > meta/recipes-qt/qt4/qt4-4.8.7/0021-configure-make-qt4-native-work-with-long-building-pa.patch > diff --git > a/meta/recipes-qt/qt4/qt4-4.8.6/0027-tools.pro-disable-qmeegographicssystemhelper.patch > b/meta/recipes-qt/qt4/qt4-4.8.7/0027-tools.pro-disable-qmeegographicssystemhelper.patch > similarity index 100% > rename from > meta/recipes-qt/qt4/qt4-4.8.6/0027-tools.pro-disable-qmeegographicssystemhelper.patch > rename to > meta/recipes-qt/qt4/qt4-4.8.7/0027-tools.pro-disable-qmeegographicssystemhelper.patch > diff --git > a/meta/recipes-qt/qt4/qt4-4.8.6/0028-Don-t-crash-on-broken-GIF-images.patch > b/meta/recipes-qt/qt4/qt4-4.8.7/0028-Don-t-crash-on-broken-GIF-images.patch > similarity index 100% > rename from > meta/recipes-qt/qt4/qt4-4.8.6/0028-Don-t-crash-on-broken-GIF-images.patch > rename to > meta/recipes-qt/qt4/qt4-4.8.7/0028-Don-t-crash-on-broken-GIF-images.patch > diff --git > a/meta/recipes-qt/qt4/qt4-4.8.6/0033-configure-support-c-0x-standard-for-directfd.patch > b/meta/recipes-qt/qt4/qt4-4.8.7/0033-configure-support-c-0x-standard-for-directfd.patch > similarity index 100% > rename from > meta/recipes-qt/qt4/qt4-4.8.6/0033-configure-support-c-0x-standard-for-directfd.patch > rename to > meta/recipes-qt/qt4/qt4-4.8.7/0033-configure-support-c-0x-standard-for-directfd.patch > diff --git > a/meta/recipes-qt/qt4/qt4-4.8.6/Fix-QWSLock-invalid-argument-logs.patch > b/meta/recipes-qt/qt4/qt4-4.8.7/Fix-QWSLock-invalid-argument-logs.patch > similarity index 100% > rename from > meta/recipes-qt/qt4/qt4-4.8.6/Fix-QWSLock-invalid-argument-logs.patch > rename to > meta/recipes-qt/qt4/qt4-4.8.7/Fix-QWSLock-invalid-argument-logs.patch > diff --git a/meta/recipes-qt/qt4/qt4-4.8.6/add_check_for_aarch64_32.patch > b/meta/recipes-qt/qt4/qt4-4.8.7/add_check_for_aarch64_32.patch > similarity index 100% > rename from meta/recipes-qt/qt4/qt4-4.8.6/add_check_for_aarch64_32.patch > rename to meta/recipes-qt/qt4/qt4-4.8.7/add_check_for_aarch64_32.patch > diff --git a/meta/recipes-qt/qt4/qt4-4.8.6/g++.conf > b/meta/recipes-qt/qt4/qt4-4.8.7/g++.conf > similarity index 100% > rename from meta/recipes-qt/qt4/qt4-4.8.6/g++.conf > rename to meta/recipes-qt/qt4/qt4-4.8.7/g++.conf > diff --git a/meta/recipes-qt/qt4/qt4-4.8.6/linux.conf > b/meta/recipes-qt/qt4/qt4-4.8.7/linux.conf > similarity index 100% > rename from meta/recipes-qt/qt4/qt4-4.8.6/linux.conf > rename to meta/recipes-qt/qt4/qt4-4.8.7/linux.conf > diff --git a/meta/recipes-qt/qt4/qt4-4.8.6/qte.sh > b/meta/recipes-qt/qt4/qt4-4.8.7/qte.sh > similarity index 100% > rename from meta/recipes-qt/qt4/qt4-4.8.6/qte.sh > rename to meta/recipes-qt/qt4/qt4-4.8.7/qte.sh > diff --git a/meta/recipes-qt/qt4/qt4-embedded.inc > b/meta/recipes-qt/qt4/qt4-embedded.inc > index ef5cf2c..a769065 100644 > --- a/meta/recipes-qt/qt4/qt4-embedded.inc > +++ b/meta/recipes-qt/qt4/qt4-embedded.inc > @@ -3,7 +3,6 @@ DESCRIPTION = "Qt is a versatile cross-platform > application framework -- this is > SECTION = "libs" > HOMEPAGE = "http://qt-project.org/" > DEPENDS += "directfb tslib" > -INC_PR = "r52" > > QT4EDEPENDS = "" > QT_BASE_LIB ?= "libqt-embedded" > diff --git a/meta/recipes-qt/qt4/qt4-embedded_4.8.6.bb > b/meta/recipes-qt/qt4/qt4-embedded_4.8.7.bb > similarity index 100% > rename from meta/recipes-qt/qt4/qt4-embedded_4.8.6.bb > rename to meta/recipes-qt/qt4/qt4-embedded_4.8.7.bb > diff --git a/meta/recipes-qt/qt4/qt4-native.inc > b/meta/recipes-qt/qt4/qt4-native.inc > index 70bda73..2a41f8a 100644 > --- a/meta/recipes-qt/qt4/qt4-native.inc > +++ b/meta/recipes-qt/qt4/qt4-native.inc > @@ -9,8 +9,6 @@ LIC_FILES_CHKSUM = > "file://LICENSE.LGPL;md5=fbc093901857fcd118f065f900982c24 \ > > file://LICENSE.GPL3;md5=6e1694ee338db410417517884918d4d2 \ > > file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6" > > -INC_PR = "r20" > - > inherit native > > SRC_URI = " > http://download.qt-project.org/official_releases/qt/4.8/${PV}/qt-everywhere-opensource-src-${PV}.tar.gz > \ > @@ -18,10 +16,6 @@ SRC_URI = " > http://download.qt-project.org/official_releases/qt/4.8/${PV}/qt-ever > > file://0002-qkbdtty_qws-fix-build-with-old-kernel-headers.patch \ > file://0003-webkit2-set-OUTPUT_DIR-value-if-empty.patch \ > > file://0021-configure-make-qt4-native-work-with-long-building-pa.patch \ > - file://0029-aarch64_arm64_fix_arch_detection.patch \ > - file://0030-aarch64_arm64_qatomic_support.patch \ > - file://0031-aarch64_arm64_mkspecs.patch \ > - file://0032-aarch64_add_header.patch \ > file://g++.conf \ > file://linux.conf \ > " > diff --git a/meta/recipes-qt/qt4/qt4-native_4.8.6.bb > b/meta/recipes-qt/qt4/qt4-native_4.8.6.bb > deleted file mode 100644 > index d874d32..0000000 > --- a/meta/recipes-qt/qt4/qt4-native_4.8.6.bb > +++ /dev/null > @@ -1,6 +0,0 @@ > -require qt4-native.inc > - > -TOBUILD := "src/tools/bootstrap ${TOBUILD}" > - > -SRC_URI[md5sum] = "2edbe4d6c2eff33ef91732602f3518eb" > -SRC_URI[sha256sum] = > "8b14dd91b52862e09b8e6a963507b74bc2580787d171feda197badfa7034032c" > diff --git a/meta/recipes-qt/qt4/qt4-native_4.8.7.bb > b/meta/recipes-qt/qt4/qt4-native_4.8.7.bb > new file mode 100644 > index 0000000..494d663 > --- /dev/null > +++ b/meta/recipes-qt/qt4/qt4-native_4.8.7.bb > @@ -0,0 +1,6 @@ > +require qt4-native.inc > + > +TOBUILD := "src/tools/bootstrap ${TOBUILD}" > + > +SRC_URI[md5sum] = "d990ee66bf7ab0c785589776f35ba6ad" > +SRC_URI[sha256sum] = > "e2882295097e47fe089f8ac741a95fef47e0a73a3f3cdf21b56990638f626ea0" > diff --git a/meta/recipes-qt/qt4/qt4-x11-free.inc > b/meta/recipes-qt/qt4/qt4-x11-free.inc > index 835fc96..f6a1737 100644 > --- a/meta/recipes-qt/qt4/qt4-x11-free.inc > +++ b/meta/recipes-qt/qt4/qt4-x11-free.inc > @@ -9,8 +9,6 @@ DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', > 'opengl', 'virtual/libgl', ' > PROVIDES += "qt4-x11" > QT4DEPENDS = "" > > -INC_PR = "r50" > - > QT_GLFLAGS ?= "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', > '-opengl', '-no-opengl', d)} " > QT_GLFLAGS_qemux86 = "-opengl" > QT_GLFLAGS_qemuppc = "-opengl" > diff --git a/meta/recipes-qt/qt4/qt4-x11-free_4.8.6.bb > b/meta/recipes-qt/qt4/qt4-x11-free_4.8.7.bb > similarity index 100% > rename from meta/recipes-qt/qt4/qt4-x11-free_4.8.6.bb > rename to meta/recipes-qt/qt4/qt4-x11-free_4.8.7.bb > -- > 1.9.1 > > -- > _______________________________________________ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core > [-- Attachment #2: Type: text/html, Size: 94903 bytes --] ^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH 1/1] qt4: upgrade to 4.8.7 2015-06-02 10:18 ` Burton, Ross @ 2015-06-02 10:19 ` Burton, Ross 0 siblings, 0 replies; 4+ messages in thread From: Burton, Ross @ 2015-06-02 10:19 UTC (permalink / raw) To: Kai Kang; +Cc: OE-core [-- Attachment #1: Type: text/plain, Size: 331 bytes --] On 2 June 2015 at 11:18, Burton, Ross <ross.burton@intel.com> wrote: > This doesn't apply against master since the GStreamer 0.10 removal patches > landed, can you rebase? > My mistake - didn't read the output properly and it was git aborting on a corrupted patch. Cherry-picked from the branch instead, thanks! Ross [-- Attachment #2: Type: text/html, Size: 694 bytes --] ^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2015-06-02 10:19 UTC | newest] Thread overview: 4+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2015-06-02 7:52 [PATCH 0/1] Upgrade qt4 from 4.8.6 to 4.8.7 Kai Kang 2015-06-02 7:52 ` [PATCH 1/1] qt4: upgrade " Kai Kang 2015-06-02 10:18 ` Burton, Ross 2015-06-02 10:19 ` Burton, Ross
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox