<div dir="ltr">Hi Kai,<div><br></div><div>This doesn't apply against master since the GStreamer 0.10 removal patches landed, can you rebase?</div><div><br></div><div>Ross</div></div><div class="gmail_extra"><br><div class="gmail_quote">On 2 June 2015 at 08:52, Kai Kang <span dir="ltr"><<a href="mailto:kai.kang@windriver.com" target="_blank">kai.kang@windriver.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Upgrade qt4 packages from version 4.8.6 to 4.8.7.<br>
<br>
* remove arm64 related patches which are merged<br>
* remove 0034-Fix-a-division-by-zero-when-processing-malformed-BMP.patch<br>
which is backported.<br>
* update 0010-configure-Hack-to-not-use-the-pg_config-of-the-host-.patch<br>
and 0013-configure-add-crossarch-option.patch for new version<br>
* remove useless variable INC_PR<br>
<br>
Signed-off-by: Kai Kang <<a href="mailto:kai.kang@windriver.com">kai.kang@windriver.com</a>><br>
---<br>
meta/recipes-qt/qt4/nativesdk-qt4-tools.inc | 2 -<br>
...<a href="http://tools_4.8.6.bb" target="_blank">tools_4.8.6.bb</a> => <a href="http://nativesdk-qt4-tools_4.8.7.bb" target="_blank">nativesdk-qt4-tools_4.8.7.bb</a>} | 4 +-<br>
.../0029-aarch64_arm64_fix_arch_detection.patch | 53 ---<br>
.../0030-aarch64_arm64_qatomic_support.patch | 491 ---------------------<br>
.../qt4/qt4-4.8.6/0031-aarch64_arm64_mkspecs.patch | 124 ------<br>
.../qt4/qt4-4.8.6/0032-aarch64_add_header.patch | 18 -<br>
...ion-by-zero-when-processing-malformed-BMP.patch | 44 --<br>
.../qt4/{qt4-4.8.6.inc => qt4-4.8.7.inc} | 9 +-<br>
...o-allow-to-set-qt.conf-from-the-outside-u.patch | 0<br>
...tty_qws-fix-build-with-old-kernel-headers.patch | 0<br>
...003-webkit2-set-OUTPUT_DIR-value-if-empty.patch | 0<br>
...make-is-already-built-in-qt4-tools-native.patch | 0<br>
...e-set-LFLAGS-to-pick-up-zlib-from-staging.patch | 0<br>
...se-OE_QMAKE_-values-to-specify-Qt-utility.patch | 0<br>
...-const-usage-that-causes-compile-failure-.patch | 0<br>
...llow-building-a-separate-qmake-for-the-ta.patch | 0<br>
...e-fix-source-file-references-in-qmake.pri.patch | 0<br>
...ack-to-not-use-the-pg_config-of-the-host-.patch | 20 +-<br>
.../0011-freetype-host-includes.patch | 0<br>
.../0012-Add-2bpp-support.patch | 0<br>
.../0013-configure-add-crossarch-option.patch | 22 +-<br>
...tions-fix-phony-translation-linking-error.patch | 0<br>
...-configure-add-nostrip-for-debug-packages.patch | 0<br>
.../0016-configure-eval-QMAKE_CXX.patch | 0<br>
...nsure-we-identify-the-compiler-as-g-in-co.patch | 0<br>
...ure-make-pulseaudio-a-configurable-option.patch | 0<br>
...xes-for-gcc-4.7.0-particularly-on-qemux86.patch | 0<br>
...ake-qt4-native-work-with-long-building-pa.patch | 0<br>
...ls.pro-disable-qmeegographicssystemhelper.patch | 0<br>
.../0028-Don-t-crash-on-broken-GIF-images.patch | 0<br>
...figure-support-c-0x-standard-for-directfd.patch | 0<br>
.../Fix-QWSLock-invalid-argument-logs.patch | 0<br>
.../add_check_for_aarch64_32.patch | 0<br>
.../qt4/{qt4-4.8.6 => qt4-4.8.7}/g++.conf | 0<br>
.../qt4/{qt4-4.8.6 => qt4-4.8.7}/linux.conf | 0<br>
.../recipes-qt/qt4/{qt4-4.8.6 => qt4-4.8.7}/qte.sh | 0<br>
meta/recipes-qt/qt4/qt4-embedded.inc | 1 -<br>
...<a href="http://qt4-embedded_4.8.6.bb" target="_blank">qt4-embedded_4.8.6.bb</a> => <a href="http://qt4-embedded_4.8.7.bb" target="_blank">qt4-embedded_4.8.7.bb</a>} | 0<br>
meta/recipes-qt/qt4/qt4-native.inc | 6 -<br>
meta/recipes-qt/qt4/<a href="http://qt4-native_4.8.6.bb" target="_blank">qt4-native_4.8.6.bb</a> | 6 -<br>
meta/recipes-qt/qt4/<a href="http://qt4-native_4.8.7.bb" target="_blank">qt4-native_4.8.7.bb</a> | 6 +<br>
meta/recipes-qt/qt4/qt4-x11-free.inc | 2 -<br>
...<a href="http://qt4-x11-free_4.8.6.bb" target="_blank">qt4-x11-free_4.8.6.bb</a> => <a href="http://qt4-x11-free_4.8.7.bb" target="_blank">qt4-x11-free_4.8.7.bb</a>} | 0<br>
43 files changed, 35 insertions(+), 773 deletions(-)<br>
rename meta/recipes-qt/qt4/{<a href="http://nativesdk-qt4-tools_4.8.6.bb" target="_blank">nativesdk-qt4-tools_4.8.6.bb</a> => <a href="http://nativesdk-qt4-tools_4.8.7.bb" target="_blank">nativesdk-qt4-tools_4.8.7.bb</a>} (44%)<br>
delete mode 100644 meta/recipes-qt/qt4/qt4-4.8.6/0029-aarch64_arm64_fix_arch_detection.patch<br>
delete mode 100644 meta/recipes-qt/qt4/qt4-4.8.6/0030-aarch64_arm64_qatomic_support.patch<br>
delete mode 100644 meta/recipes-qt/qt4/qt4-4.8.6/0031-aarch64_arm64_mkspecs.patch<br>
delete mode 100644 meta/recipes-qt/qt4/qt4-4.8.6/0032-aarch64_add_header.patch<br>
delete mode 100644 meta/recipes-qt/qt4/qt4-4.8.6/0034-Fix-a-division-by-zero-when-processing-malformed-BMP.patch<br>
rename meta/recipes-qt/qt4/{qt4-4.8.6.inc => qt4-4.8.7.inc} (87%)<br>
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%)<br>
rename meta/recipes-qt/qt4/{qt4-4.8.6 => qt4-4.8.7}/0002-qkbdtty_qws-fix-build-with-old-kernel-headers.patch (100%)<br>
rename meta/recipes-qt/qt4/{qt4-4.8.6 => qt4-4.8.7}/0003-webkit2-set-OUTPUT_DIR-value-if-empty.patch (100%)<br>
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%)<br>
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%)<br>
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%)<br>
rename meta/recipes-qt/qt4/{qt4-4.8.6 => qt4-4.8.7}/0007-dbus-Remove-const-usage-that-causes-compile-failure-.patch (100%)<br>
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%)<br>
rename meta/recipes-qt/qt4/{qt4-4.8.6 => qt4-4.8.7}/0009-qmake-fix-source-file-references-in-qmake.pri.patch (100%)<br>
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%)<br>
rename meta/recipes-qt/qt4/{qt4-4.8.6 => qt4-4.8.7}/0011-freetype-host-includes.patch (100%)<br>
rename meta/recipes-qt/qt4/{qt4-4.8.6 => qt4-4.8.7}/0012-Add-2bpp-support.patch (100%)<br>
rename meta/recipes-qt/qt4/{qt4-4.8.6 => qt4-4.8.7}/0013-configure-add-crossarch-option.patch (76%)<br>
rename meta/recipes-qt/qt4/{qt4-4.8.6 => qt4-4.8.7}/0014-translations-fix-phony-translation-linking-error.patch (100%)<br>
rename meta/recipes-qt/qt4/{qt4-4.8.6 => qt4-4.8.7}/0015-configure-add-nostrip-for-debug-packages.patch (100%)<br>
rename meta/recipes-qt/qt4/{qt4-4.8.6 => qt4-4.8.7}/0016-configure-eval-QMAKE_CXX.patch (100%)<br>
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%)<br>
rename meta/recipes-qt/qt4/{qt4-4.8.6 => qt4-4.8.7}/0018-configure-make-pulseaudio-a-configurable-option.patch (100%)<br>
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%)<br>
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%)<br>
rename meta/recipes-qt/qt4/{qt4-4.8.6 => qt4-4.8.7}/0027-tools.pro-disable-qmeegographicssystemhelper.patch (100%)<br>
rename meta/recipes-qt/qt4/{qt4-4.8.6 => qt4-4.8.7}/0028-Don-t-crash-on-broken-GIF-images.patch (100%)<br>
rename meta/recipes-qt/qt4/{qt4-4.8.6 => qt4-4.8.7}/0033-configure-support-c-0x-standard-for-directfd.patch (100%)<br>
rename meta/recipes-qt/qt4/{qt4-4.8.6 => qt4-4.8.7}/Fix-QWSLock-invalid-argument-logs.patch (100%)<br>
rename meta/recipes-qt/qt4/{qt4-4.8.6 => qt4-4.8.7}/add_check_for_aarch64_32.patch (100%)<br>
rename meta/recipes-qt/qt4/{qt4-4.8.6 => qt4-4.8.7}/g++.conf (100%)<br>
rename meta/recipes-qt/qt4/{qt4-4.8.6 => qt4-4.8.7}/linux.conf (100%)<br>
rename meta/recipes-qt/qt4/{qt4-4.8.6 => qt4-4.8.7}/qte.sh (100%)<br>
rename meta/recipes-qt/qt4/{<a href="http://qt4-embedded_4.8.6.bb" target="_blank">qt4-embedded_4.8.6.bb</a> => <a href="http://qt4-embedded_4.8.7.bb" target="_blank">qt4-embedded_4.8.7.bb</a>} (100%)<br>
delete mode 100644 meta/recipes-qt/qt4/<a href="http://qt4-native_4.8.6.bb" target="_blank">qt4-native_4.8.6.bb</a><br>
create mode 100644 meta/recipes-qt/qt4/<a href="http://qt4-native_4.8.7.bb" target="_blank">qt4-native_4.8.7.bb</a><br>
rename meta/recipes-qt/qt4/{<a href="http://qt4-x11-free_4.8.6.bb" target="_blank">qt4-x11-free_4.8.6.bb</a> => <a href="http://qt4-x11-free_4.8.7.bb" target="_blank">qt4-x11-free_4.8.7.bb</a>} (100%)<br>
<br>
diff --git a/meta/recipes-qt/qt4/nativesdk-qt4-tools.inc b/meta/recipes-qt/qt4/nativesdk-qt4-tools.inc<br>
index 1c9ee2e..aa84e3d 100644<br>
--- a/meta/recipes-qt/qt4/nativesdk-qt4-tools.inc<br>
+++ b/meta/recipes-qt/qt4/nativesdk-qt4-tools.inc<br>
@@ -4,8 +4,6 @@ SECTION = "libs"<br>
HOMEPAGE = "<a href="http://qt-project.org/" target="_blank">http://qt-project.org/</a>"<br>
LICENSE = "LGPLv2.1 | GPLv3"<br>
<br>
-INC_PR = "r13"<br>
-<br>
FILESEXTRAPATHS =. "${FILE_DIRNAME}/qt4-${PV}:"<br>
<br>
inherit nativesdk qmake2<br>
diff --git a/meta/recipes-qt/qt4/<a href="http://nativesdk-qt4-tools_4.8.6.bb" target="_blank">nativesdk-qt4-tools_4.8.6.bb</a> b/meta/recipes-qt/qt4/<a href="http://nativesdk-qt4-tools_4.8.7.bb" target="_blank">nativesdk-qt4-tools_4.8.7.bb</a><br>
similarity index 44%<br>
rename from meta/recipes-qt/qt4/<a href="http://nativesdk-qt4-tools_4.8.6.bb" target="_blank">nativesdk-qt4-tools_4.8.6.bb</a><br>
rename to meta/recipes-qt/qt4/<a href="http://nativesdk-qt4-tools_4.8.7.bb" target="_blank">nativesdk-qt4-tools_4.8.7.bb</a><br>
index 00526b8..90ba07c 100644<br>
--- a/meta/recipes-qt/qt4/<a href="http://nativesdk-qt4-tools_4.8.6.bb" target="_blank">nativesdk-qt4-tools_4.8.6.bb</a><br>
+++ b/meta/recipes-qt/qt4/<a href="http://nativesdk-qt4-tools_4.8.7.bb" target="_blank">nativesdk-qt4-tools_4.8.7.bb</a><br>
@@ -2,5 +2,5 @@ require nativesdk-qt4-tools.inc<br>
<br>
SRC_URI += "file://0009-qmake-fix-source-file-references-in-qmake.pri.patch"<br>
<br>
-SRC_URI[md5sum] = "2edbe4d6c2eff33ef91732602f3518eb"<br>
-SRC_URI[sha256sum] = "8b14dd91b52862e09b8e6a963507b74bc2580787d171feda197badfa7034032c"<br>
+SRC_URI[md5sum] = "d990ee66bf7ab0c785589776f35ba6ad"<br>
+SRC_URI[sha256sum] = "e2882295097e47fe089f8ac741a95fef47e0a73a3f3cdf21b56990638f626ea0"<br>
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<br>
deleted file mode 100644<br>
index fbd32b1..0000000<br>
--- a/meta/recipes-qt/qt4/qt4-4.8.6/0029-aarch64_arm64_fix_arch_detection.patch<br>
+++ /dev/null<br>
@@ -1,53 +0,0 @@<br>
-From 800abbba658203fc8e746e3fc780a297cd4110cf Mon Sep 17 00:00:00 2001<br>
-From: =?UTF-8?q?Lisandro=20Dami=C3=A1n=20Nicanor=20P=C3=A9rez=20Meyer?=<br>
- <<a href="mailto:perezmeyer@gmail.com">perezmeyer@gmail.com</a>><br>
-Date: Wed, 20 Aug 2014 17:52:49 -0300<br>
-Subject: [PATCH] Fix AArch64/arm64 detection.<br>
-<br>
-The detection needs to go before arm, else the system will detect AArch64/arm64<br>
-as arm.<br>
-<br>
-This patch comes from Wookey, he has agreed to put it under BSD or Expat<br>
-to allow it's inclusion in here:<br>
-<<a href="https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=735488#255" target="_blank">https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=735488#255</a>><br>
-<br>
-Change-Id: Ic2171c03fca8bb871347940fa3a2bc467776f797<br>
-<br>
-<br>
-Upstream-Status: Pending<br>
-<br>
-Signed-off-by: Kai Kang <<a href="mailto:kai.kang@windriver.com">kai.kang@windriver.com</a>><br>
----<br>
- configure | 12 ++++++------<br>
- 1 file changed, 6 insertions(+), 6 deletions(-)<br>
-<br>
-diff --git a/configure b/configure<br>
-index a9ba7c8..eb88b72 100755<br>
---- a/configure<br>
-+++ b/configure<br>
-@@ -3241,17 +3241,17 @@ if [ -z "${CFG_HOST_ARCH}" ]; then<br>
- fi<br>
- CFG_HOST_ARCH=s390<br>
- ;;<br>
-- *:*:arm*)<br>
-+ *:*:aarch64*|*:*:arm64*)<br>
- if [ "$OPT_VERBOSE" = "yes" ]; then<br>
-- echo " ARM (arm)"<br>
-+ echo " AArch64 (aarch64)"<br>
- fi<br>
-- CFG_HOST_ARCH=arm<br>
-+ CFG_HOST_ARCH=aarch64<br>
- ;;<br>
-- *:*:aarch64*)<br>
-+ *:*:arm*)<br>
- if [ "$OPT_VERBOSE" = "yes" ]; then<br>
-- echo " AArch64 (aarch64)"<br>
-+ echo " ARM (arm)"<br>
- fi<br>
-- CFG_HOST_ARCH=aarch64<br>
-+ CFG_HOST_ARCH=arm<br>
- ;;<br>
- Linux:*:sparc*)<br>
- if [ "$OPT_VERBOSE" = "yes" ]; then<br>
---<br>
-2.1.0<br>
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<br>
deleted file mode 100644<br>
index ba4c2a6..0000000<br>
--- a/meta/recipes-qt/qt4/qt4-4.8.6/0030-aarch64_arm64_qatomic_support.patch<br>
+++ /dev/null<br>
@@ -1,491 +0,0 @@<br>
-From 294010b562c9846bb2bc4ee9c63ff78adc7c1f4f Mon Sep 17 00:00:00 2001<br>
-From: =?UTF-8?q?Lisandro=20Dami=C3=A1n=20Nicanor=20P=C3=A9rez=20Meyer?=<br>
- <<a href="mailto:perezmeyer@gmail.com">perezmeyer@gmail.com</a>><br>
-Date: Sat, 15 Mar 2014 15:40:49 -0300<br>
-Subject: [PATCH] Add qatomic support for AArch64 (aka arm64).<br>
-<br>
-Patch by Mark Salter <<a href="mailto:msalter@redhat.com">msalter@redhat.com</a>><br>
-licensed under BSD:<br>
-<br>
-<<a href="https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=735488#195" target="_blank">https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=735488#195</a>><br>
-<br>
-This patch is known to not be the most correct way<br>
-to implement them, as it seems to be possible to do it in a faster way,<br>
-but should work non the less until we can provide something better.<br>
-<br>
-Change-Id: Ib392b27dc54691fd4c2ea9896240ad71fb8128cc<br>
-<br>
-<br>
-Upstream-Status: Pending<br>
-<br>
-Signed-off-by: Kai Kang <<a href="mailto:kai.kang@windriver.com">kai.kang@windriver.com</a>><br>
-<br>
----<br>
- src/corelib/arch/aarch64/arch.pri | 4 +<br>
- src/corelib/arch/aarch64/qatomic_aarch64.cpp | 70 ++++++<br>
- src/corelib/arch/arch.pri | 4 +-<br>
- src/corelib/arch/qatomic_aarch64.h | 335 +++++++++++++++++++++++++++<br>
- src/corelib/arch/qatomic_arch.h | 2 +<br>
- 5 files changed, 414 insertions(+), 1 deletion(-)<br>
- create mode 100644 src/corelib/arch/aarch64/arch.pri<br>
- create mode 100644 src/corelib/arch/aarch64/qatomic_aarch64.cpp<br>
- create mode 100644 src/corelib/arch/qatomic_aarch64.h<br>
-<br>
-diff --git a/src/corelib/arch/aarch64/arch.pri b/src/corelib/arch/aarch64/arch.pri<br>
-new file mode 100644<br>
-index 0000000..63523d9<br>
---- /dev/null<br>
-+++ b/src/corelib/arch/aarch64/arch.pri<br>
-@@ -0,0 +1,4 @@<br>
-+#<br>
-+# AArch64 architecture<br>
-+#<br>
-+SOURCES += $$QT_ARCH_CPP/qatomic_aarch64.cpp<br>
-diff --git a/src/corelib/arch/aarch64/qatomic_aarch64.cpp b/src/corelib/arch/aarch64/qatomic_aarch64.cpp<br>
-new file mode 100644<br>
-index 0000000..fc851b9<br>
---- /dev/null<br>
-+++ b/src/corelib/arch/aarch64/qatomic_aarch64.cpp<br>
-@@ -0,0 +1,70 @@<br>
-+/****************************************************************************<br>
-+**<br>
-+** Copyright (C) 2012, 2013 Digia Plc and/or its subsidiary(-ies).<br>
-+** Contact: <a href="http://www.qt-project.org/legal" target="_blank">http://www.qt-project.org/legal</a><br>
-+**<br>
-+** This file is part of the QtCore module of the Qt Toolkit.<br>
-+**<br>
-+** $QT_BEGIN_LICENSE:LGPL$<br>
-+** Commercial License Usage<br>
-+** Licensees holding valid commercial Qt licenses may use this file in<br>
-+** accordance with the commercial license agreement provided with the<br>
-+** Software or, alternatively, in accordance with the terms contained in<br>
-+** a written agreement between you and Digia. For licensing terms and<br>
-+** conditions see <a href="http://qt.digia.com/licensing" target="_blank">http://qt.digia.com/licensing</a>. For further information<br>
-+** use the contact form at <a href="http://qt.digia.com/contact-us" target="_blank">http://qt.digia.com/contact-us</a>.<br>
-+**<br>
-+** GNU Lesser General Public License Usage<br>
-+** Alternatively, this file may be used under the terms of the GNU Lesser<br>
-+** General Public License version 2.1 as published by the Free Software<br>
-+** Foundation and appearing in the file LICENSE.LGPL included in the<br>
-+** packaging of this file. Please review the following information to<br>
-+** ensure the GNU Lesser General Public License version 2.1 requirements<br>
-+** will be met: <a href="http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html" target="_blank">http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html</a>.<br>
-+**<br>
-+** In addition, as a special exception, Digia gives you certain additional<br>
-+** rights. These rights are described in the Digia Qt LGPL Exception<br>
-+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.<br>
-+**<br>
-+** GNU General Public License Usage<br>
-+** Alternatively, this file may be used under the terms of the GNU<br>
-+** General Public License version 3.0 as published by the Free Software<br>
-+** Foundation and appearing in the file LICENSE.GPL included in the<br>
-+** packaging of this file. Please review the following information to<br>
-+** ensure the GNU General Public License version 3.0 requirements will be<br>
-+** met: <a href="http://www.gnu.org/copyleft/gpl.html" target="_blank">http://www.gnu.org/copyleft/gpl.html</a>.<br>
-+**<br>
-+**<br>
-+** $QT_END_LICENSE$<br>
-+**<br>
-+****************************************************************************/<br>
-+<br>
-+#include <QtCore/qglobal.h><br>
-+<br>
-+#include <unistd.h><br>
-+#ifdef _POSIX_PRIORITY_SCHEDULING<br>
-+# include <sched.h><br>
-+#endif<br>
-+#include <time.h><br>
-+<br>
-+QT_BEGIN_NAMESPACE<br>
-+<br>
-+QT_USE_NAMESPACE<br>
-+<br>
-+Q_CORE_EXPORT void qt_atomic_yield(int *count)<br>
-+{<br>
-+#ifdef _POSIX_PRIORITY_SCHEDULING<br>
-+ if ((*count)++ < 50) {<br>
-+ sched_yield();<br>
-+ } else<br>
-+#endif<br>
-+ {<br>
-+ struct timespec tm;<br>
-+ tm.tv_sec = 0;<br>
-+ tm.tv_nsec = 2000001;<br>
-+ nanosleep(&tm, NULL);<br>
-+ *count = 0;<br>
-+ }<br>
-+}<br>
-+<br>
-+QT_END_NAMESPACE<br>
-diff --git a/src/corelib/arch/arch.pri b/src/corelib/arch/arch.pri<br>
-index cd23e5e..f50fca7 100644<br>
---- a/src/corelib/arch/arch.pri<br>
-+++ b/src/corelib/arch/arch.pri<br>
-@@ -31,7 +31,9 @@ integrity:HEADERS += arch/qatomic_integrity.h<br>
- arch/qatomic_s390.h \<br>
- arch/qatomic_x86_64.h \<br>
- arch/qatomic_sh.h \<br>
-- arch/qatomic_sh4a.h<br>
-+ arch/qatomic_sh4a.h \<br>
-+ arch/qatomic_aarch64.h \<br>
-+<br>
-<br>
- QT_ARCH_CPP = $$QT_SOURCE_TREE/src/corelib/arch/$$QT_ARCH<br>
- DEPENDPATH += $$QT_ARCH_CPP<br>
-diff --git a/src/corelib/arch/qatomic_aarch64.h b/src/corelib/arch/qatomic_aarch64.h<br>
-new file mode 100644<br>
-index 0000000..de61ca8<br>
---- /dev/null<br>
-+++ b/src/corelib/arch/qatomic_aarch64.h<br>
-@@ -0,0 +1,335 @@<br>
-+/****************************************************************************<br>
-+**<br>
-+** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).<br>
-+** Contact: <a href="http://www.qt-project.org/legal" target="_blank">http://www.qt-project.org/legal</a><br>
-+**<br>
-+** This file is part of the QtCore module of the Qt Toolkit.<br>
-+**<br>
-+** $QT_BEGIN_LICENSE:LGPL$<br>
-+** Commercial License Usage<br>
-+** Licensees holding valid commercial Qt licenses may use this file in<br>
-+** accordance with the commercial license agreement provided with the<br>
-+** Software or, alternatively, in accordance with the terms contained in<br>
-+** a written agreement between you and Digia. For licensing terms and<br>
-+** conditions see <a href="http://qt.digia.com/licensing" target="_blank">http://qt.digia.com/licensing</a>. For further information<br>
-+** use the contact form at <a href="http://qt.digia.com/contact-us" target="_blank">http://qt.digia.com/contact-us</a>.<br>
-+**<br>
-+** GNU Lesser General Public License Usage<br>
-+** Alternatively, this file may be used under the terms of the GNU Lesser<br>
-+** General Public License version 2.1 as published by the Free Software<br>
-+** Foundation and appearing in the file LICENSE.LGPL included in the<br>
-+** packaging of this file. Please review the following information to<br>
-+** ensure the GNU Lesser General Public License version 2.1 requirements<br>
-+** will be met: <a href="http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html" target="_blank">http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html</a>.<br>
-+**<br>
-+** In addition, as a special exception, Digia gives you certain additional<br>
-+** rights. These rights are described in the Digia Qt LGPL Exception<br>
-+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.<br>
-+**<br>
-+** GNU General Public License Usage<br>
-+** Alternatively, this file may be used under the terms of the GNU<br>
-+** General Public License version 3.0 as published by the Free Software<br>
-+** Foundation and appearing in the file LICENSE.GPL included in the<br>
-+** packaging of this file. Please review the following information to<br>
-+** ensure the GNU General Public License version 3.0 requirements will be<br>
-+** met: <a href="http://www.gnu.org/copyleft/gpl.html" target="_blank">http://www.gnu.org/copyleft/gpl.html</a>.<br>
-+**<br>
-+**<br>
-+** $QT_END_LICENSE$<br>
-+**<br>
-+****************************************************************************/<br>
-+<br>
-+#ifndef QATOMIC_AARCH64_H<br>
-+#define QATOMIC_AARCH64_H<br>
-+<br>
-+QT_BEGIN_HEADER<br>
-+<br>
-+QT_BEGIN_NAMESPACE<br>
-+<br>
-+#define Q_ATOMIC_INT_REFERENCE_COUNTING_IS_ALWAYS_NATIVE<br>
-+<br>
-+inline bool QBasicAtomicInt::isReferenceCountingNative()<br>
-+{ return true; }<br>
-+inline bool QBasicAtomicInt::isReferenceCountingWaitFree()<br>
-+{ return false; }<br>
-+<br>
-+#define Q_ATOMIC_INT_TEST_AND_SET_IS_ALWAYS_NATIVE<br>
-+<br>
-+inline bool QBasicAtomicInt::isTestAndSetNative()<br>
-+{ return true; }<br>
-+inline bool QBasicAtomicInt::isTestAndSetWaitFree()<br>
-+{ return false; }<br>
-+<br>
-+#define Q_ATOMIC_INT_FETCH_AND_STORE_IS_ALWAYS_NATIVE<br>
-+<br>
-+inline bool QBasicAtomicInt::isFetchAndStoreNative()<br>
-+{ return true; }<br>
-+inline bool QBasicAtomicInt::isFetchAndStoreWaitFree()<br>
-+{ return false; }<br>
-+<br>
-+#define Q_ATOMIC_INT_FETCH_AND_ADD_IS_ALWAYS_NATIVE<br>
-+<br>
-+inline bool QBasicAtomicInt::isFetchAndAddNative()<br>
-+{ return true; }<br>
-+inline bool QBasicAtomicInt::isFetchAndAddWaitFree()<br>
-+{ return false; }<br>
-+<br>
-+#define Q_ATOMIC_POINTER_TEST_AND_SET_IS_ALWAYS_NATIVE<br>
-+<br>
-+template <typename T><br>
-+Q_INLINE_TEMPLATE bool QBasicAtomicPointer<T>::isTestAndSetNative()<br>
-+{ return true; }<br>
-+template <typename T><br>
-+Q_INLINE_TEMPLATE bool QBasicAtomicPointer<T>::isTestAndSetWaitFree()<br>
-+{ return false; }<br>
-+<br>
-+#define Q_ATOMIC_POINTER_FETCH_AND_STORE_IS_ALWAYS_NATIVE<br>
-+<br>
-+template <typename T><br>
-+Q_INLINE_TEMPLATE bool QBasicAtomicPointer<T>::isFetchAndStoreNative()<br>
-+{ return true; }<br>
-+template <typename T><br>
-+Q_INLINE_TEMPLATE bool QBasicAtomicPointer<T>::isFetchAndStoreWaitFree()<br>
-+{ return false; }<br>
-+<br>
-+#define Q_ATOMIC_POINTER_FETCH_AND_ADD_IS_ALWAYS_NATIVE<br>
-+<br>
-+template <typename T><br>
-+Q_INLINE_TEMPLATE bool QBasicAtomicPointer<T>::isFetchAndAddNative()<br>
-+{ return true; }<br>
-+template <typename T><br>
-+Q_INLINE_TEMPLATE bool QBasicAtomicPointer<T>::isFetchAndAddWaitFree()<br>
-+{ return false; }<br>
-+<br>
-+#ifndef Q_DATA_MEMORY_BARRIER<br>
-+# define Q_DATA_MEMORY_BARRIER asm volatile("dmb sy\n":::"memory")<br>
-+#endif<br>
-+#ifndef Q_COMPILER_MEMORY_BARRIER<br>
-+# define Q_COMPILER_MEMORY_BARRIER asm volatile("":::"memory")<br>
-+#endif<br>
-+<br>
-+inline bool QBasicAtomicInt::ref()<br>
-+{<br>
-+ int newValue;<br>
-+<br>
-+ Q_COMPILER_MEMORY_BARRIER;<br>
-+ newValue = __atomic_add_fetch(&_q_value, 1, __ATOMIC_ACQ_REL);<br>
-+ Q_COMPILER_MEMORY_BARRIER;<br>
-+<br>
-+ return newValue != 0;<br>
-+}<br>
-+<br>
-+inline bool QBasicAtomicInt::deref()<br>
-+{<br>
-+ int newValue;<br>
-+<br>
-+ Q_COMPILER_MEMORY_BARRIER;<br>
-+ newValue = __atomic_sub_fetch(&_q_value, 1, __ATOMIC_ACQ_REL);<br>
-+ Q_COMPILER_MEMORY_BARRIER;<br>
-+<br>
-+ return newValue != 0;<br>
-+}<br>
-+<br>
-+inline bool QBasicAtomicInt::testAndSetRelaxed(int expectedValue, int newValue)<br>
-+{<br>
-+ bool val;<br>
-+<br>
-+ Q_COMPILER_MEMORY_BARRIER;<br>
-+ val = __atomic_compare_exchange_n (&_q_value, &expectedValue, newValue,<br>
-+ false, __ATOMIC_RELAXED, __ATOMIC_RELAXED);<br>
-+ Q_COMPILER_MEMORY_BARRIER;<br>
-+ return val;<br>
-+}<br>
-+<br>
-+inline int QBasicAtomicInt::fetchAndStoreRelaxed(int newValue)<br>
-+{<br>
-+ int val;<br>
-+ Q_COMPILER_MEMORY_BARRIER;<br>
-+ val = __atomic_exchange_n(&_q_value, newValue, __ATOMIC_RELAXED);<br>
-+ Q_COMPILER_MEMORY_BARRIER;<br>
-+ return val;<br>
-+}<br>
-+<br>
-+inline int QBasicAtomicInt::fetchAndAddRelaxed(int valueToAdd)<br>
-+{<br>
-+ int val;<br>
-+ Q_COMPILER_MEMORY_BARRIER;<br>
-+ val = __atomic_fetch_add(&_q_value, valueToAdd, __ATOMIC_RELAXED);<br>
-+ Q_COMPILER_MEMORY_BARRIER;<br>
-+ return val;<br>
-+}<br>
-+<br>
-+template <typename T><br>
-+Q_INLINE_TEMPLATE bool QBasicAtomicPointer<T>::testAndSetRelaxed(T *expectedValue, T *newValue)<br>
-+{<br>
-+ bool val;<br>
-+ Q_COMPILER_MEMORY_BARRIER;<br>
-+ val = __atomic_compare_exchange_n (&_q_value, &expectedValue, newValue,<br>
-+ false, __ATOMIC_RELAXED, __ATOMIC_RELAXED);<br>
-+ Q_COMPILER_MEMORY_BARRIER;<br>
-+ return val;<br>
-+}<br>
-+<br>
-+template <typename T><br>
-+Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndStoreRelaxed(T *newValue)<br>
-+{<br>
-+ T *val;<br>
-+ Q_COMPILER_MEMORY_BARRIER;<br>
-+ val = __atomic_exchange_n(&_q_value, newValue, __ATOMIC_RELAXED);<br>
-+ Q_COMPILER_MEMORY_BARRIER;<br>
-+ return val;<br>
-+}<br>
-+<br>
-+template <typename T><br>
-+Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndAddRelaxed(qptrdiff valueToAdd)<br>
-+{<br>
-+ T *val;<br>
-+ Q_COMPILER_MEMORY_BARRIER;<br>
-+ val = __atomic_fetch_add(&_q_value, valueToAdd, __ATOMIC_RELAXED);<br>
-+ Q_COMPILER_MEMORY_BARRIER;<br>
-+ return val;<br>
-+}<br>
-+<br>
-+inline bool QBasicAtomicInt::testAndSetAcquire(int expectedValue, int newValue)<br>
-+{<br>
-+ bool returnValue = testAndSetRelaxed(expectedValue, newValue);<br>
-+ Q_DATA_MEMORY_BARRIER;<br>
-+ return returnValue;<br>
-+}<br>
-+<br>
-+inline bool QBasicAtomicInt::testAndSetRelease(int expectedValue, int newValue)<br>
-+{<br>
-+ Q_DATA_MEMORY_BARRIER;<br>
-+ return testAndSetRelaxed(expectedValue, newValue);<br>
-+}<br>
-+<br>
-+inline bool QBasicAtomicInt::testAndSetOrdered(int expectedValue, int newValue)<br>
-+{<br>
-+ Q_DATA_MEMORY_BARRIER;<br>
-+ bool returnValue = testAndSetRelaxed(expectedValue, newValue);<br>
-+ Q_COMPILER_MEMORY_BARRIER;<br>
-+ return returnValue;<br>
-+}<br>
-+<br>
-+inline int QBasicAtomicInt::fetchAndStoreAcquire(int newValue)<br>
-+{<br>
-+ int returnValue = fetchAndStoreRelaxed(newValue);<br>
-+ Q_DATA_MEMORY_BARRIER;<br>
-+ return returnValue;<br>
-+}<br>
-+<br>
-+inline int QBasicAtomicInt::fetchAndStoreRelease(int newValue)<br>
-+{<br>
-+ Q_DATA_MEMORY_BARRIER;<br>
-+ return fetchAndStoreRelaxed(newValue);<br>
-+}<br>
-+<br>
-+inline int QBasicAtomicInt::fetchAndStoreOrdered(int newValue)<br>
-+{<br>
-+ Q_DATA_MEMORY_BARRIER;<br>
-+ int returnValue = fetchAndStoreRelaxed(newValue);<br>
-+ Q_COMPILER_MEMORY_BARRIER;<br>
-+ return returnValue;<br>
-+}<br>
-+<br>
-+inline int QBasicAtomicInt::fetchAndAddAcquire(int valueToAdd)<br>
-+{<br>
-+ int returnValue = fetchAndAddRelaxed(valueToAdd);<br>
-+ Q_DATA_MEMORY_BARRIER;<br>
-+ return returnValue;<br>
-+}<br>
-+<br>
-+inline int QBasicAtomicInt::fetchAndAddRelease(int valueToAdd)<br>
-+{<br>
-+ Q_DATA_MEMORY_BARRIER;<br>
-+ return fetchAndAddRelaxed(valueToAdd);<br>
-+}<br>
-+<br>
-+inline int QBasicAtomicInt::fetchAndAddOrdered(int valueToAdd)<br>
-+{<br>
-+ Q_DATA_MEMORY_BARRIER;<br>
-+ int returnValue = fetchAndAddRelaxed(valueToAdd);<br>
-+ Q_COMPILER_MEMORY_BARRIER;<br>
-+ return returnValue;<br>
-+}<br>
-+<br>
-+template <typename T><br>
-+Q_INLINE_TEMPLATE bool QBasicAtomicPointer<T>::testAndSetAcquire(T *expectedValue, T *newValue)<br>
-+{<br>
-+ bool returnValue = testAndSetRelaxed(expectedValue, newValue);<br>
-+ Q_DATA_MEMORY_BARRIER;<br>
-+ return returnValue;<br>
-+}<br>
-+<br>
-+template <typename T><br>
-+Q_INLINE_TEMPLATE bool QBasicAtomicPointer<T>::testAndSetRelease(T *expectedValue, T *newValue)<br>
-+{<br>
-+ Q_DATA_MEMORY_BARRIER;<br>
-+ return testAndSetRelaxed(expectedValue, newValue);<br>
-+}<br>
-+<br>
-+template <typename T><br>
-+Q_INLINE_TEMPLATE bool QBasicAtomicPointer<T>::testAndSetOrdered(T *expectedValue, T *newValue)<br>
-+{<br>
-+ Q_DATA_MEMORY_BARRIER;<br>
-+ bool returnValue = testAndSetAcquire(expectedValue, newValue);<br>
-+ Q_COMPILER_MEMORY_BARRIER;<br>
-+ return returnValue;<br>
-+}<br>
-+<br>
-+template <typename T><br>
-+Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndStoreAcquire(T *newValue)<br>
-+{<br>
-+ T *returnValue = fetchAndStoreRelaxed(newValue);<br>
-+ Q_DATA_MEMORY_BARRIER;<br>
-+ return returnValue;<br>
-+}<br>
-+<br>
-+template <typename T><br>
-+Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndStoreRelease(T *newValue)<br>
-+{<br>
-+ Q_DATA_MEMORY_BARRIER;<br>
-+ return fetchAndStoreRelaxed(newValue);<br>
-+}<br>
-+<br>
-+template <typename T><br>
-+Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndStoreOrdered(T *newValue)<br>
-+{<br>
-+ Q_DATA_MEMORY_BARRIER;<br>
-+ T *returnValue = fetchAndStoreRelaxed(newValue);<br>
-+ Q_COMPILER_MEMORY_BARRIER;<br>
-+ return returnValue;<br>
-+}<br>
-+<br>
-+template <typename T><br>
-+Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndAddAcquire(qptrdiff valueToAdd)<br>
-+{<br>
-+ T *returnValue = fetchAndAddRelaxed(valueToAdd);<br>
-+ Q_DATA_MEMORY_BARRIER;<br>
-+ return returnValue;<br>
-+}<br>
-+<br>
-+template <typename T><br>
-+Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndAddRelease(qptrdiff valueToAdd)<br>
-+{<br>
-+ Q_DATA_MEMORY_BARRIER;<br>
-+ return fetchAndAddRelaxed(valueToAdd);<br>
-+}<br>
-+<br>
-+template <typename T><br>
-+Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndAddOrdered(qptrdiff valueToAdd)<br>
-+{<br>
-+ Q_DATA_MEMORY_BARRIER;<br>
-+ T *returnValue = fetchAndAddRelaxed(valueToAdd);<br>
-+ Q_COMPILER_MEMORY_BARRIER;<br>
-+ return returnValue;<br>
-+}<br>
-+<br>
-+#undef Q_DATA_MEMORY_BARRIER<br>
-+#undef Q_COMPILER_MEMORY_BARRIER<br>
-+<br>
-+QT_END_NAMESPACE<br>
-+<br>
-+QT_END_HEADER<br>
-+<br>
-+#endif // QATOMIC_AARCH64_H<br>
-diff --git a/src/corelib/arch/qatomic_arch.h b/src/corelib/arch/qatomic_arch.h<br>
-index 141726c..3e96926 100644<br>
---- a/src/corelib/arch/qatomic_arch.h<br>
-+++ b/src/corelib/arch/qatomic_arch.h<br>
-@@ -94,6 +94,8 @@ QT_BEGIN_HEADER<br>
- # include "QtCore/qatomic_sh4a.h"<br>
- #elif defined(QT_ARCH_NACL)<br>
- # include "QtCore/qatomic_generic.h"<br>
-+#elif defined(QT_ARCH_AARCH64)<br>
-+# include "QtCore/qatomic_aarch64.h"<br>
- #else<br>
- # error "Qt has not been ported to this architecture"<br>
- #endif<br>
---<br>
-2.1.0<br>
-<br>
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<br>
deleted file mode 100644<br>
index a01e7ad..0000000<br>
--- a/meta/recipes-qt/qt4/qt4-4.8.6/0031-aarch64_arm64_mkspecs.patch<br>
+++ /dev/null<br>
@@ -1,124 +0,0 @@<br>
-From 7090fc80ff630712a90de92403190f647dd38a39 Mon Sep 17 00:00:00 2001<br>
-From: =?UTF-8?q?Lisandro=20Dami=C3=A1n=20Nicanor=20P=C3=A9rez=20Meyer?=<br>
- <<a href="mailto:perezmeyer@gmail.com">perezmeyer@gmail.com</a>><br>
-Date: Sat, 15 Mar 2014 15:35:00 -0300<br>
-Subject: [PATCH] mkspecs for AArch64 (aka arm64).<br>
-<br>
-Patch by Marcin Juszkiewicz <<a href="mailto:marcin@juszkiewicz.com.pl">marcin@juszkiewicz.com.pl</a>><br>
-licensed under either Public Domain or BSD:<br>
-<br>
-<<a href="https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=735488#179" target="_blank">https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=735488#179</a>><br>
-<br>
-Change-Id: I21f17953234cfb176bac023e52ecdc927fc5c1a9<br>
-<br>
-<br>
-Upstream-Status: Pending<br>
-<br>
-Signed-off-by: Kai Kang <<a href="mailto:kai.kang@windriver.com">kai.kang@windriver.com</a>><br>
-<br>
----<br>
- configure | 3 +++<br>
- mkspecs/linux-g++-aarch64/qmake.conf | 27 ++++++++++++++++++++<br>
- mkspecs/linux-g++-aarch64/qplatformdefs.h | 42 +++++++++++++++++++++++++++++++<br>
- 3 files changed, 72 insertions(+)<br>
- create mode 100644 mkspecs/linux-g++-aarch64/qmake.conf<br>
- create mode 100644 mkspecs/linux-g++-aarch64/qplatformdefs.h<br>
-<br>
-diff --git a/configure b/configure<br>
-index a9ba7c8..e57d053 100755<br>
---- a/configure<br>
-+++ b/configure<br>
-@@ -2808,6 +2808,9 @@ if [ "$CFG_EMBEDDED" != "no" ]; then<br>
- *86_64)<br>
- PLATFORM=qws/linux-x86_64-g++<br>
- ;;<br>
-+ aarch64)<br>
-+ PLATFORM=linux-aarch64-g++<br>
-+ ;;<br>
- *)<br>
- PLATFORM=qws/linux-generic-g++<br>
- ;;<br>
-diff --git a/mkspecs/linux-g++-aarch64/qmake.conf b/mkspecs/linux-g++-aarch64/qmake.conf<br>
-new file mode 100644<br>
-index 0000000..ebc0a92<br>
---- /dev/null<br>
-+++ b/mkspecs/linux-g++-aarch64/qmake.conf<br>
-@@ -0,0 +1,27 @@<br>
-+#<br>
-+# qmake configuration for linux-g++<br>
-+#<br>
-+# Written for GNU/Linux platforms that have both lib and lib64 directories,<br>
-+# like the AMD Opteron.<br>
-+#<br>
-+<br>
-+MAKEFILE_GENERATOR = UNIX<br>
-+TARGET_PLATFORM = unix<br>
-+TEMPLATE = app<br>
-+CONFIG += qt warn_on release incremental link_prl gdb_dwarf_index<br>
-+QT += core gui<br>
-+QMAKE_INCREMENTAL_STYLE = sublib<br>
-+<br>
-+QMAKE_CFLAGS =<br>
-+QMAKE_LFLAGS =<br>
-+<br>
-+QMAKE_CFLAGS_RELEASE += -O2<br>
-+<br>
-+include(../common/linux.conf)<br>
-+include(../common/gcc-base-unix.conf)<br>
-+include(../common/g++-unix.conf)<br>
-+<br>
-+QMAKE_LIBDIR_X11 = /usr/X11R6/lib64<br>
-+QMAKE_LIBDIR_OPENGL = /usr/X11R6/lib64<br>
-+<br>
-+load(qt_config)<br>
-diff --git a/mkspecs/linux-g++-aarch64/qplatformdefs.h b/mkspecs/linux-g++-aarch64/qplatformdefs.h<br>
-new file mode 100644<br>
-index 0000000..562128b<br>
---- /dev/null<br>
-+++ b/mkspecs/linux-g++-aarch64/qplatformdefs.h<br>
-@@ -0,0 +1,42 @@<br>
-+/****************************************************************************<br>
-+**<br>
-+** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).<br>
-+** Contact: <a href="http://www.qt-project.org/legal" target="_blank">http://www.qt-project.org/legal</a><br>
-+**<br>
-+** This file is part of the qmake spec of the Qt Toolkit.<br>
-+**<br>
-+** $QT_BEGIN_LICENSE:LGPL$<br>
-+** Commercial License Usage<br>
-+** Licensees holding valid commercial Qt licenses may use this file in<br>
-+** accordance with the commercial license agreement provided with the<br>
-+** Software or, alternatively, in accordance with the terms contained in<br>
-+** a written agreement between you and Digia. For licensing terms and<br>
-+** conditions see <a href="http://qt.digia.com/licensing" target="_blank">http://qt.digia.com/licensing</a>. For further information<br>
-+** use the contact form at <a href="http://qt.digia.com/contact-us" target="_blank">http://qt.digia.com/contact-us</a>.<br>
-+**<br>
-+** GNU Lesser General Public License Usage<br>
-+** Alternatively, this file may be used under the terms of the GNU Lesser<br>
-+** General Public License version 2.1 as published by the Free Software<br>
-+** Foundation and appearing in the file LICENSE.LGPL included in the<br>
-+** packaging of this file. Please review the following information to<br>
-+** ensure the GNU Lesser General Public License version 2.1 requirements<br>
-+** will be met: <a href="http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html" target="_blank">http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html</a>.<br>
-+**<br>
-+** In addition, as a special exception, Digia gives you certain additional<br>
-+** rights. These rights are described in the Digia Qt LGPL Exception<br>
-+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.<br>
-+**<br>
-+** GNU General Public License Usage<br>
-+** Alternatively, this file may be used under the terms of the GNU<br>
-+** General Public License version 3.0 as published by the Free Software<br>
-+** Foundation and appearing in the file LICENSE.GPL included in the<br>
-+** packaging of this file. Please review the following information to<br>
-+** ensure the GNU General Public License version 3.0 requirements will be<br>
-+** met: <a href="http://www.gnu.org/copyleft/gpl.html" target="_blank">http://www.gnu.org/copyleft/gpl.html</a>.<br>
-+**<br>
-+**<br>
-+** $QT_END_LICENSE$<br>
-+**<br>
-+****************************************************************************/<br>
-+<br>
-+#include "../linux-g++/qplatformdefs.h"<br>
---<br>
-2.1.0<br>
-<br>
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<br>
deleted file mode 100644<br>
index 7132224..0000000<br>
--- a/meta/recipes-qt/qt4/qt4-4.8.6/0032-aarch64_add_header.patch<br>
+++ /dev/null<br>
@@ -1,18 +0,0 @@<br>
-Add missing header for aarch64. And install ../corelib/arch/qatomic_aarch64.h.<br>
-<br>
-Upstream-Status: Pending<br>
-<br>
-Signed-off-by: Kai Kang <<a href="mailto:kai.kang@windriver.com">kai.kang@windriver.com</a>><br>
----<br>
-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<br>
---- qt-everywhere-opensource-src-4.8.6.orig/include/QtCore/qatomic_aarch64.h 1970-01-01 08:30:00.000000000 +0830<br>
-+++ qt-everywhere-opensource-src-4.8.6/include/QtCore/qatomic_aarch64.h 2014-09-09 17:18:03.768352551 +0800<br>
-@@ -0,0 +1 @@<br>
-+#include "../../src/corelib/arch/qatomic_aarch64.h"<br>
---- qt-everywhere-opensource-src-4.8.6/include/QtCore/headers.pri.orig 2014-09-09 18:05:37.100430311 +0800<br>
-+++ qt-everywhere-opensource-src-4.8.6/include/QtCore/headers.pri 2014-09-09 18:05:59.112430911 +0800<br>
-@@ -1,3 +1,3 @@<br>
--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<br>
../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<br>
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/<br>
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<br>
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<br>
../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 ../.<br>
./include/QtCore/QtCore<br>
-+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<br>
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<br>
/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<br>
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<br>
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 ../<br>
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<br>
.h ../corelib/tools/qvector.h ../../include/QtCore/QtCore<br>
- 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<br>
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<br>
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<br>
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 ..<br>
/../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<br>
../../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<br>
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<br>
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<br>
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<br>
/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<br>
- 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<br>
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<br>
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<br>
../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<br>
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<br>
deleted file mode 100644<br>
index 8ff4ad5..0000000<br>
--- a/meta/recipes-qt/qt4/qt4-4.8.6/0034-Fix-a-division-by-zero-when-processing-malformed-BMP.patch<br>
+++ /dev/null<br>
@@ -1,44 +0,0 @@<br>
-From e50aa2252cdd5cb53eef7d8c4503c7edff634f68 Mon Sep 17 00:00:00 2001<br>
-From: "Richard J. Moore" <<a href="mailto:rich@kde.org">rich@kde.org</a>><br>
-Date: Tue, 24 Feb 2015 19:02:35 +0000<br>
-Subject: [PATCH] Fix a division by zero when processing malformed BMP files.<br>
-<br>
-This fixes a division by 0 when processing a maliciously crafted BMP<br>
-file. No impact beyond DoS.<br>
-<br>
-Backport of 661f6bfd032dacc62841037732816a583640e187<br>
-<br>
-Upstream-Status: Backport<br>
-<br>
-Task-number: QTBUG-44547<br>
-Change-Id: I43f06e752b11cb50669101460902a82b885ae618<br>
-Reviewed-by: Thiago Macieira <<a href="mailto:thiago.macieira@intel.com">thiago.macieira@intel.com</a>><br>
-Signed-off-by: Jonathan Liu <<a href="mailto:net147@gmail.com">net147@gmail.com</a>><br>
----<br>
- src/gui/image/qbmphandler.cpp | 6 ++++++<br>
- 1 file changed, 6 insertions(+)<br>
-<br>
-diff --git a/src/gui/image/qbmphandler.cpp b/src/gui/image/qbmphandler.cpp<br>
-index b22e842..30fa9e0 100644<br>
---- a/src/gui/image/qbmphandler.cpp<br>
-+++ b/src/gui/image/qbmphandler.cpp<br>
-@@ -319,10 +319,16 @@ static bool read_dib_body(QDataStream &s, const BMP_INFOHDR &bi, int offset, int<br>
- }<br>
- } else if (comp == BMP_BITFIELDS && (nbits == 16 || nbits == 32)) {<br>
- red_shift = calc_shift(red_mask);<br>
-+ if (((red_mask >> red_shift) + 1) == 0)<br>
-+ return false;<br>
- red_scale = 256 / ((red_mask >> red_shift) + 1);<br>
- green_shift = calc_shift(green_mask);<br>
-+ if (((green_mask >> green_shift) + 1) == 0)<br>
-+ return false;<br>
- green_scale = 256 / ((green_mask >> green_shift) + 1);<br>
- blue_shift = calc_shift(blue_mask);<br>
-+ if (((blue_mask >> blue_shift) + 1) == 0)<br>
-+ return false;<br>
- blue_scale = 256 / ((blue_mask >> blue_shift) + 1);<br>
- } else if (comp == BMP_RGB && (nbits == 24 || nbits == 32)) {<br>
- blue_mask = 0x000000ff;<br>
---<br>
-2.3.1<br>
-<br>
diff --git a/meta/recipes-qt/qt4/qt4-4.8.6.inc b/meta/recipes-qt/qt4/qt4-4.8.7.inc<br>
similarity index 87%<br>
rename from meta/recipes-qt/qt4/qt4-4.8.6.inc<br>
rename to meta/recipes-qt/qt4/qt4-4.8.7.inc<br>
index 0cb7f80..2f580cc 100644<br>
--- a/meta/recipes-qt/qt4/qt4-4.8.6.inc<br>
+++ b/meta/recipes-qt/qt4/qt4-4.8.7.inc<br>
@@ -22,19 +22,14 @@ SRC_URI = "<a href="http://download.qt-project.org/official_releases/qt/4.8/${PV}/qt-ever" target="_blank">http://download.qt-project.org/official_releases/qt/4.8/${PV}/qt-ever</a><br>
file://0019-Fixes-for-gcc-4.7.0-particularly-on-qemux86.patch \<br>
file://0027-tools.pro-disable-qmeegographicssystemhelper.patch \<br>
file://0028-Don-t-crash-on-broken-GIF-images.patch \<br>
- file://0029-aarch64_arm64_fix_arch_detection.patch \<br>
- file://0030-aarch64_arm64_qatomic_support.patch \<br>
- file://0031-aarch64_arm64_mkspecs.patch \<br>
- file://0032-aarch64_add_header.patch \<br>
- file://0034-Fix-a-division-by-zero-when-processing-malformed-BMP.patch \<br>
file://Fix-QWSLock-invalid-argument-logs.patch \<br>
file://add_check_for_aarch64_32.patch \<br>
file://g++.conf \<br>
file://linux.conf \<br>
"<br>
<br>
-SRC_URI[md5sum] = "2edbe4d6c2eff33ef91732602f3518eb"<br>
-SRC_URI[sha256sum] = "8b14dd91b52862e09b8e6a963507b74bc2580787d171feda197badfa7034032c"<br>
+SRC_URI[md5sum] = "d990ee66bf7ab0c785589776f35ba6ad"<br>
+SRC_URI[sha256sum] = "e2882295097e47fe089f8ac741a95fef47e0a73a3f3cdf21b56990638f626ea0"<br>
<br>
S = "${WORKDIR}/qt-everywhere-opensource-src-${PV}"<br>
<br>
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<br>
similarity index 100%<br>
rename from meta/recipes-qt/qt4/qt4-4.8.6/0001-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch<br>
rename to meta/recipes-qt/qt4/qt4-4.8.7/0001-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch<br>
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<br>
similarity index 100%<br>
rename from meta/recipes-qt/qt4/qt4-4.8.6/0002-qkbdtty_qws-fix-build-with-old-kernel-headers.patch<br>
rename to meta/recipes-qt/qt4/qt4-4.8.7/0002-qkbdtty_qws-fix-build-with-old-kernel-headers.patch<br>
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<br>
similarity index 100%<br>
rename from meta/recipes-qt/qt4/qt4-4.8.6/0003-webkit2-set-OUTPUT_DIR-value-if-empty.patch<br>
rename to meta/recipes-qt/qt4/qt4-4.8.7/0003-webkit2-set-OUTPUT_DIR-value-if-empty.patch<br>
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<br>
similarity index 100%<br>
rename from meta/recipes-qt/qt4/qt4-4.8.6/0004-configure-qmake-is-already-built-in-qt4-tools-native.patch<br>
rename to meta/recipes-qt/qt4/qt4-4.8.7/0004-configure-qmake-is-already-built-in-qt4-tools-native.patch<br>
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<br>
similarity index 100%<br>
rename from meta/recipes-qt/qt4/qt4-4.8.6/0005-configure-set-LFLAGS-to-pick-up-zlib-from-staging.patch<br>
rename to meta/recipes-qt/qt4/qt4-4.8.7/0005-configure-set-LFLAGS-to-pick-up-zlib-from-staging.patch<br>
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<br>
similarity index 100%<br>
rename from meta/recipes-qt/qt4/qt4-4.8.6/0006-configure-Use-OE_QMAKE_-values-to-specify-Qt-utility.patch<br>
rename to meta/recipes-qt/qt4/qt4-4.8.7/0006-configure-Use-OE_QMAKE_-values-to-specify-Qt-utility.patch<br>
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<br>
similarity index 100%<br>
rename from meta/recipes-qt/qt4/qt4-4.8.6/0007-dbus-Remove-const-usage-that-causes-compile-failure-.patch<br>
rename to meta/recipes-qt/qt4/qt4-4.8.7/0007-dbus-Remove-const-usage-that-causes-compile-failure-.patch<br>
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<br>
similarity index 100%<br>
rename from meta/recipes-qt/qt4/qt4-4.8.6/0008-qmake.pro-Allow-building-a-separate-qmake-for-the-ta.patch<br>
rename to meta/recipes-qt/qt4/qt4-4.8.7/0008-qmake.pro-Allow-building-a-separate-qmake-for-the-ta.patch<br>
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<br>
similarity index 100%<br>
rename from meta/recipes-qt/qt4/qt4-4.8.6/0009-qmake-fix-source-file-references-in-qmake.pri.patch<br>
rename to meta/recipes-qt/qt4/qt4-4.8.7/0009-qmake-fix-source-file-references-in-qmake.pri.patch<br>
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<br>
similarity index 65%<br>
rename from meta/recipes-qt/qt4/qt4-4.8.6/0010-configure-Hack-to-not-use-the-pg_config-of-the-host-.patch<br>
rename to meta/recipes-qt/qt4/qt4-4.8.7/0010-configure-Hack-to-not-use-the-pg_config-of-the-host-.patch<br>
index 1d2ddab..ca6a0b8 100644<br>
--- a/meta/recipes-qt/qt4/qt4-4.8.6/0010-configure-Hack-to-not-use-the-pg_config-of-the-host-.patch<br>
+++ b/meta/recipes-qt/qt4/qt4-4.8.7/0010-configure-Hack-to-not-use-the-pg_config-of-the-host-.patch<br>
@@ -14,6 +14,10 @@ will pad.<br>
Upstream-Status: Inappropriate [configuration]<br>
<br>
Signed-off-by: Martin Jansa <<a href="mailto:Martin.Jansa@gmail.com">Martin.Jansa@gmail.com</a>><br>
+<br>
+Update for qt 4.8.7.<br>
+<br>
+Signed-off-by: Kai Kang <<a href="mailto:kai.kang@windriver.com">kai.kang@windriver.com</a>><br>
---<br>
configure | 8 ++++----<br>
1 file changed, 4 insertions(+), 4 deletions(-)<br>
@@ -22,17 +26,17 @@ diff --git a/configure b/configure<br>
index db4d044..35a8fe7 100755<br>
--- a/configure<br>
+++ b/configure<br>
-@@ -5511,10 +5511,10 @@ for _SQLDR in $CFG_SQL_AVAILABLE; do<br>
- psql)<br>
+@@ -5574,10 +5574,10 @@<br>
if [ "$CFG_SQL_psql" != "no" ]; then<br>
+ [ -z "$CFG_PSQL_CONFIG" ] && CFG_PSQL_CONFIG=`"$WHICH" pg_config`<br>
# Be careful not to use native pg_config when cross building.<br>
-- if [ "$XPLATFORM_MINGW" != "yes" ] && "$WHICH" pg_config >/dev/null 2>&1; then<br>
-- QT_CFLAGS_PSQL=`pg_config --includedir 2>/dev/null`<br>
-- QT_LFLAGS_PSQL=`pg_config --libdir 2>/dev/null`<br>
+- if [ "$XPLATFORM_MINGW" != "yes" ] && [ -x "$CFG_PSQL_CONFIG" ]; then<br>
+- QT_CFLAGS_PSQL=`$CFG_PSQL_CONFIG --includedir 2>/dev/null`<br>
+- QT_LFLAGS_PSQL=`$CFG_PSQL_CONFIG --libdir 2>/dev/null`<br>
- fi<br>
-+# if [ "$XPLATFORM_MINGW" != "yes" ] && "$WHICH" pg_config >/dev/null 2>&1; then<br>
-+# QT_CFLAGS_PSQL=`pg_config --includedir 2>/dev/null`<br>
-+# QT_LFLAGS_PSQL=`pg_config --libdir 2>/dev/null`<br>
++# if [ "$XPLATFORM_MINGW" != "yes" ] && [ -x "$CFG_PSQL_CONFIG" ]; then<br>
++# QT_CFLAGS_PSQL=`$CFG_PSQL_CONFIG --includedir 2>/dev/null`<br>
++# QT_LFLAGS_PSQL=`$CFG_PSQL_CONFIG --libdir 2>/dev/null`<br>
+# fi<br>
[ -z "$QT_CFLAGS_PSQL" ] || QT_CFLAGS_PSQL="-I$QT_CFLAGS_PSQL"<br>
[ -z "$QT_LFLAGS_PSQL" ] || QT_LFLAGS_PSQL="-L$QT_LFLAGS_PSQL"<br>
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<br>
similarity index 100%<br>
rename from meta/recipes-qt/qt4/qt4-4.8.6/0011-freetype-host-includes.patch<br>
rename to meta/recipes-qt/qt4/qt4-4.8.7/0011-freetype-host-includes.patch<br>
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<br>
similarity index 100%<br>
rename from meta/recipes-qt/qt4/qt4-4.8.6/0012-Add-2bpp-support.patch<br>
rename to meta/recipes-qt/qt4/qt4-4.8.7/0012-Add-2bpp-support.patch<br>
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<br>
similarity index 76%<br>
rename from meta/recipes-qt/qt4/qt4-4.8.6/0013-configure-add-crossarch-option.patch<br>
rename to meta/recipes-qt/qt4/qt4-4.8.7/0013-configure-add-crossarch-option.patch<br>
index aa464fd..762cdaf 100644<br>
--- a/meta/recipes-qt/qt4/qt4-4.8.6/0013-configure-add-crossarch-option.patch<br>
+++ b/meta/recipes-qt/qt4/qt4-4.8.7/0013-configure-add-crossarch-option.patch<br>
@@ -6,34 +6,38 @@ Subject: [PATCH 13/21] configure: add "-crossarch" option<br>
Upstream-Status: Pending<br>
<br>
Signed-off-by: Martin Jansa <<a href="mailto:Martin.Jansa@gmail.com">Martin.Jansa@gmail.com</a>><br>
+<br>
+Update for qt 4.8.7<br>
+<br>
+Signed-off-by: Kai Kang <<a href="mailto:kai.kang@windriver.com">kai.kang@windriver.com</a>><br>
---<br>
configure | 7 ++++++-<br>
1 file changed, 6 insertions(+), 1 deletion(-)<br>
<br>
diff --git a/configure b/configure<br>
-index 79c1c7b..7983c3d 100755<br>
+index 4eb4a3d..a4dacec 100755<br>
--- a/configure<br>
+++ b/configure<br>
-@@ -1153,7 +1153,7 @@ while [ "$#" -gt 0 ]; do<br>
+@@ -1160,7 +1160,7 @@ while [ "$#" -gt 0 ]; do<br>
shift<br>
VAL=$1<br>
;;<br>
-- -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)<br>
-+ -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)<br>
+- -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)<br>
++ -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)<br>
VAR=`echo $1 | sed "s,^-\(.*\),\1,"`<br>
shift<br>
VAL="$1"<br>
-@@ -1709,6 +1709,9 @@ while [ "$#" -gt 0 ]; do<br>
+@@ -1719,6 +1719,9 @@ while [ "$#" -gt 0 ]; do<br>
DEV_VAL=`echo $VAL | sed "s,^.*=\(.*\),\1,"`<br>
DeviceVar set $DEV_VAR $DEV_VAL<br>
;;<br>
-+ crossarch)<br>
-+ CROSSARCH="$VAL"<br>
-+ ;;<br>
++ crossarch)<br>
++ CROSSARCH="$VAL"<br>
++ ;;<br>
debug-and-release)<br>
if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then<br>
CFG_DEBUG_RELEASE="$VAL"<br>
-@@ -3324,6 +3327,8 @@ arm*)<br>
+@@ -3333,6 +3336,8 @@ arm*)<br>
;;<br>
esac<br>
<br>
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<br>
similarity index 100%<br>
rename from meta/recipes-qt/qt4/qt4-4.8.6/0014-translations-fix-phony-translation-linking-error.patch<br>
rename to meta/recipes-qt/qt4/qt4-4.8.7/0014-translations-fix-phony-translation-linking-error.patch<br>
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<br>
similarity index 100%<br>
rename from meta/recipes-qt/qt4/qt4-4.8.6/0015-configure-add-nostrip-for-debug-packages.patch<br>
rename to meta/recipes-qt/qt4/qt4-4.8.7/0015-configure-add-nostrip-for-debug-packages.patch<br>
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<br>
similarity index 100%<br>
rename from meta/recipes-qt/qt4/qt4-4.8.6/0016-configure-eval-QMAKE_CXX.patch<br>
rename to meta/recipes-qt/qt4/qt4-4.8.7/0016-configure-eval-QMAKE_CXX.patch<br>
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<br>
similarity index 100%<br>
rename from meta/recipes-qt/qt4/qt4-4.8.6/0017-configure-ensure-we-identify-the-compiler-as-g-in-co.patch<br>
rename to meta/recipes-qt/qt4/qt4-4.8.7/0017-configure-ensure-we-identify-the-compiler-as-g-in-co.patch<br>
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<br>
similarity index 100%<br>
rename from meta/recipes-qt/qt4/qt4-4.8.6/0018-configure-make-pulseaudio-a-configurable-option.patch<br>
rename to meta/recipes-qt/qt4/qt4-4.8.7/0018-configure-make-pulseaudio-a-configurable-option.patch<br>
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<br>
similarity index 100%<br>
rename from meta/recipes-qt/qt4/qt4-4.8.6/0019-Fixes-for-gcc-4.7.0-particularly-on-qemux86.patch<br>
rename to meta/recipes-qt/qt4/qt4-4.8.7/0019-Fixes-for-gcc-4.7.0-particularly-on-qemux86.patch<br>
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<br>
similarity index 100%<br>
rename from meta/recipes-qt/qt4/qt4-4.8.6/0021-configure-make-qt4-native-work-with-long-building-pa.patch<br>
rename to meta/recipes-qt/qt4/qt4-4.8.7/0021-configure-make-qt4-native-work-with-long-building-pa.patch<br>
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<br>
similarity index 100%<br>
rename from meta/recipes-qt/qt4/qt4-4.8.6/0027-tools.pro-disable-qmeegographicssystemhelper.patch<br>
rename to meta/recipes-qt/qt4/qt4-4.8.7/0027-tools.pro-disable-qmeegographicssystemhelper.patch<br>
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<br>
similarity index 100%<br>
rename from meta/recipes-qt/qt4/qt4-4.8.6/0028-Don-t-crash-on-broken-GIF-images.patch<br>
rename to meta/recipes-qt/qt4/qt4-4.8.7/0028-Don-t-crash-on-broken-GIF-images.patch<br>
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<br>
similarity index 100%<br>
rename from meta/recipes-qt/qt4/qt4-4.8.6/0033-configure-support-c-0x-standard-for-directfd.patch<br>
rename to meta/recipes-qt/qt4/qt4-4.8.7/0033-configure-support-c-0x-standard-for-directfd.patch<br>
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<br>
similarity index 100%<br>
rename from meta/recipes-qt/qt4/qt4-4.8.6/Fix-QWSLock-invalid-argument-logs.patch<br>
rename to meta/recipes-qt/qt4/qt4-4.8.7/Fix-QWSLock-invalid-argument-logs.patch<br>
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<br>
similarity index 100%<br>
rename from meta/recipes-qt/qt4/qt4-4.8.6/add_check_for_aarch64_32.patch<br>
rename to meta/recipes-qt/qt4/qt4-4.8.7/add_check_for_aarch64_32.patch<br>
diff --git a/meta/recipes-qt/qt4/qt4-4.8.6/g++.conf b/meta/recipes-qt/qt4/qt4-4.8.7/g++.conf<br>
similarity index 100%<br>
rename from meta/recipes-qt/qt4/qt4-4.8.6/g++.conf<br>
rename to meta/recipes-qt/qt4/qt4-4.8.7/g++.conf<br>
diff --git a/meta/recipes-qt/qt4/qt4-4.8.6/linux.conf b/meta/recipes-qt/qt4/qt4-4.8.7/linux.conf<br>
similarity index 100%<br>
rename from meta/recipes-qt/qt4/qt4-4.8.6/linux.conf<br>
rename to meta/recipes-qt/qt4/qt4-4.8.7/linux.conf<br>
diff --git a/meta/recipes-qt/qt4/qt4-4.8.6/qte.sh b/meta/recipes-qt/qt4/qt4-4.8.7/qte.sh<br>
similarity index 100%<br>
rename from meta/recipes-qt/qt4/qt4-4.8.6/qte.sh<br>
rename to meta/recipes-qt/qt4/qt4-4.8.7/qte.sh<br>
diff --git a/meta/recipes-qt/qt4/qt4-embedded.inc b/meta/recipes-qt/qt4/qt4-embedded.inc<br>
index ef5cf2c..a769065 100644<br>
--- a/meta/recipes-qt/qt4/qt4-embedded.inc<br>
+++ b/meta/recipes-qt/qt4/qt4-embedded.inc<br>
@@ -3,7 +3,6 @@ DESCRIPTION = "Qt is a versatile cross-platform application framework -- this is<br>
SECTION = "libs"<br>
HOMEPAGE = "<a href="http://qt-project.org/" target="_blank">http://qt-project.org/</a>"<br>
DEPENDS += "directfb tslib"<br>
-INC_PR = "r52"<br>
<br>
QT4EDEPENDS = ""<br>
QT_BASE_LIB ?= "libqt-embedded"<br>
diff --git a/meta/recipes-qt/qt4/<a href="http://qt4-embedded_4.8.6.bb" target="_blank">qt4-embedded_4.8.6.bb</a> b/meta/recipes-qt/qt4/<a href="http://qt4-embedded_4.8.7.bb" target="_blank">qt4-embedded_4.8.7.bb</a><br>
similarity index 100%<br>
rename from meta/recipes-qt/qt4/<a href="http://qt4-embedded_4.8.6.bb" target="_blank">qt4-embedded_4.8.6.bb</a><br>
rename to meta/recipes-qt/qt4/<a href="http://qt4-embedded_4.8.7.bb" target="_blank">qt4-embedded_4.8.7.bb</a><br>
diff --git a/meta/recipes-qt/qt4/qt4-native.inc b/meta/recipes-qt/qt4/qt4-native.inc<br>
index 70bda73..2a41f8a 100644<br>
--- a/meta/recipes-qt/qt4/qt4-native.inc<br>
+++ b/meta/recipes-qt/qt4/qt4-native.inc<br>
@@ -9,8 +9,6 @@ LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=fbc093901857fcd118f065f900982c24 \<br>
file://LICENSE.GPL3;md5=6e1694ee338db410417517884918d4d2 \<br>
file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6"<br>
<br>
-INC_PR = "r20"<br>
-<br>
inherit native<br>
<br>
SRC_URI = "<a href="http://download.qt-project.org/official_releases/qt/4.8/${PV}/qt-everywhere-opensource-src-${PV}.tar.gz" target="_blank">http://download.qt-project.org/official_releases/qt/4.8/${PV}/qt-everywhere-opensource-src-${PV}.tar.gz</a> \<br>
@@ -18,10 +16,6 @@ SRC_URI = "<a href="http://download.qt-project.org/official_releases/qt/4.8/${PV}/qt-ever" target="_blank">http://download.qt-project.org/official_releases/qt/4.8/${PV}/qt-ever</a><br>
file://0002-qkbdtty_qws-fix-build-with-old-kernel-headers.patch \<br>
file://0003-webkit2-set-OUTPUT_DIR-value-if-empty.patch \<br>
file://0021-configure-make-qt4-native-work-with-long-building-pa.patch \<br>
- file://0029-aarch64_arm64_fix_arch_detection.patch \<br>
- file://0030-aarch64_arm64_qatomic_support.patch \<br>
- file://0031-aarch64_arm64_mkspecs.patch \<br>
- file://0032-aarch64_add_header.patch \<br>
file://g++.conf \<br>
file://linux.conf \<br>
"<br>
diff --git a/meta/recipes-qt/qt4/<a href="http://qt4-native_4.8.6.bb" target="_blank">qt4-native_4.8.6.bb</a> b/meta/recipes-qt/qt4/<a href="http://qt4-native_4.8.6.bb" target="_blank">qt4-native_4.8.6.bb</a><br>
deleted file mode 100644<br>
index d874d32..0000000<br>
--- a/meta/recipes-qt/qt4/<a href="http://qt4-native_4.8.6.bb" target="_blank">qt4-native_4.8.6.bb</a><br>
+++ /dev/null<br>
@@ -1,6 +0,0 @@<br>
-require qt4-native.inc<br>
-<br>
-TOBUILD := "src/tools/bootstrap ${TOBUILD}"<br>
-<br>
-SRC_URI[md5sum] = "2edbe4d6c2eff33ef91732602f3518eb"<br>
-SRC_URI[sha256sum] = "8b14dd91b52862e09b8e6a963507b74bc2580787d171feda197badfa7034032c"<br>
diff --git a/meta/recipes-qt/qt4/<a href="http://qt4-native_4.8.7.bb" target="_blank">qt4-native_4.8.7.bb</a> b/meta/recipes-qt/qt4/<a href="http://qt4-native_4.8.7.bb" target="_blank">qt4-native_4.8.7.bb</a><br>
new file mode 100644<br>
index 0000000..494d663<br>
--- /dev/null<br>
+++ b/meta/recipes-qt/qt4/<a href="http://qt4-native_4.8.7.bb" target="_blank">qt4-native_4.8.7.bb</a><br>
@@ -0,0 +1,6 @@<br>
+require qt4-native.inc<br>
+<br>
+TOBUILD := "src/tools/bootstrap ${TOBUILD}"<br>
+<br>
+SRC_URI[md5sum] = "d990ee66bf7ab0c785589776f35ba6ad"<br>
+SRC_URI[sha256sum] = "e2882295097e47fe089f8ac741a95fef47e0a73a3f3cdf21b56990638f626ea0"<br>
diff --git a/meta/recipes-qt/qt4/qt4-x11-free.inc b/meta/recipes-qt/qt4/qt4-x11-free.inc<br>
index 835fc96..f6a1737 100644<br>
--- a/meta/recipes-qt/qt4/qt4-x11-free.inc<br>
+++ b/meta/recipes-qt/qt4/qt4-x11-free.inc<br>
@@ -9,8 +9,6 @@ DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'virtual/libgl', '<br>
PROVIDES += "qt4-x11"<br>
QT4DEPENDS = ""<br>
<br>
-INC_PR = "r50"<br>
-<br>
QT_GLFLAGS ?= "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', '-opengl', '-no-opengl', d)} "<br>
QT_GLFLAGS_qemux86 = "-opengl"<br>
QT_GLFLAGS_qemuppc = "-opengl"<br>
diff --git a/meta/recipes-qt/qt4/<a href="http://qt4-x11-free_4.8.6.bb" target="_blank">qt4-x11-free_4.8.6.bb</a> b/meta/recipes-qt/qt4/<a href="http://qt4-x11-free_4.8.7.bb" target="_blank">qt4-x11-free_4.8.7.bb</a><br>
similarity index 100%<br>
rename from meta/recipes-qt/qt4/<a href="http://qt4-x11-free_4.8.6.bb" target="_blank">qt4-x11-free_4.8.6.bb</a><br>
rename to meta/recipes-qt/qt4/<a href="http://qt4-x11-free_4.8.7.bb" target="_blank">qt4-x11-free_4.8.7.bb</a><br>
<span class="HOEnZb"><font color="#888888">--<br>
1.9.1<br>
<br>
--<br>
_______________________________________________<br>
Openembedded-core mailing list<br>
<a href="mailto:Openembedded-core@lists.openembedded.org">Openembedded-core@lists.openembedded.org</a><br>
<a href="http://lists.openembedded.org/mailman/listinfo/openembedded-core" target="_blank">http://lists.openembedded.org/mailman/listinfo/openembedded-core</a><br>
</font></span></blockquote></div><br></div>