[PATCH 00/10] qt4: upgrade to 4.8.3 and cleanup

[PATCH 00/10] qt4: upgrade to 4.8.3 and cleanup

[Martin Jansa]

Please test on more architectures.
I've tested complete qt4-native + qt4-free-x11 on armv4t.
And only do_patch for nativesdk-qt4-tools, qt-mobility-*, qt4-embedded.

The following changes since commit 938d07871bedd91f0d95ed6fe338ecbfafa5ebfe:

  busybox: Fix misplaced quote (2012-09-26 18:28:17 +0100)

are available in the git repository at:

  git://git.openembedded.org/openembedded-core-contrib jansa/qt4-4.8.3
  http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=jansa/qt4-4.8.3

Martin Jansa (10):
  qt4-tools-nativesdk.inc: rename to nativesdk-qt4-tools.inc
  qt4: use releases.qt-project.org instead of get.qt.nokia.com
  qt4: rename qt-4.8.1 to qt4-4.8.1 to match other .inc and .bb
  qt4.inc: move more options to separate variables
  qt-mobility: move qt-mobility patches to separate dir
  qt4: move patches from files to qt4-4.8.1
  qt4: drop patches not used in any recipe
  qt4: replace all local patches with git patches with headers
  qt4: PR bumps
  qt4: upgrade to 4.8.3

 meta/recipes-qt/qt4/files/0004-no-qmake.patch      | 27 ------
 meta/recipes-qt/qt4/files/0008-qt-lib-infix.patch  | 41 ----------
 .../qt4/files/blacklist-diginotar-certs.diff       | 95 ----------------------
 .../recipes-qt/qt4/files/compile.test-lflags.patch | 17 ----
 meta/recipes-qt/qt4/files/fix-config-tests.patch   | 38 ---------
 ...tools-nativesdk.inc => nativesdk-qt4-tools.inc} | 18 ++--
 meta/recipes-qt/qt4/nativesdk-qt4-tools_4.8.1.bb   |  8 --
 meta/recipes-qt/qt4/nativesdk-qt4-tools_4.8.3.bb   |  8 ++
 .../qt4/qt-4.8.1/fix_conflicting_types.patch       | 29 -------
 meta/recipes-qt/qt4/qt-4.8.1/gcc47-fix.patch       | 35 --------
 meta/recipes-qt/qt4/qt-4.8.1/qmake_cxx_eval.patch  | 22 -----
 ...stvideoconnector-fixed-buffers-allocation.patch |  0
 ...nnecessary-rpaths-from-qml_device-example.patch |  0
 .../{files => qt-mobility-1.2.0}/gcc-scope.patch   |  0
 .../qt-mobility-configure.patch                    |  0
 .../qt-mobility-no-opengl.patch                    |  0
 meta/recipes-qt/qt4/qt-mobility_1.2.0.inc          |  3 +-
 .../recipes-qt/qt4/{qt-4.8.1.inc => qt4-4.8.3.inc} | 41 +++++-----
 ...-allow-to-set-qt.conf-from-the-outside-u.patch} | 28 +++++--
 ...ty_qws-fix-build-with-old-kernel-headers.patch} | 21 ++++-
 ...03-webkit2-set-OUTPUT_DIR-value-if-empty.patch} | 21 ++++-
 ...make-is-already-built-in-qt4-tools-native.patch | 29 +++++++
 ...-set-LFLAGS-to-pick-up-zlib-from-staging.patch} | 24 ++++--
 ...e-OE_QMAKE_-values-to-specify-Qt-utility.patch} | 26 ++++--
 ...const-usage-that-causes-compile-failure-.patch} | 26 ++++--
 ...low-building-a-separate-qmake-for-the-ta.patch} | 20 +++--
 ...-fix-source-file-references-in-qmake.pri.patch} | 15 ++--
 ...ck-to-not-use-the-pg_config-of-the-host-.patch} | 25 ++++--
 .../0011-freetype-host-includes.patch}             | 20 +++--
 .../0012-Add-2bpp-support.patch}                   | 76 ++++++++++-------
 .../0013-configure-add-crossarch-option.patch}     | 36 ++++----
 ...ions-fix-phony-translation-linking-error.patch} | 19 +++--
 ...configure-add-nostrip-for-debug-packages.patch} | 15 +++-
 ...sure-we-identify-the-compiler-as-g-in-co.patch} | 27 ++++--
 ...re-make-pulseaudio-a-configurable-option.patch} | 17 ++--
 ...es-for-gcc-4.7.0-particularly-on-qemux86.patch} | 45 ++++++----
 ...019-webkit-disable-the-fuse-ld-gold-flag.patch} | 23 ++++--
 .../qt4/{qt-4.8.1 => qt4-4.8.3}/g++.conf           |  0
 .../qt4/{qt-4.8.1 => qt4-4.8.3}/linux.conf         |  0
 meta/recipes-qt/qt4/{files => qt4-4.8.3}/qte.sh    |  0
 meta/recipes-qt/qt4/qt4-embedded.inc               |  2 +-
 ...qt4-embedded_4.8.1.bb => qt4-embedded_4.8.3.bb} |  4 +-
 meta/recipes-qt/qt4/qt4-native.inc                 | 10 +--
 meta/recipes-qt/qt4/qt4-native_4.8.1.bb            | 12 ---
 meta/recipes-qt/qt4/qt4-native_4.8.3.bb            |  8 ++
 meta/recipes-qt/qt4/qt4-x11-free.inc               |  2 +-
 ...qt4-x11-free_4.8.1.bb => qt4-x11-free_4.8.3.bb} |  4 +-
 meta/recipes-qt/qt4/qt4.inc                        | 19 ++++-
 48 files changed, 427 insertions(+), 529 deletions(-)
 delete mode 100644 meta/recipes-qt/qt4/files/0004-no-qmake.patch
 delete mode 100644 meta/recipes-qt/qt4/files/0008-qt-lib-infix.patch
 delete mode 100644 meta/recipes-qt/qt4/files/blacklist-diginotar-certs.diff
 delete mode 100644 meta/recipes-qt/qt4/files/compile.test-lflags.patch
 delete mode 100644 meta/recipes-qt/qt4/files/fix-config-tests.patch
 rename meta/recipes-qt/qt4/{qt4-tools-nativesdk.inc => nativesdk-qt4-tools.inc} (83%)
 delete mode 100644 meta/recipes-qt/qt4/nativesdk-qt4-tools_4.8.1.bb
 create mode 100644 meta/recipes-qt/qt4/nativesdk-qt4-tools_4.8.3.bb
 delete mode 100644 meta/recipes-qt/qt4/qt-4.8.1/fix_conflicting_types.patch
 delete mode 100644 meta/recipes-qt/qt4/qt-4.8.1/gcc47-fix.patch
 delete mode 100644 meta/recipes-qt/qt4/qt-4.8.1/qmake_cxx_eval.patch
 rename meta/recipes-qt/qt4/{files => qt-mobility-1.2.0}/0001-gstvideoconnector-fixed-buffers-allocation.patch (100%)
 rename meta/recipes-qt/qt4/{files => qt-mobility-1.2.0}/0002-Remove-unnecessary-rpaths-from-qml_device-example.patch (100%)
 rename meta/recipes-qt/qt4/{files => qt-mobility-1.2.0}/gcc-scope.patch (100%)
 rename meta/recipes-qt/qt4/{files => qt-mobility-1.2.0}/qt-mobility-configure.patch (100%)
 rename meta/recipes-qt/qt4/{files => qt-mobility-1.2.0}/qt-mobility-no-opengl.patch (100%)
 rename meta/recipes-qt/qt4/{qt-4.8.1.inc => qt4-4.8.3.inc} (50%)
 rename meta/recipes-qt/qt4/{files/qt-config.patch => qt4-4.8.3/0001-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch} (49%)
 rename meta/recipes-qt/qt4/{files/fix_qkbdtty_qws.patch => qt4-4.8.3/0002-qkbdtty_qws-fix-build-with-old-kernel-headers.patch} (68%)
 rename meta/recipes-qt/qt4/{files/set-OUTPUT_DIR-if-empty.patch => qt4-4.8.3/0003-webkit2-set-OUTPUT_DIR-value-if-empty.patch} (48%)
 create mode 100644 meta/recipes-qt/qt4/qt4-4.8.3/0004-configure-qmake-is-already-built-in-qt4-tools-native.patch
 rename meta/recipes-qt/qt4/{qt-4.8.1/configure-lflags.patch => qt4-4.8.3/0005-configure-set-LFLAGS-to-pick-up-zlib-from-staging.patch} (46%)
 rename meta/recipes-qt/qt4/{files/configure-paths.patch => qt4-4.8.3/0006-configure-Use-OE_QMAKE_-values-to-specify-Qt-utility.patch} (58%)
 rename meta/recipes-qt/qt4/{files/qt-dbus-const.patch => qt4-4.8.3/0007-dbus-Remove-const-usage-that-causes-compile-failure-.patch} (52%)
 rename meta/recipes-qt/qt4/{files/target_qmake.patch => qt4-4.8.3/0008-qmake.pro-Allow-building-a-separate-qmake-for-the-ta.patch} (57%)
 rename meta/recipes-qt/qt4/{qt-4.8.1/qmake_pri_fixes.patch => qt4-4.8.3/0009-qmake-fix-source-file-references-in-qmake.pri.patch} (81%)
 rename meta/recipes-qt/qt4/{qt-4.8.1/hack-out-pg2-4.7.0.patch => qt4-4.8.3/0010-configure-Hack-to-not-use-the-pg_config-of-the-host-.patch} (68%)
 rename meta/recipes-qt/qt4/{files/0006-freetype-host-includes.patch => qt4-4.8.3/0011-freetype-host-includes.patch} (50%)
 rename meta/recipes-qt/qt4/{files/0009-support-2bpp.patch => qt4-4.8.3/0012-Add-2bpp-support.patch} (83%)
 rename meta/recipes-qt/qt4/{qt-4.8.1/0001-Added-Openembedded-crossarch-option.patch => qt4-4.8.3/0013-configure-add-crossarch-option.patch} (49%)
 rename meta/recipes-qt/qt4/{qt-4.8.1/fix-translations.patch => qt4-4.8.3/0014-translations-fix-phony-translation-linking-error.patch} (63%)
 rename meta/recipes-qt/qt4/{files/add_nostrip_for_debug_packages.diff => qt4-4.8.3/0015-configure-add-nostrip-for-debug-packages.patch} (57%)
 rename meta/recipes-qt/qt4/{qt-4.8.1/configure_oe_compiler.patch => qt4-4.8.3/0016-configure-ensure-we-identify-the-compiler-as-g-in-co.patch} (60%)
 rename meta/recipes-qt/qt4/{qt-4.8.1/pulseaudio-config.patch => qt4-4.8.3/0017-configure-make-pulseaudio-a-configurable-option.patch} (85%)
 rename meta/recipes-qt/qt4/{qt-4.8.1/gcc47-fix2.patch => qt4-4.8.3/0018-Fixes-for-gcc-4.7.0-particularly-on-qemux86.patch} (46%)
 rename meta/recipes-qt/qt4/{qt-4.8.1/disable-fuse-gold-flag.patch => qt4-4.8.3/0019-webkit-disable-the-fuse-ld-gold-flag.patch} (46%)
 rename meta/recipes-qt/qt4/{qt-4.8.1 => qt4-4.8.3}/g++.conf (100%)
 rename meta/recipes-qt/qt4/{qt-4.8.1 => qt4-4.8.3}/linux.conf (100%)
 rename meta/recipes-qt/qt4/{files => qt4-4.8.3}/qte.sh (100%)
 rename meta/recipes-qt/qt4/{qt4-embedded_4.8.1.bb => qt4-embedded_4.8.3.bb} (73%)
 delete mode 100644 meta/recipes-qt/qt4/qt4-native_4.8.1.bb
 create mode 100644 meta/recipes-qt/qt4/qt4-native_4.8.3.bb
 rename meta/recipes-qt/qt4/{qt4-x11-free_4.8.1.bb => qt4-x11-free_4.8.3.bb} (75%)

-- 
1.7.12

[PATCH 01/10] qt4-tools-nativesdk.inc: rename to nativesdk-qt4-tools.inc

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 .../recipes-qt/qt4/{qt4-tools-nativesdk.inc => nativesdk-qt4-tools.inc} | 0
 meta/recipes-qt/qt4/nativesdk-qt4-tools_4.8.1.bb                        | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-qt/qt4/{qt4-tools-nativesdk.inc => nativesdk-qt4-tools.inc} (100%)

diff --git a/meta/recipes-qt/qt4/qt4-tools-nativesdk.inc b/meta/recipes-qt/qt4/nativesdk-qt4-tools.inc
similarity index 100%
rename from meta/recipes-qt/qt4/qt4-tools-nativesdk.inc
rename to meta/recipes-qt/qt4/nativesdk-qt4-tools.inc
diff --git a/meta/recipes-qt/qt4/nativesdk-qt4-tools_4.8.1.bb b/meta/recipes-qt/qt4/nativesdk-qt4-tools_4.8.1.bb
index e17a8ad..42d2873 100644
--- a/meta/recipes-qt/qt4/nativesdk-qt4-tools_4.8.1.bb
+++ b/meta/recipes-qt/qt4/nativesdk-qt4-tools_4.8.1.bb
@@ -1,4 +1,4 @@
-require qt4-tools-nativesdk.inc
+require nativesdk-qt4-tools.inc
 
 PR = "${INC_PR}.1"
 
-- 
1.7.12

[PATCH 02/10] qt4: use releases.qt-project.org instead of get.qt.nokia.com

[Martin Jansa]

* releases.qt-project.org has 4.8.1 as well as 4.8.3

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta/recipes-qt/qt4/nativesdk-qt4-tools.inc | 2 +-
 meta/recipes-qt/qt4/qt-4.8.1.inc            | 2 +-
 meta/recipes-qt/qt4/qt4-native.inc          | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/meta/recipes-qt/qt4/nativesdk-qt4-tools.inc b/meta/recipes-qt/qt4/nativesdk-qt4-tools.inc
index a1dd8df..0228b56 100644
--- a/meta/recipes-qt/qt4/nativesdk-qt4-tools.inc
+++ b/meta/recipes-qt/qt4/nativesdk-qt4-tools.inc
@@ -10,7 +10,7 @@ FILESEXTRAPATHS =. "${FILE_DIRNAME}/qt-${PV}:"
 
 inherit nativesdk qmake2
 
-SRC_URI = "http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-${PV}.tar.gz \
+SRC_URI = "http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-${PV}.tar.gz \
            file://0004-no-qmake.patch \
            file://configure-lflags.patch \
            file://qt-config.patch \
diff --git a/meta/recipes-qt/qt4/qt-4.8.1.inc b/meta/recipes-qt/qt4/qt-4.8.1.inc
index b923e60..aa18301 100644
--- a/meta/recipes-qt/qt4/qt-4.8.1.inc
+++ b/meta/recipes-qt/qt4/qt-4.8.1.inc
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=fbc093901857fcd118f065f900982c24 \
 
 FILESPATH =. "${FILE_DIRNAME}/qt-${PV}:"
 
-SRC_URI = "http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-${PV}.tar.gz \
+SRC_URI = "http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-${PV}.tar.gz \
            file://0004-no-qmake.patch \
            file://hack-out-pg2-4.7.0.patch \
            file://0006-freetype-host-includes.patch \
diff --git a/meta/recipes-qt/qt4/qt4-native.inc b/meta/recipes-qt/qt4/qt4-native.inc
index e00a1f3..492a700 100644
--- a/meta/recipes-qt/qt4/qt4-native.inc
+++ b/meta/recipes-qt/qt4/qt4-native.inc
@@ -13,7 +13,7 @@ INC_PR = "r16"
 
 inherit native
 
-SRC_URI = "http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-${PV}.tar.gz \
+SRC_URI = "http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-${PV}.tar.gz \
            file://qt-config.patch \
            file://g++.conf \
            file://linux.conf \
-- 
1.7.12

[PATCH 03/10] qt4: rename qt-4.8.1 to qt4-4.8.1 to match other .inc and .bb

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta/recipes-qt/qt4/nativesdk-qt4-tools.inc                             | 2 +-
 meta/recipes-qt/qt4/{qt-4.8.1.inc => qt4-4.8.1.inc}                     | 2 +-
 .../0001-Added-Openembedded-crossarch-option.patch                      | 0
 meta/recipes-qt/qt4/{qt-4.8.1 => qt4-4.8.1}/configure-lflags.patch      | 0
 meta/recipes-qt/qt4/{qt-4.8.1 => qt4-4.8.1}/configure_oe_compiler.patch | 0
 .../recipes-qt/qt4/{qt-4.8.1 => qt4-4.8.1}/disable-fuse-gold-flag.patch | 0
 meta/recipes-qt/qt4/{qt-4.8.1 => qt4-4.8.1}/fix-translations.patch      | 0
 meta/recipes-qt/qt4/{qt-4.8.1 => qt4-4.8.1}/fix_conflicting_types.patch | 0
 meta/recipes-qt/qt4/{qt-4.8.1 => qt4-4.8.1}/g++.conf                    | 0
 meta/recipes-qt/qt4/{qt-4.8.1 => qt4-4.8.1}/gcc47-fix.patch             | 0
 meta/recipes-qt/qt4/{qt-4.8.1 => qt4-4.8.1}/gcc47-fix2.patch            | 0
 meta/recipes-qt/qt4/{qt-4.8.1 => qt4-4.8.1}/hack-out-pg2-4.7.0.patch    | 0
 meta/recipes-qt/qt4/{qt-4.8.1 => qt4-4.8.1}/linux.conf                  | 0
 meta/recipes-qt/qt4/{qt-4.8.1 => qt4-4.8.1}/pulseaudio-config.patch     | 0
 meta/recipes-qt/qt4/{qt-4.8.1 => qt4-4.8.1}/qmake_cxx_eval.patch        | 0
 meta/recipes-qt/qt4/{qt-4.8.1 => qt4-4.8.1}/qmake_pri_fixes.patch       | 0
 meta/recipes-qt/qt4/qt4-embedded_4.8.1.bb                               | 2 +-
 meta/recipes-qt/qt4/qt4-native_4.8.1.bb                                 | 2 +-
 meta/recipes-qt/qt4/qt4-x11-free_4.8.1.bb                               | 2 +-
 19 files changed, 5 insertions(+), 5 deletions(-)
 rename meta/recipes-qt/qt4/{qt-4.8.1.inc => qt4-4.8.1.inc} (98%)
 rename meta/recipes-qt/qt4/{qt-4.8.1 => qt4-4.8.1}/0001-Added-Openembedded-crossarch-option.patch (100%)
 rename meta/recipes-qt/qt4/{qt-4.8.1 => qt4-4.8.1}/configure-lflags.patch (100%)
 rename meta/recipes-qt/qt4/{qt-4.8.1 => qt4-4.8.1}/configure_oe_compiler.patch (100%)
 rename meta/recipes-qt/qt4/{qt-4.8.1 => qt4-4.8.1}/disable-fuse-gold-flag.patch (100%)
 rename meta/recipes-qt/qt4/{qt-4.8.1 => qt4-4.8.1}/fix-translations.patch (100%)
 rename meta/recipes-qt/qt4/{qt-4.8.1 => qt4-4.8.1}/fix_conflicting_types.patch (100%)
 rename meta/recipes-qt/qt4/{qt-4.8.1 => qt4-4.8.1}/g++.conf (100%)
 rename meta/recipes-qt/qt4/{qt-4.8.1 => qt4-4.8.1}/gcc47-fix.patch (100%)
 rename meta/recipes-qt/qt4/{qt-4.8.1 => qt4-4.8.1}/gcc47-fix2.patch (100%)
 rename meta/recipes-qt/qt4/{qt-4.8.1 => qt4-4.8.1}/hack-out-pg2-4.7.0.patch (100%)
 rename meta/recipes-qt/qt4/{qt-4.8.1 => qt4-4.8.1}/linux.conf (100%)
 rename meta/recipes-qt/qt4/{qt-4.8.1 => qt4-4.8.1}/pulseaudio-config.patch (100%)
 rename meta/recipes-qt/qt4/{qt-4.8.1 => qt4-4.8.1}/qmake_cxx_eval.patch (100%)
 rename meta/recipes-qt/qt4/{qt-4.8.1 => qt4-4.8.1}/qmake_pri_fixes.patch (100%)

diff --git a/meta/recipes-qt/qt4/nativesdk-qt4-tools.inc b/meta/recipes-qt/qt4/nativesdk-qt4-tools.inc
index 0228b56..542f395 100644
--- a/meta/recipes-qt/qt4/nativesdk-qt4-tools.inc
+++ b/meta/recipes-qt/qt4/nativesdk-qt4-tools.inc
@@ -6,7 +6,7 @@ LICENSE = "LGPLv2.1 | GPLv3"
 
 INC_PR = "r11"
 
-FILESEXTRAPATHS =. "${FILE_DIRNAME}/qt-${PV}:"
+FILESEXTRAPATHS =. "${FILE_DIRNAME}/qt4-${PV}:"
 
 inherit nativesdk qmake2
 
diff --git a/meta/recipes-qt/qt4/qt-4.8.1.inc b/meta/recipes-qt/qt4/qt4-4.8.1.inc
similarity index 98%
rename from meta/recipes-qt/qt4/qt-4.8.1.inc
rename to meta/recipes-qt/qt4/qt4-4.8.1.inc
index aa18301..ace665f 100644
--- a/meta/recipes-qt/qt4/qt-4.8.1.inc
+++ b/meta/recipes-qt/qt4/qt4-4.8.1.inc
@@ -3,7 +3,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=fbc093901857fcd118f065f900982c24 \
                     file://LICENSE.GPL3;md5=babc5b6b77441da277f5c06b2e547720 \
                     file://LGPL_EXCEPTION.txt;md5=411080a56ff917a5a1aa08c98acae354"
 
-FILESPATH =. "${FILE_DIRNAME}/qt-${PV}:"
+FILESEXTRAPATHS =. "${FILE_DIRNAME}/qt4-${PV}:"
 
 SRC_URI = "http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-${PV}.tar.gz \
            file://0004-no-qmake.patch \
diff --git a/meta/recipes-qt/qt4/qt-4.8.1/0001-Added-Openembedded-crossarch-option.patch b/meta/recipes-qt/qt4/qt4-4.8.1/0001-Added-Openembedded-crossarch-option.patch
similarity index 100%
rename from meta/recipes-qt/qt4/qt-4.8.1/0001-Added-Openembedded-crossarch-option.patch
rename to meta/recipes-qt/qt4/qt4-4.8.1/0001-Added-Openembedded-crossarch-option.patch
diff --git a/meta/recipes-qt/qt4/qt-4.8.1/configure-lflags.patch b/meta/recipes-qt/qt4/qt4-4.8.1/configure-lflags.patch
similarity index 100%
rename from meta/recipes-qt/qt4/qt-4.8.1/configure-lflags.patch
rename to meta/recipes-qt/qt4/qt4-4.8.1/configure-lflags.patch
diff --git a/meta/recipes-qt/qt4/qt-4.8.1/configure_oe_compiler.patch b/meta/recipes-qt/qt4/qt4-4.8.1/configure_oe_compiler.patch
similarity index 100%
rename from meta/recipes-qt/qt4/qt-4.8.1/configure_oe_compiler.patch
rename to meta/recipes-qt/qt4/qt4-4.8.1/configure_oe_compiler.patch
diff --git a/meta/recipes-qt/qt4/qt-4.8.1/disable-fuse-gold-flag.patch b/meta/recipes-qt/qt4/qt4-4.8.1/disable-fuse-gold-flag.patch
similarity index 100%
rename from meta/recipes-qt/qt4/qt-4.8.1/disable-fuse-gold-flag.patch
rename to meta/recipes-qt/qt4/qt4-4.8.1/disable-fuse-gold-flag.patch
diff --git a/meta/recipes-qt/qt4/qt-4.8.1/fix-translations.patch b/meta/recipes-qt/qt4/qt4-4.8.1/fix-translations.patch
similarity index 100%
rename from meta/recipes-qt/qt4/qt-4.8.1/fix-translations.patch
rename to meta/recipes-qt/qt4/qt4-4.8.1/fix-translations.patch
diff --git a/meta/recipes-qt/qt4/qt-4.8.1/fix_conflicting_types.patch b/meta/recipes-qt/qt4/qt4-4.8.1/fix_conflicting_types.patch
similarity index 100%
rename from meta/recipes-qt/qt4/qt-4.8.1/fix_conflicting_types.patch
rename to meta/recipes-qt/qt4/qt4-4.8.1/fix_conflicting_types.patch
diff --git a/meta/recipes-qt/qt4/qt-4.8.1/g++.conf b/meta/recipes-qt/qt4/qt4-4.8.1/g++.conf
similarity index 100%
rename from meta/recipes-qt/qt4/qt-4.8.1/g++.conf
rename to meta/recipes-qt/qt4/qt4-4.8.1/g++.conf
diff --git a/meta/recipes-qt/qt4/qt-4.8.1/gcc47-fix.patch b/meta/recipes-qt/qt4/qt4-4.8.1/gcc47-fix.patch
similarity index 100%
rename from meta/recipes-qt/qt4/qt-4.8.1/gcc47-fix.patch
rename to meta/recipes-qt/qt4/qt4-4.8.1/gcc47-fix.patch
diff --git a/meta/recipes-qt/qt4/qt-4.8.1/gcc47-fix2.patch b/meta/recipes-qt/qt4/qt4-4.8.1/gcc47-fix2.patch
similarity index 100%
rename from meta/recipes-qt/qt4/qt-4.8.1/gcc47-fix2.patch
rename to meta/recipes-qt/qt4/qt4-4.8.1/gcc47-fix2.patch
diff --git a/meta/recipes-qt/qt4/qt-4.8.1/hack-out-pg2-4.7.0.patch b/meta/recipes-qt/qt4/qt4-4.8.1/hack-out-pg2-4.7.0.patch
similarity index 100%
rename from meta/recipes-qt/qt4/qt-4.8.1/hack-out-pg2-4.7.0.patch
rename to meta/recipes-qt/qt4/qt4-4.8.1/hack-out-pg2-4.7.0.patch
diff --git a/meta/recipes-qt/qt4/qt-4.8.1/linux.conf b/meta/recipes-qt/qt4/qt4-4.8.1/linux.conf
similarity index 100%
rename from meta/recipes-qt/qt4/qt-4.8.1/linux.conf
rename to meta/recipes-qt/qt4/qt4-4.8.1/linux.conf
diff --git a/meta/recipes-qt/qt4/qt-4.8.1/pulseaudio-config.patch b/meta/recipes-qt/qt4/qt4-4.8.1/pulseaudio-config.patch
similarity index 100%
rename from meta/recipes-qt/qt4/qt-4.8.1/pulseaudio-config.patch
rename to meta/recipes-qt/qt4/qt4-4.8.1/pulseaudio-config.patch
diff --git a/meta/recipes-qt/qt4/qt-4.8.1/qmake_cxx_eval.patch b/meta/recipes-qt/qt4/qt4-4.8.1/qmake_cxx_eval.patch
similarity index 100%
rename from meta/recipes-qt/qt4/qt-4.8.1/qmake_cxx_eval.patch
rename to meta/recipes-qt/qt4/qt4-4.8.1/qmake_cxx_eval.patch
diff --git a/meta/recipes-qt/qt4/qt-4.8.1/qmake_pri_fixes.patch b/meta/recipes-qt/qt4/qt4-4.8.1/qmake_pri_fixes.patch
similarity index 100%
rename from meta/recipes-qt/qt4/qt-4.8.1/qmake_pri_fixes.patch
rename to meta/recipes-qt/qt4/qt4-4.8.1/qmake_pri_fixes.patch
diff --git a/meta/recipes-qt/qt4/qt4-embedded_4.8.1.bb b/meta/recipes-qt/qt4/qt4-embedded_4.8.1.bb
index 668565e..5a3dc65 100644
--- a/meta/recipes-qt/qt4/qt4-embedded_4.8.1.bb
+++ b/meta/recipes-qt/qt4/qt4-embedded_4.8.1.bb
@@ -1,4 +1,4 @@
-require qt-${PV}.inc
+require qt4-${PV}.inc
 require qt4-embedded.inc
 
 PR = "${INC_PR}.1"
diff --git a/meta/recipes-qt/qt4/qt4-native_4.8.1.bb b/meta/recipes-qt/qt4/qt4-native_4.8.1.bb
index a2a1dbd..c09e6df 100644
--- a/meta/recipes-qt/qt4/qt4-native_4.8.1.bb
+++ b/meta/recipes-qt/qt4/qt4-native_4.8.1.bb
@@ -3,7 +3,7 @@ require qt4-native.inc
 PR = "${INC_PR}.1"
 
 # Find the g++.conf/linux.conf in the right directory.
-FILESEXTRAPATHS =. "${FILE_DIRNAME}/qt-${PV}:"
+FILESEXTRAPATHS =. "${FILE_DIRNAME}/qt4-${PV}:"
 
 TOBUILD := "src/tools/bootstrap ${TOBUILD}"
 
diff --git a/meta/recipes-qt/qt4/qt4-x11-free_4.8.1.bb b/meta/recipes-qt/qt4/qt4-x11-free_4.8.1.bb
index 6978053..9b03ff2 100644
--- a/meta/recipes-qt/qt4/qt4-x11-free_4.8.1.bb
+++ b/meta/recipes-qt/qt4/qt4-x11-free_4.8.1.bb
@@ -1,5 +1,5 @@
 require qt4-x11-free.inc
-require qt-${PV}.inc
+require qt4-${PV}.inc
 
 PR = "${INC_PR}.1"
 
-- 
1.7.12

[PATCH 04/10] qt4.inc: move more options to separate variables

[Martin Jansa]

* make it easier to override them in bbappend
* convert pulseaudio to more common -pulseaudio/-no-pulseaudio form

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta/recipes-qt/qt4/qt4.inc | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/meta/recipes-qt/qt4/qt4.inc b/meta/recipes-qt/qt4/qt4.inc
index ba231ba..35748f8 100644
--- a/meta/recipes-qt/qt4/qt4.inc
+++ b/meta/recipes-qt/qt4/qt4.inc
@@ -12,12 +12,25 @@ QT_SQL_DRIVER_FLAGS ?= "-no-sql-ibase -no-sql-mysql -no-sql-psql -no-sql-odbc -p
 
 QT_GLFLAGS ?= ""
 
+  
+QT_QT3SUPPORT ?= "-qt3support"
+QT_XML ?= "-xmlpatterns"
+QT_WEBKIT ?= "-webkit"
+QT_PHONON ?= "-phonon"
+QT_DBUS ?= "-qdbus"
+QT_MULTIMEDIA ?= "${@base_contains('DISTRO_FEATURES', 'pulseaudio', '-pulseaudio', '-no-pulseaudio', d)}"
+ 
 QT_CONFIG_FLAGS += "-release -no-cups -reduce-relocations \
                     -shared -no-nas-sound -no-nis \
                     -system-libjpeg -system-libpng -system-libtiff -system-zlib \
-                    -no-pch -qdbus -stl -glib -phonon -webkit \
-                    -xmlpatterns -no-rpath -qt3support -silent \
-                    ${@base_contains('DISTRO_FEATURES', 'pulseaudio', '--enable-pulseaudio', '--disable-pulseaudio', d)} \
+                    -no-pch -stl -glib \
+                    -no-rpath -silent \
+                    ${QT_DBUS} \
+                    ${QT_QT3SUPPORT} \
+                    ${QT_WEBKIT} \
+                    ${QT_PHONON} \
+                    ${QT_XML} \
+                    ${QT_MULTIMEDIA} \
                     ${QT_SQL_DRIVER_FLAGS} \
                     ${QT_DISTRO_FLAGS} \
                     ${QT_GLFLAGS}"
-- 
1.7.12

[PATCH 05/10] qt-mobility: move qt-mobility patches to separate dir

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 .../0001-gstvideoconnector-fixed-buffers-allocation.patch                | 0
 .../0002-Remove-unnecessary-rpaths-from-qml_device-example.patch         | 0
 meta/recipes-qt/qt4/{files => qt-mobility-1.2.0}/gcc-scope.patch         | 0
 .../qt4/{files => qt-mobility-1.2.0}/qt-mobility-configure.patch         | 0
 .../qt4/{files => qt-mobility-1.2.0}/qt-mobility-no-opengl.patch         | 0
 meta/recipes-qt/qt4/qt-mobility_1.2.0.inc                                | 1 +
 6 files changed, 1 insertion(+)
 rename meta/recipes-qt/qt4/{files => qt-mobility-1.2.0}/0001-gstvideoconnector-fixed-buffers-allocation.patch (100%)
 rename meta/recipes-qt/qt4/{files => qt-mobility-1.2.0}/0002-Remove-unnecessary-rpaths-from-qml_device-example.patch (100%)
 rename meta/recipes-qt/qt4/{files => qt-mobility-1.2.0}/gcc-scope.patch (100%)
 rename meta/recipes-qt/qt4/{files => qt-mobility-1.2.0}/qt-mobility-configure.patch (100%)
 rename meta/recipes-qt/qt4/{files => qt-mobility-1.2.0}/qt-mobility-no-opengl.patch (100%)

diff --git a/meta/recipes-qt/qt4/files/0001-gstvideoconnector-fixed-buffers-allocation.patch b/meta/recipes-qt/qt4/qt-mobility-1.2.0/0001-gstvideoconnector-fixed-buffers-allocation.patch
similarity index 100%
rename from meta/recipes-qt/qt4/files/0001-gstvideoconnector-fixed-buffers-allocation.patch
rename to meta/recipes-qt/qt4/qt-mobility-1.2.0/0001-gstvideoconnector-fixed-buffers-allocation.patch
diff --git a/meta/recipes-qt/qt4/files/0002-Remove-unnecessary-rpaths-from-qml_device-example.patch b/meta/recipes-qt/qt4/qt-mobility-1.2.0/0002-Remove-unnecessary-rpaths-from-qml_device-example.patch
similarity index 100%
rename from meta/recipes-qt/qt4/files/0002-Remove-unnecessary-rpaths-from-qml_device-example.patch
rename to meta/recipes-qt/qt4/qt-mobility-1.2.0/0002-Remove-unnecessary-rpaths-from-qml_device-example.patch
diff --git a/meta/recipes-qt/qt4/files/gcc-scope.patch b/meta/recipes-qt/qt4/qt-mobility-1.2.0/gcc-scope.patch
similarity index 100%
rename from meta/recipes-qt/qt4/files/gcc-scope.patch
rename to meta/recipes-qt/qt4/qt-mobility-1.2.0/gcc-scope.patch
diff --git a/meta/recipes-qt/qt4/files/qt-mobility-configure.patch b/meta/recipes-qt/qt4/qt-mobility-1.2.0/qt-mobility-configure.patch
similarity index 100%
rename from meta/recipes-qt/qt4/files/qt-mobility-configure.patch
rename to meta/recipes-qt/qt4/qt-mobility-1.2.0/qt-mobility-configure.patch
diff --git a/meta/recipes-qt/qt4/files/qt-mobility-no-opengl.patch b/meta/recipes-qt/qt4/qt-mobility-1.2.0/qt-mobility-no-opengl.patch
similarity index 100%
rename from meta/recipes-qt/qt4/files/qt-mobility-no-opengl.patch
rename to meta/recipes-qt/qt4/qt-mobility-1.2.0/qt-mobility-no-opengl.patch
diff --git a/meta/recipes-qt/qt4/qt-mobility_1.2.0.inc b/meta/recipes-qt/qt4/qt-mobility_1.2.0.inc
index 7f0af9f..3dc12af 100644
--- a/meta/recipes-qt/qt4/qt-mobility_1.2.0.inc
+++ b/meta/recipes-qt/qt4/qt-mobility_1.2.0.inc
@@ -5,6 +5,7 @@ LICENSE = "LGPLv2.1"
 LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=fbc093901857fcd118f065f900982c24 \
 		    file://LGPL_EXCEPTION.txt;md5=411080a56ff917a5a1aa08c98acae354"
 
+FILESEXTRAPATHS =. "${FILE_DIRNAME}/qt-mobility-${PV}:"
 SRC_URI = "http://get.qt.nokia.com/qt/add-ons/qt-mobility-opensource-src-${PV}.tar.gz \
            file://qt-mobility-configure.patch \
            file://0001-gstvideoconnector-fixed-buffers-allocation.patch \
-- 
1.7.12

[PATCH 06/10] qt4: move patches from files to qt4-4.8.1

[Martin Jansa]

* faster lookup in FILESPATH as small bonus

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta/recipes-qt/qt4/{files => qt4-4.8.1}/0004-no-qmake.patch              | 0
 .../recipes-qt/qt4/{files => qt4-4.8.1}/0006-freetype-host-includes.patch | 0
 meta/recipes-qt/qt4/{files => qt4-4.8.1}/0008-qt-lib-infix.patch          | 0
 meta/recipes-qt/qt4/{files => qt4-4.8.1}/0009-support-2bpp.patch          | 0
 .../qt4/{files => qt4-4.8.1}/add_nostrip_for_debug_packages.diff          | 0
 meta/recipes-qt/qt4/{files => qt4-4.8.1}/blacklist-diginotar-certs.diff   | 0
 meta/recipes-qt/qt4/{files => qt4-4.8.1}/compile.test-lflags.patch        | 0
 meta/recipes-qt/qt4/{files => qt4-4.8.1}/configure-paths.patch            | 0
 meta/recipes-qt/qt4/{files => qt4-4.8.1}/fix-config-tests.patch           | 0
 meta/recipes-qt/qt4/{files => qt4-4.8.1}/fix_qkbdtty_qws.patch            | 0
 meta/recipes-qt/qt4/{files => qt4-4.8.1}/qt-config.patch                  | 0
 meta/recipes-qt/qt4/{files => qt4-4.8.1}/qt-dbus-const.patch              | 0
 meta/recipes-qt/qt4/{files => qt4-4.8.1}/qte.sh                           | 0
 meta/recipes-qt/qt4/{files => qt4-4.8.1}/set-OUTPUT_DIR-if-empty.patch    | 0
 meta/recipes-qt/qt4/{files => qt4-4.8.1}/target_qmake.patch               | 0
 15 files changed, 0 insertions(+), 0 deletions(-)
 rename meta/recipes-qt/qt4/{files => qt4-4.8.1}/0004-no-qmake.patch (100%)
 rename meta/recipes-qt/qt4/{files => qt4-4.8.1}/0006-freetype-host-includes.patch (100%)
 rename meta/recipes-qt/qt4/{files => qt4-4.8.1}/0008-qt-lib-infix.patch (100%)
 rename meta/recipes-qt/qt4/{files => qt4-4.8.1}/0009-support-2bpp.patch (100%)
 rename meta/recipes-qt/qt4/{files => qt4-4.8.1}/add_nostrip_for_debug_packages.diff (100%)
 rename meta/recipes-qt/qt4/{files => qt4-4.8.1}/blacklist-diginotar-certs.diff (100%)
 rename meta/recipes-qt/qt4/{files => qt4-4.8.1}/compile.test-lflags.patch (100%)
 rename meta/recipes-qt/qt4/{files => qt4-4.8.1}/configure-paths.patch (100%)
 rename meta/recipes-qt/qt4/{files => qt4-4.8.1}/fix-config-tests.patch (100%)
 rename meta/recipes-qt/qt4/{files => qt4-4.8.1}/fix_qkbdtty_qws.patch (100%)
 rename meta/recipes-qt/qt4/{files => qt4-4.8.1}/qt-config.patch (100%)
 rename meta/recipes-qt/qt4/{files => qt4-4.8.1}/qt-dbus-const.patch (100%)
 rename meta/recipes-qt/qt4/{files => qt4-4.8.1}/qte.sh (100%)
 rename meta/recipes-qt/qt4/{files => qt4-4.8.1}/set-OUTPUT_DIR-if-empty.patch (100%)
 rename meta/recipes-qt/qt4/{files => qt4-4.8.1}/target_qmake.patch (100%)

diff --git a/meta/recipes-qt/qt4/files/0004-no-qmake.patch b/meta/recipes-qt/qt4/qt4-4.8.1/0004-no-qmake.patch
similarity index 100%
rename from meta/recipes-qt/qt4/files/0004-no-qmake.patch
rename to meta/recipes-qt/qt4/qt4-4.8.1/0004-no-qmake.patch
diff --git a/meta/recipes-qt/qt4/files/0006-freetype-host-includes.patch b/meta/recipes-qt/qt4/qt4-4.8.1/0006-freetype-host-includes.patch
similarity index 100%
rename from meta/recipes-qt/qt4/files/0006-freetype-host-includes.patch
rename to meta/recipes-qt/qt4/qt4-4.8.1/0006-freetype-host-includes.patch
diff --git a/meta/recipes-qt/qt4/files/0008-qt-lib-infix.patch b/meta/recipes-qt/qt4/qt4-4.8.1/0008-qt-lib-infix.patch
similarity index 100%
rename from meta/recipes-qt/qt4/files/0008-qt-lib-infix.patch
rename to meta/recipes-qt/qt4/qt4-4.8.1/0008-qt-lib-infix.patch
diff --git a/meta/recipes-qt/qt4/files/0009-support-2bpp.patch b/meta/recipes-qt/qt4/qt4-4.8.1/0009-support-2bpp.patch
similarity index 100%
rename from meta/recipes-qt/qt4/files/0009-support-2bpp.patch
rename to meta/recipes-qt/qt4/qt4-4.8.1/0009-support-2bpp.patch
diff --git a/meta/recipes-qt/qt4/files/add_nostrip_for_debug_packages.diff b/meta/recipes-qt/qt4/qt4-4.8.1/add_nostrip_for_debug_packages.diff
similarity index 100%
rename from meta/recipes-qt/qt4/files/add_nostrip_for_debug_packages.diff
rename to meta/recipes-qt/qt4/qt4-4.8.1/add_nostrip_for_debug_packages.diff
diff --git a/meta/recipes-qt/qt4/files/blacklist-diginotar-certs.diff b/meta/recipes-qt/qt4/qt4-4.8.1/blacklist-diginotar-certs.diff
similarity index 100%
rename from meta/recipes-qt/qt4/files/blacklist-diginotar-certs.diff
rename to meta/recipes-qt/qt4/qt4-4.8.1/blacklist-diginotar-certs.diff
diff --git a/meta/recipes-qt/qt4/files/compile.test-lflags.patch b/meta/recipes-qt/qt4/qt4-4.8.1/compile.test-lflags.patch
similarity index 100%
rename from meta/recipes-qt/qt4/files/compile.test-lflags.patch
rename to meta/recipes-qt/qt4/qt4-4.8.1/compile.test-lflags.patch
diff --git a/meta/recipes-qt/qt4/files/configure-paths.patch b/meta/recipes-qt/qt4/qt4-4.8.1/configure-paths.patch
similarity index 100%
rename from meta/recipes-qt/qt4/files/configure-paths.patch
rename to meta/recipes-qt/qt4/qt4-4.8.1/configure-paths.patch
diff --git a/meta/recipes-qt/qt4/files/fix-config-tests.patch b/meta/recipes-qt/qt4/qt4-4.8.1/fix-config-tests.patch
similarity index 100%
rename from meta/recipes-qt/qt4/files/fix-config-tests.patch
rename to meta/recipes-qt/qt4/qt4-4.8.1/fix-config-tests.patch
diff --git a/meta/recipes-qt/qt4/files/fix_qkbdtty_qws.patch b/meta/recipes-qt/qt4/qt4-4.8.1/fix_qkbdtty_qws.patch
similarity index 100%
rename from meta/recipes-qt/qt4/files/fix_qkbdtty_qws.patch
rename to meta/recipes-qt/qt4/qt4-4.8.1/fix_qkbdtty_qws.patch
diff --git a/meta/recipes-qt/qt4/files/qt-config.patch b/meta/recipes-qt/qt4/qt4-4.8.1/qt-config.patch
similarity index 100%
rename from meta/recipes-qt/qt4/files/qt-config.patch
rename to meta/recipes-qt/qt4/qt4-4.8.1/qt-config.patch
diff --git a/meta/recipes-qt/qt4/files/qt-dbus-const.patch b/meta/recipes-qt/qt4/qt4-4.8.1/qt-dbus-const.patch
similarity index 100%
rename from meta/recipes-qt/qt4/files/qt-dbus-const.patch
rename to meta/recipes-qt/qt4/qt4-4.8.1/qt-dbus-const.patch
diff --git a/meta/recipes-qt/qt4/files/qte.sh b/meta/recipes-qt/qt4/qt4-4.8.1/qte.sh
similarity index 100%
rename from meta/recipes-qt/qt4/files/qte.sh
rename to meta/recipes-qt/qt4/qt4-4.8.1/qte.sh
diff --git a/meta/recipes-qt/qt4/files/set-OUTPUT_DIR-if-empty.patch b/meta/recipes-qt/qt4/qt4-4.8.1/set-OUTPUT_DIR-if-empty.patch
similarity index 100%
rename from meta/recipes-qt/qt4/files/set-OUTPUT_DIR-if-empty.patch
rename to meta/recipes-qt/qt4/qt4-4.8.1/set-OUTPUT_DIR-if-empty.patch
diff --git a/meta/recipes-qt/qt4/files/target_qmake.patch b/meta/recipes-qt/qt4/qt4-4.8.1/target_qmake.patch
similarity index 100%
rename from meta/recipes-qt/qt4/files/target_qmake.patch
rename to meta/recipes-qt/qt4/qt4-4.8.1/target_qmake.patch
-- 
1.7.12

[PATCH 07/10] qt4: drop patches not used in any recipe

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 .../qt4/qt4-4.8.1/0008-qt-lib-infix.patch          | 41 ----------
 .../qt4/qt4-4.8.1/blacklist-diginotar-certs.diff   | 95 ----------------------
 .../qt4/qt4-4.8.1/compile.test-lflags.patch        | 17 ----
 .../qt4/qt4-4.8.1/fix-config-tests.patch           | 38 ---------
 4 files changed, 191 deletions(-)
 delete mode 100644 meta/recipes-qt/qt4/qt4-4.8.1/0008-qt-lib-infix.patch
 delete mode 100644 meta/recipes-qt/qt4/qt4-4.8.1/blacklist-diginotar-certs.diff
 delete mode 100644 meta/recipes-qt/qt4/qt4-4.8.1/compile.test-lflags.patch
 delete mode 100644 meta/recipes-qt/qt4/qt4-4.8.1/fix-config-tests.patch

diff --git a/meta/recipes-qt/qt4/qt4-4.8.1/0008-qt-lib-infix.patch b/meta/recipes-qt/qt4/qt4-4.8.1/0008-qt-lib-infix.patch
deleted file mode 100644
index d308a15..0000000
--- a/meta/recipes-qt/qt4/qt4-4.8.1/0008-qt-lib-infix.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-Add lib infix for QtUiTools to distinguish different Qt edition: e.g. "E" for embedded, "" for X11
-
-Patch has been accepted upstream and should be included in the next major version (4.8.0), see:
-http://bugreports.qt.nokia.com/browse/QTBUG-7169
-
-Original Author: Jeremy Lainé <jeremy.laine@m4x.org>
-Ported from OE by: Yu Ke <ke.yu@intel.com>
-Upstream-Status: Accepted
-
---- /tmp/uitools.prf	2009-12-01 18:38:22.000000000 +0100
-+++ qt-everywhere-opensource-src-4.6.0/mkspecs/features/uitools.prf	2009-12-01 18:58:16.000000000 +0100
-@@ -3,11 +3,11 @@
- 
- # Include the correct version of the UiLoader library
- symbian: QTUITOOLS_LINKAGE = -lQtUiTools.lib
--else: QTUITOOLS_LINKAGE = -lQtUiTools
-+else: QTUITOOLS_LINKAGE = -lQtUiTools$${QT_LIBINFIX}
- 
- CONFIG(debug, debug|release) {
--    mac: QTUITOOLS_LINKAGE = -lQtUiTools_debug
--    win32: QTUITOOLS_LINKAGE = -lQtUiToolsd
-+    mac: QTUITOOLS_LINKAGE = -lQtUiTools$${QT_LIBINFIX}_debug
-+    win32: QTUITOOLS_LINKAGE = -lQtUiTools$${QT_LIBINFIX}d
- }
- LIBS += $$QTUITOOLS_LINKAGE
- 
---- /tmp/uitools.pro	2009-12-01 18:40:28.000000000 +0100
-+++ qt-everywhere-opensource-src-4.6.0/tools/designer/src/uitools/uitools.pro	2009-12-01 18:59:18.000000000 +0100
-@@ -1,5 +1,5 @@
- TEMPLATE = lib
--TARGET = $$qtLibraryTarget(QtUiTools)
-+TARGET = QtUiTools
- QT += xml
- CONFIG += qt staticlib
- DESTDIR = ../../../../lib
-@@ -43,3 +43,5 @@
-    QMAKE_PKGCONFIG_DESTDIR = pkgconfig
-    QMAKE_PKGCONFIG_REQUIRES += QtXml
- }
-+
-+TARGET = $$qtLibraryTarget($$TARGET$$QT_LIBINFIX) #do this towards the end
diff --git a/meta/recipes-qt/qt4/qt4-4.8.1/blacklist-diginotar-certs.diff b/meta/recipes-qt/qt4/qt4-4.8.1/blacklist-diginotar-certs.diff
deleted file mode 100644
index 4d88ae2..0000000
--- a/meta/recipes-qt/qt4/qt4-4.8.1/blacklist-diginotar-certs.diff
+++ /dev/null
@@ -1,95 +0,0 @@
-http://labs.qt.nokia.com/2011/09/02/what-the-diginotar-security-breach-means-for-qt-users/
-http://labs.qt.nokia.com/2011/09/07/what-the-diginotar-security-breach-means-for-qt-users-continued/
-
-Original Author:Nokia
-Upstream-Status: Integrated in upcoming versions
-
-diff --git a/src/network/ssl/qsslcertificate.cpp b/src/network/ssl/qsslcertificate.cpp
-index 328c5c2..1ae98f4 100644
---- a/src/network/ssl/qsslcertificate.cpp
-+++ b/src/network/ssl/qsslcertificate.cpp
-@@ -803,22 +803,47 @@ QList<QSslCertificate> QSslCertificatePrivate::certificatesFromDer(const QByteAr
- // These certificates are known to be fraudulent and were created during the comodo
- // compromise. See http://www.comodo.com/Comodo-Fraud-Incident-2011-03-23.html
- static const char *certificate_blacklist[] = {
--    "04:7e:cb:e9:fc:a5:5f:7b:d0:9e:ae:36:e1:0c:ae:1e",
--    "f5:c8:6a:f3:61:62:f1:3a:64:f5:4f:6d:c9:58:7c:06",
--    "d7:55:8f:da:f5:f1:10:5b:b2:13:28:2b:70:77:29:a3",
--    "39:2a:43:4f:0e:07:df:1f:8a:a3:05:de:34:e0:c2:29",
--    "3e:75:ce:d4:6b:69:30:21:21:88:30:ae:86:a8:2a:71",
--    "e9:02:8b:95:78:e4:15:dc:1a:71:0a:2b:88:15:44:47",
--    "92:39:d5:34:8f:40:d1:69:5a:74:54:70:e1:f2:3f:43",
--    "b0:b7:13:3e:d0:96:f9:b5:6f:ae:91:c8:74:bd:3a:c0",
--    "d8:f3:5f:4e:b7:87:2b:2d:ab:06:92:e3:15:38:2f:b0",
-+    "04:7e:cb:e9:fc:a5:5f:7b:d0:9e:ae:36:e1:0c:ae:1e", "mail.google.com", // Comodo
-+    "f5:c8:6a:f3:61:62:f1:3a:64:f5:4f:6d:c9:58:7c:06", "www.google.com", // Comodo
-+    "d7:55:8f:da:f5:f1:10:5b:b2:13:28:2b:70:77:29:a3", "login.yahoo.com", // Comodo
-+    "39:2a:43:4f:0e:07:df:1f:8a:a3:05:de:34:e0:c2:29", "login.yahoo.com", // Comodo
-+    "3e:75:ce:d4:6b:69:30:21:21:88:30:ae:86:a8:2a:71", "login.yahoo.com", // Comodo
-+    "e9:02:8b:95:78:e4:15:dc:1a:71:0a:2b:88:15:44:47", "login.skype.com", // Comodo
-+    "92:39:d5:34:8f:40:d1:69:5a:74:54:70:e1:f2:3f:43", "addons.mozilla.org", // Comodo
-+    "b0:b7:13:3e:d0:96:f9:b5:6f:ae:91:c8:74:bd:3a:c0", "login.live.com", // Comodo
-+    "d8:f3:5f:4e:b7:87:2b:2d:ab:06:92:e3:15:38:2f:b0", "global trustee", // Comodo
-+
-+    "05:e2:e6:a4:cd:09:ea:54:d6:65:b0:75:fe:22:a2:56", "*.google.com", // leaf certificate issued by DigiNotar
-+    "0c:76:da:9c:91:0c:4e:2c:9e:fe:15:d0:58:93:3c:4c", "DigiNotar Root CA", // DigiNotar root
-+    "f1:4a:13:f4:87:2b:56:dc:39:df:84:ca:7a:a1:06:49", "DigiNotar Services CA", // DigiNotar intermediate signed by DigiNotar Root
-+    "36:16:71:55:43:42:1b:9d:e6:cb:a3:64:41:df:24:38", "DigiNotar Services 1024 CA", // DigiNotar intermediate signed by DigiNotar Root
-+    "0a:82:bd:1e:14:4e:88:14:d7:5b:1a:55:27:be:bf:3e", "DigiNotar Root CA G2", // other DigiNotar Root CA
-+    "a4:b6:ce:e3:2e:d3:35:46:26:3c:b3:55:3a:a8:92:21", "CertiID Enterprise Certificate Authority", // DigiNotar intermediate signed by "DigiNotar Root CA G2"
-+    "5b:d5:60:9c:64:17:68:cf:21:0e:35:fd:fb:05:ad:41", "DigiNotar Qualified CA", // DigiNotar intermediate signed by DigiNotar Root
-+
-+    "1184640176",                                      "DigiNotar Services 1024 CA", // DigiNotar intermediate cross-signed by Entrust
-+    "120000525",                                       "DigiNotar Cyber CA", // DigiNotar intermediate cross-signed by CyberTrust
-+    "120000505",                                       "DigiNotar Cyber CA", // DigiNotar intermediate cross-signed by CyberTrust
-+    "120000515",                                       "DigiNotar Cyber CA", // DigiNotar intermediate cross-signed by CyberTrust
-+    "20015536",                                        "DigiNotar PKIoverheid CA Overheid en Bedrijven", // DigiNotar intermediate cross-signed by the Dutch government
-+    "20001983",                                        "DigiNotar PKIoverheid CA Organisatie - G2", // DigiNotar intermediate cross-signed by the Dutch government
-+    "d6:d0:29:77:f1:49:fd:1a:83:f2:b9:ea:94:8c:5c:b4", "DigiNotar Extended Validation CA", // DigiNotar intermediate signed by DigiNotar EV Root
-+    "1e:7d:7a:53:3d:45:30:41:96:40:0f:71:48:1f:45:04", "DigiNotar Public CA 2025", // DigiNotar intermediate
-+//    "(has not been seen in the wild so far)", "DigiNotar Public CA - G2", // DigiNotar intermediate
-+//    "(has not been seen in the wild so far)", "Koninklijke Notariele Beroepsorganisatie CA", // compromised during DigiNotar breach
-+//    "(has not been seen in the wild so far)", "Stichting TTP Infos CA," // compromised during DigiNotar breach
-+    "1184640175", "DigiNotar Root CA", // DigiNotar intermediate cross-signed by Entrust
-+    "1184644297", "DigiNotar Root CA", // DigiNotar intermediate cross-signed by Entrust
-     0
- };
- 
- bool QSslCertificatePrivate::isBlacklisted(const QSslCertificate &certificate)
- {
-     for (int a = 0; certificate_blacklist[a] != 0; a++) {
--        if (certificate.serialNumber() == certificate_blacklist[a])
-+        QString blacklistedCommonName = QString::fromUtf8(certificate_blacklist[(a+1)]);
-+        if (certificate.serialNumber() == certificate_blacklist[a++] &&
-+            (certificate.subjectInfo(QSslCertificate::CommonName) == blacklistedCommonName ||
-+             certificate.issuerInfo(QSslCertificate::CommonName) == blacklistedCommonName))
-             return true;
-     }
-     return false;
-diff --git a/src/network/ssl/qsslsocket_openssl.cpp b/src/network/ssl/qsslsocket_openssl.cpp
-index 141d80a..b8e6c4c 100644
---- a/src/network/ssl/qsslsocket_openssl.cpp
-+++ b/src/network/ssl/qsslsocket_openssl.cpp
-@@ -1193,12 +1193,16 @@ bool QSslSocketBackendPrivate::startHandshake()
-     X509 *x509 = q_SSL_get_peer_certificate(ssl);
-     configuration.peerCertificate = QSslCertificatePrivate::QSslCertificate_from_X509(x509);
-     q_X509_free(x509);
--    if (QSslCertificatePrivate::isBlacklisted(configuration.peerCertificate)) {
--        q->setErrorString(QSslSocket::tr("The peer certificate is blacklisted"));
--        q->setSocketError(QAbstractSocket::SslHandshakeFailedError);
--        emit q->error(QAbstractSocket::SslHandshakeFailedError);
--        plainSocket->disconnectFromHost();
--        return false;
-+
-+    // check the whole chain for blacklisting (including root, as we check for subjectInfo and issuer)
-+    foreach (const QSslCertificate &cert, configuration.peerCertificateChain) {
-+        if (QSslCertificatePrivate::isBlacklisted(cert)) {
-+            q->setErrorString(QSslSocket::tr("The peer certificate is blacklisted"));
-+            q->setSocketError(QAbstractSocket::SslHandshakeFailedError);
-+            emit q->error(QAbstractSocket::SslHandshakeFailedError);
-+            plainSocket->disconnectFromHost();
-+            return false;
-+        }
-     }
- 
-     // Start translating errors.
diff --git a/meta/recipes-qt/qt4/qt4-4.8.1/compile.test-lflags.patch b/meta/recipes-qt/qt4/qt4-4.8.1/compile.test-lflags.patch
deleted file mode 100644
index 1d725b7..0000000
--- a/meta/recipes-qt/qt4/qt4-4.8.1/compile.test-lflags.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Pass through LDFLAGS to configure tests
-
-Upstream-Status: Inappropriate [configuration]
-
-Index: qt-everywhere-opensource-src-4.6.3/config.tests/unix/compile.test
-===================================================================
---- qt-everywhere-opensource-src-4.6.3.orig/config.tests/unix/compile.test	2010-06-02 06:03:18.000000000 +0400
-+++ qt-everywhere-opensource-src-4.6.3/config.tests/unix/compile.test	2010-10-04 17:35:07.587783460 +0400
-@@ -11,7 +11,7 @@
- EXE=`basename "$6"`
- DESCRIPTION=$7
- shift 7
--LFLAGS=""
-+LFLAGS="$LDFLAGS"
- INCLUDEPATH=""
- CXXFLAGS=""
- MAC_ARCH_CXXFLAGS=""
diff --git a/meta/recipes-qt/qt4/qt4-4.8.1/fix-config-tests.patch b/meta/recipes-qt/qt4/qt4-4.8.1/fix-config-tests.patch
deleted file mode 100644
index 1e0d14e..0000000
--- a/meta/recipes-qt/qt4/qt4-4.8.1/fix-config-tests.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Fix invocation in case of "ccache some-compiler-gcc". As the command "ccache some-compiler-gcc" will not exist but "ccache" will.
-
-both visibility and relocs were affected.
-
-Original Author: Holger Hans Peter Freyther <zecke@selfish.org>
-Ported from OE by: Yu Ke <ke.yu@intel.com>
-Upstream-Status: Pending
-
-Index: qt-x11-opensource-src-4.5.2/config.tests/unix/bsymbolic_functions.test
-===================================================================
---- qt-x11-opensource-src-4.5.2.orig/config.tests/unix/bsymbolic_functions.test 2009-08-01 08:01:11.000000000 +0200
-+++ qt-x11-opensource-src-4.5.2/config.tests/unix/bsymbolic_functions.test      2009-08-01 08:01:16.000000000 +0200
-@@ -8,7 +8,7 @@
- int main() { return 0; }
- EOF
- 
--"$COMPILER" -o libtest.so -shared -Wl,-Bsymbolic-functions -fPIC bsymbolic_functions.c >/dev/null 2>&1 && BSYMBOLIC_FUNCTIONS_SUPPORT=yes
-+$COMPILER -o libtest.so -shared -Wl,-Bsymbolic-functions -fPIC bsymbolic_functions.c >/dev/null 2>&1 && BSYMBOLIC_FUNCTIONS_SUPPORT=yes
- rm -f bsymbolic_functions.c libtest.so
- 
- # done
-Index: qt-x11-opensource-src-4.5.2/config.tests/unix/fvisibility.test
-===================================================================
---- qt-x11-opensource-src-4.5.2.orig/config.tests/unix/fvisibility.test 2009-06-20 06:57:50.000000000 +0200
-+++ qt-x11-opensource-src-4.5.2/config.tests/unix/fvisibility.test      2009-08-01 07:59:05.000000000 +0200
-@@ -15,9 +15,9 @@
- EOF
- 
-     if [ "$VERBOSE" = "yes" ] ; then
--        "$COMPILER" -c -fvisibility=hidden fvisibility.c && FVISIBILITY_SUPPORT=yes
-+        $COMPILER -c -fvisibility=hidden fvisibility.c && FVISIBILITY_SUPPORT=yes
-     else
--        "$COMPILER" -c -fvisibility=hidden fvisibility.c >/dev/null 2>&1 && FVISIBILITY_SUPPORT=yes
-+        $COMPILER -c -fvisibility=hidden fvisibility.c >/dev/null 2>&1 && FVISIBILITY_SUPPORT=yes
-     fi
-     rm -f fvisibility.c fvisibility.o
- }
-
-- 
1.7.12

[PATCH 08/10] qt4: replace all local patches with git patches with headers

[Martin Jansa]

* in preparation for upgrade to 4.8.3

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta/recipes-qt/qt4/nativesdk-qt4-tools.inc        | 12 ++--
 meta/recipes-qt/qt4/nativesdk-qt4-tools_4.8.1.bb   |  2 +-
 meta/recipes-qt/qt4/qt4-4.8.1.inc                  | 34 +++++-----
 ...-allow-to-set-qt.conf-from-the-outside-u.patch} | 28 ++++++--
 ...ty_qws-fix-build-with-old-kernel-headers.patch} | 21 ++++--
 ...03-webkit2-set-OUTPUT_DIR-value-if-empty.patch} | 21 +++++-
 ...make-is-already-built-in-qt4-tools-native.patch | 29 +++++++++
 meta/recipes-qt/qt4/qt4-4.8.1/0004-no-qmake.patch  | 27 --------
 ...-set-LFLAGS-to-pick-up-zlib-from-staging.patch} | 22 +++++--
 ...e-OE_QMAKE_-values-to-specify-Qt-utility.patch} | 26 ++++++--
 ...const-usage-that-causes-compile-failure-.patch} | 26 ++++++--
 ...low-building-a-separate-qmake-for-the-ta.patch} | 20 +++---
 ...-fix-source-file-references-in-qmake.pri.patch} | 13 ++--
 ...ck-to-not-use-the-pg_config-of-the-host-.patch} | 25 +++++--
 ...des.patch => 0011-freetype-host-includes.patch} | 20 +++---
 ...port-2bpp.patch => 0012-Add-2bpp-support.patch} | 76 +++++++++++++---------
 ...h => 0013-configure-add-crossarch-option.patch} | 32 ++++-----
 ...ions-fix-phony-translation-linking-error.patch} | 19 ++++--
 ...configure-add-nostrip-for-debug-packages.patch} | 15 ++++-
 ...l.patch => 0016-configure-eval-QMAKE_CXX.patch} | 26 ++++++--
 ...sure-we-identify-the-compiler-as-g-in-co.patch} | 27 ++++++--
 ...re-make-pulseaudio-a-configurable-option.patch} | 17 ++---
 ...re-Fix-compile-error-when-using-toolchai.patch} | 31 ++++++---
 ...es-for-gcc-4.7.0-particularly-on-qemux86.patch} | 45 ++++++++-----
 ...021-webkit-disable-the-fuse-ld-gold-flag.patch} | 23 +++++--
 ...tch => 0022-webkit-fix-conflicting-types.patch} | 32 +++++----
 meta/recipes-qt/qt4/qt4-native.inc                 |  6 +-
 27 files changed, 438 insertions(+), 237 deletions(-)
 rename meta/recipes-qt/qt4/qt4-4.8.1/{qt-config.patch => 0001-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch} (49%)
 rename meta/recipes-qt/qt4/qt4-4.8.1/{fix_qkbdtty_qws.patch => 0002-qkbdtty_qws-fix-build-with-old-kernel-headers.patch} (68%)
 rename meta/recipes-qt/qt4/qt4-4.8.1/{set-OUTPUT_DIR-if-empty.patch => 0003-webkit2-set-OUTPUT_DIR-value-if-empty.patch} (48%)
 create mode 100644 meta/recipes-qt/qt4/qt4-4.8.1/0004-configure-qmake-is-already-built-in-qt4-tools-native.patch
 delete mode 100644 meta/recipes-qt/qt4/qt4-4.8.1/0004-no-qmake.patch
 rename meta/recipes-qt/qt4/qt4-4.8.1/{configure-lflags.patch => 0005-configure-set-LFLAGS-to-pick-up-zlib-from-staging.patch} (48%)
 rename meta/recipes-qt/qt4/qt4-4.8.1/{configure-paths.patch => 0006-configure-Use-OE_QMAKE_-values-to-specify-Qt-utility.patch} (58%)
 rename meta/recipes-qt/qt4/qt4-4.8.1/{qt-dbus-const.patch => 0007-dbus-Remove-const-usage-that-causes-compile-failure-.patch} (52%)
 rename meta/recipes-qt/qt4/qt4-4.8.1/{target_qmake.patch => 0008-qmake.pro-Allow-building-a-separate-qmake-for-the-ta.patch} (57%)
 rename meta/recipes-qt/qt4/qt4-4.8.1/{qmake_pri_fixes.patch => 0009-qmake-fix-source-file-references-in-qmake.pri.patch} (82%)
 rename meta/recipes-qt/qt4/qt4-4.8.1/{hack-out-pg2-4.7.0.patch => 0010-configure-Hack-to-not-use-the-pg_config-of-the-host-.patch} (68%)
 rename meta/recipes-qt/qt4/qt4-4.8.1/{0006-freetype-host-includes.patch => 0011-freetype-host-includes.patch} (50%)
 rename meta/recipes-qt/qt4/qt4-4.8.1/{0009-support-2bpp.patch => 0012-Add-2bpp-support.patch} (83%)
 rename meta/recipes-qt/qt4/qt4-4.8.1/{0001-Added-Openembedded-crossarch-option.patch => 0013-configure-add-crossarch-option.patch} (61%)
 rename meta/recipes-qt/qt4/qt4-4.8.1/{fix-translations.patch => 0014-translations-fix-phony-translation-linking-error.patch} (63%)
 rename meta/recipes-qt/qt4/qt4-4.8.1/{add_nostrip_for_debug_packages.diff => 0015-configure-add-nostrip-for-debug-packages.patch} (57%)
 rename meta/recipes-qt/qt4/qt4-4.8.1/{qmake_cxx_eval.patch => 0016-configure-eval-QMAKE_CXX.patch} (60%)
 rename meta/recipes-qt/qt4/qt4-4.8.1/{configure_oe_compiler.patch => 0017-configure-ensure-we-identify-the-compiler-as-g-in-co.patch} (60%)
 rename meta/recipes-qt/qt4/qt4-4.8.1/{pulseaudio-config.patch => 0018-configure-make-pulseaudio-a-configurable-option.patch} (85%)
 rename meta/recipes-qt/qt4/qt4-4.8.1/{gcc47-fix.patch => 0019-javascriptcore-Fix-compile-error-when-using-toolchai.patch} (46%)
 rename meta/recipes-qt/qt4/qt4-4.8.1/{gcc47-fix2.patch => 0020-Fixes-for-gcc-4.7.0-particularly-on-qemux86.patch} (46%)
 rename meta/recipes-qt/qt4/qt4-4.8.1/{disable-fuse-gold-flag.patch => 0021-webkit-disable-the-fuse-ld-gold-flag.patch} (46%)
 rename meta/recipes-qt/qt4/qt4-4.8.1/{fix_conflicting_types.patch => 0022-webkit-fix-conflicting-types.patch} (42%)

diff --git a/meta/recipes-qt/qt4/nativesdk-qt4-tools.inc b/meta/recipes-qt/qt4/nativesdk-qt4-tools.inc
index 542f395..2330853 100644
--- a/meta/recipes-qt/qt4/nativesdk-qt4-tools.inc
+++ b/meta/recipes-qt/qt4/nativesdk-qt4-tools.inc
@@ -11,12 +11,12 @@ FILESEXTRAPATHS =. "${FILE_DIRNAME}/qt4-${PV}:"
 inherit nativesdk qmake2
 
 SRC_URI = "http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-${PV}.tar.gz \
-           file://0004-no-qmake.patch \
-           file://configure-lflags.patch \
-           file://qt-config.patch \
-           file://configure-paths.patch \
-           file://qt-dbus-const.patch \
-           file://target_qmake.patch \
+           file://0001-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch \
+           file://0004-configure-qmake-is-already-built-in-qt4-tools-native.patch \
+           file://0005-configure-set-LFLAGS-to-pick-up-zlib-from-staging.patch \
+           file://0006-configure-Use-OE_QMAKE_-values-to-specify-Qt-utility.patch \
+           file://0007-dbus-Remove-const-usage-that-causes-compile-failure-.patch \
+           file://0008-qmake.pro-Allow-building-a-separate-qmake-for-the-ta.patch \
            file://g++.conf \
            file://linux.conf"
 
diff --git a/meta/recipes-qt/qt4/nativesdk-qt4-tools_4.8.1.bb b/meta/recipes-qt/qt4/nativesdk-qt4-tools_4.8.1.bb
index 42d2873..6d9800d 100644
--- a/meta/recipes-qt/qt4/nativesdk-qt4-tools_4.8.1.bb
+++ b/meta/recipes-qt/qt4/nativesdk-qt4-tools_4.8.1.bb
@@ -2,7 +2,7 @@ require nativesdk-qt4-tools.inc
 
 PR = "${INC_PR}.1"
 
-SRC_URI += "file://qmake_pri_fixes.patch"
+SRC_URI += "file://0009-qmake-fix-source-file-references-in-qmake.pri.patch"
 
 SRC_URI[md5sum] = "7960ba8e18ca31f0c6e4895a312f92ff"
 SRC_URI[sha256sum] = "ef851a36aa41b4ad7a3e4c96ca27eaed2a629a6d2fa06c20f072118caed87ae8"
diff --git a/meta/recipes-qt/qt4/qt4-4.8.1.inc b/meta/recipes-qt/qt4/qt4-4.8.1.inc
index ace665f..4cf1222 100644
--- a/meta/recipes-qt/qt4/qt4-4.8.1.inc
+++ b/meta/recipes-qt/qt4/qt4-4.8.1.inc
@@ -6,25 +6,25 @@ LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=fbc093901857fcd118f065f900982c24 \
 FILESEXTRAPATHS =. "${FILE_DIRNAME}/qt4-${PV}:"
 
 SRC_URI = "http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-${PV}.tar.gz \
-           file://0004-no-qmake.patch \
-           file://hack-out-pg2-4.7.0.patch \
-           file://0006-freetype-host-includes.patch \
-           file://0009-support-2bpp.patch \
-           file://0001-Added-Openembedded-crossarch-option.patch \
-           file://fix-translations.patch \
-           file://add_nostrip_for_debug_packages.diff \
-           file://qmake_cxx_eval.patch \
-           file://configure_oe_compiler.patch \
-           file://target_qmake.patch \
-           file://qmake_pri_fixes.patch \
-           file://pulseaudio-config.patch \
+           file://0003-webkit2-set-OUTPUT_DIR-value-if-empty.patch \
+           file://0004-configure-qmake-is-already-built-in-qt4-tools-native.patch \
+           file://0008-qmake.pro-Allow-building-a-separate-qmake-for-the-ta.patch \
+           file://0009-qmake-fix-source-file-references-in-qmake.pri.patch \
+           file://0010-configure-Hack-to-not-use-the-pg_config-of-the-host-.patch \
+           file://0011-freetype-host-includes.patch \
+           file://0012-Add-2bpp-support.patch \
+           file://0013-configure-add-crossarch-option.patch \
+           file://0014-translations-fix-phony-translation-linking-error.patch \
+           file://0015-configure-add-nostrip-for-debug-packages.patch \
+           file://0016-configure-eval-QMAKE_CXX.patch \
+           file://0017-configure-ensure-we-identify-the-compiler-as-g-in-co.patch \
+           file://0018-configure-make-pulseaudio-a-configurable-option.patch \
+           file://0019-javascriptcore-Fix-compile-error-when-using-toolchai.patch \
+           file://0020-Fixes-for-gcc-4.7.0-particularly-on-qemux86.patch \
+           file://0021-webkit-disable-the-fuse-ld-gold-flag.patch \
+           file://0022-webkit-fix-conflicting-types.patch \
            file://g++.conf \
            file://linux.conf \
-           file://gcc47-fix.patch \
-           file://gcc47-fix2.patch \
-           file://disable-fuse-gold-flag.patch \
-           file://fix_conflicting_types.patch \
-           file://set-OUTPUT_DIR-if-empty.patch \
            "
 
 SRC_URI[md5sum] = "7960ba8e18ca31f0c6e4895a312f92ff"
diff --git a/meta/recipes-qt/qt4/qt4-4.8.1/qt-config.patch b/meta/recipes-qt/qt4/qt4-4.8.1/0001-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch
similarity index 49%
rename from meta/recipes-qt/qt4/qt4-4.8.1/qt-config.patch
rename to meta/recipes-qt/qt4/qt4-4.8.1/0001-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch
index 2ab05ed..a3a8dae 100644
--- a/meta/recipes-qt/qt4/qt4-4.8.1/qt-config.patch
+++ b/meta/recipes-qt/qt4/qt4-4.8.1/0001-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch
@@ -1,14 +1,25 @@
+From 51c37481a0c0ea946567ea2344107428e6d71590 Mon Sep 17 00:00:00 2001
+From: Holger Freyther <zecke@selfish.org>
+Date: Wed, 26 Sep 2012 17:22:30 +0200
+Subject: [PATCH 01/22] qlibraryinfo: allow to set qt.conf from the outside
+ using the environment
+
 Allow to set a qt.conf from the outside using the environment. This allows
 to inject new prefixes and other paths into qmake. This is needed when using
 the same qmake binary to build qt/x11 and qt/embedded
 
-Original Author: Holger Freyther <zecke@selfish.org>
-Ported from OE by: Yu Ke <ke.yu@intel.com>
 Upstream-Status: Pending
 
---- /tmp/qlibraryinfo.cpp	2008-08-02 17:16:41.000000000 +0200
-+++ qt-embedded-linux-opensource-src-4.4.1/src/corelib/global/qlibraryinfo.cpp	2008-08-02 17:17:42.000000000 +0200
-@@ -47,6 +47,7 @@
+Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
+---
+ src/corelib/global/qlibraryinfo.cpp | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp
+index 2862c2c..3a36b01 100644
+--- a/src/corelib/global/qlibraryinfo.cpp
++++ b/src/corelib/global/qlibraryinfo.cpp
+@@ -54,6 +54,7 @@
  QT_BEGIN_NAMESPACE
  extern QString qmake_libraryInfoFile();
  QT_END_NAMESPACE
@@ -16,8 +27,8 @@ Upstream-Status: Pending
  #else
  # include "qcoreapplication.h"
  #endif
-@@ -113,6 +114,10 @@
- #ifdef QT_BUILD_QMAKE
+@@ -112,6 +113,10 @@ QSettings *QLibraryInfoPrivate::findConfiguration()
+ #ifdef BOOTSTRAPPING
      if(!QFile::exists(qtconfig))
          qtconfig = qmake_libraryInfoFile();
 +    if (!QFile::exists(qtconfig)) {
@@ -27,3 +38,6 @@ Upstream-Status: Pending
  #else
      if (!QFile::exists(qtconfig) && QCoreApplication::instance()) {
  #ifdef Q_OS_MAC
+-- 
+1.7.12
+
diff --git a/meta/recipes-qt/qt4/qt4-4.8.1/fix_qkbdtty_qws.patch b/meta/recipes-qt/qt4/qt4-4.8.1/0002-qkbdtty_qws-fix-build-with-old-kernel-headers.patch
similarity index 68%
rename from meta/recipes-qt/qt4/qt4-4.8.1/fix_qkbdtty_qws.patch
rename to meta/recipes-qt/qt4/qt4-4.8.1/0002-qkbdtty_qws-fix-build-with-old-kernel-headers.patch
index c2aed5c..021a6de 100644
--- a/meta/recipes-qt/qt4/qt4-4.8.1/fix_qkbdtty_qws.patch
+++ b/meta/recipes-qt/qt4/qt4-4.8.1/0002-qkbdtty_qws-fix-build-with-old-kernel-headers.patch
@@ -1,4 +1,7 @@
-Upstream-Status: Pending
+From 419b6a19d3d506880fa705682613eaaeb7dcd9cf Mon Sep 17 00:00:00 2001
+From: Wenzong Fan <wenzong.fan@windriver.com>
+Date: Wed, 26 Sep 2012 20:18:08 +0200
+Subject: [PATCH 02/22] qkbdtty_qws: fix build with old kernel headers
 
 This issue is that with C++ compiler process an old version of kernel
 header file, coincidently that file has a variable named 'new':
@@ -9,11 +12,18 @@ header file, coincidently that file has a variable named 'new':
 
 On mostly hosts it has been changed to: new -> newev.
 
+Upstream-Status: Pending
+
 Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
-=======================================
+Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
+---
+ src/gui/embedded/qkbdtty_qws.cpp | 12 ++++++++++++
+ 1 file changed, 12 insertions(+)
+
 diff --git a/src/gui/embedded/qkbdtty_qws.cpp b/src/gui/embedded/qkbdtty_qws.cpp
---- a/src/gui/embedded/qkbdtty_qws.cpp	2012-07-27 13:16:58.420198350 +0800
-+++ b/src/gui/embedded/qkbdtty_qws.cpp	2012-07-27 13:24:43.924191127 +0800
+index f4b8461..4cee2e7 100644
+--- a/src/gui/embedded/qkbdtty_qws.cpp
++++ b/src/gui/embedded/qkbdtty_qws.cpp
 @@ -54,8 +54,20 @@
  
  #if defined Q_OS_LINUX
@@ -35,3 +45,6 @@ diff --git a/src/gui/embedded/qkbdtty_qws.cpp b/src/gui/embedded/qkbdtty_qws.cpp
  #  include "qscreen_qws.h"
  #  include "qwindowsystem_qws.h"
  #  include "qapplication.h"
+-- 
+1.7.12
+
diff --git a/meta/recipes-qt/qt4/qt4-4.8.1/set-OUTPUT_DIR-if-empty.patch b/meta/recipes-qt/qt4/qt4-4.8.1/0003-webkit2-set-OUTPUT_DIR-value-if-empty.patch
similarity index 48%
rename from meta/recipes-qt/qt4/qt4-4.8.1/set-OUTPUT_DIR-if-empty.patch
rename to meta/recipes-qt/qt4/qt4-4.8.1/0003-webkit2-set-OUTPUT_DIR-value-if-empty.patch
index 9cb72ba..859a037 100644
--- a/meta/recipes-qt/qt4/qt4-4.8.1/set-OUTPUT_DIR-if-empty.patch
+++ b/meta/recipes-qt/qt4/qt4-4.8.1/0003-webkit2-set-OUTPUT_DIR-value-if-empty.patch
@@ -1,3 +1,8 @@
+From 96bee73bdf663ddeb2a5d48cab9c5e4df65ba295 Mon Sep 17 00:00:00 2001
+From: Martin Jansa <Martin.Jansa@gmail.com>
+Date: Tue, 1 May 2012 07:48:15 +0200
+Subject: [PATCH 03/22] webkit2: set OUTPUT_DIR value if empty
+
 Without this do_configure was trying to create /include/WebCore/libdummy.prl in root of build host filesystem
 now it's in proper place ${WORKDIR}/qt-everywhere-opensource-src-4.8.1/src/3rdparty/webkit/include/WebCore/libdummy.prl
 
@@ -6,9 +11,16 @@ http://www.mail-archive.com/openembedded-devel@lists.openembedded.org/msg24436.h
 
 Upstream-Status: Pending
 
---- qt-everywhere-opensource-src-4.8.1/src/3rdparty/webkit/Source/WebKit2/DerivedSources.pro.orig	2012-05-01 07:48:08.457613310 +0200
-+++ qt-everywhere-opensource-src-4.8.1/src/3rdparty/webkit/Source/WebKit2/DerivedSources.pro	2012-05-01 07:48:15.493613232 +0200
-@@ -3,6 +3,8 @@
+Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
+---
+ src/3rdparty/webkit/Source/WebKit2/DerivedSources.pro | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/3rdparty/webkit/Source/WebKit2/DerivedSources.pro b/src/3rdparty/webkit/Source/WebKit2/DerivedSources.pro
+index 006a88c..5e17193 100644
+--- a/src/3rdparty/webkit/Source/WebKit2/DerivedSources.pro
++++ b/src/3rdparty/webkit/Source/WebKit2/DerivedSources.pro
+@@ -3,6 +3,8 @@ TARGET = dummy
  
  CONFIG -= debug_and_release
  
@@ -17,3 +29,6 @@ Upstream-Status: Pending
  CONFIG(standalone_package) {
      isEmpty(WEBKIT2_GENERATED_SOURCES_DIR):WEBKIT2_GENERATED_SOURCES_DIR = $$PWD/generated
      isEmpty(WC_GENERATED_SOURCES_DIR):WC_GENERATED_SOURCES_DIR = $$PWD/../WebCore/generated
+-- 
+1.7.12
+
diff --git a/meta/recipes-qt/qt4/qt4-4.8.1/0004-configure-qmake-is-already-built-in-qt4-tools-native.patch b/meta/recipes-qt/qt4/qt4-4.8.1/0004-configure-qmake-is-already-built-in-qt4-tools-native.patch
new file mode 100644
index 0000000..e147375
--- /dev/null
+++ b/meta/recipes-qt/qt4/qt4-4.8.1/0004-configure-qmake-is-already-built-in-qt4-tools-native.patch
@@ -0,0 +1,29 @@
+From aa1788b0ec0b9b7c0e1a7c6bd9ef5c9555361014 Mon Sep 17 00:00:00 2001
+From: Michael Krelin <hacker@klever.net>
+Date: Wed, 26 Sep 2012 20:24:20 +0200
+Subject: [PATCH 04/22] configure: qmake is already built in qt4-tools-native,
+ so disable it
+
+Upstream-Status: Inappropriate [configuration]
+
+Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
+---
+ configure | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure b/configure
+index a706908..00b072a 100755
+--- a/configure
++++ b/configure
+@@ -4816,7 +4816,7 @@ END {
+ }
+ 
+ # build qmake
+-if true; then ###[ '!' -f "$outpath/bin/qmake" ];
++if false; then ###[ '!' -f "$outpath/bin/qmake" ];
+     echo "Creating qmake. Please wait..."
+ 
+     OLD_QCONFIG_H=
+-- 
+1.7.12
+
diff --git a/meta/recipes-qt/qt4/qt4-4.8.1/0004-no-qmake.patch b/meta/recipes-qt/qt4/qt4-4.8.1/0004-no-qmake.patch
deleted file mode 100644
index ed50c6d..0000000
--- a/meta/recipes-qt/qt4/qt4-4.8.1/0004-no-qmake.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From f5a73ce944240de9013cc23288c115e8213add5e Mon Sep 17 00:00:00 2001
-From: Michael Krelin <hacker@klever.net>
-Date: Sat, 2 Jun 2007 16:06:59 +0200
-Subject: [PATCH] no qmake
-
-qmake is already built in qt4-tools-native, so disable it
-
-Ported from OE by: Yu Ke <ke.yu@intel.com>
-Upstream-Status: Inappropriate [configuration]
-
----
- configure |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-Index: qt-embedded-linux-opensource-src-4.4.3/configure
-===================================================================
---- qt-embedded-linux-opensource-src-4.4.3.orig/configure	2009-03-26 17:03:43.000000000 +0100
-+++ qt-embedded-linux-opensource-src-4.4.3/configure	2009-03-26 17:04:17.000000000 +0100
-@@ -3786,7 +3786,7 @@
- }
- 
- # build qmake
--if true; then ###[ '!' -f "$outpath/bin/qmake" ];
-+if false; then ###[ '!' -f "$outpath/bin/qmake" ];
-     echo "Creating qmake. Please wait..."
- 
-     OLD_QCONFIG_H=
diff --git a/meta/recipes-qt/qt4/qt4-4.8.1/configure-lflags.patch b/meta/recipes-qt/qt4/qt4-4.8.1/0005-configure-set-LFLAGS-to-pick-up-zlib-from-staging.patch
similarity index 48%
rename from meta/recipes-qt/qt4/qt4-4.8.1/configure-lflags.patch
rename to meta/recipes-qt/qt4/qt4-4.8.1/0005-configure-set-LFLAGS-to-pick-up-zlib-from-staging.patch
index d74f7fd..9171fa7 100644
--- a/meta/recipes-qt/qt4/qt4-4.8.1/configure-lflags.patch
+++ b/meta/recipes-qt/qt4/qt4-4.8.1/0005-configure-set-LFLAGS-to-pick-up-zlib-from-staging.patch
@@ -1,12 +1,19 @@
-qt4-tools-native: set LFLAGS to pick up zlib from staging
+From 1602cdf7f3bb548e63fca40b5bff8b9a75a144c5 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jeremy=20Lain=C3=A9?= <jeremy.laine@m4x.org>
+Date: Wed, 26 Sep 2012 20:27:44 +0200
+Subject: [PATCH 05/22] configure: set LFLAGS to pick up zlib from staging
 
-Original Author: Jeremy Lainé <jeremy.laine@m4x.org>
 Upstream-Status: Pending
 
-Index: qt-everywhere-opensource-src-4.8.0/configure
-===================================================================
---- qt-everywhere-opensource-src-4.8.0.orig/configure
-+++ qt-everywhere-opensource-src-4.8.0/configure
+Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
+---
+ configure | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure b/configure
+index 00b072a..b1ba542 100755
+--- a/configure
++++ b/configure
 @@ -611,7 +611,7 @@ fi
  # initalize variables
  #-------------------------------------------------------------------------------
@@ -16,3 +23,6 @@ Index: qt-everywhere-opensource-src-4.8.0/configure
  for varname in $SYSTEM_VARIABLES; do
      qmakevarname="${varname}"
      # use LDFLAGS for autoconf compat, but qmake uses QMAKE_LFLAGS
+-- 
+1.7.12
+
diff --git a/meta/recipes-qt/qt4/qt4-4.8.1/configure-paths.patch b/meta/recipes-qt/qt4/qt4-4.8.1/0006-configure-Use-OE_QMAKE_-values-to-specify-Qt-utility.patch
similarity index 58%
rename from meta/recipes-qt/qt4/qt4-4.8.1/configure-paths.patch
rename to meta/recipes-qt/qt4/qt4-4.8.1/0006-configure-Use-OE_QMAKE_-values-to-specify-Qt-utility.patch
index 45208ec..51a6cfc 100644
--- a/meta/recipes-qt/qt4/qt4-4.8.1/configure-paths.patch
+++ b/meta/recipes-qt/qt4/qt4-4.8.1/0006-configure-Use-OE_QMAKE_-values-to-specify-Qt-utility.patch
@@ -1,13 +1,22 @@
-Use OE_QMAKE_* values to specify Qt utility paths
+From 074881d57e5d7ad23a7a784a75f4ffebf091e543 Mon Sep 17 00:00:00 2001
+From: Paul Eggleton <paul.eggleton@linux.intel.com>
+Date: Wed, 26 Sep 2012 20:29:09 +0200
+Subject: [PATCH 06/22] configure: Use OE_QMAKE_* values to specify Qt utility
+ paths
 
-Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
 Upstream-Status: Inappropriate [configuration]
 
-Index: qt-everywhere-opensource-src-4.6.3/configure
-===================================================================
---- qt-everywhere-opensource-src-4.6.3.orig/configure	2011-01-10 15:47:37.100607001 +0000
-+++ qt-everywhere-opensource-src-4.6.3/configure	2011-01-10 15:49:14.576606999 +0000
-@@ -7198,11 +7198,11 @@
+Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
+Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
+---
+ configure | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/configure b/configure
+index b1ba542..0231b7d 100755
+--- a/configure
++++ b/configure
+@@ -8517,11 +8517,11 @@ QMAKE_ABSOLUTE_SOURCE_ROOT = \$\$QT_SOURCE_TREE
  QMAKE_MOC_SRC    = \$\$QT_BUILD_TREE/src/moc
  
  #local paths that cannot be queried from the QT_INSTALL_* properties while building QTDIR
@@ -24,3 +33,6 @@ Index: qt-everywhere-opensource-src-4.6.3/configure
  QMAKE_INCDIR_QT  = \$\$QT_BUILD_TREE/include
  QMAKE_LIBDIR_QT  = \$\$QT_BUILD_TREE/lib
  
+-- 
+1.7.12
+
diff --git a/meta/recipes-qt/qt4/qt4-4.8.1/qt-dbus-const.patch b/meta/recipes-qt/qt4/qt4-4.8.1/0007-dbus-Remove-const-usage-that-causes-compile-failure-.patch
similarity index 52%
rename from meta/recipes-qt/qt4/qt4-4.8.1/qt-dbus-const.patch
rename to meta/recipes-qt/qt4/qt4-4.8.1/0007-dbus-Remove-const-usage-that-causes-compile-failure-.patch
index 6ee402f..0105758 100644
--- a/meta/recipes-qt/qt4/qt4-4.8.1/qt-dbus-const.patch
+++ b/meta/recipes-qt/qt4/qt4-4.8.1/0007-dbus-Remove-const-usage-that-causes-compile-failure-.patch
@@ -1,17 +1,26 @@
-Remove "const" usage that causes compile failure building nativesdk-qt4-tools
-
-Upstream-Status: Denied [possible retry]
+From ff6a714f8256c6d98234066ba1788bee234b25a1 Mon Sep 17 00:00:00 2001
+From: Pavel Heimlich <tropikhajma@gmail.com>
+Date: Wed, 26 Sep 2012 20:31:10 +0200
+Subject: [PATCH 07/22] dbus: Remove "const" usage that causes compile failure
+ building nativesdk-qt4-tools
 
 Patch has apparently been rejected upstream, not because it is invalid
 but because the submitter did not submit a merge request for it, so the
 validity of the patch upstream is uncertain. For further details see:
 http://bugreports.qt.nokia.com/browse/QTBUG-17962
 
-Original Author: Pavel Heimlich <tropikhajma at gmail.com>
+Upstream-Status: Denied [possible retry]
 
---- qt-everywhere-opensource-src-4.7.3/src/dbus/qdbusintegrator.cpp.orig	2011-03-12 02:11:32.313467991 +0100
-+++ qt-everywhere-opensource-src-4.7.3/src/dbus/qdbusintegrator.cpp	2011-03-12 02:11:03.795809176 +0100
-@@ -71,7 +71,7 @@
+Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
+---
+ src/dbus/qdbusintegrator.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/dbus/qdbusintegrator.cpp b/src/dbus/qdbusintegrator.cpp
+index 5d97a8e..5014b8b 100644
+--- a/src/dbus/qdbusintegrator.cpp
++++ b/src/dbus/qdbusintegrator.cpp
+@@ -72,7 +72,7 @@ QT_BEGIN_NAMESPACE
  static bool isDebugging;
  #define qDBusDebug              if (!::isDebugging); else qDebug
  
@@ -20,3 +29,6 @@ Original Author: Pavel Heimlich <tropikhajma at gmail.com>
  
  static inline QString dbusServiceString()
  { return *orgFreedesktopDBusString(); }
+-- 
+1.7.12
+
diff --git a/meta/recipes-qt/qt4/qt4-4.8.1/target_qmake.patch b/meta/recipes-qt/qt4/qt4-4.8.1/0008-qmake.pro-Allow-building-a-separate-qmake-for-the-ta.patch
similarity index 57%
rename from meta/recipes-qt/qt4/qt4-4.8.1/target_qmake.patch
rename to meta/recipes-qt/qt4/qt4-4.8.1/0008-qmake.pro-Allow-building-a-separate-qmake-for-the-ta.patch
index 9b53aff..57071c7 100644
--- a/meta/recipes-qt/qt4/qt4-4.8.1/target_qmake.patch
+++ b/meta/recipes-qt/qt4/qt4-4.8.1/0008-qmake.pro-Allow-building-a-separate-qmake-for-the-ta.patch
@@ -1,17 +1,19 @@
-From e4b27237386b3dd864dd603de2ae54a707f5419f Mon Sep 17 00:00:00 2001
+From 049f44c260fb8956f0acf18355e3403638d2a084 Mon Sep 17 00:00:00 2001
 From: Paul Eggleton <paul.eggleton@linux.intel.com>
-Date: Mon, 27 Feb 2012 00:13:05 +0000
-Subject: [PATCH] Allow building a separate qmake for the target
-
-Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
+Date: Wed, 26 Sep 2012 20:32:41 +0200
+Subject: [PATCH 08/22] qmake.pro: Allow building a separate qmake for the
+ target
 
 Upstream-Status: Inappropriate [config]
+
+Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
+Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
 ---
- qmake/qmake.pro |    1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
+ qmake/qmake.pro | 1 +
+ 1 file changed, 1 insertion(+)
 
 diff --git a/qmake/qmake.pro b/qmake/qmake.pro
-index b602afa..b59f7fb 100644
+index 38e0fce..53b1ffb 100644
 --- a/qmake/qmake.pro
 +++ b/qmake/qmake.pro
 @@ -7,6 +7,7 @@ CONFIG += console bootstrap
@@ -23,5 +25,5 @@ index b602afa..b59f7fb 100644
  OBJECTS_DIR = .
  MOC_DIR = .
 -- 
-1.7.5.4
+1.7.12
 
diff --git a/meta/recipes-qt/qt4/qt4-4.8.1/qmake_pri_fixes.patch b/meta/recipes-qt/qt4/qt4-4.8.1/0009-qmake-fix-source-file-references-in-qmake.pri.patch
similarity index 82%
rename from meta/recipes-qt/qt4/qt4-4.8.1/qmake_pri_fixes.patch
rename to meta/recipes-qt/qt4/qt4-4.8.1/0009-qmake-fix-source-file-references-in-qmake.pri.patch
index 82bff04..43072e0 100644
--- a/meta/recipes-qt/qt4/qt4-4.8.1/qmake_pri_fixes.patch
+++ b/meta/recipes-qt/qt4/qt4-4.8.1/0009-qmake-fix-source-file-references-in-qmake.pri.patch
@@ -1,7 +1,7 @@
-From c56ed5f64a5f47cf8d539aa4ca9bedbe1fea2264 Mon Sep 17 00:00:00 2001
+From e863f35a80b130d8b520cdb7c81112a601157c44 Mon Sep 17 00:00:00 2001
 From: Paul Eggleton <paul.eggleton@linux.intel.com>
-Date: Fri, 10 Feb 2012 15:32:12 +0000
-Subject: [PATCH] qmake: fix source file references in qmake.pri
+Date: Wed, 26 Sep 2012 20:33:49 +0200
+Subject: [PATCH 09/22] qmake: fix source file references in qmake.pri
 
 Fix duplicate entries in SOURCES and HEADERS, and fix the source file
 list for the split of qlocale.cpp.
@@ -9,9 +9,10 @@ list for the split of qlocale.cpp.
 Upstream-Status: Pending
 
 Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
+Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
 ---
- qmake/qmake.pri |    8 ++++----
- 1 files changed, 4 insertions(+), 4 deletions(-)
+ qmake/qmake.pri | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
 
 diff --git a/qmake/qmake.pri b/qmake/qmake.pri
 index f2a3705..2d4e94c 100644
@@ -47,5 +48,5 @@ index f2a3705..2d4e94c 100644
          qmap.cpp \
          qmetatype.cpp \
 -- 
-1.7.5.4
+1.7.12
 
diff --git a/meta/recipes-qt/qt4/qt4-4.8.1/hack-out-pg2-4.7.0.patch b/meta/recipes-qt/qt4/qt4-4.8.1/0010-configure-Hack-to-not-use-the-pg_config-of-the-host-.patch
similarity index 68%
rename from meta/recipes-qt/qt4/qt4-4.8.1/hack-out-pg2-4.7.0.patch
rename to meta/recipes-qt/qt4/qt4-4.8.1/0010-configure-Hack-to-not-use-the-pg_config-of-the-host-.patch
index 39c5f4a..38e3cdf 100644
--- a/meta/recipes-qt/qt4/qt4-4.8.1/hack-out-pg2-4.7.0.patch
+++ b/meta/recipes-qt/qt4/qt4-4.8.1/0010-configure-Hack-to-not-use-the-pg_config-of-the-host-.patch
@@ -1,4 +1,8 @@
-Hack to not use the pg_config of the host system which will add /usr/include
+From 64c70ae60b96c940805ab50be3ce724df094eddc Mon Sep 17 00:00:00 2001
+From: Holger Freyther <zecke@selfish.org>
+Date: Wed, 26 Sep 2012 20:36:38 +0200
+Subject: [PATCH 10/22] configure: Hack to not use the pg_config of the host
+ system which will add /usr/include
 
 pg_config is a native binary so using that when cross compiling
 will always fail.  The commented out fix would do, but for OE
@@ -7,14 +11,18 @@ really cross compiling. Just comment out the test, we are passing
 the location to the postgres headers and if they are okay we
 will pad.
 
-Original Author: Holger Hans Peter Freyther <zecke@selfish.org>
 Upstream-Status: Inappropriate [configuration]
 
-Index: qt-everywhere-opensource-src-4.7.0/configure
-===================================================================
---- qt-everywhere-opensource-src-4.7.0.orig/configure	2010-09-22 15:43:51.191162141 -0400
-+++ qt-everywhere-opensource-src-4.7.0/configure	2010-09-22 15:44:35.179981232 -0400
-@@ -4921,10 +4921,10 @@
+Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
+---
+ configure | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/configure b/configure
+index 0231b7d..9650199f6 100755
+--- a/configure
++++ b/configure
+@@ -5362,10 +5362,10 @@ for _SQLDR in $CFG_SQL_AVAILABLE; do
          psql)
              if [ "$CFG_SQL_psql" != "no" ]; then
                  # Be careful not to use native pg_config when cross building.
@@ -29,3 +37,6 @@ Index: qt-everywhere-opensource-src-4.7.0/configure
                  [ -z "$QT_CFLAGS_PSQL" ] || QT_CFLAGS_PSQL="-I$QT_CFLAGS_PSQL"
                  [ -z "$QT_LFLAGS_PSQL" ] || QT_LFLAGS_PSQL="-L$QT_LFLAGS_PSQL"
                  # But, respect PSQL_LIBS if set
+-- 
+1.7.12
+
diff --git a/meta/recipes-qt/qt4/qt4-4.8.1/0006-freetype-host-includes.patch b/meta/recipes-qt/qt4/qt4-4.8.1/0011-freetype-host-includes.patch
similarity index 50%
rename from meta/recipes-qt/qt4/qt4-4.8.1/0006-freetype-host-includes.patch
rename to meta/recipes-qt/qt4/qt4-4.8.1/0011-freetype-host-includes.patch
index effc5f1..7f6ff32 100644
--- a/meta/recipes-qt/qt4/qt4-4.8.1/0006-freetype-host-includes.patch
+++ b/meta/recipes-qt/qt4/qt4-4.8.1/0011-freetype-host-includes.patch
@@ -1,21 +1,22 @@
-From c9ab62bd9a56643574b3ae6e59e0ca776d4860d2 Mon Sep 17 00:00:00 2001
+From 9b05106d0bdfa84e8406633d71206ef1defaade8 Mon Sep 17 00:00:00 2001
 From: Michael Krelin <hacker@klever.net>
 Date: Mon, 4 Jun 2007 14:48:50 +0200
-Subject: [PATCH] freetype host includes
+Subject: [PATCH 11/22] freetype host includes
 
 Host include path should not be used in cross compiling case.
 
 Ported from OE by: Yu Ke <ke.yu@intel.com>
 Upstream-Status: Pending
 
+Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
 ---
- config.tests/unix/freetype/freetype.pri |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ config.tests/unix/freetype/freetype.pri | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
-Index: qt-embedded-linux-opensource-src-4.5.0/config.tests/unix/freetype/freetype.pri
-===================================================================
---- qt-embedded-linux-opensource-src-4.5.0.orig/config.tests/unix/freetype/freetype.pri	2009-02-25 22:32:32.000000000 +0100
-+++ qt-embedded-linux-opensource-src-4.5.0/config.tests/unix/freetype/freetype.pri	2009-03-26 17:14:16.000000000 +0100
+diff --git a/config.tests/unix/freetype/freetype.pri b/config.tests/unix/freetype/freetype.pri
+index 7ef1cf9..b362fcd 100644
+--- a/config.tests/unix/freetype/freetype.pri
++++ b/config.tests/unix/freetype/freetype.pri
 @@ -1,5 +1,5 @@
  !cross_compile {
 -    TRY_INCLUDEPATHS = /include /usr/include $$QMAKE_INCDIR $$QMAKE_INCDIR_X11 $$INCLUDEPATH
@@ -23,3 +24,6 @@ Index: qt-embedded-linux-opensource-src-4.5.0/config.tests/unix/freetype/freetyp
      # LSB doesn't allow using headers from /include or /usr/include
      linux-lsb-g++:TRY_INCLUDEPATHS = $$QMAKE_INCDIR $$QMAKE_INCDIR_X11 $$INCLUDEPATH
      for(p, TRY_INCLUDEPATHS) {
+-- 
+1.7.12
+
diff --git a/meta/recipes-qt/qt4/qt4-4.8.1/0009-support-2bpp.patch b/meta/recipes-qt/qt4/qt4-4.8.1/0012-Add-2bpp-support.patch
similarity index 83%
rename from meta/recipes-qt/qt4/qt4-4.8.1/0009-support-2bpp.patch
rename to meta/recipes-qt/qt4/qt4-4.8.1/0012-Add-2bpp-support.patch
index 6f0890b..580ba4c 100644
--- a/meta/recipes-qt/qt4/qt4-4.8.1/0009-support-2bpp.patch
+++ b/meta/recipes-qt/qt4/qt4-4.8.1/0012-Add-2bpp-support.patch
@@ -1,16 +1,25 @@
-Add 2bpp support
+From 69ff4de0f06ba112a5ca531957937dd860d0f3f8 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jeremy=20Lain=C3=A9?= <jeremy.laine@m4x.org>
+Date: Wed, 26 Sep 2012 20:39:21 +0200
+Subject: [PATCH 12/22] Add 2bpp support
 
 Submitted upstream but rejected as being "out of scope":
 http://bugreports.qt.nokia.com/browse/QTBUG-3468
 
 Upstream-Status: Denied
-Original author: Jeremy Lainé <jeremy.laine@m4x.org>
-Ported from OE by: Yu Ke <ke.yu@intel.com>
 
-diff -urN qt-embedded-linux-opensource-src-4.4.3.orig/configure qt-embedded-linux-opensource-src-4.4.3/configure
---- qt-embedded-linux-opensource-src-4.4.3.orig/configure	2008-09-27 11:01:23.000000000 +0200
-+++ qt-embedded-linux-opensource-src-4.4.3/configure	2009-01-14 14:30:53.000000000 +0100
-@@ -5045,6 +5045,7 @@
+Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
+---
+ configure                               |   5 +-
+ src/gui/embedded/qscreen_qws.cpp        | 211 ++++++++++++++++++++++++++++++++
+ src/gui/embedded/qscreenlinuxfb_qws.cpp |   4 +-
+ 3 files changed, 216 insertions(+), 4 deletions(-)
+
+diff --git a/configure b/configure
+index 9650199f6..7028ecf 100755
+--- a/configure
++++ b/configure
+@@ -6917,6 +6917,7 @@ if [ "$CFG_QWS_DEPTHS" = "prompted" -a "$PROMPT_FOR_DEPTHS" = "yes" ]; then
      echo "Choose pixel-depths to support:"
      echo
      echo "   1. 1bpp, black/white"
@@ -18,7 +27,7 @@ diff -urN qt-embedded-linux-opensource-src-4.4.3.orig/configure qt-embedded-linu
      echo "   4. 4bpp, grayscale"
      echo "   8. 8bpp, paletted"
      echo "  12. 12bpp, rgb 4-4-4"
-@@ -5063,11 +5064,11 @@
+@@ -6935,11 +6936,11 @@ if [ "$CFG_QWS_DEPTHS" = "prompted" -a "$PROMPT_FOR_DEPTHS" = "yes" ]; then
  fi
  if [ -n "$CFG_QWS_DEPTHS" -a "$PLATFORM_QWS" = "yes" ]; then
      if [ "$CFG_QWS_DEPTHS" = "all" ]; then
@@ -32,24 +41,11 @@ diff -urN qt-embedded-linux-opensource-src-4.4.3.orig/configure qt-embedded-linu
  	    generic) QCONFIG_FLAGS="$QCONFIG_FLAGS QT_QWS_DEPTH_GENERIC";;
  	esac
      done
-diff -urN qt-embedded-linux-opensource-src-4.4.3.orig/src/gui/embedded/qscreenlinuxfb_qws.cpp qt-embedded-linux-opensource-src-4.4.3/src/gui/embedded/qscreenlinuxfb_qws.cpp
---- qt-embedded-linux-opensource-src-4.4.3.orig/src/gui/embedded/qscreenlinuxfb_qws.cpp	2008-09-27 11:01:28.000000000 +0200
-+++ qt-embedded-linux-opensource-src-4.4.3/src/gui/embedded/qscreenlinuxfb_qws.cpp	2009-01-14 17:22:34.000000000 +0100
-@@ -404,8 +404,8 @@
-         setupOffScreen();
- 
-     // Now read in palette
--    if((vinfo.bits_per_pixel==8) || (vinfo.bits_per_pixel==4)) {
--        screencols= (vinfo.bits_per_pixel==8) ? 256 : 16;
-+    if((vinfo.bits_per_pixel==8) || (vinfo.bits_per_pixel==4) || (vinfo.bits_per_pixel==2)) {
-+        screencols= 1 << vinfo.bits_per_pixel;
-         int loopc;
-         fb_cmap startcmap;
-         startcmap.start=0;
-diff -urN qt-embedded-linux-opensource-src-4.4.3.orig/src/gui/embedded/qscreen_qws.cpp qt-embedded-linux-opensource-src-4.4.3/src/gui/embedded/qscreen_qws.cpp
---- qt-embedded-linux-opensource-src-4.4.3.orig/src/gui/embedded/qscreen_qws.cpp	2008-09-27 11:01:28.000000000 +0200
-+++ qt-embedded-linux-opensource-src-4.4.3/src/gui/embedded/qscreen_qws.cpp	2009-01-14 17:22:44.000000000 +0100
-@@ -444,6 +444,58 @@
+diff --git a/src/gui/embedded/qscreen_qws.cpp b/src/gui/embedded/qscreen_qws.cpp
+index d6c614d..504f3d3 100644
+--- a/src/gui/embedded/qscreen_qws.cpp
++++ b/src/gui/embedded/qscreen_qws.cpp
+@@ -469,6 +469,58 @@ static void solidFill_gray4(QScreen *screen, const QColor &color,
  }
  #endif // QT_QWS_DEPTH_4
  
@@ -108,7 +104,7 @@ diff -urN qt-embedded-linux-opensource-src-4.4.3.orig/src/gui/embedded/qscreen_q
  #ifdef QT_QWS_DEPTH_1
  static inline void qt_rectfill_mono(quint8 *dest, quint8 value,
                                      int x, int y, int width, int height,
-@@ -551,6 +603,11 @@
+@@ -576,6 +628,11 @@ void qt_solidFill_setup(QScreen *screen, const QColor &color,
          screen->d_ptr->solidFill = solidFill_gray4;
          break;
  #endif
@@ -120,7 +116,7 @@ diff -urN qt-embedded-linux-opensource-src-4.4.3.orig/src/gui/embedded/qscreen_q
  #ifdef QT_QWS_DEPTH_1
      case 1:
          screen->d_ptr->solidFill = solidFill_mono;
-@@ -958,6 +1015,149 @@
+@@ -1006,6 +1063,149 @@ static void blit_4(QScreen *screen, const QImage &image,
  }
  #endif // QT_QWS_DEPTH_4
  
@@ -270,7 +266,7 @@ diff -urN qt-embedded-linux-opensource-src-4.4.3.orig/src/gui/embedded/qscreen_q
  #ifdef QT_QWS_DEPTH_1
  
  struct qmono { quint8 dummy; } Q_PACKED;
-@@ -1206,6 +1406,11 @@
+@@ -1259,6 +1459,11 @@ void qt_blit_setup(QScreen *screen, const QImage &image,
          screen->d_ptr->blit = blit_4;
          break;
  #endif
@@ -282,7 +278,7 @@ diff -urN qt-embedded-linux-opensource-src-4.4.3.orig/src/gui/embedded/qscreen_q
  #ifdef QT_QWS_DEPTH_1
      case 1:
          screen->d_ptr->blit = blit_1;
-@@ -2056,6 +2261,8 @@
+@@ -2146,6 +2351,8 @@ int QScreen::alloc(unsigned int r,unsigned int g,unsigned int b)
          }
      } else if (d == 4) {
          ret = qGray(r, g, b) >> 4;
@@ -291,7 +287,7 @@ diff -urN qt-embedded-linux-opensource-src-4.4.3.orig/src/gui/embedded/qscreen_q
      } else if (d == 1) {
          ret = qGray(r, g, b) >= 128;
      } else {
-@@ -2126,6 +2333,10 @@
+@@ -2216,6 +2423,10 @@ bool QScreen::supportsDepth(int d) const
      } else if(d==1) {
          return true;
  #endif
@@ -302,3 +298,21 @@ diff -urN qt-embedded-linux-opensource-src-4.4.3.orig/src/gui/embedded/qscreen_q
  #ifdef QT_QWS_DEPTH_4
      } else if(d==4) {
          return true;
+diff --git a/src/gui/embedded/qscreenlinuxfb_qws.cpp b/src/gui/embedded/qscreenlinuxfb_qws.cpp
+index 3fe9713..933f489 100644
+--- a/src/gui/embedded/qscreenlinuxfb_qws.cpp
++++ b/src/gui/embedded/qscreenlinuxfb_qws.cpp
+@@ -466,8 +466,8 @@ bool QLinuxFbScreen::connect(const QString &displaySpec)
+         setupOffScreen();
+ 
+     // Now read in palette
+-    if((vinfo.bits_per_pixel==8) || (vinfo.bits_per_pixel==4)) {
+-        screencols= (vinfo.bits_per_pixel==8) ? 256 : 16;
++    if((vinfo.bits_per_pixel==8) || (vinfo.bits_per_pixel==4) || (vinfo.bits_per_pixel==2)) {
++        screencols= 1 << vinfo.bits_per_pixel;
+         int loopc;
+         ::fb_cmap startcmap;
+         startcmap.start=0;
+-- 
+1.7.12
+
diff --git a/meta/recipes-qt/qt4/qt4-4.8.1/0001-Added-Openembedded-crossarch-option.patch b/meta/recipes-qt/qt4/qt4-4.8.1/0013-configure-add-crossarch-option.patch
similarity index 61%
rename from meta/recipes-qt/qt4/qt4-4.8.1/0001-Added-Openembedded-crossarch-option.patch
rename to meta/recipes-qt/qt4/qt4-4.8.1/0013-configure-add-crossarch-option.patch
index f302c5b..c1ec3b5 100644
--- a/meta/recipes-qt/qt4/qt4-4.8.1/0001-Added-Openembedded-crossarch-option.patch
+++ b/meta/recipes-qt/qt4/qt4-4.8.1/0013-configure-add-crossarch-option.patch
@@ -1,20 +1,20 @@
-From b1ba119f6a824dc01bd42ee00dba4a1653867b72 Mon Sep 17 00:00:00 2001
-From: Matthias Günther <matgnt@gmail.com>
-Date: Wed, 12 May 2010 16:52:45 +0200
-Subject: [PATCH 1/9] Added Openembedded "-crossarch" option
+From 8ddc1820a8678fda3a9bf3da4fc256c22fbd9b51 Mon Sep 17 00:00:00 2001
+From: Michael Lauer <mickey@vanille-media.de>
+Date: Wed, 26 Sep 2012 20:41:32 +0200
+Subject: [PATCH 13/22] configure: add "-crossarch" option
 
-Original Author: Michael Lauer <mickey@vanille-media.de>
 Upstream-Status: Pending
 
+Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
 ---
- configure |    7 ++++++-
- 1 files changed, 6 insertions(+), 1 deletions(-)
+ configure | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
 
 diff --git a/configure b/configure
-index facd192..9d15136 100755
+index 7028ecf..8eb138f 100755
 --- a/configure
 +++ b/configure
-@@ -954,7 +954,7 @@ while [ "$#" -gt 0 ]; do
+@@ -1059,7 +1059,7 @@ while [ "$#" -gt 0 ]; do
          shift
          VAL=$1
          ;;
@@ -23,9 +23,9 @@ index facd192..9d15136 100755
          VAR=`echo $1 | sed "s,^-\(.*\),\1,"`
          shift
          VAL="$1"
-@@ -1443,6 +1443,9 @@ while [ "$#" -gt 0 ]; do
-     xplatform)
-         XPLATFORM="$VAL"
+@@ -1601,6 +1601,9 @@ while [ "$#" -gt 0 ]; do
+         case "$XPLATFORM" in *symbian*) XPLATFORM_SYMBIAN=yes;; esac
+         case "$XPLATFORM" in symbian-sbsv2) XPLATFORM_SYMBIAN_SBSV2=yes;; esac
          ;;
 +	crossarch)
 +		CROSSARCH="$VAL"
@@ -33,9 +33,9 @@ index facd192..9d15136 100755
      debug-and-release)
          if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
              CFG_DEBUG_RELEASE="$VAL"
-@@ -2918,6 +2921,8 @@ elif [ "$PLATFORM_MAC" = "yes" ] || [ -z "$CFG_ARCH" ]; then
-     CFG_ARCH=$CFG_HOST_ARCH
- fi
+@@ -3200,6 +3203,8 @@ arm*)
+     ;;
+ esac
  
 +CFG_ARCH="$CROSSARCH"
 +
@@ -43,5 +43,5 @@ index facd192..9d15136 100755
      if [ "$OPT_VERBOSE" = "yes" ]; then
          echo "    '$CFG_ARCH' is supported"
 -- 
-1.7.0.4
+1.7.12
 
diff --git a/meta/recipes-qt/qt4/qt4-4.8.1/fix-translations.patch b/meta/recipes-qt/qt4/qt4-4.8.1/0014-translations-fix-phony-translation-linking-error.patch
similarity index 63%
rename from meta/recipes-qt/qt4/qt4-4.8.1/fix-translations.patch
rename to meta/recipes-qt/qt4/qt4-4.8.1/0014-translations-fix-phony-translation-linking-error.patch
index 906d4e3..b788a68 100644
--- a/meta/recipes-qt/qt4/qt4-4.8.1/fix-translations.patch
+++ b/meta/recipes-qt/qt4/qt4-4.8.1/0014-translations-fix-phony-translation-linking-error.patch
@@ -1,4 +1,7 @@
-fix phony translation linking error
+From 306e0987cfdc67db11abc7071c48b0d196e84c8e Mon Sep 17 00:00:00 2001
+From: Otavio Salvador <otavio@ossystems.com.br>
+Date: Wed, 26 Sep 2012 20:45:10 +0200
+Subject: [PATCH 14/22] translations: fix phony translation linking error
 
   | .../usr/lib/crt1.o: In function `_start':
   | .../../sysdeps/i386/elf/start.S:115: undefined reference to `main'
@@ -6,13 +9,16 @@ fix phony translation linking error
 
 Upstream-Status: Pending
 
-Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
+Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
+---
+ translations/translations.pro | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/translations/translations.pro b/translations/translations.pro
-index cdaf04a..24fa668 100644
+index dc99beb..0d98829 100644
 --- a/translations/translations.pro
 +++ b/translations/translations.pro
-@@ -20,7 +20,7 @@ updateqm.name = LRELEASE ${QMAKE_FILE_IN}
+@@ -101,7 +101,7 @@ updateqm.name = LRELEASE ${QMAKE_FILE_IN}
  updateqm.CONFIG += no_link
  QMAKE_EXTRA_COMPILERS += updateqm
  
@@ -21,7 +27,7 @@ index cdaf04a..24fa668 100644
      QMAKE_LINK = @: IGNORE THIS LINE
      OBJECTS_DIR =
      win32:CONFIG -= embed_manifest_exe
-@@ -30,7 +30,7 @@ isEmpty(vcproj) {
+@@ -111,7 +111,7 @@ isEmpty(vcproj) {
      phony_src.input = PHONY_DEPS
      phony_src.output = phony.c
      phony_src.variable_out = GENERATED_SOURCES
@@ -30,3 +36,6 @@ index cdaf04a..24fa668 100644
      phony_src.name = CREATE phony.c
      phony_src.CONFIG += combine
      QMAKE_EXTRA_COMPILERS += phony_src
+-- 
+1.7.12
+
diff --git a/meta/recipes-qt/qt4/qt4-4.8.1/add_nostrip_for_debug_packages.diff b/meta/recipes-qt/qt4/qt4-4.8.1/0015-configure-add-nostrip-for-debug-packages.patch
similarity index 57%
rename from meta/recipes-qt/qt4/qt4-4.8.1/add_nostrip_for_debug_packages.diff
rename to meta/recipes-qt/qt4/qt4-4.8.1/0015-configure-add-nostrip-for-debug-packages.patch
index 774cb99..027633d 100644
--- a/meta/recipes-qt/qt4/qt4-4.8.1/add_nostrip_for_debug_packages.diff
+++ b/meta/recipes-qt/qt4/qt4-4.8.1/0015-configure-add-nostrip-for-debug-packages.patch
@@ -1,4 +1,7 @@
-author: Fathi Boudra <fabo@debian.org>
+From c7ee6896f4894626986956cc8892a13fa9f7c2aa Mon Sep 17 00:00:00 2001
+From: Fathi Boudra <fabo@debian.org>
+Date: Wed, 26 Sep 2012 20:46:14 +0200
+Subject: [PATCH 15/22] configure: add nostrip for debug packages
 
 Qt is built in release mode and strip files by default.
 Set CONFIG+=nostrip to avoid the stripping and
@@ -6,13 +9,16 @@ let dh_strip do it to generate debug packages.
 
 Upstream-Status: Inappropriate [Configuration]
 
+Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
 ---
- configure |    2 ++
+ configure | 2 ++
  1 file changed, 2 insertions(+)
 
+diff --git a/configure b/configure
+index 8eb138f..5cc755e 100755
 --- a/configure
 +++ b/configure
-@@ -627,6 +627,8 @@ mkdir -p "$outpath/config.tests"
+@@ -631,6 +631,8 @@ mkdir -p "$outpath/config.tests"
  rm -f "$outpath/config.tests/.qmake.cache"
  cp "$QMAKE_VARS_FILE" "$outpath/config.tests/.qmake.cache"
  
@@ -21,3 +27,6 @@ Upstream-Status: Inappropriate [Configuration]
  QMakeVar add styles "cde mac motif plastique cleanlooks windows"
  QMakeVar add decorations "default windows styled"
  QMakeVar add mouse-drivers "pc"
+-- 
+1.7.12
+
diff --git a/meta/recipes-qt/qt4/qt4-4.8.1/qmake_cxx_eval.patch b/meta/recipes-qt/qt4/qt4-4.8.1/0016-configure-eval-QMAKE_CXX.patch
similarity index 60%
rename from meta/recipes-qt/qt4/qt4-4.8.1/qmake_cxx_eval.patch
rename to meta/recipes-qt/qt4/qt4-4.8.1/0016-configure-eval-QMAKE_CXX.patch
index d5eac6b..8b9b3bf 100644
--- a/meta/recipes-qt/qt4/qt4-4.8.1/qmake_cxx_eval.patch
+++ b/meta/recipes-qt/qt4/qt4-4.8.1/0016-configure-eval-QMAKE_CXX.patch
@@ -1,16 +1,25 @@
+From 3893ad264f85e4a0eec64017d515dddf9ee9ef88 Mon Sep 17 00:00:00 2001
+From: Paul Eggleton <paul.eggleton@linux.intel.com>
+Date: Wed, 26 Sep 2012 20:47:08 +0200
+Subject: [PATCH 16/22] configure: eval QMAKE_CXX
+
 Allow expansion of $(...) references in QMAKE_CXX (currently its value
 is $(OE_QMAKE_CXX)) in order to allow compiler version check to succeed
 which allows WebKit to be enabled.
 
-Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
-
 Upstream-Status: Pending
 
-Index: qt-everywhere-opensource-src-4.8.0/configure
-===================================================================
---- qt-everywhere-opensource-src-4.8.0.orig/configure
-+++ qt-everywhere-opensource-src-4.8.0/configure
-@@ -3322,7 +3322,8 @@ else
+Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
+Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
+---
+ configure | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/configure b/configure
+index 5cc755e..1e6c910 100755
+--- a/configure
++++ b/configure
+@@ -3329,7 +3329,8 @@ else
      CFG_FRAMEWORK=no
  fi
  
@@ -20,3 +29,6 @@ Index: qt-everywhere-opensource-src-4.8.0/configure
  TEST_COMPILER="$CXX"
  
  [ -z "$TEST_COMPILER" ] && TEST_COMPILER=$QMAKE_CONF_COMPILER
+-- 
+1.7.12
+
diff --git a/meta/recipes-qt/qt4/qt4-4.8.1/configure_oe_compiler.patch b/meta/recipes-qt/qt4/qt4-4.8.1/0017-configure-ensure-we-identify-the-compiler-as-g-in-co.patch
similarity index 60%
rename from meta/recipes-qt/qt4/qt4-4.8.1/configure_oe_compiler.patch
rename to meta/recipes-qt/qt4/qt4-4.8.1/0017-configure-ensure-we-identify-the-compiler-as-g-in-co.patch
index d455d0a..32649b4 100644
--- a/meta/recipes-qt/qt4/qt4-4.8.1/configure_oe_compiler.patch
+++ b/meta/recipes-qt/qt4/qt4-4.8.1/0017-configure-ensure-we-identify-the-compiler-as-g-in-co.patch
@@ -1,13 +1,19 @@
-Ensure we identify the compiler as g++ in configure
+From 965068125d1e83699442fca83f0c9fe05ecee564 Mon Sep 17 00:00:00 2001
+From: Paul Eggleton <paul.eggleton@linux.intel.com>
+Date: Wed, 26 Sep 2012 20:48:37 +0200
+Subject: [PATCH 17/22] configure: ensure we identify the compiler as g++ in
+ configure
 
 Our PLATFORM in OE is ${TARGET_OS}-oe-g++, and previously the configure
-script was interpreting from this that the compiler was "oe-g++" and thus
+script was interpreting from this that the compiler was "oe-g++" and
+thus
 g++ specific checks were not being run since this string did not match;
 among other things this resulted in a compiler version check in the
 QtWebKit build code not working, and hence the following error at build
 time:
 
-./wtf/NullPtr.h:48:1: error: identifier 'nullptr' will become a keyword in C++0x [-Werror=c++0x-compat]
+./wtf/NullPtr.h:48:1: error: identifier 'nullptr' will become a keyword
+in C++0x [-Werror=c++0x-compat]
 
 The easiest thing since our PLATFORM is entirely artificial is to just
 force COMPILER to "g++" in the configure script if it is detected as
@@ -16,10 +22,16 @@ force COMPILER to "g++" in the configure script if it is detected as
 Upstream-Status: Inappropriate [configuration]
 
 Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
+Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
+---
+ configure | 3 +++
+ 1 file changed, 3 insertions(+)
 
---- qt-everywhere-opensource-src-4.8.0.orig/configure
-+++ qt-everywhere-opensource-src-4.8.0/configure
-@@ -7444,6 +7444,9 @@ elif [ "$XPLATFORM" != "$PLATFORM" ]; th
+diff --git a/configure b/configure
+index 1e6c910..0edaad9 100755
+--- a/configure
++++ b/configure
+@@ -7444,6 +7444,9 @@ elif [ "$XPLATFORM" != "$PLATFORM" ]; then
  else
      COMPILER=`echo $PLATFORM | cut -f 2- -d-`
  fi
@@ -29,3 +41,6 @@ Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
  if [ "$CFG_EXCEPTIONS" = "unspecified" -a "$PLATFORM_QWS" = "yes" ]; then
      CFG_EXCEPTIONS=no
  fi
+-- 
+1.7.12
+
diff --git a/meta/recipes-qt/qt4/qt4-4.8.1/pulseaudio-config.patch b/meta/recipes-qt/qt4/qt4-4.8.1/0018-configure-make-pulseaudio-a-configurable-option.patch
similarity index 85%
rename from meta/recipes-qt/qt4/qt4-4.8.1/pulseaudio-config.patch
rename to meta/recipes-qt/qt4/qt4-4.8.1/0018-configure-make-pulseaudio-a-configurable-option.patch
index 0992efa..4d91560 100644
--- a/meta/recipes-qt/qt4/qt4-4.8.1/pulseaudio-config.patch
+++ b/meta/recipes-qt/qt4/qt4-4.8.1/0018-configure-make-pulseaudio-a-configurable-option.patch
@@ -1,7 +1,7 @@
-From 677f5b4bec03972c8cada19d2e4530252c9ac4ef Mon Sep 17 00:00:00 2001
+From d93ea994bf2ecee4775c68de645eac0cab248ac2 Mon Sep 17 00:00:00 2001
 From: Paul Eggleton <paul.eggleton@linux.intel.com>
 Date: Tue, 28 Feb 2012 15:10:24 +0000
-Subject: [PATCH] configure: make pulseaudio a configurable option
+Subject: [PATCH 18/22] configure: make pulseaudio a configurable option
 
 Allows disabling pulseaudio support within phonon at configure time.
 (This is the Qt 4.8.0 version.)
@@ -9,15 +9,16 @@ Allows disabling pulseaudio support within phonon at configure time.
 Upstream-Status: Pending
 
 Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
+Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
 ---
- configure |    9 ++++++++-
- 1 files changed, 8 insertions(+), 1 deletions(-)
+ configure | 9 ++++++++-
+ 1 file changed, 8 insertions(+), 1 deletion(-)
 
 diff --git a/configure b/configure
-index 5a5ef1d..e43b920 100755
+index 0edaad9..3a63734 100755
 --- a/configure
 +++ b/configure
-@@ -1043,7 +1043,7 @@ while [ "$#" -gt 0 ]; do
+@@ -1045,7 +1045,7 @@ while [ "$#" -gt 0 ]; do
          VAL=no
          ;;
      #Qt style yes options
@@ -26,7 +27,7 @@ index 5a5ef1d..e43b920 100755
          VAR=`echo $1 | sed "s,^-\(.*\),\1,"`
          VAL=yes
          ;;
-@@ -2000,6 +2000,13 @@ while [ "$#" -gt 0 ]; do
+@@ -2005,6 +2005,13 @@ while [ "$#" -gt 0 ]; do
              UNKNOWN_OPT=yes
          fi
          ;;
@@ -41,5 +42,5 @@ index 5a5ef1d..e43b920 100755
          if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
              CFG_QGTKSTYLE="$VAL"
 -- 
-1.7.5.4
+1.7.12
 
diff --git a/meta/recipes-qt/qt4/qt4-4.8.1/gcc47-fix.patch b/meta/recipes-qt/qt4/qt4-4.8.1/0019-javascriptcore-Fix-compile-error-when-using-toolchai.patch
similarity index 46%
rename from meta/recipes-qt/qt4/qt4-4.8.1/gcc47-fix.patch
rename to meta/recipes-qt/qt4/qt4-4.8.1/0019-javascriptcore-Fix-compile-error-when-using-toolchai.patch
index 47618cf..13229d4 100644
--- a/meta/recipes-qt/qt4/qt4-4.8.1/gcc47-fix.patch
+++ b/meta/recipes-qt/qt4/qt4-4.8.1/0019-javascriptcore-Fix-compile-error-when-using-toolchai.patch
@@ -1,13 +1,21 @@
-Fix compile error when using toolchains based on GCC 4.7.
+From 4811267206e20e5409df0500c02d7fe77caf5293 Mon Sep 17 00:00:00 2001
+From: Ken Werner <ken.werner@linaro.org>
+Date: Wed, 26 Sep 2012 20:53:35 +0200
+Subject: [PATCH 19/22] javascriptcore: Fix compile error when using
+ toolchains based on GCC 4.7.
 
 Upstream-Status: Pending
 
-Signed-off-by: Ken Werner <ken.werner@linaro.org>
+Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
+---
+ src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSGlobalObject.h   | 4 +---
+ .../javascriptcore/JavaScriptCore/runtime/JSStaticScopeObject.h       | 3 +--
+ 2 files changed, 2 insertions(+), 5 deletions(-)
 
-Index: qt-everywhere-opensource-src-4.8.0/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSGlobalObject.h
-===================================================================
---- qt-everywhere-opensource-src-4.8.0.orig/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSGlobalObject.h
-+++ qt-everywhere-opensource-src-4.8.0/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSGlobalObject.h
+diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSGlobalObject.h b/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSGlobalObject.h
+index 7c20272..917c0ff 100644
+--- a/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSGlobalObject.h
++++ b/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSGlobalObject.h
 @@ -57,9 +57,7 @@ namespace JSC {
      
      class JSGlobalObject : public JSVariableObject {
@@ -19,10 +27,10 @@ Index: qt-everywhere-opensource-src-4.8.0/src/3rdparty/javascriptcore/JavaScript
              // We use an explicit destructor function pointer instead of a
              // virtual destructor because we want to avoid adding a vtable
              // pointer to this struct. Adding a vtable pointer would force the
-Index: qt-everywhere-opensource-src-4.8.0/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSStaticScopeObject.h
-===================================================================
---- qt-everywhere-opensource-src-4.8.0.orig/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSStaticScopeObject.h
-+++ qt-everywhere-opensource-src-4.8.0/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSStaticScopeObject.h
+diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSStaticScopeObject.h b/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSStaticScopeObject.h
+index 2542878..637f62c 100644
+--- a/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSStaticScopeObject.h
++++ b/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSStaticScopeObject.h
 @@ -32,8 +32,7 @@ namespace JSC{
      
      class JSStaticScopeObject : public JSVariableObject {
@@ -33,3 +41,6 @@ Index: qt-everywhere-opensource-src-4.8.0/src/3rdparty/javascriptcore/JavaScript
              JSStaticScopeObjectData()
                  : JSVariableObjectData(&symbolTable, &registerStore + 1)
              {
+-- 
+1.7.12
+
diff --git a/meta/recipes-qt/qt4/qt4-4.8.1/gcc47-fix2.patch b/meta/recipes-qt/qt4/qt4-4.8.1/0020-Fixes-for-gcc-4.7.0-particularly-on-qemux86.patch
similarity index 46%
rename from meta/recipes-qt/qt4/qt4-4.8.1/gcc47-fix2.patch
rename to meta/recipes-qt/qt4/qt4-4.8.1/0020-Fixes-for-gcc-4.7.0-particularly-on-qemux86.patch
index 09513b6..b763ac1 100644
--- a/meta/recipes-qt/qt4/qt4-4.8.1/gcc47-fix2.patch
+++ b/meta/recipes-qt/qt4/qt4-4.8.1/0020-Fixes-for-gcc-4.7.0-particularly-on-qemux86.patch
@@ -1,4 +1,7 @@
-Fixes for gcc 4.7.0, particularly on qemux86
+From fb89f23c25363ac7b138fdba2bf5a9cdcaa7e840 Mon Sep 17 00:00:00 2001
+From: Richard Purdie <richard.purdie@linuxfoundation.org>
+Date: Wed, 26 Sep 2012 20:54:38 +0200
+Subject: [PATCH 20/22] Fixes for gcc 4.7.0, particularly on qemux86
 
 Origin: upstream, http://trac.webkit.org/changeset/93631
 Origin: upstream, http://trac.webkit.org/changeset/113848
@@ -10,11 +13,18 @@ RP 2012/04/30
 
 Upstream-Status: Backport
 
-Index: qt-everywhere-opensource-src-4.8.1/src/3rdparty/webkit/Source/WebCore/dom/Element.cpp
-===================================================================
---- qt-everywhere-opensource-src-4.8.1.orig/src/3rdparty/webkit/Source/WebCore/dom/Element.cpp	2012-04-30 09:15:17.000000000 +0000
-+++ qt-everywhere-opensource-src-4.8.1/src/3rdparty/webkit/Source/WebCore/dom/Element.cpp	2012-04-30 09:22:04.586008994 +0000
-@@ -1080,7 +1080,7 @@
+Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
+---
+ src/3rdparty/webkit/Source/WebCore/dom/Element.cpp                      | 2 +-
+ src/3rdparty/webkit/Source/WebCore/html/HTMLImageElement.cpp            | 2 +-
+ .../webkit/Source/WebCore/platform/graphics/TiledBackingStoreClient.h   | 1 +
+ 3 files changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/src/3rdparty/webkit/Source/WebCore/dom/Element.cpp b/src/3rdparty/webkit/Source/WebCore/dom/Element.cpp
+index 32e47ca..b8e7389 100644
+--- a/src/3rdparty/webkit/Source/WebCore/dom/Element.cpp
++++ b/src/3rdparty/webkit/Source/WebCore/dom/Element.cpp
+@@ -1080,7 +1080,7 @@ void Element::recalcStyle(StyleChange change)
  {
      // Ref currentStyle in case it would otherwise be deleted when setRenderStyle() is called.
      RefPtr<RenderStyle> currentStyle(renderStyle());
@@ -23,11 +33,11 @@ Index: qt-everywhere-opensource-src-4.8.1/src/3rdparty/webkit/Source/WebCore/dom
      bool hasDirectAdjacentRules = currentStyle && currentStyle->childrenAffectedByDirectAdjacentRules();
      bool hasIndirectAdjacentRules = currentStyle && currentStyle->childrenAffectedByForwardPositionalRules();
  
-Index: qt-everywhere-opensource-src-4.8.1/src/3rdparty/webkit/Source/WebCore/html/HTMLImageElement.cpp
-===================================================================
---- qt-everywhere-opensource-src-4.8.1.orig/src/3rdparty/webkit/Source/WebCore/html/HTMLImageElement.cpp	2012-03-14 14:01:19.000000000 +0000
-+++ qt-everywhere-opensource-src-4.8.1/src/3rdparty/webkit/Source/WebCore/html/HTMLImageElement.cpp	2012-04-30 09:22:04.586008994 +0000
-@@ -74,7 +74,7 @@
+diff --git a/src/3rdparty/webkit/Source/WebCore/html/HTMLImageElement.cpp b/src/3rdparty/webkit/Source/WebCore/html/HTMLImageElement.cpp
+index d66075e..ab8f111 100644
+--- a/src/3rdparty/webkit/Source/WebCore/html/HTMLImageElement.cpp
++++ b/src/3rdparty/webkit/Source/WebCore/html/HTMLImageElement.cpp
+@@ -74,7 +74,7 @@ PassRefPtr<HTMLImageElement> HTMLImageElement::createForJSConstructor(Document*
      RefPtr<HTMLImageElement> image = adoptRef(new HTMLImageElement(imgTag, document));
      if (optionalWidth)
          image->setWidth(*optionalWidth);
@@ -36,11 +46,11 @@ Index: qt-everywhere-opensource-src-4.8.1/src/3rdparty/webkit/Source/WebCore/htm
          image->setHeight(*optionalHeight);
      return image.release();
  }
-Index: qt-everywhere-opensource-src-4.8.1/src/3rdparty/webkit/Source/WebCore/platform/graphics/TiledBackingStoreClient.h
-===================================================================
---- qt-everywhere-opensource-src-4.8.1.orig/src/3rdparty/webkit/Source/WebCore/platform/graphics/TiledBackingStoreClient.h	2012-03-14 14:01:24.000000000 +0000
-+++ qt-everywhere-opensource-src-4.8.1/src/3rdparty/webkit/Source/WebCore/platform/graphics/TiledBackingStoreClient.h	2012-04-30 09:22:04.590008963 +0000
-@@ -25,6 +25,7 @@
+diff --git a/src/3rdparty/webkit/Source/WebCore/platform/graphics/TiledBackingStoreClient.h b/src/3rdparty/webkit/Source/WebCore/platform/graphics/TiledBackingStoreClient.h
+index 6087ec3..6d748f6 100644
+--- a/src/3rdparty/webkit/Source/WebCore/platform/graphics/TiledBackingStoreClient.h
++++ b/src/3rdparty/webkit/Source/WebCore/platform/graphics/TiledBackingStoreClient.h
+@@ -25,6 +25,7 @@ namespace WebCore {
  #if ENABLE(TILED_BACKING_STORE)
  class TiledBackingStoreClient {
  public:
@@ -48,3 +58,6 @@ Index: qt-everywhere-opensource-src-4.8.1/src/3rdparty/webkit/Source/WebCore/pla
      virtual void tiledBackingStorePaintBegin() = 0;
      virtual void tiledBackingStorePaint(GraphicsContext*, const IntRect&) = 0;
      virtual void tiledBackingStorePaintEnd(const Vector<IntRect>& paintedArea) = 0;
+-- 
+1.7.12
+
diff --git a/meta/recipes-qt/qt4/qt4-4.8.1/disable-fuse-gold-flag.patch b/meta/recipes-qt/qt4/qt4-4.8.1/0021-webkit-disable-the-fuse-ld-gold-flag.patch
similarity index 46%
rename from meta/recipes-qt/qt4/qt4-4.8.1/disable-fuse-gold-flag.patch
rename to meta/recipes-qt/qt4/qt4-4.8.1/0021-webkit-disable-the-fuse-ld-gold-flag.patch
index 6efbaf5..05dc806 100644
--- a/meta/recipes-qt/qt4/qt4-4.8.1/disable-fuse-gold-flag.patch
+++ b/meta/recipes-qt/qt4/qt4-4.8.1/0021-webkit-disable-the-fuse-ld-gold-flag.patch
@@ -1,14 +1,22 @@
-Disable the -fuse-ld=gold flag. This option is a Debian/Ubuntu specific
-extension to the g++ and causes upstream GCC to throw an error.
+From 3a74f5cf7f92ff6bf6b69c7cf76f54516573abb7 Mon Sep 17 00:00:00 2001
+From: Ken Werner <ken.werner@linaro.org>
+Date: Wed, 26 Sep 2012 20:55:21 +0200
+Subject: [PATCH 21/22] webkit: disable the -fuse-ld=gold flag
+
+This option is a Debian/Ubuntu specific extension to the g++ and causes upstream GCC to throw an error.
 
 Upstream-Status: Pending
 
 Signed-off-by: Ken Werner <ken.werner@linaro.org>
+Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
+---
+ src/3rdparty/webkit/Source/common.pri | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
 
-Index: qt-everywhere-opensource-src-4.8.0/src/3rdparty/webkit/Source/common.pri
-===================================================================
---- qt-everywhere-opensource-src-4.8.0.orig/src/3rdparty/webkit/Source/common.pri
-+++ qt-everywhere-opensource-src-4.8.0/src/3rdparty/webkit/Source/common.pri
+diff --git a/src/3rdparty/webkit/Source/common.pri b/src/3rdparty/webkit/Source/common.pri
+index 0f62e14..d81a1f0 100644
+--- a/src/3rdparty/webkit/Source/common.pri
++++ b/src/3rdparty/webkit/Source/common.pri
 @@ -3,12 +3,12 @@
  contains(JAVASCRIPTCORE_JIT,yes): DEFINES+=ENABLE_JIT=1
  contains(JAVASCRIPTCORE_JIT,no): DEFINES+=ENABLE_JIT=0
@@ -28,3 +36,6 @@ Index: qt-everywhere-opensource-src-4.8.0/src/3rdparty/webkit/Source/common.pri
  
  # We use this flag on production branches
  # See https://bugs.webkit.org/show_bug.cgi?id=60824
+-- 
+1.7.12
+
diff --git a/meta/recipes-qt/qt4/qt4-4.8.1/fix_conflicting_types.patch b/meta/recipes-qt/qt4/qt4-4.8.1/0022-webkit-fix-conflicting-types.patch
similarity index 42%
rename from meta/recipes-qt/qt4/qt4-4.8.1/fix_conflicting_types.patch
rename to meta/recipes-qt/qt4/qt4-4.8.1/0022-webkit-fix-conflicting-types.patch
index 8124505..bdd5d4f 100644
--- a/meta/recipes-qt/qt4/qt4-4.8.1/fix_conflicting_types.patch
+++ b/meta/recipes-qt/qt4/qt4-4.8.1/0022-webkit-fix-conflicting-types.patch
@@ -1,23 +1,30 @@
-Upstream-Status: Pending
+From 5cc08e33ea7ab5d32b6a14ccb23a366d56e50ea1 Mon Sep 17 00:00:00 2001
+From: Nitin A Kamble <nitin.a.kamble@intel.com>
+Date: Wed, 26 Sep 2012 20:56:33 +0200
+Subject: [PATCH 22/22] webkit: fix conflicting types
 
 This patch fixes the type mismatch fixing this compile issue:
 
-| /srv/home/nitin/builds/build-gcc47/tmp/sysroots/qemux86/usr/include/glib-2.0/glib/gthread.h:58:7: error: 'union' tag used in naming 'struct _GMutex' [-Werror=permissive]
+|
+/srv/home/nitin/builds/build-gcc47/tmp/sysroots/qemux86/usr/include/glib-2.0/glib/gthread.h:58:7:
+error: 'union' tag used in naming 'struct _GMutex' [-Werror=permissive]
 | In file included from ./wtf/Platform.h:1217:0,
 |                  from ./config.h:30,
 |                  from wtf/gobject/GOwnPtr.cpp:19:
-| wtf/gobject/GTypedefs.h:55:16: note: 'struct _GMutex' was previously declared here
-NOTE: package qt4-x11-free-4.8.1-r41.1: task do_compile: Failed
-
+| wtf/gobject/GTypedefs.h:55:16: note: 'struct _GMutex' was previously
+declared here
 
-Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com>
-2012/04/30
+Upstream-Status: Pending
 
+Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
+---
+ src/3rdparty/webkit/Source/JavaScriptCore/wtf/gobject/GTypedefs.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
-Index:  qt-everywhere-opensource-src-4.8.1/src/3rdparty/webkit/Source/JavaScriptCore/wtf/gobject/GTypedefs.h
-===================================================================
---- qt-everywhere-opensource-src-4.8.1/src/3rdparty.orig/webkit/Source/JavaScriptCore/wtf/gobject/GTypedefs.h
-+++ qt-everywhere-opensource-src-4.8.1/src/3rdparty/webkit/Source/JavaScriptCore/wtf/gobject/GTypedefs.h
+diff --git a/src/3rdparty/webkit/Source/JavaScriptCore/wtf/gobject/GTypedefs.h b/src/3rdparty/webkit/Source/JavaScriptCore/wtf/gobject/GTypedefs.h
+index c7f7ac4..f00e9cf 100644
+--- a/src/3rdparty/webkit/Source/JavaScriptCore/wtf/gobject/GTypedefs.h
++++ b/src/3rdparty/webkit/Source/JavaScriptCore/wtf/gobject/GTypedefs.h
 @@ -52,7 +52,7 @@ typedef struct _GFile GFile;
  typedef struct _GHashTable GHashTable;
  typedef struct _GInputStream GInputStream;
@@ -27,3 +34,6 @@ Index:  qt-everywhere-opensource-src-4.8.1/src/3rdparty/webkit/Source/JavaScript
  typedef struct _GPatternSpec GPatternSpec;
  typedef struct _GPollableOutputStream GPollableOutputStream;
  typedef struct _GSocketClient GSocketClient;
+-- 
+1.7.12
+
diff --git a/meta/recipes-qt/qt4/qt4-native.inc b/meta/recipes-qt/qt4/qt4-native.inc
index 492a700..9500d4b 100644
--- a/meta/recipes-qt/qt4/qt4-native.inc
+++ b/meta/recipes-qt/qt4/qt4-native.inc
@@ -14,11 +14,11 @@ INC_PR = "r16"
 inherit native
 
 SRC_URI = "http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-${PV}.tar.gz \
-           file://qt-config.patch \
+           file://0001-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch \
+           file://0002-qkbdtty_qws-fix-build-with-old-kernel-headers.patch \
+           file://0003-webkit2-set-OUTPUT_DIR-value-if-empty.patch \
            file://g++.conf \
            file://linux.conf \
-           file://fix_qkbdtty_qws.patch \
-           file://set-OUTPUT_DIR-if-empty.patch \
 	"
 S = "${WORKDIR}/qt-everywhere-opensource-src-${PV}"
 
-- 
1.7.12

[PATCH 09/10] qt4: PR bumps

[Martin Jansa]

* sofar only formal changes, but to test that everything still builds the same

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta/recipes-qt/qt4/nativesdk-qt4-tools.inc | 2 +-
 meta/recipes-qt/qt4/qt-mobility_1.2.0.inc   | 2 +-
 meta/recipes-qt/qt4/qt4-embedded.inc        | 2 +-
 meta/recipes-qt/qt4/qt4-native.inc          | 2 +-
 meta/recipes-qt/qt4/qt4-x11-free.inc        | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/meta/recipes-qt/qt4/nativesdk-qt4-tools.inc b/meta/recipes-qt/qt4/nativesdk-qt4-tools.inc
index 2330853..1199a8a 100644
--- a/meta/recipes-qt/qt4/nativesdk-qt4-tools.inc
+++ b/meta/recipes-qt/qt4/nativesdk-qt4-tools.inc
@@ -4,7 +4,7 @@ SECTION = "libs"
 HOMEPAGE = "http://qt.nokia.com"
 LICENSE = "LGPLv2.1 | GPLv3"
 
-INC_PR = "r11"
+INC_PR = "r12"
 
 FILESEXTRAPATHS =. "${FILE_DIRNAME}/qt4-${PV}:"
 
diff --git a/meta/recipes-qt/qt4/qt-mobility_1.2.0.inc b/meta/recipes-qt/qt4/qt-mobility_1.2.0.inc
index 3dc12af..7778630 100644
--- a/meta/recipes-qt/qt4/qt-mobility_1.2.0.inc
+++ b/meta/recipes-qt/qt4/qt-mobility_1.2.0.inc
@@ -17,7 +17,7 @@ SRC_URI = "http://get.qt.nokia.com/qt/add-ons/qt-mobility-opensource-src-${PV}.t
 SRC_URI[md5sum]="ea5db5a8d3dd4709c2926dceda646bd8"
 SRC_URI[sha256sum]="ee3c88975e04139ac9589f76d4be646d44fcbc4c8c1cf2db621abc154cf0ba44"
 
-PR = "r6"
+PR = "r7"
 
 S = "${WORKDIR}/qt-mobility-opensource-src-${PV}"
 
diff --git a/meta/recipes-qt/qt4/qt4-embedded.inc b/meta/recipes-qt/qt4/qt4-embedded.inc
index 53eb652..c060634 100644
--- a/meta/recipes-qt/qt4/qt4-embedded.inc
+++ b/meta/recipes-qt/qt4/qt4-embedded.inc
@@ -2,7 +2,7 @@ DESCRIPTION = "Qt is a versatile cross-platform application framework -- this is
 SECTION = "libs"
 HOMEPAGE = "http://qt.nokia.com"
 DEPENDS += "directfb tslib"
-INC_PR = "r48"
+INC_PR = "r49"
 
 QT_BASE_LIB  ?= "libqt-embedded"
 
diff --git a/meta/recipes-qt/qt4/qt4-native.inc b/meta/recipes-qt/qt4/qt4-native.inc
index 9500d4b..5f0fce1 100644
--- a/meta/recipes-qt/qt4/qt4-native.inc
+++ b/meta/recipes-qt/qt4/qt4-native.inc
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=fbc093901857fcd118f065f900982c24 \
                     file://LICENSE.GPL3;md5=babc5b6b77441da277f5c06b2e547720 \
                     file://LGPL_EXCEPTION.txt;md5=411080a56ff917a5a1aa08c98acae354"
 
-INC_PR = "r16"
+INC_PR = "r17"
 
 inherit native
 
diff --git a/meta/recipes-qt/qt4/qt4-x11-free.inc b/meta/recipes-qt/qt4/qt4-x11-free.inc
index 0ae74f7..68b3078 100644
--- a/meta/recipes-qt/qt4/qt4-x11-free.inc
+++ b/meta/recipes-qt/qt4/qt4-x11-free.inc
@@ -6,7 +6,7 @@ SECTION = "x11/libs"
 DEPENDS += "virtual/libgl virtual/libx11 fontconfig libxft libxext libxrender libxrandr libxcursor"
 PROVIDES += "qt4-x11"
 
-INC_PR = "r46"
+INC_PR = "r47"
 
 QT_GLFLAGS ?= "${@base_contains('DISTRO_FEATURES', 'opengl', '-opengl', '-no-opengl', d)} "
 QT_GLFLAGS_qemux86 = "-opengl"
-- 
1.7.12

[PATCH 10/10] qt4: upgrade to 4.8.3

[Martin Jansa]

* rebased patches, 3 patches are resolved upstream:
  0016-configure-eval-QMAKE_CXX.patch
    resolved in upstream commit 68c7f80a672e1d6d2710e49548a7c83b105d8d5f
  0019-javascriptcore-Fix-compile-error-when-using-toolchai.patch
    resolved in upstream commit 7ac8d8597db1f58b11338f91fb27f6ad8696b34b
  0022-webkit-fix-conflicting-types.patch
    resolved in upstream commit929b4443d53fcf3a7ad1cb9f3af5569e41ef56f1

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 ...tools_4.8.1.bb => nativesdk-qt4-tools_4.8.3.bb} |  6 +--
 .../qt4-4.8.1/0016-configure-eval-QMAKE_CXX.patch  | 34 ----------------
 ...ore-Fix-compile-error-when-using-toolchai.patch | 46 ----------------------
 .../0022-webkit-fix-conflicting-types.patch        | 39 ------------------
 .../qt4/{qt4-4.8.1.inc => qt4-4.8.3.inc}           | 15 +++----
 ...o-allow-to-set-qt.conf-from-the-outside-u.patch |  6 +--
 ...tty_qws-fix-build-with-old-kernel-headers.patch |  6 +--
 ...003-webkit2-set-OUTPUT_DIR-value-if-empty.patch |  4 +-
 ...make-is-already-built-in-qt4-tools-native.patch |  8 ++--
 ...e-set-LFLAGS-to-pick-up-zlib-from-staging.patch |  8 ++--
 ...se-OE_QMAKE_-values-to-specify-Qt-utility.patch |  8 ++--
 ...-const-usage-that-causes-compile-failure-.patch |  6 +--
 ...llow-building-a-separate-qmake-for-the-ta.patch |  4 +-
 ...e-fix-source-file-references-in-qmake.pri.patch |  6 +--
 ...ack-to-not-use-the-pg_config-of-the-host-.patch |  8 ++--
 .../0011-freetype-host-includes.patch              |  4 +-
 .../0012-Add-2bpp-support.patch                    | 14 +++----
 .../0013-configure-add-crossarch-option.patch      | 20 +++++-----
 ...tions-fix-phony-translation-linking-error.patch |  4 +-
 ...-configure-add-nostrip-for-debug-packages.patch |  8 ++--
 ...sure-we-identify-the-compiler-as-g-in-co.patch} |  8 ++--
 ...re-make-pulseaudio-a-configurable-option.patch} | 10 ++---
 ...es-for-gcc-4.7.0-particularly-on-qemux86.patch} |  4 +-
 ...019-webkit-disable-the-fuse-ld-gold-flag.patch} |  4 +-
 .../qt4/{qt4-4.8.1 => qt4-4.8.3}/g++.conf          |  0
 .../qt4/{qt4-4.8.1 => qt4-4.8.3}/linux.conf        |  0
 .../recipes-qt/qt4/{qt4-4.8.1 => qt4-4.8.3}/qte.sh |  0
 ...qt4-embedded_4.8.1.bb => qt4-embedded_4.8.3.bb} |  2 +-
 meta/recipes-qt/qt4/qt4-native_4.8.1.bb            | 12 ------
 meta/recipes-qt/qt4/qt4-native_4.8.3.bb            |  8 ++++
 ...qt4-x11-free_4.8.1.bb => qt4-x11-free_4.8.3.bb} |  2 +-
 31 files changed, 89 insertions(+), 215 deletions(-)
 rename meta/recipes-qt/qt4/{nativesdk-qt4-tools_4.8.1.bb => nativesdk-qt4-tools_4.8.3.bb} (41%)
 delete mode 100644 meta/recipes-qt/qt4/qt4-4.8.1/0016-configure-eval-QMAKE_CXX.patch
 delete mode 100644 meta/recipes-qt/qt4/qt4-4.8.1/0019-javascriptcore-Fix-compile-error-when-using-toolchai.patch
 delete mode 100644 meta/recipes-qt/qt4/qt4-4.8.1/0022-webkit-fix-conflicting-types.patch
 rename meta/recipes-qt/qt4/{qt4-4.8.1.inc => qt4-4.8.3.inc} (79%)
 rename meta/recipes-qt/qt4/{qt4-4.8.1 => qt4-4.8.3}/0001-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch (88%)
 rename meta/recipes-qt/qt4/{qt4-4.8.1 => qt4-4.8.3}/0002-qkbdtty_qws-fix-build-with-old-kernel-headers.patch (89%)
 rename meta/recipes-qt/qt4/{qt4-4.8.1 => qt4-4.8.3}/0003-webkit2-set-OUTPUT_DIR-value-if-empty.patch (90%)
 rename meta/recipes-qt/qt4/{qt4-4.8.1 => qt4-4.8.3}/0004-configure-qmake-is-already-built-in-qt4-tools-native.patch (73%)
 rename meta/recipes-qt/qt4/{qt4-4.8.1 => qt4-4.8.3}/0005-configure-set-LFLAGS-to-pick-up-zlib-from-staging.patch (80%)
 rename meta/recipes-qt/qt4/{qt4-4.8.1 => qt4-4.8.3}/0006-configure-Use-OE_QMAKE_-values-to-specify-Qt-utility.patch (83%)
 rename meta/recipes-qt/qt4/{qt4-4.8.1 => qt4-4.8.3}/0007-dbus-Remove-const-usage-that-causes-compile-failure-.patch (87%)
 rename meta/recipes-qt/qt4/{qt4-4.8.1 => qt4-4.8.3}/0008-qmake.pro-Allow-building-a-separate-qmake-for-the-ta.patch (83%)
 rename meta/recipes-qt/qt4/{qt4-4.8.1 => qt4-4.8.3}/0009-qmake-fix-source-file-references-in-qmake.pri.patch (91%)
 rename meta/recipes-qt/qt4/{qt4-4.8.1 => qt4-4.8.3}/0010-configure-Hack-to-not-use-the-pg_config-of-the-host-.patch (87%)
 rename meta/recipes-qt/qt4/{qt4-4.8.1 => qt4-4.8.3}/0011-freetype-host-includes.patch (89%)
 rename meta/recipes-qt/qt4/{qt4-4.8.1 => qt4-4.8.3}/0012-Add-2bpp-support.patch (97%)
 rename meta/recipes-qt/qt4/{qt4-4.8.1 => qt4-4.8.3}/0013-configure-add-crossarch-option.patch (63%)
 rename meta/recipes-qt/qt4/{qt4-4.8.1 => qt4-4.8.3}/0014-translations-fix-phony-translation-linking-error.patch (90%)
 rename meta/recipes-qt/qt4/{qt4-4.8.1 => qt4-4.8.3}/0015-configure-add-nostrip-for-debug-packages.patch (78%)
 rename meta/recipes-qt/qt4/{qt4-4.8.1/0017-configure-ensure-we-identify-the-compiler-as-g-in-co.patch => qt4-4.8.3/0016-configure-ensure-we-identify-the-compiler-as-g-in-co.patch} (84%)
 rename meta/recipes-qt/qt4/{qt4-4.8.1/0018-configure-make-pulseaudio-a-configurable-option.patch => qt4-4.8.3/0017-configure-make-pulseaudio-a-configurable-option.patch} (90%)
 rename meta/recipes-qt/qt4/{qt4-4.8.1/0020-Fixes-for-gcc-4.7.0-particularly-on-qemux86.patch => qt4-4.8.3/0018-Fixes-for-gcc-4.7.0-particularly-on-qemux86.patch} (96%)
 rename meta/recipes-qt/qt4/{qt4-4.8.1/0021-webkit-disable-the-fuse-ld-gold-flag.patch => qt4-4.8.3/0019-webkit-disable-the-fuse-ld-gold-flag.patch} (90%)
 rename meta/recipes-qt/qt4/{qt4-4.8.1 => qt4-4.8.3}/g++.conf (100%)
 rename meta/recipes-qt/qt4/{qt4-4.8.1 => qt4-4.8.3}/linux.conf (100%)
 rename meta/recipes-qt/qt4/{qt4-4.8.1 => qt4-4.8.3}/qte.sh (100%)
 rename meta/recipes-qt/qt4/{qt4-embedded_4.8.1.bb => qt4-embedded_4.8.3.bb} (87%)
 delete mode 100644 meta/recipes-qt/qt4/qt4-native_4.8.1.bb
 create mode 100644 meta/recipes-qt/qt4/qt4-native_4.8.3.bb
 rename meta/recipes-qt/qt4/{qt4-x11-free_4.8.1.bb => qt4-x11-free_4.8.3.bb} (88%)

diff --git a/meta/recipes-qt/qt4/nativesdk-qt4-tools_4.8.1.bb b/meta/recipes-qt/qt4/nativesdk-qt4-tools_4.8.3.bb
similarity index 41%
rename from meta/recipes-qt/qt4/nativesdk-qt4-tools_4.8.1.bb
rename to meta/recipes-qt/qt4/nativesdk-qt4-tools_4.8.3.bb
index 6d9800d..51afe13 100644
--- a/meta/recipes-qt/qt4/nativesdk-qt4-tools_4.8.1.bb
+++ b/meta/recipes-qt/qt4/nativesdk-qt4-tools_4.8.3.bb
@@ -1,8 +1,8 @@
 require nativesdk-qt4-tools.inc
 
-PR = "${INC_PR}.1"
+PR = "${INC_PR}.0"
 
 SRC_URI += "file://0009-qmake-fix-source-file-references-in-qmake.pri.patch"
 
-SRC_URI[md5sum] = "7960ba8e18ca31f0c6e4895a312f92ff"
-SRC_URI[sha256sum] = "ef851a36aa41b4ad7a3e4c96ca27eaed2a629a6d2fa06c20f072118caed87ae8"
+SRC_URI[md5sum] = "a663b6c875f8d7caa8ac9c30e4a4ec3b"
+SRC_URI[sha256sum] = "f1f72974f924861be04019f49f07cd43ab3c95056db2ba8f34b283487cccc728"
diff --git a/meta/recipes-qt/qt4/qt4-4.8.1/0016-configure-eval-QMAKE_CXX.patch b/meta/recipes-qt/qt4/qt4-4.8.1/0016-configure-eval-QMAKE_CXX.patch
deleted file mode 100644
index 8b9b3bf..0000000
--- a/meta/recipes-qt/qt4/qt4-4.8.1/0016-configure-eval-QMAKE_CXX.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 3893ad264f85e4a0eec64017d515dddf9ee9ef88 Mon Sep 17 00:00:00 2001
-From: Paul Eggleton <paul.eggleton@linux.intel.com>
-Date: Wed, 26 Sep 2012 20:47:08 +0200
-Subject: [PATCH 16/22] configure: eval QMAKE_CXX
-
-Allow expansion of $(...) references in QMAKE_CXX (currently its value
-is $(OE_QMAKE_CXX)) in order to allow compiler version check to succeed
-which allows WebKit to be enabled.
-
-Upstream-Status: Pending
-
-Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
-Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
----
- configure | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/configure b/configure
-index 5cc755e..1e6c910 100755
---- a/configure
-+++ b/configure
-@@ -3329,7 +3329,8 @@ else
-     CFG_FRAMEWORK=no
- fi
- 
--QMAKE_CONF_COMPILER=`getQMakeConf "$XQMAKESPEC" | grep "^QMAKE_CXX[^_A-Z0-9]" | sed "s,.* *= *\(.*\)$,\1," | tail -1`
-+QMAKE_CONF_COMPILER=`getQMakeConf "$XQMAKESPEC" | grep "^QMAKE_CXX[^_A-Z0-9]" | sed "s,.* *= *\(.*\)$,\1," | sed -n 's/$[(]\([0-9a-zA-Z_]*\)[)]/$\1/pg' | tail -1`
-+QMAKE_CONF_COMPILER=`eval "echo $QMAKE_CONF_COMPILER"`
- TEST_COMPILER="$CXX"
- 
- [ -z "$TEST_COMPILER" ] && TEST_COMPILER=$QMAKE_CONF_COMPILER
--- 
-1.7.12
-
diff --git a/meta/recipes-qt/qt4/qt4-4.8.1/0019-javascriptcore-Fix-compile-error-when-using-toolchai.patch b/meta/recipes-qt/qt4/qt4-4.8.1/0019-javascriptcore-Fix-compile-error-when-using-toolchai.patch
deleted file mode 100644
index 13229d4..0000000
--- a/meta/recipes-qt/qt4/qt4-4.8.1/0019-javascriptcore-Fix-compile-error-when-using-toolchai.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 4811267206e20e5409df0500c02d7fe77caf5293 Mon Sep 17 00:00:00 2001
-From: Ken Werner <ken.werner@linaro.org>
-Date: Wed, 26 Sep 2012 20:53:35 +0200
-Subject: [PATCH 19/22] javascriptcore: Fix compile error when using
- toolchains based on GCC 4.7.
-
-Upstream-Status: Pending
-
-Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
----
- src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSGlobalObject.h   | 4 +---
- .../javascriptcore/JavaScriptCore/runtime/JSStaticScopeObject.h       | 3 +--
- 2 files changed, 2 insertions(+), 5 deletions(-)
-
-diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSGlobalObject.h b/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSGlobalObject.h
-index 7c20272..917c0ff 100644
---- a/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSGlobalObject.h
-+++ b/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSGlobalObject.h
-@@ -57,9 +57,7 @@ namespace JSC {
-     
-     class JSGlobalObject : public JSVariableObject {
-     protected:
--        using JSVariableObject::JSVariableObjectData;
--
--        struct JSGlobalObjectData : public JSVariableObjectData {
-+        struct JSGlobalObjectData : public JSVariableObject::JSVariableObjectData {
-             // We use an explicit destructor function pointer instead of a
-             // virtual destructor because we want to avoid adding a vtable
-             // pointer to this struct. Adding a vtable pointer would force the
-diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSStaticScopeObject.h b/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSStaticScopeObject.h
-index 2542878..637f62c 100644
---- a/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSStaticScopeObject.h
-+++ b/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSStaticScopeObject.h
-@@ -32,8 +32,7 @@ namespace JSC{
-     
-     class JSStaticScopeObject : public JSVariableObject {
-     protected:
--        using JSVariableObject::JSVariableObjectData;
--        struct JSStaticScopeObjectData : public JSVariableObjectData {
-+        struct JSStaticScopeObjectData : public JSVariableObjectData::JSVariableObjectData {
-             JSStaticScopeObjectData()
-                 : JSVariableObjectData(&symbolTable, &registerStore + 1)
-             {
--- 
-1.7.12
-
diff --git a/meta/recipes-qt/qt4/qt4-4.8.1/0022-webkit-fix-conflicting-types.patch b/meta/recipes-qt/qt4/qt4-4.8.1/0022-webkit-fix-conflicting-types.patch
deleted file mode 100644
index bdd5d4f..0000000
--- a/meta/recipes-qt/qt4/qt4-4.8.1/0022-webkit-fix-conflicting-types.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 5cc08e33ea7ab5d32b6a14ccb23a366d56e50ea1 Mon Sep 17 00:00:00 2001
-From: Nitin A Kamble <nitin.a.kamble@intel.com>
-Date: Wed, 26 Sep 2012 20:56:33 +0200
-Subject: [PATCH 22/22] webkit: fix conflicting types
-
-This patch fixes the type mismatch fixing this compile issue:
-
-|
-/srv/home/nitin/builds/build-gcc47/tmp/sysroots/qemux86/usr/include/glib-2.0/glib/gthread.h:58:7:
-error: 'union' tag used in naming 'struct _GMutex' [-Werror=permissive]
-| In file included from ./wtf/Platform.h:1217:0,
-|                  from ./config.h:30,
-|                  from wtf/gobject/GOwnPtr.cpp:19:
-| wtf/gobject/GTypedefs.h:55:16: note: 'struct _GMutex' was previously
-declared here
-
-Upstream-Status: Pending
-
-Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
----
- src/3rdparty/webkit/Source/JavaScriptCore/wtf/gobject/GTypedefs.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/3rdparty/webkit/Source/JavaScriptCore/wtf/gobject/GTypedefs.h b/src/3rdparty/webkit/Source/JavaScriptCore/wtf/gobject/GTypedefs.h
-index c7f7ac4..f00e9cf 100644
---- a/src/3rdparty/webkit/Source/JavaScriptCore/wtf/gobject/GTypedefs.h
-+++ b/src/3rdparty/webkit/Source/JavaScriptCore/wtf/gobject/GTypedefs.h
-@@ -52,7 +52,7 @@ typedef struct _GFile GFile;
- typedef struct _GHashTable GHashTable;
- typedef struct _GInputStream GInputStream;
- typedef struct _GList GList;
--typedef struct _GMutex GMutex;
-+typedef union _GMutex GMutex;
- typedef struct _GPatternSpec GPatternSpec;
- typedef struct _GPollableOutputStream GPollableOutputStream;
- typedef struct _GSocketClient GSocketClient;
--- 
-1.7.12
-
diff --git a/meta/recipes-qt/qt4/qt4-4.8.1.inc b/meta/recipes-qt/qt4/qt4-4.8.3.inc
similarity index 79%
rename from meta/recipes-qt/qt4/qt4-4.8.1.inc
rename to meta/recipes-qt/qt4/qt4-4.8.3.inc
index 4cf1222..e009c08 100644
--- a/meta/recipes-qt/qt4/qt4-4.8.1.inc
+++ b/meta/recipes-qt/qt4/qt4-4.8.3.inc
@@ -16,19 +16,16 @@ SRC_URI = "http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-sr
            file://0013-configure-add-crossarch-option.patch \
            file://0014-translations-fix-phony-translation-linking-error.patch \
            file://0015-configure-add-nostrip-for-debug-packages.patch \
-           file://0016-configure-eval-QMAKE_CXX.patch \
-           file://0017-configure-ensure-we-identify-the-compiler-as-g-in-co.patch \
-           file://0018-configure-make-pulseaudio-a-configurable-option.patch \
-           file://0019-javascriptcore-Fix-compile-error-when-using-toolchai.patch \
-           file://0020-Fixes-for-gcc-4.7.0-particularly-on-qemux86.patch \
-           file://0021-webkit-disable-the-fuse-ld-gold-flag.patch \
-           file://0022-webkit-fix-conflicting-types.patch \
+           file://0016-configure-ensure-we-identify-the-compiler-as-g-in-co.patch \
+           file://0017-configure-make-pulseaudio-a-configurable-option.patch \
+           file://0018-Fixes-for-gcc-4.7.0-particularly-on-qemux86.patch \
+           file://0019-webkit-disable-the-fuse-ld-gold-flag.patch \
            file://g++.conf \
            file://linux.conf \
            "
 
-SRC_URI[md5sum] = "7960ba8e18ca31f0c6e4895a312f92ff"
-SRC_URI[sha256sum] = "ef851a36aa41b4ad7a3e4c96ca27eaed2a629a6d2fa06c20f072118caed87ae8"
+SRC_URI[md5sum] = "a663b6c875f8d7caa8ac9c30e4a4ec3b"
+SRC_URI[sha256sum] = "f1f72974f924861be04019f49f07cd43ab3c95056db2ba8f34b283487cccc728"
 
 S = "${WORKDIR}/qt-everywhere-opensource-src-${PV}"
 
diff --git a/meta/recipes-qt/qt4/qt4-4.8.1/0001-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch b/meta/recipes-qt/qt4/qt4-4.8.3/0001-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch
similarity index 88%
rename from meta/recipes-qt/qt4/qt4-4.8.1/0001-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch
rename to meta/recipes-qt/qt4/qt4-4.8.3/0001-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch
index a3a8dae..b844a4e 100644
--- a/meta/recipes-qt/qt4/qt4-4.8.1/0001-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch
+++ b/meta/recipes-qt/qt4/qt4-4.8.3/0001-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch
@@ -1,7 +1,7 @@
-From 51c37481a0c0ea946567ea2344107428e6d71590 Mon Sep 17 00:00:00 2001
+From 89349d565cf03f3a2c09fe235ac6c75e415859bd Mon Sep 17 00:00:00 2001
 From: Holger Freyther <zecke@selfish.org>
 Date: Wed, 26 Sep 2012 17:22:30 +0200
-Subject: [PATCH 01/22] qlibraryinfo: allow to set qt.conf from the outside
+Subject: [PATCH 01/19] qlibraryinfo: allow to set qt.conf from the outside
  using the environment
 
 Allow to set a qt.conf from the outside using the environment. This allows
@@ -16,7 +16,7 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
  1 file changed, 5 insertions(+)
 
 diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp
-index 2862c2c..3a36b01 100644
+index 91d2dfc..41045b3 100644
 --- a/src/corelib/global/qlibraryinfo.cpp
 +++ b/src/corelib/global/qlibraryinfo.cpp
 @@ -54,6 +54,7 @@
diff --git a/meta/recipes-qt/qt4/qt4-4.8.1/0002-qkbdtty_qws-fix-build-with-old-kernel-headers.patch b/meta/recipes-qt/qt4/qt4-4.8.3/0002-qkbdtty_qws-fix-build-with-old-kernel-headers.patch
similarity index 89%
rename from meta/recipes-qt/qt4/qt4-4.8.1/0002-qkbdtty_qws-fix-build-with-old-kernel-headers.patch
rename to meta/recipes-qt/qt4/qt4-4.8.3/0002-qkbdtty_qws-fix-build-with-old-kernel-headers.patch
index 021a6de..a473e8e 100644
--- a/meta/recipes-qt/qt4/qt4-4.8.1/0002-qkbdtty_qws-fix-build-with-old-kernel-headers.patch
+++ b/meta/recipes-qt/qt4/qt4-4.8.3/0002-qkbdtty_qws-fix-build-with-old-kernel-headers.patch
@@ -1,7 +1,7 @@
-From 419b6a19d3d506880fa705682613eaaeb7dcd9cf Mon Sep 17 00:00:00 2001
+From fe15b966616cc2d2f2f071474a3414fd03ee473e Mon Sep 17 00:00:00 2001
 From: Wenzong Fan <wenzong.fan@windriver.com>
 Date: Wed, 26 Sep 2012 20:18:08 +0200
-Subject: [PATCH 02/22] qkbdtty_qws: fix build with old kernel headers
+Subject: [PATCH 02/19] qkbdtty_qws: fix build with old kernel headers
 
 This issue is that with C++ compiler process an old version of kernel
 header file, coincidently that file has a variable named 'new':
@@ -21,7 +21,7 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
  1 file changed, 12 insertions(+)
 
 diff --git a/src/gui/embedded/qkbdtty_qws.cpp b/src/gui/embedded/qkbdtty_qws.cpp
-index f4b8461..4cee2e7 100644
+index c629fa3..47fd3f7 100644
 --- a/src/gui/embedded/qkbdtty_qws.cpp
 +++ b/src/gui/embedded/qkbdtty_qws.cpp
 @@ -54,8 +54,20 @@
diff --git a/meta/recipes-qt/qt4/qt4-4.8.1/0003-webkit2-set-OUTPUT_DIR-value-if-empty.patch b/meta/recipes-qt/qt4/qt4-4.8.3/0003-webkit2-set-OUTPUT_DIR-value-if-empty.patch
similarity index 90%
rename from meta/recipes-qt/qt4/qt4-4.8.1/0003-webkit2-set-OUTPUT_DIR-value-if-empty.patch
rename to meta/recipes-qt/qt4/qt4-4.8.3/0003-webkit2-set-OUTPUT_DIR-value-if-empty.patch
index 859a037..718db07 100644
--- a/meta/recipes-qt/qt4/qt4-4.8.1/0003-webkit2-set-OUTPUT_DIR-value-if-empty.patch
+++ b/meta/recipes-qt/qt4/qt4-4.8.3/0003-webkit2-set-OUTPUT_DIR-value-if-empty.patch
@@ -1,7 +1,7 @@
-From 96bee73bdf663ddeb2a5d48cab9c5e4df65ba295 Mon Sep 17 00:00:00 2001
+From f7eb6d336d30da7b8193f1d1ab6142293e3966da Mon Sep 17 00:00:00 2001
 From: Martin Jansa <Martin.Jansa@gmail.com>
 Date: Tue, 1 May 2012 07:48:15 +0200
-Subject: [PATCH 03/22] webkit2: set OUTPUT_DIR value if empty
+Subject: [PATCH 03/19] webkit2: set OUTPUT_DIR value if empty
 
 Without this do_configure was trying to create /include/WebCore/libdummy.prl in root of build host filesystem
 now it's in proper place ${WORKDIR}/qt-everywhere-opensource-src-4.8.1/src/3rdparty/webkit/include/WebCore/libdummy.prl
diff --git a/meta/recipes-qt/qt4/qt4-4.8.1/0004-configure-qmake-is-already-built-in-qt4-tools-native.patch b/meta/recipes-qt/qt4/qt4-4.8.3/0004-configure-qmake-is-already-built-in-qt4-tools-native.patch
similarity index 73%
rename from meta/recipes-qt/qt4/qt4-4.8.1/0004-configure-qmake-is-already-built-in-qt4-tools-native.patch
rename to meta/recipes-qt/qt4/qt4-4.8.3/0004-configure-qmake-is-already-built-in-qt4-tools-native.patch
index e147375..9affadb 100644
--- a/meta/recipes-qt/qt4/qt4-4.8.1/0004-configure-qmake-is-already-built-in-qt4-tools-native.patch
+++ b/meta/recipes-qt/qt4/qt4-4.8.3/0004-configure-qmake-is-already-built-in-qt4-tools-native.patch
@@ -1,7 +1,7 @@
-From aa1788b0ec0b9b7c0e1a7c6bd9ef5c9555361014 Mon Sep 17 00:00:00 2001
+From 53a20e5f7f790d047b67b1631e1d4acc9a86906a Mon Sep 17 00:00:00 2001
 From: Michael Krelin <hacker@klever.net>
 Date: Wed, 26 Sep 2012 20:24:20 +0200
-Subject: [PATCH 04/22] configure: qmake is already built in qt4-tools-native,
+Subject: [PATCH 04/19] configure: qmake is already built in qt4-tools-native,
  so disable it
 
 Upstream-Status: Inappropriate [configuration]
@@ -12,10 +12,10 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/configure b/configure
-index a706908..00b072a 100755
+index d19f443..59bdb63 100755
 --- a/configure
 +++ b/configure
-@@ -4816,7 +4816,7 @@ END {
+@@ -4899,7 +4899,7 @@ setBootstrapVariable()
  }
  
  # build qmake
diff --git a/meta/recipes-qt/qt4/qt4-4.8.1/0005-configure-set-LFLAGS-to-pick-up-zlib-from-staging.patch b/meta/recipes-qt/qt4/qt4-4.8.3/0005-configure-set-LFLAGS-to-pick-up-zlib-from-staging.patch
similarity index 80%
rename from meta/recipes-qt/qt4/qt4-4.8.1/0005-configure-set-LFLAGS-to-pick-up-zlib-from-staging.patch
rename to meta/recipes-qt/qt4/qt4-4.8.3/0005-configure-set-LFLAGS-to-pick-up-zlib-from-staging.patch
index 9171fa7..be7887b 100644
--- a/meta/recipes-qt/qt4/qt4-4.8.1/0005-configure-set-LFLAGS-to-pick-up-zlib-from-staging.patch
+++ b/meta/recipes-qt/qt4/qt4-4.8.3/0005-configure-set-LFLAGS-to-pick-up-zlib-from-staging.patch
@@ -1,7 +1,7 @@
-From 1602cdf7f3bb548e63fca40b5bff8b9a75a144c5 Mon Sep 17 00:00:00 2001
+From 5641d763180e7f848f5d39588417292b6b8df88e Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Jeremy=20Lain=C3=A9?= <jeremy.laine@m4x.org>
 Date: Wed, 26 Sep 2012 20:27:44 +0200
-Subject: [PATCH 05/22] configure: set LFLAGS to pick up zlib from staging
+Subject: [PATCH 05/19] configure: set LFLAGS to pick up zlib from staging
 
 Upstream-Status: Pending
 
@@ -11,10 +11,10 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/configure b/configure
-index 00b072a..b1ba542 100755
+index 59bdb63..cc08b71 100755
 --- a/configure
 +++ b/configure
-@@ -611,7 +611,7 @@ fi
+@@ -690,7 +690,7 @@ fi
  # initalize variables
  #-------------------------------------------------------------------------------
  
diff --git a/meta/recipes-qt/qt4/qt4-4.8.1/0006-configure-Use-OE_QMAKE_-values-to-specify-Qt-utility.patch b/meta/recipes-qt/qt4/qt4-4.8.3/0006-configure-Use-OE_QMAKE_-values-to-specify-Qt-utility.patch
similarity index 83%
rename from meta/recipes-qt/qt4/qt4-4.8.1/0006-configure-Use-OE_QMAKE_-values-to-specify-Qt-utility.patch
rename to meta/recipes-qt/qt4/qt4-4.8.3/0006-configure-Use-OE_QMAKE_-values-to-specify-Qt-utility.patch
index 51a6cfc..6d20c8c 100644
--- a/meta/recipes-qt/qt4/qt4-4.8.1/0006-configure-Use-OE_QMAKE_-values-to-specify-Qt-utility.patch
+++ b/meta/recipes-qt/qt4/qt4-4.8.3/0006-configure-Use-OE_QMAKE_-values-to-specify-Qt-utility.patch
@@ -1,7 +1,7 @@
-From 074881d57e5d7ad23a7a784a75f4ffebf091e543 Mon Sep 17 00:00:00 2001
+From fa9e376ff72f488608c8fc635ec669fc00c3c1ea Mon Sep 17 00:00:00 2001
 From: Paul Eggleton <paul.eggleton@linux.intel.com>
 Date: Wed, 26 Sep 2012 20:29:09 +0200
-Subject: [PATCH 06/22] configure: Use OE_QMAKE_* values to specify Qt utility
+Subject: [PATCH 06/19] configure: Use OE_QMAKE_* values to specify Qt utility
  paths
 
 Upstream-Status: Inappropriate [configuration]
@@ -13,10 +13,10 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
  1 file changed, 5 insertions(+), 5 deletions(-)
 
 diff --git a/configure b/configure
-index b1ba542..0231b7d 100755
+index cc08b71..958b884 100755
 --- a/configure
 +++ b/configure
-@@ -8517,11 +8517,11 @@ QMAKE_ABSOLUTE_SOURCE_ROOT = \$\$QT_SOURCE_TREE
+@@ -8612,11 +8612,11 @@ QMAKE_ABSOLUTE_SOURCE_ROOT = \$\$QT_SOURCE_TREE
  QMAKE_MOC_SRC    = \$\$QT_BUILD_TREE/src/moc
  
  #local paths that cannot be queried from the QT_INSTALL_* properties while building QTDIR
diff --git a/meta/recipes-qt/qt4/qt4-4.8.1/0007-dbus-Remove-const-usage-that-causes-compile-failure-.patch b/meta/recipes-qt/qt4/qt4-4.8.3/0007-dbus-Remove-const-usage-that-causes-compile-failure-.patch
similarity index 87%
rename from meta/recipes-qt/qt4/qt4-4.8.1/0007-dbus-Remove-const-usage-that-causes-compile-failure-.patch
rename to meta/recipes-qt/qt4/qt4-4.8.3/0007-dbus-Remove-const-usage-that-causes-compile-failure-.patch
index 0105758..465c237 100644
--- a/meta/recipes-qt/qt4/qt4-4.8.1/0007-dbus-Remove-const-usage-that-causes-compile-failure-.patch
+++ b/meta/recipes-qt/qt4/qt4-4.8.3/0007-dbus-Remove-const-usage-that-causes-compile-failure-.patch
@@ -1,7 +1,7 @@
-From ff6a714f8256c6d98234066ba1788bee234b25a1 Mon Sep 17 00:00:00 2001
+From db3c7b5710ee14280b51c355487dabe21eff60b4 Mon Sep 17 00:00:00 2001
 From: Pavel Heimlich <tropikhajma@gmail.com>
 Date: Wed, 26 Sep 2012 20:31:10 +0200
-Subject: [PATCH 07/22] dbus: Remove "const" usage that causes compile failure
+Subject: [PATCH 07/19] dbus: Remove "const" usage that causes compile failure
  building nativesdk-qt4-tools
 
 Patch has apparently been rejected upstream, not because it is invalid
@@ -17,7 +17,7 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/src/dbus/qdbusintegrator.cpp b/src/dbus/qdbusintegrator.cpp
-index 5d97a8e..5014b8b 100644
+index 0bf62de..e53620f 100644
 --- a/src/dbus/qdbusintegrator.cpp
 +++ b/src/dbus/qdbusintegrator.cpp
 @@ -72,7 +72,7 @@ QT_BEGIN_NAMESPACE
diff --git a/meta/recipes-qt/qt4/qt4-4.8.1/0008-qmake.pro-Allow-building-a-separate-qmake-for-the-ta.patch b/meta/recipes-qt/qt4/qt4-4.8.3/0008-qmake.pro-Allow-building-a-separate-qmake-for-the-ta.patch
similarity index 83%
rename from meta/recipes-qt/qt4/qt4-4.8.1/0008-qmake.pro-Allow-building-a-separate-qmake-for-the-ta.patch
rename to meta/recipes-qt/qt4/qt4-4.8.3/0008-qmake.pro-Allow-building-a-separate-qmake-for-the-ta.patch
index 57071c7..5d294b1 100644
--- a/meta/recipes-qt/qt4/qt4-4.8.1/0008-qmake.pro-Allow-building-a-separate-qmake-for-the-ta.patch
+++ b/meta/recipes-qt/qt4/qt4-4.8.3/0008-qmake.pro-Allow-building-a-separate-qmake-for-the-ta.patch
@@ -1,7 +1,7 @@
-From 049f44c260fb8956f0acf18355e3403638d2a084 Mon Sep 17 00:00:00 2001
+From dacee47b11fc7cf89cdb8ddeeac9e6b64320ec8b Mon Sep 17 00:00:00 2001
 From: Paul Eggleton <paul.eggleton@linux.intel.com>
 Date: Wed, 26 Sep 2012 20:32:41 +0200
-Subject: [PATCH 08/22] qmake.pro: Allow building a separate qmake for the
+Subject: [PATCH 08/19] qmake.pro: Allow building a separate qmake for the
  target
 
 Upstream-Status: Inappropriate [config]
diff --git a/meta/recipes-qt/qt4/qt4-4.8.1/0009-qmake-fix-source-file-references-in-qmake.pri.patch b/meta/recipes-qt/qt4/qt4-4.8.3/0009-qmake-fix-source-file-references-in-qmake.pri.patch
similarity index 91%
rename from meta/recipes-qt/qt4/qt4-4.8.1/0009-qmake-fix-source-file-references-in-qmake.pri.patch
rename to meta/recipes-qt/qt4/qt4-4.8.3/0009-qmake-fix-source-file-references-in-qmake.pri.patch
index 43072e0..87d6397 100644
--- a/meta/recipes-qt/qt4/qt4-4.8.1/0009-qmake-fix-source-file-references-in-qmake.pri.patch
+++ b/meta/recipes-qt/qt4/qt4-4.8.3/0009-qmake-fix-source-file-references-in-qmake.pri.patch
@@ -1,7 +1,7 @@
-From e863f35a80b130d8b520cdb7c81112a601157c44 Mon Sep 17 00:00:00 2001
+From 08ec0f7ac7438e6f5b506b23fb52fe086078308b Mon Sep 17 00:00:00 2001
 From: Paul Eggleton <paul.eggleton@linux.intel.com>
 Date: Wed, 26 Sep 2012 20:33:49 +0200
-Subject: [PATCH 09/22] qmake: fix source file references in qmake.pri
+Subject: [PATCH 09/19] qmake: fix source file references in qmake.pri
 
 Fix duplicate entries in SOURCES and HEADERS, and fix the source file
 list for the split of qlocale.cpp.
@@ -15,7 +15,7 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
  1 file changed, 4 insertions(+), 4 deletions(-)
 
 diff --git a/qmake/qmake.pri b/qmake/qmake.pri
-index f2a3705..2d4e94c 100644
+index 31f67f4..9081669 100644
 --- a/qmake/qmake.pri
 +++ b/qmake/qmake.pri
 @@ -22,8 +22,7 @@ SOURCES += project.cpp property.cpp main.cpp generators/makefile.cpp \
diff --git a/meta/recipes-qt/qt4/qt4-4.8.1/0010-configure-Hack-to-not-use-the-pg_config-of-the-host-.patch b/meta/recipes-qt/qt4/qt4-4.8.3/0010-configure-Hack-to-not-use-the-pg_config-of-the-host-.patch
similarity index 87%
rename from meta/recipes-qt/qt4/qt4-4.8.1/0010-configure-Hack-to-not-use-the-pg_config-of-the-host-.patch
rename to meta/recipes-qt/qt4/qt4-4.8.3/0010-configure-Hack-to-not-use-the-pg_config-of-the-host-.patch
index 38e3cdf..99e7419 100644
--- a/meta/recipes-qt/qt4/qt4-4.8.1/0010-configure-Hack-to-not-use-the-pg_config-of-the-host-.patch
+++ b/meta/recipes-qt/qt4/qt4-4.8.3/0010-configure-Hack-to-not-use-the-pg_config-of-the-host-.patch
@@ -1,7 +1,7 @@
-From 64c70ae60b96c940805ab50be3ce724df094eddc Mon Sep 17 00:00:00 2001
+From d9544b4a079f3c66d15f973c5d1526df2fe49d40 Mon Sep 17 00:00:00 2001
 From: Holger Freyther <zecke@selfish.org>
 Date: Wed, 26 Sep 2012 20:36:38 +0200
-Subject: [PATCH 10/22] configure: Hack to not use the pg_config of the host
+Subject: [PATCH 10/19] configure: Hack to not use the pg_config of the host
  system which will add /usr/include
 
 pg_config is a native binary so using that when cross compiling
@@ -19,10 +19,10 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
  1 file changed, 4 insertions(+), 4 deletions(-)
 
 diff --git a/configure b/configure
-index 0231b7d..9650199f6 100755
+index 958b884..24cbb2a 100755
 --- a/configure
 +++ b/configure
-@@ -5362,10 +5362,10 @@ for _SQLDR in $CFG_SQL_AVAILABLE; do
+@@ -5441,10 +5441,10 @@ for _SQLDR in $CFG_SQL_AVAILABLE; do
          psql)
              if [ "$CFG_SQL_psql" != "no" ]; then
                  # Be careful not to use native pg_config when cross building.
diff --git a/meta/recipes-qt/qt4/qt4-4.8.1/0011-freetype-host-includes.patch b/meta/recipes-qt/qt4/qt4-4.8.3/0011-freetype-host-includes.patch
similarity index 89%
rename from meta/recipes-qt/qt4/qt4-4.8.1/0011-freetype-host-includes.patch
rename to meta/recipes-qt/qt4/qt4-4.8.3/0011-freetype-host-includes.patch
index 7f6ff32..f0be174 100644
--- a/meta/recipes-qt/qt4/qt4-4.8.1/0011-freetype-host-includes.patch
+++ b/meta/recipes-qt/qt4/qt4-4.8.3/0011-freetype-host-includes.patch
@@ -1,7 +1,7 @@
-From 9b05106d0bdfa84e8406633d71206ef1defaade8 Mon Sep 17 00:00:00 2001
+From 95cbbdaaf543bb5747b535b5e4b02114f3d821d6 Mon Sep 17 00:00:00 2001
 From: Michael Krelin <hacker@klever.net>
 Date: Mon, 4 Jun 2007 14:48:50 +0200
-Subject: [PATCH 11/22] freetype host includes
+Subject: [PATCH 11/19] freetype host includes
 
 Host include path should not be used in cross compiling case.
 
diff --git a/meta/recipes-qt/qt4/qt4-4.8.1/0012-Add-2bpp-support.patch b/meta/recipes-qt/qt4/qt4-4.8.3/0012-Add-2bpp-support.patch
similarity index 97%
rename from meta/recipes-qt/qt4/qt4-4.8.1/0012-Add-2bpp-support.patch
rename to meta/recipes-qt/qt4/qt4-4.8.3/0012-Add-2bpp-support.patch
index 580ba4c..098b270 100644
--- a/meta/recipes-qt/qt4/qt4-4.8.1/0012-Add-2bpp-support.patch
+++ b/meta/recipes-qt/qt4/qt4-4.8.3/0012-Add-2bpp-support.patch
@@ -1,7 +1,7 @@
-From 69ff4de0f06ba112a5ca531957937dd860d0f3f8 Mon Sep 17 00:00:00 2001
+From a8233fddb36592361910d967664e5b546ac4cc3e Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Jeremy=20Lain=C3=A9?= <jeremy.laine@m4x.org>
 Date: Wed, 26 Sep 2012 20:39:21 +0200
-Subject: [PATCH 12/22] Add 2bpp support
+Subject: [PATCH 12/19] Add 2bpp support
 
 Submitted upstream but rejected as being "out of scope":
 http://bugreports.qt.nokia.com/browse/QTBUG-3468
@@ -16,10 +16,10 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
  3 files changed, 216 insertions(+), 4 deletions(-)
 
 diff --git a/configure b/configure
-index 9650199f6..7028ecf 100755
+index 24cbb2a..cd66d05 100755
 --- a/configure
 +++ b/configure
-@@ -6917,6 +6917,7 @@ if [ "$CFG_QWS_DEPTHS" = "prompted" -a "$PROMPT_FOR_DEPTHS" = "yes" ]; then
+@@ -6999,6 +6999,7 @@ if [ "$CFG_QWS_DEPTHS" = "prompted" -a "$PROMPT_FOR_DEPTHS" = "yes" ]; then
      echo "Choose pixel-depths to support:"
      echo
      echo "   1. 1bpp, black/white"
@@ -27,7 +27,7 @@ index 9650199f6..7028ecf 100755
      echo "   4. 4bpp, grayscale"
      echo "   8. 8bpp, paletted"
      echo "  12. 12bpp, rgb 4-4-4"
-@@ -6935,11 +6936,11 @@ if [ "$CFG_QWS_DEPTHS" = "prompted" -a "$PROMPT_FOR_DEPTHS" = "yes" ]; then
+@@ -7017,11 +7018,11 @@ if [ "$CFG_QWS_DEPTHS" = "prompted" -a "$PROMPT_FOR_DEPTHS" = "yes" ]; then
  fi
  if [ -n "$CFG_QWS_DEPTHS" -a "$PLATFORM_QWS" = "yes" ]; then
      if [ "$CFG_QWS_DEPTHS" = "all" ]; then
@@ -42,7 +42,7 @@ index 9650199f6..7028ecf 100755
  	esac
      done
 diff --git a/src/gui/embedded/qscreen_qws.cpp b/src/gui/embedded/qscreen_qws.cpp
-index d6c614d..504f3d3 100644
+index d2ad851..d25fc87 100644
 --- a/src/gui/embedded/qscreen_qws.cpp
 +++ b/src/gui/embedded/qscreen_qws.cpp
 @@ -469,6 +469,58 @@ static void solidFill_gray4(QScreen *screen, const QColor &color,
@@ -299,7 +299,7 @@ index d6c614d..504f3d3 100644
      } else if(d==4) {
          return true;
 diff --git a/src/gui/embedded/qscreenlinuxfb_qws.cpp b/src/gui/embedded/qscreenlinuxfb_qws.cpp
-index 3fe9713..933f489 100644
+index 04abcd4..06dea6d 100644
 --- a/src/gui/embedded/qscreenlinuxfb_qws.cpp
 +++ b/src/gui/embedded/qscreenlinuxfb_qws.cpp
 @@ -466,8 +466,8 @@ bool QLinuxFbScreen::connect(const QString &displaySpec)
diff --git a/meta/recipes-qt/qt4/qt4-4.8.1/0013-configure-add-crossarch-option.patch b/meta/recipes-qt/qt4/qt4-4.8.3/0013-configure-add-crossarch-option.patch
similarity index 63%
rename from meta/recipes-qt/qt4/qt4-4.8.1/0013-configure-add-crossarch-option.patch
rename to meta/recipes-qt/qt4/qt4-4.8.3/0013-configure-add-crossarch-option.patch
index c1ec3b5..45a058e 100644
--- a/meta/recipes-qt/qt4/qt4-4.8.1/0013-configure-add-crossarch-option.patch
+++ b/meta/recipes-qt/qt4/qt4-4.8.3/0013-configure-add-crossarch-option.patch
@@ -1,7 +1,7 @@
-From 8ddc1820a8678fda3a9bf3da4fc256c22fbd9b51 Mon Sep 17 00:00:00 2001
+From 8785f376533ffdcf4c32b53274e8c40f567d7fd5 Mon Sep 17 00:00:00 2001
 From: Michael Lauer <mickey@vanille-media.de>
 Date: Wed, 26 Sep 2012 20:41:32 +0200
-Subject: [PATCH 13/22] configure: add "-crossarch" option
+Subject: [PATCH 13/19] configure: add "-crossarch" option
 
 Upstream-Status: Pending
 
@@ -11,21 +11,21 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
  1 file changed, 6 insertions(+), 1 deletion(-)
 
 diff --git a/configure b/configure
-index 7028ecf..8eb138f 100755
+index cd66d05..f2c0725 100755
 --- a/configure
 +++ b/configure
-@@ -1059,7 +1059,7 @@ while [ "$#" -gt 0 ]; do
+@@ -1141,7 +1141,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|-buildkey|-sdk|-arch|-host-arch|-mysql_config)
-+    -prefix|-docdir|-headerdir|-plugindir|-importdir|-datadir|-libdir|-bindir|-translationdir|-sysconfdir|-examplesdir|-demosdir|-depths|-make|-nomake|-platform|-xplatform|-buildkey|-sdk|-arch|-host-arch|-mysql_config|-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|-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)
          VAR=`echo $1 | sed "s,^-\(.*\),\1,"`
          shift
          VAL="$1"
-@@ -1601,6 +1601,9 @@ while [ "$#" -gt 0 ]; do
-         case "$XPLATFORM" in *symbian*) XPLATFORM_SYMBIAN=yes;; esac
-         case "$XPLATFORM" in symbian-sbsv2) XPLATFORM_SYMBIAN_SBSV2=yes;; esac
+@@ -1697,6 +1697,9 @@ while [ "$#" -gt 0 ]; do
+         DEV_VAL=`echo $VAL | sed "s,^.*=\(.*\),\1,"`
+         DeviceVar set $DEV_VAR $DEV_VAL
          ;;
 +	crossarch)
 +		CROSSARCH="$VAL"
@@ -33,7 +33,7 @@ index 7028ecf..8eb138f 100755
      debug-and-release)
          if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
              CFG_DEBUG_RELEASE="$VAL"
-@@ -3200,6 +3203,8 @@ arm*)
+@@ -3297,6 +3300,8 @@ arm*)
      ;;
  esac
  
diff --git a/meta/recipes-qt/qt4/qt4-4.8.1/0014-translations-fix-phony-translation-linking-error.patch b/meta/recipes-qt/qt4/qt4-4.8.3/0014-translations-fix-phony-translation-linking-error.patch
similarity index 90%
rename from meta/recipes-qt/qt4/qt4-4.8.1/0014-translations-fix-phony-translation-linking-error.patch
rename to meta/recipes-qt/qt4/qt4-4.8.3/0014-translations-fix-phony-translation-linking-error.patch
index b788a68..e4bd91e 100644
--- a/meta/recipes-qt/qt4/qt4-4.8.1/0014-translations-fix-phony-translation-linking-error.patch
+++ b/meta/recipes-qt/qt4/qt4-4.8.3/0014-translations-fix-phony-translation-linking-error.patch
@@ -1,7 +1,7 @@
-From 306e0987cfdc67db11abc7071c48b0d196e84c8e Mon Sep 17 00:00:00 2001
+From 851eb73f7c2d3fa8dc017c3fb4f448b522cd9873 Mon Sep 17 00:00:00 2001
 From: Otavio Salvador <otavio@ossystems.com.br>
 Date: Wed, 26 Sep 2012 20:45:10 +0200
-Subject: [PATCH 14/22] translations: fix phony translation linking error
+Subject: [PATCH 14/19] translations: fix phony translation linking error
 
   | .../usr/lib/crt1.o: In function `_start':
   | .../../sysdeps/i386/elf/start.S:115: undefined reference to `main'
diff --git a/meta/recipes-qt/qt4/qt4-4.8.1/0015-configure-add-nostrip-for-debug-packages.patch b/meta/recipes-qt/qt4/qt4-4.8.3/0015-configure-add-nostrip-for-debug-packages.patch
similarity index 78%
rename from meta/recipes-qt/qt4/qt4-4.8.1/0015-configure-add-nostrip-for-debug-packages.patch
rename to meta/recipes-qt/qt4/qt4-4.8.3/0015-configure-add-nostrip-for-debug-packages.patch
index 027633d..7d791dc 100644
--- a/meta/recipes-qt/qt4/qt4-4.8.1/0015-configure-add-nostrip-for-debug-packages.patch
+++ b/meta/recipes-qt/qt4/qt4-4.8.3/0015-configure-add-nostrip-for-debug-packages.patch
@@ -1,7 +1,7 @@
-From c7ee6896f4894626986956cc8892a13fa9f7c2aa Mon Sep 17 00:00:00 2001
+From 1c42c9c5f02845ea4c5b82638b7b2ed4d3dca0ff Mon Sep 17 00:00:00 2001
 From: Fathi Boudra <fabo@debian.org>
 Date: Wed, 26 Sep 2012 20:46:14 +0200
-Subject: [PATCH 15/22] configure: add nostrip for debug packages
+Subject: [PATCH 15/19] configure: add nostrip for debug packages
 
 Qt is built in release mode and strip files by default.
 Set CONFIG+=nostrip to avoid the stripping and
@@ -15,10 +15,10 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
  1 file changed, 2 insertions(+)
 
 diff --git a/configure b/configure
-index 8eb138f..5cc755e 100755
+index f2c0725..d1a0dfd 100755
 --- a/configure
 +++ b/configure
-@@ -631,6 +631,8 @@ mkdir -p "$outpath/config.tests"
+@@ -710,6 +710,8 @@ mkdir -p "$outpath/config.tests"
  rm -f "$outpath/config.tests/.qmake.cache"
  cp "$QMAKE_VARS_FILE" "$outpath/config.tests/.qmake.cache"
  
diff --git a/meta/recipes-qt/qt4/qt4-4.8.1/0017-configure-ensure-we-identify-the-compiler-as-g-in-co.patch b/meta/recipes-qt/qt4/qt4-4.8.3/0016-configure-ensure-we-identify-the-compiler-as-g-in-co.patch
similarity index 84%
rename from meta/recipes-qt/qt4/qt4-4.8.1/0017-configure-ensure-we-identify-the-compiler-as-g-in-co.patch
rename to meta/recipes-qt/qt4/qt4-4.8.3/0016-configure-ensure-we-identify-the-compiler-as-g-in-co.patch
index 32649b4..f85f534 100644
--- a/meta/recipes-qt/qt4/qt4-4.8.1/0017-configure-ensure-we-identify-the-compiler-as-g-in-co.patch
+++ b/meta/recipes-qt/qt4/qt4-4.8.3/0016-configure-ensure-we-identify-the-compiler-as-g-in-co.patch
@@ -1,7 +1,7 @@
-From 965068125d1e83699442fca83f0c9fe05ecee564 Mon Sep 17 00:00:00 2001
+From 8f4a0ccc89a43f8cc1a4e71c6f3d350d3b3b687c Mon Sep 17 00:00:00 2001
 From: Paul Eggleton <paul.eggleton@linux.intel.com>
 Date: Wed, 26 Sep 2012 20:48:37 +0200
-Subject: [PATCH 17/22] configure: ensure we identify the compiler as g++ in
+Subject: [PATCH 16/19] configure: ensure we identify the compiler as g++ in
  configure
 
 Our PLATFORM in OE is ${TARGET_OS}-oe-g++, and previously the configure
@@ -28,10 +28,10 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
  1 file changed, 3 insertions(+)
 
 diff --git a/configure b/configure
-index 1e6c910..0edaad9 100755
+index d1a0dfd..1d8d8f5 100755
 --- a/configure
 +++ b/configure
-@@ -7444,6 +7444,9 @@ elif [ "$XPLATFORM" != "$PLATFORM" ]; then
+@@ -7525,6 +7525,9 @@ elif [ "$XPLATFORM" != "$PLATFORM" ]; then
  else
      COMPILER=`echo $PLATFORM | cut -f 2- -d-`
  fi
diff --git a/meta/recipes-qt/qt4/qt4-4.8.1/0018-configure-make-pulseaudio-a-configurable-option.patch b/meta/recipes-qt/qt4/qt4-4.8.3/0017-configure-make-pulseaudio-a-configurable-option.patch
similarity index 90%
rename from meta/recipes-qt/qt4/qt4-4.8.1/0018-configure-make-pulseaudio-a-configurable-option.patch
rename to meta/recipes-qt/qt4/qt4-4.8.3/0017-configure-make-pulseaudio-a-configurable-option.patch
index 4d91560..f84b737 100644
--- a/meta/recipes-qt/qt4/qt4-4.8.1/0018-configure-make-pulseaudio-a-configurable-option.patch
+++ b/meta/recipes-qt/qt4/qt4-4.8.3/0017-configure-make-pulseaudio-a-configurable-option.patch
@@ -1,7 +1,7 @@
-From d93ea994bf2ecee4775c68de645eac0cab248ac2 Mon Sep 17 00:00:00 2001
+From 6c06728b714a9864a7fe0ce576b015d726613e1e Mon Sep 17 00:00:00 2001
 From: Paul Eggleton <paul.eggleton@linux.intel.com>
 Date: Tue, 28 Feb 2012 15:10:24 +0000
-Subject: [PATCH 18/22] configure: make pulseaudio a configurable option
+Subject: [PATCH 17/19] configure: make pulseaudio a configurable option
 
 Allows disabling pulseaudio support within phonon at configure time.
 (This is the Qt 4.8.0 version.)
@@ -15,10 +15,10 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
  1 file changed, 8 insertions(+), 1 deletion(-)
 
 diff --git a/configure b/configure
-index 0edaad9..3a63734 100755
+index 1d8d8f5..4fb234b 100755
 --- a/configure
 +++ b/configure
-@@ -1045,7 +1045,7 @@ while [ "$#" -gt 0 ]; do
+@@ -1127,7 +1127,7 @@ while [ "$#" -gt 0 ]; do
          VAL=no
          ;;
      #Qt style yes options
@@ -27,7 +27,7 @@ index 0edaad9..3a63734 100755
          VAR=`echo $1 | sed "s,^-\(.*\),\1,"`
          VAL=yes
          ;;
-@@ -2005,6 +2005,13 @@ while [ "$#" -gt 0 ]; do
+@@ -2101,6 +2101,13 @@ while [ "$#" -gt 0 ]; do
              UNKNOWN_OPT=yes
          fi
          ;;
diff --git a/meta/recipes-qt/qt4/qt4-4.8.1/0020-Fixes-for-gcc-4.7.0-particularly-on-qemux86.patch b/meta/recipes-qt/qt4/qt4-4.8.3/0018-Fixes-for-gcc-4.7.0-particularly-on-qemux86.patch
similarity index 96%
rename from meta/recipes-qt/qt4/qt4-4.8.1/0020-Fixes-for-gcc-4.7.0-particularly-on-qemux86.patch
rename to meta/recipes-qt/qt4/qt4-4.8.3/0018-Fixes-for-gcc-4.7.0-particularly-on-qemux86.patch
index b763ac1..0e8454e 100644
--- a/meta/recipes-qt/qt4/qt4-4.8.1/0020-Fixes-for-gcc-4.7.0-particularly-on-qemux86.patch
+++ b/meta/recipes-qt/qt4/qt4-4.8.3/0018-Fixes-for-gcc-4.7.0-particularly-on-qemux86.patch
@@ -1,7 +1,7 @@
-From fb89f23c25363ac7b138fdba2bf5a9cdcaa7e840 Mon Sep 17 00:00:00 2001
+From 3f49a22ef042948689b5b60f8cc69c9d65c37610 Mon Sep 17 00:00:00 2001
 From: Richard Purdie <richard.purdie@linuxfoundation.org>
 Date: Wed, 26 Sep 2012 20:54:38 +0200
-Subject: [PATCH 20/22] Fixes for gcc 4.7.0, particularly on qemux86
+Subject: [PATCH 18/19] Fixes for gcc 4.7.0, particularly on qemux86
 
 Origin: upstream, http://trac.webkit.org/changeset/93631
 Origin: upstream, http://trac.webkit.org/changeset/113848
diff --git a/meta/recipes-qt/qt4/qt4-4.8.1/0021-webkit-disable-the-fuse-ld-gold-flag.patch b/meta/recipes-qt/qt4/qt4-4.8.3/0019-webkit-disable-the-fuse-ld-gold-flag.patch
similarity index 90%
rename from meta/recipes-qt/qt4/qt4-4.8.1/0021-webkit-disable-the-fuse-ld-gold-flag.patch
rename to meta/recipes-qt/qt4/qt4-4.8.3/0019-webkit-disable-the-fuse-ld-gold-flag.patch
index 05dc806..a841c2d 100644
--- a/meta/recipes-qt/qt4/qt4-4.8.1/0021-webkit-disable-the-fuse-ld-gold-flag.patch
+++ b/meta/recipes-qt/qt4/qt4-4.8.3/0019-webkit-disable-the-fuse-ld-gold-flag.patch
@@ -1,7 +1,7 @@
-From 3a74f5cf7f92ff6bf6b69c7cf76f54516573abb7 Mon Sep 17 00:00:00 2001
+From 156a0936d6e37fa000a92131832b4f762605d81e Mon Sep 17 00:00:00 2001
 From: Ken Werner <ken.werner@linaro.org>
 Date: Wed, 26 Sep 2012 20:55:21 +0200
-Subject: [PATCH 21/22] webkit: disable the -fuse-ld=gold flag
+Subject: [PATCH 19/19] webkit: disable the -fuse-ld=gold flag
 
 This option is a Debian/Ubuntu specific extension to the g++ and causes upstream GCC to throw an error.
 
diff --git a/meta/recipes-qt/qt4/qt4-4.8.1/g++.conf b/meta/recipes-qt/qt4/qt4-4.8.3/g++.conf
similarity index 100%
rename from meta/recipes-qt/qt4/qt4-4.8.1/g++.conf
rename to meta/recipes-qt/qt4/qt4-4.8.3/g++.conf
diff --git a/meta/recipes-qt/qt4/qt4-4.8.1/linux.conf b/meta/recipes-qt/qt4/qt4-4.8.3/linux.conf
similarity index 100%
rename from meta/recipes-qt/qt4/qt4-4.8.1/linux.conf
rename to meta/recipes-qt/qt4/qt4-4.8.3/linux.conf
diff --git a/meta/recipes-qt/qt4/qt4-4.8.1/qte.sh b/meta/recipes-qt/qt4/qt4-4.8.3/qte.sh
similarity index 100%
rename from meta/recipes-qt/qt4/qt4-4.8.1/qte.sh
rename to meta/recipes-qt/qt4/qt4-4.8.3/qte.sh
diff --git a/meta/recipes-qt/qt4/qt4-embedded_4.8.1.bb b/meta/recipes-qt/qt4/qt4-embedded_4.8.3.bb
similarity index 87%
rename from meta/recipes-qt/qt4/qt4-embedded_4.8.1.bb
rename to meta/recipes-qt/qt4/qt4-embedded_4.8.3.bb
index 5a3dc65..187de73 100644
--- a/meta/recipes-qt/qt4/qt4-embedded_4.8.1.bb
+++ b/meta/recipes-qt/qt4/qt4-embedded_4.8.3.bb
@@ -1,7 +1,7 @@
 require qt4-${PV}.inc
 require qt4-embedded.inc
 
-PR = "${INC_PR}.1"
+PR = "${INC_PR}.0"
 
 QT_CONFIG_FLAGS_append_armv6 = " -no-neon "
 
diff --git a/meta/recipes-qt/qt4/qt4-native_4.8.1.bb b/meta/recipes-qt/qt4/qt4-native_4.8.1.bb
deleted file mode 100644
index c09e6df..0000000
--- a/meta/recipes-qt/qt4/qt4-native_4.8.1.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-require qt4-native.inc
-
-PR = "${INC_PR}.1"
-
-# Find the g++.conf/linux.conf in the right directory.
-FILESEXTRAPATHS =. "${FILE_DIRNAME}/qt4-${PV}:"
-
-TOBUILD := "src/tools/bootstrap ${TOBUILD}"
-
-SRC_URI[md5sum] = "7960ba8e18ca31f0c6e4895a312f92ff"
-SRC_URI[sha256sum] = "ef851a36aa41b4ad7a3e4c96ca27eaed2a629a6d2fa06c20f072118caed87ae8"
-
diff --git a/meta/recipes-qt/qt4/qt4-native_4.8.3.bb b/meta/recipes-qt/qt4/qt4-native_4.8.3.bb
new file mode 100644
index 0000000..afae0ae
--- /dev/null
+++ b/meta/recipes-qt/qt4/qt4-native_4.8.3.bb
@@ -0,0 +1,8 @@
+require qt4-native.inc
+
+PR = "${INC_PR}.0"
+
+TOBUILD := "src/tools/bootstrap ${TOBUILD}"
+
+SRC_URI[md5sum] = "a663b6c875f8d7caa8ac9c30e4a4ec3b"
+SRC_URI[sha256sum] = "f1f72974f924861be04019f49f07cd43ab3c95056db2ba8f34b283487cccc728"
diff --git a/meta/recipes-qt/qt4/qt4-x11-free_4.8.1.bb b/meta/recipes-qt/qt4/qt4-x11-free_4.8.3.bb
similarity index 88%
rename from meta/recipes-qt/qt4/qt4-x11-free_4.8.1.bb
rename to meta/recipes-qt/qt4/qt4-x11-free_4.8.3.bb
index 9b03ff2..bedd201 100644
--- a/meta/recipes-qt/qt4/qt4-x11-free_4.8.1.bb
+++ b/meta/recipes-qt/qt4/qt4-x11-free_4.8.3.bb
@@ -1,7 +1,7 @@
 require qt4-x11-free.inc
 require qt4-${PV}.inc
 
-PR = "${INC_PR}.1"
+PR = "${INC_PR}.0"
 
 QT_CONFIG_FLAGS_append_armv6 = " -no-neon "
 
-- 
1.7.12

Re: [PATCH 00/10] qt4: upgrade to 4.8.3 and cleanup

[Paul Eggleton]

On Thursday 27 September 2012 00:27:05 Martin Jansa wrote:
> Please test on more architectures.
> I've tested complete qt4-native + qt4-free-x11 on armv4t.
> And only do_patch for nativesdk-qt4-tools, qt-mobility-*, qt4-embedded.

So this is great work and these patches look good, although I'm still not 
particularly happy with breaking out so many of the configure options because 
I'm convinced it won't stop here; but it's possible I might be overruled on 
this issue. 

The bigger problem is when these patches are arriving - we're late into the 
stabilisation period and given the choice I'd prefer not to merge them until 
the next development cycle.

Cheers,
Paul

-- 

Paul Eggleton
Intel Open Source Technology Centre

Re: [PATCH 00/10] qt4: upgrade to 4.8.3 and cleanup

[Martin Jansa]

[-- Attachment #1: Type: text/plain, Size: 1373 bytes --]

On Thu, Sep 27, 2012 at 04:10:20PM +0100, Paul Eggleton wrote:
> On Thursday 27 September 2012 00:27:05 Martin Jansa wrote:
> > Please test on more architectures.
> > I've tested complete qt4-native + qt4-free-x11 on armv4t.
> > And only do_patch for nativesdk-qt4-tools, qt-mobility-*, qt4-embedded.
> 
> So this is great work and these patches look good, although I'm still not 
> particularly happy with breaking out so many of the configure options because 
> I'm convinced it won't stop here; but it's possible I might be overruled on 
> this issue. 

I've added that, because meta-webos layer disables more stuff then .inc
file forces enabled, so I would have to rewrite whole QT_CONFIG_FLAGS
(if I don't want to have e.g. -webkit from .inc and -no-webkit appended
after that through QT_DISTRO_FLAGS).

But it can be just 2 variables instead of 6 if it's issue.

> The bigger problem is when these patches are arriving - we're late into the 
> stabilisation period and given the choice I'd prefer not to merge them until 
> the next development cycle.

The cleanup part is formal only, so with low risk IMHO.

I have some layer with .bbappends to it which needs 4.8.3 (or 4.8.2) so recipe 
even with negative D_P would help me to be able to use next oe-core release.

Cheers,

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]

Re: [PATCH 00/10] qt4: upgrade to 4.8.3 and cleanup

[Anders Darander]

* Martin Jansa <martin.jansa@gmail.com> [120927 17:44]:

> On Thu, Sep 27, 2012 at 04:10:20PM +0100, Paul Eggleton wrote:
> > On Thursday 27 September 2012 00:27:05 Martin Jansa wrote:
> > > Please test on more architectures.
> > > I've tested complete qt4-native + qt4-free-x11 on armv4t.
> > > And only do_patch for nativesdk-qt4-tools, qt-mobility-*, qt4-embedded.
> > 
> > So this is great work and these patches look good, although I'm still not 
> > particularly happy with breaking out so many of the configure options because 
> > I'm convinced it won't stop here; but it's possible I might be overruled on 
> > this issue. 

> I've added that, because meta-webos layer disables more stuff then .inc
> file forces enabled, so I would have to rewrite whole QT_CONFIG_FLAGS
> (if I don't want to have e.g. -webkit from .inc and -no-webkit appended
> after that through QT_DISTRO_FLAGS).

> But it can be just 2 variables instead of 6 if it's issue.

I haven't looked closely at the patches, but we're also disabling lots
of stuff (though, quite a bit of that comes from meta-oe). Thus, I'm
leaning towards an easier way to handle this.

We're currently using an approach were we add to QT_CONFIG_FLAGS, to set
our desired config, and oe_filter_out() to remove certain defaults from
oe-core and meta-oe. Thus, everything that can help reduce this mess is
something we'd appreciate.

Cheers,
Anders


-- 
Anders Darander
ChargeStorm AB / eStorm AB

Re: [PATCH 00/10] qt4: upgrade to 4.8.3 and cleanup

[Martin Jansa]

[-- Attachment #1: Type: text/plain, Size: 9352 bytes --]

On Thu, Sep 27, 2012 at 12:27:05AM +0200, Martin Jansa wrote:
> Please test on more architectures.
> I've tested complete qt4-native + qt4-free-x11 on armv4t.
> And only do_patch for nativesdk-qt4-tools, qt-mobility-*, qt4-embedded.

I've finished testing qt4-free-x11 on armv7a, x86_64 and armv5te +
qt-mobility-x11 on armv4t and armv7a.

Only python-pyqt_4.8.4.bb from meta-oe is failing with that, probably
needs to be updated to 4.9.2 or something like that.

Should I resend only 4.8.1 cleanup without adding 4.8.3 or with 4.8.3 
having negative D_P?

Cheers,

> 
> The following changes since commit 938d07871bedd91f0d95ed6fe338ecbfafa5ebfe:
> 
>   busybox: Fix misplaced quote (2012-09-26 18:28:17 +0100)
> 
> are available in the git repository at:
> 
>   git://git.openembedded.org/openembedded-core-contrib jansa/qt4-4.8.3
>   http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=jansa/qt4-4.8.3
> 
> Martin Jansa (10):
>   qt4-tools-nativesdk.inc: rename to nativesdk-qt4-tools.inc
>   qt4: use releases.qt-project.org instead of get.qt.nokia.com
>   qt4: rename qt-4.8.1 to qt4-4.8.1 to match other .inc and .bb
>   qt4.inc: move more options to separate variables
>   qt-mobility: move qt-mobility patches to separate dir
>   qt4: move patches from files to qt4-4.8.1
>   qt4: drop patches not used in any recipe
>   qt4: replace all local patches with git patches with headers
>   qt4: PR bumps
>   qt4: upgrade to 4.8.3
> 
>  meta/recipes-qt/qt4/files/0004-no-qmake.patch      | 27 ------
>  meta/recipes-qt/qt4/files/0008-qt-lib-infix.patch  | 41 ----------
>  .../qt4/files/blacklist-diginotar-certs.diff       | 95 ----------------------
>  .../recipes-qt/qt4/files/compile.test-lflags.patch | 17 ----
>  meta/recipes-qt/qt4/files/fix-config-tests.patch   | 38 ---------
>  ...tools-nativesdk.inc => nativesdk-qt4-tools.inc} | 18 ++--
>  meta/recipes-qt/qt4/nativesdk-qt4-tools_4.8.1.bb   |  8 --
>  meta/recipes-qt/qt4/nativesdk-qt4-tools_4.8.3.bb   |  8 ++
>  .../qt4/qt-4.8.1/fix_conflicting_types.patch       | 29 -------
>  meta/recipes-qt/qt4/qt-4.8.1/gcc47-fix.patch       | 35 --------
>  meta/recipes-qt/qt4/qt-4.8.1/qmake_cxx_eval.patch  | 22 -----
>  ...stvideoconnector-fixed-buffers-allocation.patch |  0
>  ...nnecessary-rpaths-from-qml_device-example.patch |  0
>  .../{files => qt-mobility-1.2.0}/gcc-scope.patch   |  0
>  .../qt-mobility-configure.patch                    |  0
>  .../qt-mobility-no-opengl.patch                    |  0
>  meta/recipes-qt/qt4/qt-mobility_1.2.0.inc          |  3 +-
>  .../recipes-qt/qt4/{qt-4.8.1.inc => qt4-4.8.3.inc} | 41 +++++-----
>  ...-allow-to-set-qt.conf-from-the-outside-u.patch} | 28 +++++--
>  ...ty_qws-fix-build-with-old-kernel-headers.patch} | 21 ++++-
>  ...03-webkit2-set-OUTPUT_DIR-value-if-empty.patch} | 21 ++++-
>  ...make-is-already-built-in-qt4-tools-native.patch | 29 +++++++
>  ...-set-LFLAGS-to-pick-up-zlib-from-staging.patch} | 24 ++++--
>  ...e-OE_QMAKE_-values-to-specify-Qt-utility.patch} | 26 ++++--
>  ...const-usage-that-causes-compile-failure-.patch} | 26 ++++--
>  ...low-building-a-separate-qmake-for-the-ta.patch} | 20 +++--
>  ...-fix-source-file-references-in-qmake.pri.patch} | 15 ++--
>  ...ck-to-not-use-the-pg_config-of-the-host-.patch} | 25 ++++--
>  .../0011-freetype-host-includes.patch}             | 20 +++--
>  .../0012-Add-2bpp-support.patch}                   | 76 ++++++++++-------
>  .../0013-configure-add-crossarch-option.patch}     | 36 ++++----
>  ...ions-fix-phony-translation-linking-error.patch} | 19 +++--
>  ...configure-add-nostrip-for-debug-packages.patch} | 15 +++-
>  ...sure-we-identify-the-compiler-as-g-in-co.patch} | 27 ++++--
>  ...re-make-pulseaudio-a-configurable-option.patch} | 17 ++--
>  ...es-for-gcc-4.7.0-particularly-on-qemux86.patch} | 45 ++++++----
>  ...019-webkit-disable-the-fuse-ld-gold-flag.patch} | 23 ++++--
>  .../qt4/{qt-4.8.1 => qt4-4.8.3}/g++.conf           |  0
>  .../qt4/{qt-4.8.1 => qt4-4.8.3}/linux.conf         |  0
>  meta/recipes-qt/qt4/{files => qt4-4.8.3}/qte.sh    |  0
>  meta/recipes-qt/qt4/qt4-embedded.inc               |  2 +-
>  ...qt4-embedded_4.8.1.bb => qt4-embedded_4.8.3.bb} |  4 +-
>  meta/recipes-qt/qt4/qt4-native.inc                 | 10 +--
>  meta/recipes-qt/qt4/qt4-native_4.8.1.bb            | 12 ---
>  meta/recipes-qt/qt4/qt4-native_4.8.3.bb            |  8 ++
>  meta/recipes-qt/qt4/qt4-x11-free.inc               |  2 +-
>  ...qt4-x11-free_4.8.1.bb => qt4-x11-free_4.8.3.bb} |  4 +-
>  meta/recipes-qt/qt4/qt4.inc                        | 19 ++++-
>  48 files changed, 427 insertions(+), 529 deletions(-)
>  delete mode 100644 meta/recipes-qt/qt4/files/0004-no-qmake.patch
>  delete mode 100644 meta/recipes-qt/qt4/files/0008-qt-lib-infix.patch
>  delete mode 100644 meta/recipes-qt/qt4/files/blacklist-diginotar-certs.diff
>  delete mode 100644 meta/recipes-qt/qt4/files/compile.test-lflags.patch
>  delete mode 100644 meta/recipes-qt/qt4/files/fix-config-tests.patch
>  rename meta/recipes-qt/qt4/{qt4-tools-nativesdk.inc => nativesdk-qt4-tools.inc} (83%)
>  delete mode 100644 meta/recipes-qt/qt4/nativesdk-qt4-tools_4.8.1.bb
>  create mode 100644 meta/recipes-qt/qt4/nativesdk-qt4-tools_4.8.3.bb
>  delete mode 100644 meta/recipes-qt/qt4/qt-4.8.1/fix_conflicting_types.patch
>  delete mode 100644 meta/recipes-qt/qt4/qt-4.8.1/gcc47-fix.patch
>  delete mode 100644 meta/recipes-qt/qt4/qt-4.8.1/qmake_cxx_eval.patch
>  rename meta/recipes-qt/qt4/{files => qt-mobility-1.2.0}/0001-gstvideoconnector-fixed-buffers-allocation.patch (100%)
>  rename meta/recipes-qt/qt4/{files => qt-mobility-1.2.0}/0002-Remove-unnecessary-rpaths-from-qml_device-example.patch (100%)
>  rename meta/recipes-qt/qt4/{files => qt-mobility-1.2.0}/gcc-scope.patch (100%)
>  rename meta/recipes-qt/qt4/{files => qt-mobility-1.2.0}/qt-mobility-configure.patch (100%)
>  rename meta/recipes-qt/qt4/{files => qt-mobility-1.2.0}/qt-mobility-no-opengl.patch (100%)
>  rename meta/recipes-qt/qt4/{qt-4.8.1.inc => qt4-4.8.3.inc} (50%)
>  rename meta/recipes-qt/qt4/{files/qt-config.patch => qt4-4.8.3/0001-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch} (49%)
>  rename meta/recipes-qt/qt4/{files/fix_qkbdtty_qws.patch => qt4-4.8.3/0002-qkbdtty_qws-fix-build-with-old-kernel-headers.patch} (68%)
>  rename meta/recipes-qt/qt4/{files/set-OUTPUT_DIR-if-empty.patch => qt4-4.8.3/0003-webkit2-set-OUTPUT_DIR-value-if-empty.patch} (48%)
>  create mode 100644 meta/recipes-qt/qt4/qt4-4.8.3/0004-configure-qmake-is-already-built-in-qt4-tools-native.patch
>  rename meta/recipes-qt/qt4/{qt-4.8.1/configure-lflags.patch => qt4-4.8.3/0005-configure-set-LFLAGS-to-pick-up-zlib-from-staging.patch} (46%)
>  rename meta/recipes-qt/qt4/{files/configure-paths.patch => qt4-4.8.3/0006-configure-Use-OE_QMAKE_-values-to-specify-Qt-utility.patch} (58%)
>  rename meta/recipes-qt/qt4/{files/qt-dbus-const.patch => qt4-4.8.3/0007-dbus-Remove-const-usage-that-causes-compile-failure-.patch} (52%)
>  rename meta/recipes-qt/qt4/{files/target_qmake.patch => qt4-4.8.3/0008-qmake.pro-Allow-building-a-separate-qmake-for-the-ta.patch} (57%)
>  rename meta/recipes-qt/qt4/{qt-4.8.1/qmake_pri_fixes.patch => qt4-4.8.3/0009-qmake-fix-source-file-references-in-qmake.pri.patch} (81%)
>  rename meta/recipes-qt/qt4/{qt-4.8.1/hack-out-pg2-4.7.0.patch => qt4-4.8.3/0010-configure-Hack-to-not-use-the-pg_config-of-the-host-.patch} (68%)
>  rename meta/recipes-qt/qt4/{files/0006-freetype-host-includes.patch => qt4-4.8.3/0011-freetype-host-includes.patch} (50%)
>  rename meta/recipes-qt/qt4/{files/0009-support-2bpp.patch => qt4-4.8.3/0012-Add-2bpp-support.patch} (83%)
>  rename meta/recipes-qt/qt4/{qt-4.8.1/0001-Added-Openembedded-crossarch-option.patch => qt4-4.8.3/0013-configure-add-crossarch-option.patch} (49%)
>  rename meta/recipes-qt/qt4/{qt-4.8.1/fix-translations.patch => qt4-4.8.3/0014-translations-fix-phony-translation-linking-error.patch} (63%)
>  rename meta/recipes-qt/qt4/{files/add_nostrip_for_debug_packages.diff => qt4-4.8.3/0015-configure-add-nostrip-for-debug-packages.patch} (57%)
>  rename meta/recipes-qt/qt4/{qt-4.8.1/configure_oe_compiler.patch => qt4-4.8.3/0016-configure-ensure-we-identify-the-compiler-as-g-in-co.patch} (60%)
>  rename meta/recipes-qt/qt4/{qt-4.8.1/pulseaudio-config.patch => qt4-4.8.3/0017-configure-make-pulseaudio-a-configurable-option.patch} (85%)
>  rename meta/recipes-qt/qt4/{qt-4.8.1/gcc47-fix2.patch => qt4-4.8.3/0018-Fixes-for-gcc-4.7.0-particularly-on-qemux86.patch} (46%)
>  rename meta/recipes-qt/qt4/{qt-4.8.1/disable-fuse-gold-flag.patch => qt4-4.8.3/0019-webkit-disable-the-fuse-ld-gold-flag.patch} (46%)
>  rename meta/recipes-qt/qt4/{qt-4.8.1 => qt4-4.8.3}/g++.conf (100%)
>  rename meta/recipes-qt/qt4/{qt-4.8.1 => qt4-4.8.3}/linux.conf (100%)
>  rename meta/recipes-qt/qt4/{files => qt4-4.8.3}/qte.sh (100%)
>  rename meta/recipes-qt/qt4/{qt4-embedded_4.8.1.bb => qt4-embedded_4.8.3.bb} (73%)
>  delete mode 100644 meta/recipes-qt/qt4/qt4-native_4.8.1.bb
>  create mode 100644 meta/recipes-qt/qt4/qt4-native_4.8.3.bb
>  rename meta/recipes-qt/qt4/{qt4-x11-free_4.8.1.bb => qt4-x11-free_4.8.3.bb} (75%)
> 
> -- 
> 1.7.12
> 

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]

Re: [PATCH 00/10] qt4: upgrade to 4.8.3 and cleanup

[Martin Jansa]

[-- Attachment #1: Type: text/plain, Size: 10054 bytes --]

On Fri, Sep 28, 2012 at 06:43:09PM +0200, Martin Jansa wrote:
> On Thu, Sep 27, 2012 at 12:27:05AM +0200, Martin Jansa wrote:
> > Please test on more architectures.
> > I've tested complete qt4-native + qt4-free-x11 on armv4t.
> > And only do_patch for nativesdk-qt4-tools, qt-mobility-*, qt4-embedded.
> 
> I've finished testing qt4-free-x11 on armv7a, x86_64 and armv5te +
> qt-mobility-x11 on armv4t and armv7a.
> 
> Only python-pyqt_4.8.4.bb from meta-oe is failing with that, probably
> needs to be updated to 4.9.2 or something like that.

This seems to be caused by missing webkit support in qt4-4.8.3.
python-pyqt-4.9.4 and 4.9.5 fails the same.

Configure ignores -webkit and says that webkit won't be built I've found
some bug reports upstream but those were resolved by forcing xrender
support which doesn't help in our case..

> Should I resend only 4.8.1 cleanup without adding 4.8.3 or with 4.8.3 
> having negative D_P?
> 
> Cheers,
> 
> > 
> > The following changes since commit 938d07871bedd91f0d95ed6fe338ecbfafa5ebfe:
> > 
> >   busybox: Fix misplaced quote (2012-09-26 18:28:17 +0100)
> > 
> > are available in the git repository at:
> > 
> >   git://git.openembedded.org/openembedded-core-contrib jansa/qt4-4.8.3
> >   http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=jansa/qt4-4.8.3
> > 
> > Martin Jansa (10):
> >   qt4-tools-nativesdk.inc: rename to nativesdk-qt4-tools.inc
> >   qt4: use releases.qt-project.org instead of get.qt.nokia.com
> >   qt4: rename qt-4.8.1 to qt4-4.8.1 to match other .inc and .bb
> >   qt4.inc: move more options to separate variables
> >   qt-mobility: move qt-mobility patches to separate dir
> >   qt4: move patches from files to qt4-4.8.1
> >   qt4: drop patches not used in any recipe
> >   qt4: replace all local patches with git patches with headers
> >   qt4: PR bumps
> >   qt4: upgrade to 4.8.3
> > 
> >  meta/recipes-qt/qt4/files/0004-no-qmake.patch      | 27 ------
> >  meta/recipes-qt/qt4/files/0008-qt-lib-infix.patch  | 41 ----------
> >  .../qt4/files/blacklist-diginotar-certs.diff       | 95 ----------------------
> >  .../recipes-qt/qt4/files/compile.test-lflags.patch | 17 ----
> >  meta/recipes-qt/qt4/files/fix-config-tests.patch   | 38 ---------
> >  ...tools-nativesdk.inc => nativesdk-qt4-tools.inc} | 18 ++--
> >  meta/recipes-qt/qt4/nativesdk-qt4-tools_4.8.1.bb   |  8 --
> >  meta/recipes-qt/qt4/nativesdk-qt4-tools_4.8.3.bb   |  8 ++
> >  .../qt4/qt-4.8.1/fix_conflicting_types.patch       | 29 -------
> >  meta/recipes-qt/qt4/qt-4.8.1/gcc47-fix.patch       | 35 --------
> >  meta/recipes-qt/qt4/qt-4.8.1/qmake_cxx_eval.patch  | 22 -----
> >  ...stvideoconnector-fixed-buffers-allocation.patch |  0
> >  ...nnecessary-rpaths-from-qml_device-example.patch |  0
> >  .../{files => qt-mobility-1.2.0}/gcc-scope.patch   |  0
> >  .../qt-mobility-configure.patch                    |  0
> >  .../qt-mobility-no-opengl.patch                    |  0
> >  meta/recipes-qt/qt4/qt-mobility_1.2.0.inc          |  3 +-
> >  .../recipes-qt/qt4/{qt-4.8.1.inc => qt4-4.8.3.inc} | 41 +++++-----
> >  ...-allow-to-set-qt.conf-from-the-outside-u.patch} | 28 +++++--
> >  ...ty_qws-fix-build-with-old-kernel-headers.patch} | 21 ++++-
> >  ...03-webkit2-set-OUTPUT_DIR-value-if-empty.patch} | 21 ++++-
> >  ...make-is-already-built-in-qt4-tools-native.patch | 29 +++++++
> >  ...-set-LFLAGS-to-pick-up-zlib-from-staging.patch} | 24 ++++--
> >  ...e-OE_QMAKE_-values-to-specify-Qt-utility.patch} | 26 ++++--
> >  ...const-usage-that-causes-compile-failure-.patch} | 26 ++++--
> >  ...low-building-a-separate-qmake-for-the-ta.patch} | 20 +++--
> >  ...-fix-source-file-references-in-qmake.pri.patch} | 15 ++--
> >  ...ck-to-not-use-the-pg_config-of-the-host-.patch} | 25 ++++--
> >  .../0011-freetype-host-includes.patch}             | 20 +++--
> >  .../0012-Add-2bpp-support.patch}                   | 76 ++++++++++-------
> >  .../0013-configure-add-crossarch-option.patch}     | 36 ++++----
> >  ...ions-fix-phony-translation-linking-error.patch} | 19 +++--
> >  ...configure-add-nostrip-for-debug-packages.patch} | 15 +++-
> >  ...sure-we-identify-the-compiler-as-g-in-co.patch} | 27 ++++--
> >  ...re-make-pulseaudio-a-configurable-option.patch} | 17 ++--
> >  ...es-for-gcc-4.7.0-particularly-on-qemux86.patch} | 45 ++++++----
> >  ...019-webkit-disable-the-fuse-ld-gold-flag.patch} | 23 ++++--
> >  .../qt4/{qt-4.8.1 => qt4-4.8.3}/g++.conf           |  0
> >  .../qt4/{qt-4.8.1 => qt4-4.8.3}/linux.conf         |  0
> >  meta/recipes-qt/qt4/{files => qt4-4.8.3}/qte.sh    |  0
> >  meta/recipes-qt/qt4/qt4-embedded.inc               |  2 +-
> >  ...qt4-embedded_4.8.1.bb => qt4-embedded_4.8.3.bb} |  4 +-
> >  meta/recipes-qt/qt4/qt4-native.inc                 | 10 +--
> >  meta/recipes-qt/qt4/qt4-native_4.8.1.bb            | 12 ---
> >  meta/recipes-qt/qt4/qt4-native_4.8.3.bb            |  8 ++
> >  meta/recipes-qt/qt4/qt4-x11-free.inc               |  2 +-
> >  ...qt4-x11-free_4.8.1.bb => qt4-x11-free_4.8.3.bb} |  4 +-
> >  meta/recipes-qt/qt4/qt4.inc                        | 19 ++++-
> >  48 files changed, 427 insertions(+), 529 deletions(-)
> >  delete mode 100644 meta/recipes-qt/qt4/files/0004-no-qmake.patch
> >  delete mode 100644 meta/recipes-qt/qt4/files/0008-qt-lib-infix.patch
> >  delete mode 100644 meta/recipes-qt/qt4/files/blacklist-diginotar-certs.diff
> >  delete mode 100644 meta/recipes-qt/qt4/files/compile.test-lflags.patch
> >  delete mode 100644 meta/recipes-qt/qt4/files/fix-config-tests.patch
> >  rename meta/recipes-qt/qt4/{qt4-tools-nativesdk.inc => nativesdk-qt4-tools.inc} (83%)
> >  delete mode 100644 meta/recipes-qt/qt4/nativesdk-qt4-tools_4.8.1.bb
> >  create mode 100644 meta/recipes-qt/qt4/nativesdk-qt4-tools_4.8.3.bb
> >  delete mode 100644 meta/recipes-qt/qt4/qt-4.8.1/fix_conflicting_types.patch
> >  delete mode 100644 meta/recipes-qt/qt4/qt-4.8.1/gcc47-fix.patch
> >  delete mode 100644 meta/recipes-qt/qt4/qt-4.8.1/qmake_cxx_eval.patch
> >  rename meta/recipes-qt/qt4/{files => qt-mobility-1.2.0}/0001-gstvideoconnector-fixed-buffers-allocation.patch (100%)
> >  rename meta/recipes-qt/qt4/{files => qt-mobility-1.2.0}/0002-Remove-unnecessary-rpaths-from-qml_device-example.patch (100%)
> >  rename meta/recipes-qt/qt4/{files => qt-mobility-1.2.0}/gcc-scope.patch (100%)
> >  rename meta/recipes-qt/qt4/{files => qt-mobility-1.2.0}/qt-mobility-configure.patch (100%)
> >  rename meta/recipes-qt/qt4/{files => qt-mobility-1.2.0}/qt-mobility-no-opengl.patch (100%)
> >  rename meta/recipes-qt/qt4/{qt-4.8.1.inc => qt4-4.8.3.inc} (50%)
> >  rename meta/recipes-qt/qt4/{files/qt-config.patch => qt4-4.8.3/0001-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch} (49%)
> >  rename meta/recipes-qt/qt4/{files/fix_qkbdtty_qws.patch => qt4-4.8.3/0002-qkbdtty_qws-fix-build-with-old-kernel-headers.patch} (68%)
> >  rename meta/recipes-qt/qt4/{files/set-OUTPUT_DIR-if-empty.patch => qt4-4.8.3/0003-webkit2-set-OUTPUT_DIR-value-if-empty.patch} (48%)
> >  create mode 100644 meta/recipes-qt/qt4/qt4-4.8.3/0004-configure-qmake-is-already-built-in-qt4-tools-native.patch
> >  rename meta/recipes-qt/qt4/{qt-4.8.1/configure-lflags.patch => qt4-4.8.3/0005-configure-set-LFLAGS-to-pick-up-zlib-from-staging.patch} (46%)
> >  rename meta/recipes-qt/qt4/{files/configure-paths.patch => qt4-4.8.3/0006-configure-Use-OE_QMAKE_-values-to-specify-Qt-utility.patch} (58%)
> >  rename meta/recipes-qt/qt4/{files/qt-dbus-const.patch => qt4-4.8.3/0007-dbus-Remove-const-usage-that-causes-compile-failure-.patch} (52%)
> >  rename meta/recipes-qt/qt4/{files/target_qmake.patch => qt4-4.8.3/0008-qmake.pro-Allow-building-a-separate-qmake-for-the-ta.patch} (57%)
> >  rename meta/recipes-qt/qt4/{qt-4.8.1/qmake_pri_fixes.patch => qt4-4.8.3/0009-qmake-fix-source-file-references-in-qmake.pri.patch} (81%)
> >  rename meta/recipes-qt/qt4/{qt-4.8.1/hack-out-pg2-4.7.0.patch => qt4-4.8.3/0010-configure-Hack-to-not-use-the-pg_config-of-the-host-.patch} (68%)
> >  rename meta/recipes-qt/qt4/{files/0006-freetype-host-includes.patch => qt4-4.8.3/0011-freetype-host-includes.patch} (50%)
> >  rename meta/recipes-qt/qt4/{files/0009-support-2bpp.patch => qt4-4.8.3/0012-Add-2bpp-support.patch} (83%)
> >  rename meta/recipes-qt/qt4/{qt-4.8.1/0001-Added-Openembedded-crossarch-option.patch => qt4-4.8.3/0013-configure-add-crossarch-option.patch} (49%)
> >  rename meta/recipes-qt/qt4/{qt-4.8.1/fix-translations.patch => qt4-4.8.3/0014-translations-fix-phony-translation-linking-error.patch} (63%)
> >  rename meta/recipes-qt/qt4/{files/add_nostrip_for_debug_packages.diff => qt4-4.8.3/0015-configure-add-nostrip-for-debug-packages.patch} (57%)
> >  rename meta/recipes-qt/qt4/{qt-4.8.1/configure_oe_compiler.patch => qt4-4.8.3/0016-configure-ensure-we-identify-the-compiler-as-g-in-co.patch} (60%)
> >  rename meta/recipes-qt/qt4/{qt-4.8.1/pulseaudio-config.patch => qt4-4.8.3/0017-configure-make-pulseaudio-a-configurable-option.patch} (85%)
> >  rename meta/recipes-qt/qt4/{qt-4.8.1/gcc47-fix2.patch => qt4-4.8.3/0018-Fixes-for-gcc-4.7.0-particularly-on-qemux86.patch} (46%)
> >  rename meta/recipes-qt/qt4/{qt-4.8.1/disable-fuse-gold-flag.patch => qt4-4.8.3/0019-webkit-disable-the-fuse-ld-gold-flag.patch} (46%)
> >  rename meta/recipes-qt/qt4/{qt-4.8.1 => qt4-4.8.3}/g++.conf (100%)
> >  rename meta/recipes-qt/qt4/{qt-4.8.1 => qt4-4.8.3}/linux.conf (100%)
> >  rename meta/recipes-qt/qt4/{files => qt4-4.8.3}/qte.sh (100%)
> >  rename meta/recipes-qt/qt4/{qt4-embedded_4.8.1.bb => qt4-embedded_4.8.3.bb} (73%)
> >  delete mode 100644 meta/recipes-qt/qt4/qt4-native_4.8.1.bb
> >  create mode 100644 meta/recipes-qt/qt4/qt4-native_4.8.3.bb
> >  rename meta/recipes-qt/qt4/{qt4-x11-free_4.8.1.bb => qt4-x11-free_4.8.3.bb} (75%)
> > 
> > -- 
> > 1.7.12
> > 
> 
> -- 
> Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com



-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]

Re: [PATCH 00/10] qt4: upgrade to 4.8.3 and cleanup

[Martin Jansa]

[-- Attachment #1: Type: text/plain, Size: 10619 bytes --]

On Sun, Sep 30, 2012 at 10:18:18PM +0200, Martin Jansa wrote:
> On Fri, Sep 28, 2012 at 06:43:09PM +0200, Martin Jansa wrote:
> > On Thu, Sep 27, 2012 at 12:27:05AM +0200, Martin Jansa wrote:
> > > Please test on more architectures.
> > > I've tested complete qt4-native + qt4-free-x11 on armv4t.
> > > And only do_patch for nativesdk-qt4-tools, qt-mobility-*, qt4-embedded.
> > 
> > I've finished testing qt4-free-x11 on armv7a, x86_64 and armv5te +
> > qt-mobility-x11 on armv4t and armv7a.
> > 
> > Only python-pyqt_4.8.4.bb from meta-oe is failing with that, probably
> > needs to be updated to 4.9.2 or something like that.
> 
> This seems to be caused by missing webkit support in qt4-4.8.3.
> python-pyqt-4.9.4 and 4.9.5 fails the same.
> 
> Configure ignores -webkit and says that webkit won't be built I've found
> some bug reports upstream but those were resolved by forcing xrender
> support which doesn't help in our case..

Found it, jansa/qt4-4.8.3 updated and 4.8.3 now added with negative D_P
instead of replacing 4.8.1, will send v2 tonight.

Cheers,

> > Should I resend only 4.8.1 cleanup without adding 4.8.3 or with 4.8.3 
> > having negative D_P?
> > 
> > Cheers,
> > 
> > > 
> > > The following changes since commit 938d07871bedd91f0d95ed6fe338ecbfafa5ebfe:
> > > 
> > >   busybox: Fix misplaced quote (2012-09-26 18:28:17 +0100)
> > > 
> > > are available in the git repository at:
> > > 
> > >   git://git.openembedded.org/openembedded-core-contrib jansa/qt4-4.8.3
> > >   http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=jansa/qt4-4.8.3
> > > 
> > > Martin Jansa (10):
> > >   qt4-tools-nativesdk.inc: rename to nativesdk-qt4-tools.inc
> > >   qt4: use releases.qt-project.org instead of get.qt.nokia.com
> > >   qt4: rename qt-4.8.1 to qt4-4.8.1 to match other .inc and .bb
> > >   qt4.inc: move more options to separate variables
> > >   qt-mobility: move qt-mobility patches to separate dir
> > >   qt4: move patches from files to qt4-4.8.1
> > >   qt4: drop patches not used in any recipe
> > >   qt4: replace all local patches with git patches with headers
> > >   qt4: PR bumps
> > >   qt4: upgrade to 4.8.3
> > > 
> > >  meta/recipes-qt/qt4/files/0004-no-qmake.patch      | 27 ------
> > >  meta/recipes-qt/qt4/files/0008-qt-lib-infix.patch  | 41 ----------
> > >  .../qt4/files/blacklist-diginotar-certs.diff       | 95 ----------------------
> > >  .../recipes-qt/qt4/files/compile.test-lflags.patch | 17 ----
> > >  meta/recipes-qt/qt4/files/fix-config-tests.patch   | 38 ---------
> > >  ...tools-nativesdk.inc => nativesdk-qt4-tools.inc} | 18 ++--
> > >  meta/recipes-qt/qt4/nativesdk-qt4-tools_4.8.1.bb   |  8 --
> > >  meta/recipes-qt/qt4/nativesdk-qt4-tools_4.8.3.bb   |  8 ++
> > >  .../qt4/qt-4.8.1/fix_conflicting_types.patch       | 29 -------
> > >  meta/recipes-qt/qt4/qt-4.8.1/gcc47-fix.patch       | 35 --------
> > >  meta/recipes-qt/qt4/qt-4.8.1/qmake_cxx_eval.patch  | 22 -----
> > >  ...stvideoconnector-fixed-buffers-allocation.patch |  0
> > >  ...nnecessary-rpaths-from-qml_device-example.patch |  0
> > >  .../{files => qt-mobility-1.2.0}/gcc-scope.patch   |  0
> > >  .../qt-mobility-configure.patch                    |  0
> > >  .../qt-mobility-no-opengl.patch                    |  0
> > >  meta/recipes-qt/qt4/qt-mobility_1.2.0.inc          |  3 +-
> > >  .../recipes-qt/qt4/{qt-4.8.1.inc => qt4-4.8.3.inc} | 41 +++++-----
> > >  ...-allow-to-set-qt.conf-from-the-outside-u.patch} | 28 +++++--
> > >  ...ty_qws-fix-build-with-old-kernel-headers.patch} | 21 ++++-
> > >  ...03-webkit2-set-OUTPUT_DIR-value-if-empty.patch} | 21 ++++-
> > >  ...make-is-already-built-in-qt4-tools-native.patch | 29 +++++++
> > >  ...-set-LFLAGS-to-pick-up-zlib-from-staging.patch} | 24 ++++--
> > >  ...e-OE_QMAKE_-values-to-specify-Qt-utility.patch} | 26 ++++--
> > >  ...const-usage-that-causes-compile-failure-.patch} | 26 ++++--
> > >  ...low-building-a-separate-qmake-for-the-ta.patch} | 20 +++--
> > >  ...-fix-source-file-references-in-qmake.pri.patch} | 15 ++--
> > >  ...ck-to-not-use-the-pg_config-of-the-host-.patch} | 25 ++++--
> > >  .../0011-freetype-host-includes.patch}             | 20 +++--
> > >  .../0012-Add-2bpp-support.patch}                   | 76 ++++++++++-------
> > >  .../0013-configure-add-crossarch-option.patch}     | 36 ++++----
> > >  ...ions-fix-phony-translation-linking-error.patch} | 19 +++--
> > >  ...configure-add-nostrip-for-debug-packages.patch} | 15 +++-
> > >  ...sure-we-identify-the-compiler-as-g-in-co.patch} | 27 ++++--
> > >  ...re-make-pulseaudio-a-configurable-option.patch} | 17 ++--
> > >  ...es-for-gcc-4.7.0-particularly-on-qemux86.patch} | 45 ++++++----
> > >  ...019-webkit-disable-the-fuse-ld-gold-flag.patch} | 23 ++++--
> > >  .../qt4/{qt-4.8.1 => qt4-4.8.3}/g++.conf           |  0
> > >  .../qt4/{qt-4.8.1 => qt4-4.8.3}/linux.conf         |  0
> > >  meta/recipes-qt/qt4/{files => qt4-4.8.3}/qte.sh    |  0
> > >  meta/recipes-qt/qt4/qt4-embedded.inc               |  2 +-
> > >  ...qt4-embedded_4.8.1.bb => qt4-embedded_4.8.3.bb} |  4 +-
> > >  meta/recipes-qt/qt4/qt4-native.inc                 | 10 +--
> > >  meta/recipes-qt/qt4/qt4-native_4.8.1.bb            | 12 ---
> > >  meta/recipes-qt/qt4/qt4-native_4.8.3.bb            |  8 ++
> > >  meta/recipes-qt/qt4/qt4-x11-free.inc               |  2 +-
> > >  ...qt4-x11-free_4.8.1.bb => qt4-x11-free_4.8.3.bb} |  4 +-
> > >  meta/recipes-qt/qt4/qt4.inc                        | 19 ++++-
> > >  48 files changed, 427 insertions(+), 529 deletions(-)
> > >  delete mode 100644 meta/recipes-qt/qt4/files/0004-no-qmake.patch
> > >  delete mode 100644 meta/recipes-qt/qt4/files/0008-qt-lib-infix.patch
> > >  delete mode 100644 meta/recipes-qt/qt4/files/blacklist-diginotar-certs.diff
> > >  delete mode 100644 meta/recipes-qt/qt4/files/compile.test-lflags.patch
> > >  delete mode 100644 meta/recipes-qt/qt4/files/fix-config-tests.patch
> > >  rename meta/recipes-qt/qt4/{qt4-tools-nativesdk.inc => nativesdk-qt4-tools.inc} (83%)
> > >  delete mode 100644 meta/recipes-qt/qt4/nativesdk-qt4-tools_4.8.1.bb
> > >  create mode 100644 meta/recipes-qt/qt4/nativesdk-qt4-tools_4.8.3.bb
> > >  delete mode 100644 meta/recipes-qt/qt4/qt-4.8.1/fix_conflicting_types.patch
> > >  delete mode 100644 meta/recipes-qt/qt4/qt-4.8.1/gcc47-fix.patch
> > >  delete mode 100644 meta/recipes-qt/qt4/qt-4.8.1/qmake_cxx_eval.patch
> > >  rename meta/recipes-qt/qt4/{files => qt-mobility-1.2.0}/0001-gstvideoconnector-fixed-buffers-allocation.patch (100%)
> > >  rename meta/recipes-qt/qt4/{files => qt-mobility-1.2.0}/0002-Remove-unnecessary-rpaths-from-qml_device-example.patch (100%)
> > >  rename meta/recipes-qt/qt4/{files => qt-mobility-1.2.0}/gcc-scope.patch (100%)
> > >  rename meta/recipes-qt/qt4/{files => qt-mobility-1.2.0}/qt-mobility-configure.patch (100%)
> > >  rename meta/recipes-qt/qt4/{files => qt-mobility-1.2.0}/qt-mobility-no-opengl.patch (100%)
> > >  rename meta/recipes-qt/qt4/{qt-4.8.1.inc => qt4-4.8.3.inc} (50%)
> > >  rename meta/recipes-qt/qt4/{files/qt-config.patch => qt4-4.8.3/0001-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch} (49%)
> > >  rename meta/recipes-qt/qt4/{files/fix_qkbdtty_qws.patch => qt4-4.8.3/0002-qkbdtty_qws-fix-build-with-old-kernel-headers.patch} (68%)
> > >  rename meta/recipes-qt/qt4/{files/set-OUTPUT_DIR-if-empty.patch => qt4-4.8.3/0003-webkit2-set-OUTPUT_DIR-value-if-empty.patch} (48%)
> > >  create mode 100644 meta/recipes-qt/qt4/qt4-4.8.3/0004-configure-qmake-is-already-built-in-qt4-tools-native.patch
> > >  rename meta/recipes-qt/qt4/{qt-4.8.1/configure-lflags.patch => qt4-4.8.3/0005-configure-set-LFLAGS-to-pick-up-zlib-from-staging.patch} (46%)
> > >  rename meta/recipes-qt/qt4/{files/configure-paths.patch => qt4-4.8.3/0006-configure-Use-OE_QMAKE_-values-to-specify-Qt-utility.patch} (58%)
> > >  rename meta/recipes-qt/qt4/{files/qt-dbus-const.patch => qt4-4.8.3/0007-dbus-Remove-const-usage-that-causes-compile-failure-.patch} (52%)
> > >  rename meta/recipes-qt/qt4/{files/target_qmake.patch => qt4-4.8.3/0008-qmake.pro-Allow-building-a-separate-qmake-for-the-ta.patch} (57%)
> > >  rename meta/recipes-qt/qt4/{qt-4.8.1/qmake_pri_fixes.patch => qt4-4.8.3/0009-qmake-fix-source-file-references-in-qmake.pri.patch} (81%)
> > >  rename meta/recipes-qt/qt4/{qt-4.8.1/hack-out-pg2-4.7.0.patch => qt4-4.8.3/0010-configure-Hack-to-not-use-the-pg_config-of-the-host-.patch} (68%)
> > >  rename meta/recipes-qt/qt4/{files/0006-freetype-host-includes.patch => qt4-4.8.3/0011-freetype-host-includes.patch} (50%)
> > >  rename meta/recipes-qt/qt4/{files/0009-support-2bpp.patch => qt4-4.8.3/0012-Add-2bpp-support.patch} (83%)
> > >  rename meta/recipes-qt/qt4/{qt-4.8.1/0001-Added-Openembedded-crossarch-option.patch => qt4-4.8.3/0013-configure-add-crossarch-option.patch} (49%)
> > >  rename meta/recipes-qt/qt4/{qt-4.8.1/fix-translations.patch => qt4-4.8.3/0014-translations-fix-phony-translation-linking-error.patch} (63%)
> > >  rename meta/recipes-qt/qt4/{files/add_nostrip_for_debug_packages.diff => qt4-4.8.3/0015-configure-add-nostrip-for-debug-packages.patch} (57%)
> > >  rename meta/recipes-qt/qt4/{qt-4.8.1/configure_oe_compiler.patch => qt4-4.8.3/0016-configure-ensure-we-identify-the-compiler-as-g-in-co.patch} (60%)
> > >  rename meta/recipes-qt/qt4/{qt-4.8.1/pulseaudio-config.patch => qt4-4.8.3/0017-configure-make-pulseaudio-a-configurable-option.patch} (85%)
> > >  rename meta/recipes-qt/qt4/{qt-4.8.1/gcc47-fix2.patch => qt4-4.8.3/0018-Fixes-for-gcc-4.7.0-particularly-on-qemux86.patch} (46%)
> > >  rename meta/recipes-qt/qt4/{qt-4.8.1/disable-fuse-gold-flag.patch => qt4-4.8.3/0019-webkit-disable-the-fuse-ld-gold-flag.patch} (46%)
> > >  rename meta/recipes-qt/qt4/{qt-4.8.1 => qt4-4.8.3}/g++.conf (100%)
> > >  rename meta/recipes-qt/qt4/{qt-4.8.1 => qt4-4.8.3}/linux.conf (100%)
> > >  rename meta/recipes-qt/qt4/{files => qt4-4.8.3}/qte.sh (100%)
> > >  rename meta/recipes-qt/qt4/{qt4-embedded_4.8.1.bb => qt4-embedded_4.8.3.bb} (73%)
> > >  delete mode 100644 meta/recipes-qt/qt4/qt4-native_4.8.1.bb
> > >  create mode 100644 meta/recipes-qt/qt4/qt4-native_4.8.3.bb
> > >  rename meta/recipes-qt/qt4/{qt4-x11-free_4.8.1.bb => qt4-x11-free_4.8.3.bb} (75%)
> > > 
> > > -- 
> > > 1.7.12
> > > 
> > 
> > -- 
> > Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com
> 
> 
> 
> -- 
> Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com



-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]

Re: [PATCH 00/10] qt4: upgrade to 4.8.3 and cleanup

[Martin Jansa]

[-- Attachment #1: Type: text/plain, Size: 11628 bytes --]

On Mon, Oct 01, 2012 at 04:31:08PM +0200, Martin Jansa wrote:
> On Sun, Sep 30, 2012 at 10:18:18PM +0200, Martin Jansa wrote:
> > On Fri, Sep 28, 2012 at 06:43:09PM +0200, Martin Jansa wrote:
> > > On Thu, Sep 27, 2012 at 12:27:05AM +0200, Martin Jansa wrote:
> > > > Please test on more architectures.
> > > > I've tested complete qt4-native + qt4-free-x11 on armv4t.
> > > > And only do_patch for nativesdk-qt4-tools, qt-mobility-*, qt4-embedded.
> > > 
> > > I've finished testing qt4-free-x11 on armv7a, x86_64 and armv5te +
> > > qt-mobility-x11 on armv4t and armv7a.
> > > 
> > > Only python-pyqt_4.8.4.bb from meta-oe is failing with that, probably
> > > needs to be updated to 4.9.2 or something like that.
> > 
> > This seems to be caused by missing webkit support in qt4-4.8.3.
> > python-pyqt-4.9.4 and 4.9.5 fails the same.
> > 
> > Configure ignores -webkit and says that webkit won't be built I've found
> > some bug reports upstream but those were resolved by forcing xrender
> > support which doesn't help in our case..
> 
> Found it, jansa/qt4-4.8.3 updated and 4.8.3 now added with negative D_P
> instead of replacing 4.8.1, will send v2 tonight.

Here is buildhistory log when whole patchset is applied without defining
P_P.

https://github.com/shr-distribution/buildhistory/commit/0e0245527626b77d7913c3b44976eab478c04ca5
https://github.com/shr-distribution/buildhistory/commit/56385ad686ab9591460d3be4d3eb13b4beddc45e

note that there are few changes, because before PR bump it was built
with gcc 4.7.1.0+git1+d07e24f4ab59f264d68d21838795349faab5dede not
4.7.2.

And here are branches (oe-core-4.8.1, oe-core-4.8.3) with all patches applied
https://github.com/shr-project/qt

Cheers,

> 
> Cheers,
> 
> > > Should I resend only 4.8.1 cleanup without adding 4.8.3 or with 4.8.3 
> > > having negative D_P?
> > > 
> > > Cheers,
> > > 
> > > > 
> > > > The following changes since commit 938d07871bedd91f0d95ed6fe338ecbfafa5ebfe:
> > > > 
> > > >   busybox: Fix misplaced quote (2012-09-26 18:28:17 +0100)
> > > > 
> > > > are available in the git repository at:
> > > > 
> > > >   git://git.openembedded.org/openembedded-core-contrib jansa/qt4-4.8.3
> > > >   http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=jansa/qt4-4.8.3
> > > > 
> > > > Martin Jansa (10):
> > > >   qt4-tools-nativesdk.inc: rename to nativesdk-qt4-tools.inc
> > > >   qt4: use releases.qt-project.org instead of get.qt.nokia.com
> > > >   qt4: rename qt-4.8.1 to qt4-4.8.1 to match other .inc and .bb
> > > >   qt4.inc: move more options to separate variables
> > > >   qt-mobility: move qt-mobility patches to separate dir
> > > >   qt4: move patches from files to qt4-4.8.1
> > > >   qt4: drop patches not used in any recipe
> > > >   qt4: replace all local patches with git patches with headers
> > > >   qt4: PR bumps
> > > >   qt4: upgrade to 4.8.3
> > > > 
> > > >  meta/recipes-qt/qt4/files/0004-no-qmake.patch      | 27 ------
> > > >  meta/recipes-qt/qt4/files/0008-qt-lib-infix.patch  | 41 ----------
> > > >  .../qt4/files/blacklist-diginotar-certs.diff       | 95 ----------------------
> > > >  .../recipes-qt/qt4/files/compile.test-lflags.patch | 17 ----
> > > >  meta/recipes-qt/qt4/files/fix-config-tests.patch   | 38 ---------
> > > >  ...tools-nativesdk.inc => nativesdk-qt4-tools.inc} | 18 ++--
> > > >  meta/recipes-qt/qt4/nativesdk-qt4-tools_4.8.1.bb   |  8 --
> > > >  meta/recipes-qt/qt4/nativesdk-qt4-tools_4.8.3.bb   |  8 ++
> > > >  .../qt4/qt-4.8.1/fix_conflicting_types.patch       | 29 -------
> > > >  meta/recipes-qt/qt4/qt-4.8.1/gcc47-fix.patch       | 35 --------
> > > >  meta/recipes-qt/qt4/qt-4.8.1/qmake_cxx_eval.patch  | 22 -----
> > > >  ...stvideoconnector-fixed-buffers-allocation.patch |  0
> > > >  ...nnecessary-rpaths-from-qml_device-example.patch |  0
> > > >  .../{files => qt-mobility-1.2.0}/gcc-scope.patch   |  0
> > > >  .../qt-mobility-configure.patch                    |  0
> > > >  .../qt-mobility-no-opengl.patch                    |  0
> > > >  meta/recipes-qt/qt4/qt-mobility_1.2.0.inc          |  3 +-
> > > >  .../recipes-qt/qt4/{qt-4.8.1.inc => qt4-4.8.3.inc} | 41 +++++-----
> > > >  ...-allow-to-set-qt.conf-from-the-outside-u.patch} | 28 +++++--
> > > >  ...ty_qws-fix-build-with-old-kernel-headers.patch} | 21 ++++-
> > > >  ...03-webkit2-set-OUTPUT_DIR-value-if-empty.patch} | 21 ++++-
> > > >  ...make-is-already-built-in-qt4-tools-native.patch | 29 +++++++
> > > >  ...-set-LFLAGS-to-pick-up-zlib-from-staging.patch} | 24 ++++--
> > > >  ...e-OE_QMAKE_-values-to-specify-Qt-utility.patch} | 26 ++++--
> > > >  ...const-usage-that-causes-compile-failure-.patch} | 26 ++++--
> > > >  ...low-building-a-separate-qmake-for-the-ta.patch} | 20 +++--
> > > >  ...-fix-source-file-references-in-qmake.pri.patch} | 15 ++--
> > > >  ...ck-to-not-use-the-pg_config-of-the-host-.patch} | 25 ++++--
> > > >  .../0011-freetype-host-includes.patch}             | 20 +++--
> > > >  .../0012-Add-2bpp-support.patch}                   | 76 ++++++++++-------
> > > >  .../0013-configure-add-crossarch-option.patch}     | 36 ++++----
> > > >  ...ions-fix-phony-translation-linking-error.patch} | 19 +++--
> > > >  ...configure-add-nostrip-for-debug-packages.patch} | 15 +++-
> > > >  ...sure-we-identify-the-compiler-as-g-in-co.patch} | 27 ++++--
> > > >  ...re-make-pulseaudio-a-configurable-option.patch} | 17 ++--
> > > >  ...es-for-gcc-4.7.0-particularly-on-qemux86.patch} | 45 ++++++----
> > > >  ...019-webkit-disable-the-fuse-ld-gold-flag.patch} | 23 ++++--
> > > >  .../qt4/{qt-4.8.1 => qt4-4.8.3}/g++.conf           |  0
> > > >  .../qt4/{qt-4.8.1 => qt4-4.8.3}/linux.conf         |  0
> > > >  meta/recipes-qt/qt4/{files => qt4-4.8.3}/qte.sh    |  0
> > > >  meta/recipes-qt/qt4/qt4-embedded.inc               |  2 +-
> > > >  ...qt4-embedded_4.8.1.bb => qt4-embedded_4.8.3.bb} |  4 +-
> > > >  meta/recipes-qt/qt4/qt4-native.inc                 | 10 +--
> > > >  meta/recipes-qt/qt4/qt4-native_4.8.1.bb            | 12 ---
> > > >  meta/recipes-qt/qt4/qt4-native_4.8.3.bb            |  8 ++
> > > >  meta/recipes-qt/qt4/qt4-x11-free.inc               |  2 +-
> > > >  ...qt4-x11-free_4.8.1.bb => qt4-x11-free_4.8.3.bb} |  4 +-
> > > >  meta/recipes-qt/qt4/qt4.inc                        | 19 ++++-
> > > >  48 files changed, 427 insertions(+), 529 deletions(-)
> > > >  delete mode 100644 meta/recipes-qt/qt4/files/0004-no-qmake.patch
> > > >  delete mode 100644 meta/recipes-qt/qt4/files/0008-qt-lib-infix.patch
> > > >  delete mode 100644 meta/recipes-qt/qt4/files/blacklist-diginotar-certs.diff
> > > >  delete mode 100644 meta/recipes-qt/qt4/files/compile.test-lflags.patch
> > > >  delete mode 100644 meta/recipes-qt/qt4/files/fix-config-tests.patch
> > > >  rename meta/recipes-qt/qt4/{qt4-tools-nativesdk.inc => nativesdk-qt4-tools.inc} (83%)
> > > >  delete mode 100644 meta/recipes-qt/qt4/nativesdk-qt4-tools_4.8.1.bb
> > > >  create mode 100644 meta/recipes-qt/qt4/nativesdk-qt4-tools_4.8.3.bb
> > > >  delete mode 100644 meta/recipes-qt/qt4/qt-4.8.1/fix_conflicting_types.patch
> > > >  delete mode 100644 meta/recipes-qt/qt4/qt-4.8.1/gcc47-fix.patch
> > > >  delete mode 100644 meta/recipes-qt/qt4/qt-4.8.1/qmake_cxx_eval.patch
> > > >  rename meta/recipes-qt/qt4/{files => qt-mobility-1.2.0}/0001-gstvideoconnector-fixed-buffers-allocation.patch (100%)
> > > >  rename meta/recipes-qt/qt4/{files => qt-mobility-1.2.0}/0002-Remove-unnecessary-rpaths-from-qml_device-example.patch (100%)
> > > >  rename meta/recipes-qt/qt4/{files => qt-mobility-1.2.0}/gcc-scope.patch (100%)
> > > >  rename meta/recipes-qt/qt4/{files => qt-mobility-1.2.0}/qt-mobility-configure.patch (100%)
> > > >  rename meta/recipes-qt/qt4/{files => qt-mobility-1.2.0}/qt-mobility-no-opengl.patch (100%)
> > > >  rename meta/recipes-qt/qt4/{qt-4.8.1.inc => qt4-4.8.3.inc} (50%)
> > > >  rename meta/recipes-qt/qt4/{files/qt-config.patch => qt4-4.8.3/0001-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch} (49%)
> > > >  rename meta/recipes-qt/qt4/{files/fix_qkbdtty_qws.patch => qt4-4.8.3/0002-qkbdtty_qws-fix-build-with-old-kernel-headers.patch} (68%)
> > > >  rename meta/recipes-qt/qt4/{files/set-OUTPUT_DIR-if-empty.patch => qt4-4.8.3/0003-webkit2-set-OUTPUT_DIR-value-if-empty.patch} (48%)
> > > >  create mode 100644 meta/recipes-qt/qt4/qt4-4.8.3/0004-configure-qmake-is-already-built-in-qt4-tools-native.patch
> > > >  rename meta/recipes-qt/qt4/{qt-4.8.1/configure-lflags.patch => qt4-4.8.3/0005-configure-set-LFLAGS-to-pick-up-zlib-from-staging.patch} (46%)
> > > >  rename meta/recipes-qt/qt4/{files/configure-paths.patch => qt4-4.8.3/0006-configure-Use-OE_QMAKE_-values-to-specify-Qt-utility.patch} (58%)
> > > >  rename meta/recipes-qt/qt4/{files/qt-dbus-const.patch => qt4-4.8.3/0007-dbus-Remove-const-usage-that-causes-compile-failure-.patch} (52%)
> > > >  rename meta/recipes-qt/qt4/{files/target_qmake.patch => qt4-4.8.3/0008-qmake.pro-Allow-building-a-separate-qmake-for-the-ta.patch} (57%)
> > > >  rename meta/recipes-qt/qt4/{qt-4.8.1/qmake_pri_fixes.patch => qt4-4.8.3/0009-qmake-fix-source-file-references-in-qmake.pri.patch} (81%)
> > > >  rename meta/recipes-qt/qt4/{qt-4.8.1/hack-out-pg2-4.7.0.patch => qt4-4.8.3/0010-configure-Hack-to-not-use-the-pg_config-of-the-host-.patch} (68%)
> > > >  rename meta/recipes-qt/qt4/{files/0006-freetype-host-includes.patch => qt4-4.8.3/0011-freetype-host-includes.patch} (50%)
> > > >  rename meta/recipes-qt/qt4/{files/0009-support-2bpp.patch => qt4-4.8.3/0012-Add-2bpp-support.patch} (83%)
> > > >  rename meta/recipes-qt/qt4/{qt-4.8.1/0001-Added-Openembedded-crossarch-option.patch => qt4-4.8.3/0013-configure-add-crossarch-option.patch} (49%)
> > > >  rename meta/recipes-qt/qt4/{qt-4.8.1/fix-translations.patch => qt4-4.8.3/0014-translations-fix-phony-translation-linking-error.patch} (63%)
> > > >  rename meta/recipes-qt/qt4/{files/add_nostrip_for_debug_packages.diff => qt4-4.8.3/0015-configure-add-nostrip-for-debug-packages.patch} (57%)
> > > >  rename meta/recipes-qt/qt4/{qt-4.8.1/configure_oe_compiler.patch => qt4-4.8.3/0016-configure-ensure-we-identify-the-compiler-as-g-in-co.patch} (60%)
> > > >  rename meta/recipes-qt/qt4/{qt-4.8.1/pulseaudio-config.patch => qt4-4.8.3/0017-configure-make-pulseaudio-a-configurable-option.patch} (85%)
> > > >  rename meta/recipes-qt/qt4/{qt-4.8.1/gcc47-fix2.patch => qt4-4.8.3/0018-Fixes-for-gcc-4.7.0-particularly-on-qemux86.patch} (46%)
> > > >  rename meta/recipes-qt/qt4/{qt-4.8.1/disable-fuse-gold-flag.patch => qt4-4.8.3/0019-webkit-disable-the-fuse-ld-gold-flag.patch} (46%)
> > > >  rename meta/recipes-qt/qt4/{qt-4.8.1 => qt4-4.8.3}/g++.conf (100%)
> > > >  rename meta/recipes-qt/qt4/{qt-4.8.1 => qt4-4.8.3}/linux.conf (100%)
> > > >  rename meta/recipes-qt/qt4/{files => qt4-4.8.3}/qte.sh (100%)
> > > >  rename meta/recipes-qt/qt4/{qt4-embedded_4.8.1.bb => qt4-embedded_4.8.3.bb} (73%)
> > > >  delete mode 100644 meta/recipes-qt/qt4/qt4-native_4.8.1.bb
> > > >  create mode 100644 meta/recipes-qt/qt4/qt4-native_4.8.3.bb
> > > >  rename meta/recipes-qt/qt4/{qt4-x11-free_4.8.1.bb => qt4-x11-free_4.8.3.bb} (75%)
> > > > 
> > > > -- 
> > > > 1.7.12
> > > > 
> > > 
> > > -- 
> > > Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com
> > 
> > 
> > 
> > -- 
> > Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com
> 
> 
> 
> -- 
> Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com



-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]

[PATCHv2 10/10] qt4: add 4.8.3 version with negative D_P

[Martin Jansa]

* rebased patches, 3 patches are resolved upstream:
  0019-javascriptcore-Fix-compile-error-when-using-toolchai.patch
    resolved in upstream commit 7ac8d8597db1f58b11338f91fb27f6ad8696b34b
  0022-webkit-fix-conflicting-types.patch
    resolved in upstream commit929b4443d53fcf3a7ad1cb9f3af5569e41ef56f1

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta/recipes-qt/qt4/nativesdk-qt4-tools_4.8.3.bb   |  10 +
 meta/recipes-qt/qt4/qt4-4.8.3.inc                  |  60 ++++
 ...o-allow-to-set-qt.conf-from-the-outside-u.patch |  43 +++
 ...tty_qws-fix-build-with-old-kernel-headers.patch |  50 ++++
 ...003-webkit2-set-OUTPUT_DIR-value-if-empty.patch |  34 +++
 ...make-is-already-built-in-qt4-tools-native.patch |  29 ++
 ...e-set-LFLAGS-to-pick-up-zlib-from-staging.patch |  28 ++
 ...se-OE_QMAKE_-values-to-specify-Qt-utility.patch |  38 +++
 ...-const-usage-that-causes-compile-failure-.patch |  34 +++
 ...llow-building-a-separate-qmake-for-the-ta.patch |  29 ++
 ...e-fix-source-file-references-in-qmake.pri.patch |  52 ++++
 ...ack-to-not-use-the-pg_config-of-the-host-.patch |  42 +++
 .../qt4-4.8.3/0011-freetype-host-includes.patch    |  29 ++
 .../qt4/qt4-4.8.3/0012-Add-2bpp-support.patch      | 318 +++++++++++++++++++++
 .../0013-configure-add-crossarch-option.patch      |  47 +++
 ...tions-fix-phony-translation-linking-error.patch |  41 +++
 ...-configure-add-nostrip-for-debug-packages.patch |  32 +++
 .../qt4-4.8.3/0016-configure-eval-QMAKE_CXX.patch  |  36 +++
 ...nsure-we-identify-the-compiler-as-g-in-co.patch |  46 +++
 ...ure-make-pulseaudio-a-configurable-option.patch |  46 +++
 ...xes-for-gcc-4.7.0-particularly-on-qemux86.patch |  63 ++++
 ...0020-webkit-disable-the-fuse-ld-gold-flag.patch |  41 +++
 meta/recipes-qt/qt4/qt4-4.8.3/g++.conf             |  56 ++++
 meta/recipes-qt/qt4/qt4-4.8.3/linux.conf           |  66 +++++
 meta/recipes-qt/qt4/qt4-4.8.3/qte.sh               |   7 +
 meta/recipes-qt/qt4/qt4-embedded_4.8.3.bb          |  11 +
 meta/recipes-qt/qt4/qt4-native_4.8.3.bb            |  10 +
 meta/recipes-qt/qt4/qt4-x11-free_4.8.3.bb          |  11 +
 28 files changed, 1309 insertions(+)
 create mode 100644 meta/recipes-qt/qt4/nativesdk-qt4-tools_4.8.3.bb
 create mode 100644 meta/recipes-qt/qt4/qt4-4.8.3.inc
 create mode 100644 meta/recipes-qt/qt4/qt4-4.8.3/0001-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch
 create mode 100644 meta/recipes-qt/qt4/qt4-4.8.3/0002-qkbdtty_qws-fix-build-with-old-kernel-headers.patch
 create mode 100644 meta/recipes-qt/qt4/qt4-4.8.3/0003-webkit2-set-OUTPUT_DIR-value-if-empty.patch
 create mode 100644 meta/recipes-qt/qt4/qt4-4.8.3/0004-configure-qmake-is-already-built-in-qt4-tools-native.patch
 create mode 100644 meta/recipes-qt/qt4/qt4-4.8.3/0005-configure-set-LFLAGS-to-pick-up-zlib-from-staging.patch
 create mode 100644 meta/recipes-qt/qt4/qt4-4.8.3/0006-configure-Use-OE_QMAKE_-values-to-specify-Qt-utility.patch
 create mode 100644 meta/recipes-qt/qt4/qt4-4.8.3/0007-dbus-Remove-const-usage-that-causes-compile-failure-.patch
 create mode 100644 meta/recipes-qt/qt4/qt4-4.8.3/0008-qmake.pro-Allow-building-a-separate-qmake-for-the-ta.patch
 create mode 100644 meta/recipes-qt/qt4/qt4-4.8.3/0009-qmake-fix-source-file-references-in-qmake.pri.patch
 create mode 100644 meta/recipes-qt/qt4/qt4-4.8.3/0010-configure-Hack-to-not-use-the-pg_config-of-the-host-.patch
 create mode 100644 meta/recipes-qt/qt4/qt4-4.8.3/0011-freetype-host-includes.patch
 create mode 100644 meta/recipes-qt/qt4/qt4-4.8.3/0012-Add-2bpp-support.patch
 create mode 100644 meta/recipes-qt/qt4/qt4-4.8.3/0013-configure-add-crossarch-option.patch
 create mode 100644 meta/recipes-qt/qt4/qt4-4.8.3/0014-translations-fix-phony-translation-linking-error.patch
 create mode 100644 meta/recipes-qt/qt4/qt4-4.8.3/0015-configure-add-nostrip-for-debug-packages.patch
 create mode 100644 meta/recipes-qt/qt4/qt4-4.8.3/0016-configure-eval-QMAKE_CXX.patch
 create mode 100644 meta/recipes-qt/qt4/qt4-4.8.3/0017-configure-ensure-we-identify-the-compiler-as-g-in-co.patch
 create mode 100644 meta/recipes-qt/qt4/qt4-4.8.3/0018-configure-make-pulseaudio-a-configurable-option.patch
 create mode 100644 meta/recipes-qt/qt4/qt4-4.8.3/0019-Fixes-for-gcc-4.7.0-particularly-on-qemux86.patch
 create mode 100644 meta/recipes-qt/qt4/qt4-4.8.3/0020-webkit-disable-the-fuse-ld-gold-flag.patch
 create mode 100644 meta/recipes-qt/qt4/qt4-4.8.3/g++.conf
 create mode 100644 meta/recipes-qt/qt4/qt4-4.8.3/linux.conf
 create mode 100644 meta/recipes-qt/qt4/qt4-4.8.3/qte.sh
 create mode 100644 meta/recipes-qt/qt4/qt4-embedded_4.8.3.bb
 create mode 100644 meta/recipes-qt/qt4/qt4-native_4.8.3.bb
 create mode 100644 meta/recipes-qt/qt4/qt4-x11-free_4.8.3.bb

diff --git a/meta/recipes-qt/qt4/nativesdk-qt4-tools_4.8.3.bb b/meta/recipes-qt/qt4/nativesdk-qt4-tools_4.8.3.bb
new file mode 100644
index 0000000..ad5d881
--- /dev/null
+++ b/meta/recipes-qt/qt4/nativesdk-qt4-tools_4.8.3.bb
@@ -0,0 +1,10 @@
+require nativesdk-qt4-tools.inc
+
+DEFAULT_PREFERENCE = "-1"
+
+PR = "${INC_PR}.0"
+
+SRC_URI += "file://0009-qmake-fix-source-file-references-in-qmake.pri.patch"
+
+SRC_URI[md5sum] = "a663b6c875f8d7caa8ac9c30e4a4ec3b"
+SRC_URI[sha256sum] = "f1f72974f924861be04019f49f07cd43ab3c95056db2ba8f34b283487cccc728"
diff --git a/meta/recipes-qt/qt4/qt4-4.8.3.inc b/meta/recipes-qt/qt4/qt4-4.8.3.inc
new file mode 100644
index 0000000..e473dc6
--- /dev/null
+++ b/meta/recipes-qt/qt4/qt4-4.8.3.inc
@@ -0,0 +1,60 @@
+LICENSE = "LGPLv2.1 | GPLv3"
+LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=fbc093901857fcd118f065f900982c24 \
+                    file://LICENSE.GPL3;md5=babc5b6b77441da277f5c06b2e547720 \
+                    file://LGPL_EXCEPTION.txt;md5=411080a56ff917a5a1aa08c98acae354"
+
+FILESEXTRAPATHS =. "${FILE_DIRNAME}/qt4-${PV}:"
+
+DEFAULT_PREFERENCE = "-1"
+
+SRC_URI = "http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-${PV}.tar.gz \
+           file://0003-webkit2-set-OUTPUT_DIR-value-if-empty.patch \
+           file://0004-configure-qmake-is-already-built-in-qt4-tools-native.patch \
+           file://0008-qmake.pro-Allow-building-a-separate-qmake-for-the-ta.patch \
+           file://0009-qmake-fix-source-file-references-in-qmake.pri.patch \
+           file://0010-configure-Hack-to-not-use-the-pg_config-of-the-host-.patch \
+           file://0011-freetype-host-includes.patch \
+           file://0012-Add-2bpp-support.patch \
+           file://0013-configure-add-crossarch-option.patch \
+           file://0014-translations-fix-phony-translation-linking-error.patch \
+           file://0015-configure-add-nostrip-for-debug-packages.patch \
+           file://0016-configure-eval-QMAKE_CXX.patch \
+           file://0017-configure-ensure-we-identify-the-compiler-as-g-in-co.patch \
+           file://0018-configure-make-pulseaudio-a-configurable-option.patch \
+           file://0019-Fixes-for-gcc-4.7.0-particularly-on-qemux86.patch \
+           file://0020-webkit-disable-the-fuse-ld-gold-flag.patch \
+           file://g++.conf \
+           file://linux.conf \
+           "
+
+SRC_URI[md5sum] = "a663b6c875f8d7caa8ac9c30e4a4ec3b"
+SRC_URI[sha256sum] = "f1f72974f924861be04019f49f07cd43ab3c95056db2ba8f34b283487cccc728"
+
+S = "${WORKDIR}/qt-everywhere-opensource-src-${PV}"
+
+FILES_${QT_BASE_NAME}-tools_append     = " ${bindir}/qml ${bindir}/qmlplugindump"
+FILES_${QT_BASE_NAME}-tools-dbg_append = " ${bindir}/.debug/qml ${bindir}/.debug/qmlplugindump"
+
+PACKAGES_append = " ${QT_BASE_NAME}-tests-dbg ${QT_BASE_NAME}-tests"
+FILES_${QT_BASE_NAME}-tests-dbg        = "/usr/tests/qt4/*/.debug"
+FILES_${QT_BASE_NAME}-tests            = "/usr/tests/qt4/*"
+
+do_configure_prepend() {
+    for pro in $(find ${S} -name "*.pro") ; do
+        sed -i \
+            -e 's:$$QT_BUILD_TREE/bin/lrelease:${OE_QMAKE_LRELEASE}:g' \
+            -e 's:qtPrepareTool(LRELEASE, lrelease):LRELEASE = ${OE_QMAKE_LRELEASE}:g' $pro
+    done
+
+    sed -i s:SEDME:${S}: ${WORKDIR}/linux.conf
+    sed -i \
+    -e /QMAKE_MOC\ /d \
+    -e /QMAKE_UIC\ /d \
+    -e /QMAKE_UIC3\ /d \
+    -e /QMAKE_RCC\ /d \
+    ${S}/configure
+
+    # Avoid problems with Qt 4.8.0 configure setting QMAKE_LINK from LD (since we want the linker to be g++)
+    unset LD
+}
+
diff --git a/meta/recipes-qt/qt4/qt4-4.8.3/0001-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch b/meta/recipes-qt/qt4/qt4-4.8.3/0001-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch
new file mode 100644
index 0000000..e7eb52c
--- /dev/null
+++ b/meta/recipes-qt/qt4/qt4-4.8.3/0001-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch
@@ -0,0 +1,43 @@
+From 89349d565cf03f3a2c09fe235ac6c75e415859bd Mon Sep 17 00:00:00 2001
+From: Holger Freyther <zecke@selfish.org>
+Date: Wed, 26 Sep 2012 17:22:30 +0200
+Subject: [PATCH 01/20] qlibraryinfo: allow to set qt.conf from the outside
+ using the environment
+
+Allow to set a qt.conf from the outside using the environment. This allows
+to inject new prefixes and other paths into qmake. This is needed when using
+the same qmake binary to build qt/x11 and qt/embedded
+
+Upstream-Status: Pending
+
+Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
+---
+ src/corelib/global/qlibraryinfo.cpp | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp
+index 91d2dfc..41045b3 100644
+--- a/src/corelib/global/qlibraryinfo.cpp
++++ b/src/corelib/global/qlibraryinfo.cpp
+@@ -54,6 +54,7 @@
+ QT_BEGIN_NAMESPACE
+ extern QString qmake_libraryInfoFile();
+ QT_END_NAMESPACE
++#include <stdlib.h>
+ #else
+ # include "qcoreapplication.h"
+ #endif
+@@ -112,6 +113,10 @@ QSettings *QLibraryInfoPrivate::findConfiguration()
+ #ifdef BOOTSTRAPPING
+     if(!QFile::exists(qtconfig))
+         qtconfig = qmake_libraryInfoFile();
++    if (!QFile::exists(qtconfig)) {
++        QByteArray config = getenv("QT_CONF_PATH");
++        qtconfig = QFile::decodeName(config);
++    }
+ #else
+     if (!QFile::exists(qtconfig) && QCoreApplication::instance()) {
+ #ifdef Q_OS_MAC
+-- 
+1.7.12
+
diff --git a/meta/recipes-qt/qt4/qt4-4.8.3/0002-qkbdtty_qws-fix-build-with-old-kernel-headers.patch b/meta/recipes-qt/qt4/qt4-4.8.3/0002-qkbdtty_qws-fix-build-with-old-kernel-headers.patch
new file mode 100644
index 0000000..fbda9c4
--- /dev/null
+++ b/meta/recipes-qt/qt4/qt4-4.8.3/0002-qkbdtty_qws-fix-build-with-old-kernel-headers.patch
@@ -0,0 +1,50 @@
+From fe15b966616cc2d2f2f071474a3414fd03ee473e Mon Sep 17 00:00:00 2001
+From: Wenzong Fan <wenzong.fan@windriver.com>
+Date: Wed, 26 Sep 2012 20:18:08 +0200
+Subject: [PATCH 02/20] qkbdtty_qws: fix build with old kernel headers
+
+This issue is that with C++ compiler process an old version of kernel
+header file, coincidently that file has a variable named 'new':
+
+* 'embedded/qkbdtty_qws.cpp' include 'linux/vt.h';
+* '/usr/include/linux/vt.h' has below code on SLED-11.x:
+    + unsigned int new;
+
+On mostly hosts it has been changed to: new -> newev.
+
+Upstream-Status: Pending
+
+Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
+Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
+---
+ src/gui/embedded/qkbdtty_qws.cpp | 12 ++++++++++++
+ 1 file changed, 12 insertions(+)
+
+diff --git a/src/gui/embedded/qkbdtty_qws.cpp b/src/gui/embedded/qkbdtty_qws.cpp
+index c629fa3..47fd3f7 100644
+--- a/src/gui/embedded/qkbdtty_qws.cpp
++++ b/src/gui/embedded/qkbdtty_qws.cpp
+@@ -54,8 +54,20 @@
+ 
+ #if defined Q_OS_LINUX
+ #  include <linux/kd.h>
++
++/* Workaround kernel headers using "new" as variable name. The problem
++ is specific to SLED-11, other distros use "newev" rather than "new" */
++#ifdef __cplusplus
++#warning "workaround kernel headers using new as variable name on SLED 11"
++#define new newev
++#endif
++
+ #  include <linux/vt.h> //TODO: move vt handling somewhere else (QLinuxFbScreen?)
+ 
++#ifdef __cplusplus
++#undef new
++#endif
++
+ #  include "qscreen_qws.h"
+ #  include "qwindowsystem_qws.h"
+ #  include "qapplication.h"
+-- 
+1.7.12
+
diff --git a/meta/recipes-qt/qt4/qt4-4.8.3/0003-webkit2-set-OUTPUT_DIR-value-if-empty.patch b/meta/recipes-qt/qt4/qt4-4.8.3/0003-webkit2-set-OUTPUT_DIR-value-if-empty.patch
new file mode 100644
index 0000000..66a7db1
--- /dev/null
+++ b/meta/recipes-qt/qt4/qt4-4.8.3/0003-webkit2-set-OUTPUT_DIR-value-if-empty.patch
@@ -0,0 +1,34 @@
+From f7eb6d336d30da7b8193f1d1ab6142293e3966da Mon Sep 17 00:00:00 2001
+From: Martin Jansa <Martin.Jansa@gmail.com>
+Date: Tue, 1 May 2012 07:48:15 +0200
+Subject: [PATCH 03/20] webkit2: set OUTPUT_DIR value if empty
+
+Without this do_configure was trying to create /include/WebCore/libdummy.prl in root of build host filesystem
+now it's in proper place ${WORKDIR}/qt-everywhere-opensource-src-4.8.1/src/3rdparty/webkit/include/WebCore/libdummy.prl
+
+First reported here:
+http://www.mail-archive.com/openembedded-devel@lists.openembedded.org/msg24436.html
+
+Upstream-Status: Pending
+
+Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
+---
+ src/3rdparty/webkit/Source/WebKit2/DerivedSources.pro | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/3rdparty/webkit/Source/WebKit2/DerivedSources.pro b/src/3rdparty/webkit/Source/WebKit2/DerivedSources.pro
+index 006a88c..5e17193 100644
+--- a/src/3rdparty/webkit/Source/WebKit2/DerivedSources.pro
++++ b/src/3rdparty/webkit/Source/WebKit2/DerivedSources.pro
+@@ -3,6 +3,8 @@ TARGET = dummy
+ 
+ CONFIG -= debug_and_release
+ 
++isEmpty(OUTPUT_DIR): OUTPUT_DIR = ../..
++
+ CONFIG(standalone_package) {
+     isEmpty(WEBKIT2_GENERATED_SOURCES_DIR):WEBKIT2_GENERATED_SOURCES_DIR = $$PWD/generated
+     isEmpty(WC_GENERATED_SOURCES_DIR):WC_GENERATED_SOURCES_DIR = $$PWD/../WebCore/generated
+-- 
+1.7.12
+
diff --git a/meta/recipes-qt/qt4/qt4-4.8.3/0004-configure-qmake-is-already-built-in-qt4-tools-native.patch b/meta/recipes-qt/qt4/qt4-4.8.3/0004-configure-qmake-is-already-built-in-qt4-tools-native.patch
new file mode 100644
index 0000000..56bb8c3
--- /dev/null
+++ b/meta/recipes-qt/qt4/qt4-4.8.3/0004-configure-qmake-is-already-built-in-qt4-tools-native.patch
@@ -0,0 +1,29 @@
+From 53a20e5f7f790d047b67b1631e1d4acc9a86906a Mon Sep 17 00:00:00 2001
+From: Michael Krelin <hacker@klever.net>
+Date: Wed, 26 Sep 2012 20:24:20 +0200
+Subject: [PATCH 04/20] configure: qmake is already built in qt4-tools-native,
+ so disable it
+
+Upstream-Status: Inappropriate [configuration]
+
+Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
+---
+ configure | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure b/configure
+index d19f443..59bdb63 100755
+--- a/configure
++++ b/configure
+@@ -4899,7 +4899,7 @@ setBootstrapVariable()
+ }
+ 
+ # build qmake
+-if true; then ###[ '!' -f "$outpath/bin/qmake" ];
++if false; then ###[ '!' -f "$outpath/bin/qmake" ];
+     echo "Creating qmake. Please wait..."
+ 
+     OLD_QCONFIG_H=
+-- 
+1.7.12
+
diff --git a/meta/recipes-qt/qt4/qt4-4.8.3/0005-configure-set-LFLAGS-to-pick-up-zlib-from-staging.patch b/meta/recipes-qt/qt4/qt4-4.8.3/0005-configure-set-LFLAGS-to-pick-up-zlib-from-staging.patch
new file mode 100644
index 0000000..4e310c2
--- /dev/null
+++ b/meta/recipes-qt/qt4/qt4-4.8.3/0005-configure-set-LFLAGS-to-pick-up-zlib-from-staging.patch
@@ -0,0 +1,28 @@
+From 5641d763180e7f848f5d39588417292b6b8df88e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jeremy=20Lain=C3=A9?= <jeremy.laine@m4x.org>
+Date: Wed, 26 Sep 2012 20:27:44 +0200
+Subject: [PATCH 05/20] configure: set LFLAGS to pick up zlib from staging
+
+Upstream-Status: Pending
+
+Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
+---
+ configure | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure b/configure
+index 59bdb63..cc08b71 100755
+--- a/configure
++++ b/configure
+@@ -690,7 +690,7 @@ fi
+ # initalize variables
+ #-------------------------------------------------------------------------------
+ 
+-SYSTEM_VARIABLES="RANLIB STRIP OBJDUMP LD CC CXX CFLAGS CXXFLAGS LDFLAGS"
++SYSTEM_VARIABLES="RANLIB STRIP OBJDUMP LD CC CXX CFLAGS CXXFLAGS LDFLAGS LFLAGS"
+ for varname in $SYSTEM_VARIABLES; do
+     qmakevarname="${varname}"
+     # use LDFLAGS for autoconf compat, but qmake uses QMAKE_LFLAGS
+-- 
+1.7.12
+
diff --git a/meta/recipes-qt/qt4/qt4-4.8.3/0006-configure-Use-OE_QMAKE_-values-to-specify-Qt-utility.patch b/meta/recipes-qt/qt4/qt4-4.8.3/0006-configure-Use-OE_QMAKE_-values-to-specify-Qt-utility.patch
new file mode 100644
index 0000000..21d5b4d
--- /dev/null
+++ b/meta/recipes-qt/qt4/qt4-4.8.3/0006-configure-Use-OE_QMAKE_-values-to-specify-Qt-utility.patch
@@ -0,0 +1,38 @@
+From fa9e376ff72f488608c8fc635ec669fc00c3c1ea Mon Sep 17 00:00:00 2001
+From: Paul Eggleton <paul.eggleton@linux.intel.com>
+Date: Wed, 26 Sep 2012 20:29:09 +0200
+Subject: [PATCH 06/20] configure: Use OE_QMAKE_* values to specify Qt utility
+ paths
+
+Upstream-Status: Inappropriate [configuration]
+
+Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
+Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
+---
+ configure | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/configure b/configure
+index cc08b71..958b884 100755
+--- a/configure
++++ b/configure
+@@ -8612,11 +8612,11 @@ QMAKE_ABSOLUTE_SOURCE_ROOT = \$\$QT_SOURCE_TREE
+ QMAKE_MOC_SRC    = \$\$QT_BUILD_TREE/src/moc
+ 
+ #local paths that cannot be queried from the QT_INSTALL_* properties while building QTDIR
+-QMAKE_MOC        = \$\$QT_BUILD_TREE/bin/moc
+-QMAKE_UIC        = \$\$QT_BUILD_TREE/bin/uic
+-QMAKE_UIC3       = \$\$QT_BUILD_TREE/bin/uic3
+-QMAKE_RCC        = \$\$QT_BUILD_TREE/bin/rcc
+-QMAKE_QDBUSXML2CPP = \$\$QT_BUILD_TREE/bin/qdbusxml2cpp
++QMAKE_MOC        = \${OE_QMAKE_MOC}
++QMAKE_UIC        = \${OE_QMAKE_UIC}
++QMAKE_UIC3       = \${OE_QMAKE_UIC3}
++QMAKE_RCC        = \${OE_QMAKE_RCC}
++QMAKE_QDBUSXML2CPP = \${OE_QMAKE_QDBUSXML2CPP}
+ QMAKE_INCDIR_QT  = \$\$QT_BUILD_TREE/include
+ QMAKE_LIBDIR_QT  = \$\$QT_BUILD_TREE/lib
+ 
+-- 
+1.7.12
+
diff --git a/meta/recipes-qt/qt4/qt4-4.8.3/0007-dbus-Remove-const-usage-that-causes-compile-failure-.patch b/meta/recipes-qt/qt4/qt4-4.8.3/0007-dbus-Remove-const-usage-that-causes-compile-failure-.patch
new file mode 100644
index 0000000..1ce3dbb
--- /dev/null
+++ b/meta/recipes-qt/qt4/qt4-4.8.3/0007-dbus-Remove-const-usage-that-causes-compile-failure-.patch
@@ -0,0 +1,34 @@
+From db3c7b5710ee14280b51c355487dabe21eff60b4 Mon Sep 17 00:00:00 2001
+From: Pavel Heimlich <tropikhajma@gmail.com>
+Date: Wed, 26 Sep 2012 20:31:10 +0200
+Subject: [PATCH 07/20] dbus: Remove "const" usage that causes compile failure
+ building nativesdk-qt4-tools
+
+Patch has apparently been rejected upstream, not because it is invalid
+but because the submitter did not submit a merge request for it, so the
+validity of the patch upstream is uncertain. For further details see:
+http://bugreports.qt.nokia.com/browse/QTBUG-17962
+
+Upstream-Status: Denied [possible retry]
+
+Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
+---
+ src/dbus/qdbusintegrator.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/dbus/qdbusintegrator.cpp b/src/dbus/qdbusintegrator.cpp
+index 0bf62de..e53620f 100644
+--- a/src/dbus/qdbusintegrator.cpp
++++ b/src/dbus/qdbusintegrator.cpp
+@@ -72,7 +72,7 @@ QT_BEGIN_NAMESPACE
+ static bool isDebugging;
+ #define qDBusDebug              if (!::isDebugging); else qDebug
+ 
+-Q_GLOBAL_STATIC_WITH_ARGS(const QString, orgFreedesktopDBusString, (QLatin1String(DBUS_SERVICE_DBUS)))
++Q_GLOBAL_STATIC_WITH_ARGS(QString, orgFreedesktopDBusString, (QLatin1String(DBUS_SERVICE_DBUS)))
+ 
+ static inline QString dbusServiceString()
+ { return *orgFreedesktopDBusString(); }
+-- 
+1.7.12
+
diff --git a/meta/recipes-qt/qt4/qt4-4.8.3/0008-qmake.pro-Allow-building-a-separate-qmake-for-the-ta.patch b/meta/recipes-qt/qt4/qt4-4.8.3/0008-qmake.pro-Allow-building-a-separate-qmake-for-the-ta.patch
new file mode 100644
index 0000000..d945025
--- /dev/null
+++ b/meta/recipes-qt/qt4/qt4-4.8.3/0008-qmake.pro-Allow-building-a-separate-qmake-for-the-ta.patch
@@ -0,0 +1,29 @@
+From dacee47b11fc7cf89cdb8ddeeac9e6b64320ec8b Mon Sep 17 00:00:00 2001
+From: Paul Eggleton <paul.eggleton@linux.intel.com>
+Date: Wed, 26 Sep 2012 20:32:41 +0200
+Subject: [PATCH 08/20] qmake.pro: Allow building a separate qmake for the
+ target
+
+Upstream-Status: Inappropriate [config]
+
+Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
+Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
+---
+ qmake/qmake.pro | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/qmake/qmake.pro b/qmake/qmake.pro
+index 38e0fce..53b1ffb 100644
+--- a/qmake/qmake.pro
++++ b/qmake/qmake.pro
+@@ -7,6 +7,7 @@ CONFIG += console bootstrap
+ CONFIG -= qt shared app_bundle uic
+ DEFINES += QT_BUILD_QMAKE QT_BOOTSTRAPPED
+ DESTDIR = ../bin/
++TARGET = qmake2
+ 
+ OBJECTS_DIR = .
+ MOC_DIR = .
+-- 
+1.7.12
+
diff --git a/meta/recipes-qt/qt4/qt4-4.8.3/0009-qmake-fix-source-file-references-in-qmake.pri.patch b/meta/recipes-qt/qt4/qt4-4.8.3/0009-qmake-fix-source-file-references-in-qmake.pri.patch
new file mode 100644
index 0000000..9616a5b
--- /dev/null
+++ b/meta/recipes-qt/qt4/qt4-4.8.3/0009-qmake-fix-source-file-references-in-qmake.pri.patch
@@ -0,0 +1,52 @@
+From 08ec0f7ac7438e6f5b506b23fb52fe086078308b Mon Sep 17 00:00:00 2001
+From: Paul Eggleton <paul.eggleton@linux.intel.com>
+Date: Wed, 26 Sep 2012 20:33:49 +0200
+Subject: [PATCH 09/20] qmake: fix source file references in qmake.pri
+
+Fix duplicate entries in SOURCES and HEADERS, and fix the source file
+list for the split of qlocale.cpp.
+
+Upstream-Status: Pending
+
+Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
+Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
+---
+ qmake/qmake.pri | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/qmake/qmake.pri b/qmake/qmake.pri
+index 31f67f4..9081669 100644
+--- a/qmake/qmake.pri
++++ b/qmake/qmake.pri
+@@ -22,8 +22,7 @@ SOURCES += project.cpp property.cpp main.cpp generators/makefile.cpp \
+            generators/symbian/initprojectdeploy_symbian.cpp \
+            generators/integrity/gbuild.cpp \
+            windows/registry.cpp \
+-           symbian/epocroot.cpp \
+-           generators/integrity/gbuild.cpp
++           symbian/epocroot.cpp
+ 
+ HEADERS += project.h property.h generators/makefile.h \
+            generators/unix/unixmake.h meta.h option.h cachekeys.h \
+@@ -40,8 +39,7 @@ HEADERS += project.h property.h generators/makefile.h \
+            generators/symbian/initprojectdeploy_symbian.h \
+            generators/integrity/gbuild.h \
+            windows/registry_p.h \
+-           symbian/epocroot_p.h \
+-           generators/integrity/gbuild.h
++           symbian/epocroot_p.h
+ 
+ contains(QT_EDITION, OpenSource) {
+    DEFINES += QMAKE_OPENSOURCE_EDITION
+@@ -72,6 +70,8 @@ bootstrap { #Qt code
+         qlist.cpp \
+         qlinkedlist.cpp \
+         qlocale.cpp \
++        qlocale_tools.cpp \
++        qlocale_unix.cpp \
+         qmalloc.cpp \
+         qmap.cpp \
+         qmetatype.cpp \
+-- 
+1.7.12
+
diff --git a/meta/recipes-qt/qt4/qt4-4.8.3/0010-configure-Hack-to-not-use-the-pg_config-of-the-host-.patch b/meta/recipes-qt/qt4/qt4-4.8.3/0010-configure-Hack-to-not-use-the-pg_config-of-the-host-.patch
new file mode 100644
index 0000000..f3674e8
--- /dev/null
+++ b/meta/recipes-qt/qt4/qt4-4.8.3/0010-configure-Hack-to-not-use-the-pg_config-of-the-host-.patch
@@ -0,0 +1,42 @@
+From d9544b4a079f3c66d15f973c5d1526df2fe49d40 Mon Sep 17 00:00:00 2001
+From: Holger Freyther <zecke@selfish.org>
+Date: Wed, 26 Sep 2012 20:36:38 +0200
+Subject: [PATCH 10/20] configure: Hack to not use the pg_config of the host
+ system which will add /usr/include
+
+pg_config is a native binary so using that when cross compiling
+will always fail.  The commented out fix would do, but for OE
+our -platform and -xplatform is the same so we are actually not
+really cross compiling. Just comment out the test, we are passing
+the location to the postgres headers and if they are okay we
+will pad.
+
+Upstream-Status: Inappropriate [configuration]
+
+Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
+---
+ configure | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/configure b/configure
+index 958b884..24cbb2a 100755
+--- a/configure
++++ b/configure
+@@ -5441,10 +5441,10 @@ for _SQLDR in $CFG_SQL_AVAILABLE; do
+         psql)
+             if [ "$CFG_SQL_psql" != "no" ]; then
+                 # 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`
+-                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`
++#                fi
+                 [ -z "$QT_CFLAGS_PSQL" ] || QT_CFLAGS_PSQL="-I$QT_CFLAGS_PSQL"
+                 [ -z "$QT_LFLAGS_PSQL" ] || QT_LFLAGS_PSQL="-L$QT_LFLAGS_PSQL"
+                 # But, respect PSQL_LIBS if set
+-- 
+1.7.12
+
diff --git a/meta/recipes-qt/qt4/qt4-4.8.3/0011-freetype-host-includes.patch b/meta/recipes-qt/qt4/qt4-4.8.3/0011-freetype-host-includes.patch
new file mode 100644
index 0000000..60acb80
--- /dev/null
+++ b/meta/recipes-qt/qt4/qt4-4.8.3/0011-freetype-host-includes.patch
@@ -0,0 +1,29 @@
+From 95cbbdaaf543bb5747b535b5e4b02114f3d821d6 Mon Sep 17 00:00:00 2001
+From: Michael Krelin <hacker@klever.net>
+Date: Mon, 4 Jun 2007 14:48:50 +0200
+Subject: [PATCH 11/20] freetype host includes
+
+Host include path should not be used in cross compiling case.
+
+Ported from OE by: Yu Ke <ke.yu@intel.com>
+Upstream-Status: Pending
+
+Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
+---
+ config.tests/unix/freetype/freetype.pri | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/config.tests/unix/freetype/freetype.pri b/config.tests/unix/freetype/freetype.pri
+index 7ef1cf9..b362fcd 100644
+--- a/config.tests/unix/freetype/freetype.pri
++++ b/config.tests/unix/freetype/freetype.pri
+@@ -1,5 +1,5 @@
+ !cross_compile {
+-    TRY_INCLUDEPATHS = /include /usr/include $$QMAKE_INCDIR $$QMAKE_INCDIR_X11 $$INCLUDEPATH
++    TRY_INCLUDEPATHS = $$QMAKE_INCDIR $$QMAKE_INCDIR_X11 $$INCLUDEPATH
+     # LSB doesn't allow using headers from /include or /usr/include
+     linux-lsb-g++:TRY_INCLUDEPATHS = $$QMAKE_INCDIR $$QMAKE_INCDIR_X11 $$INCLUDEPATH
+     for(p, TRY_INCLUDEPATHS) {
+-- 
+1.7.12
+
diff --git a/meta/recipes-qt/qt4/qt4-4.8.3/0012-Add-2bpp-support.patch b/meta/recipes-qt/qt4/qt4-4.8.3/0012-Add-2bpp-support.patch
new file mode 100644
index 0000000..019b9f4
--- /dev/null
+++ b/meta/recipes-qt/qt4/qt4-4.8.3/0012-Add-2bpp-support.patch
@@ -0,0 +1,318 @@
+From a8233fddb36592361910d967664e5b546ac4cc3e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jeremy=20Lain=C3=A9?= <jeremy.laine@m4x.org>
+Date: Wed, 26 Sep 2012 20:39:21 +0200
+Subject: [PATCH 12/20] Add 2bpp support
+
+Submitted upstream but rejected as being "out of scope":
+http://bugreports.qt.nokia.com/browse/QTBUG-3468
+
+Upstream-Status: Denied
+
+Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
+---
+ configure                               |   5 +-
+ src/gui/embedded/qscreen_qws.cpp        | 211 ++++++++++++++++++++++++++++++++
+ src/gui/embedded/qscreenlinuxfb_qws.cpp |   4 +-
+ 3 files changed, 216 insertions(+), 4 deletions(-)
+
+diff --git a/configure b/configure
+index 24cbb2a..cd66d05 100755
+--- a/configure
++++ b/configure
+@@ -6999,6 +6999,7 @@ if [ "$CFG_QWS_DEPTHS" = "prompted" -a "$PROMPT_FOR_DEPTHS" = "yes" ]; then
+     echo "Choose pixel-depths to support:"
+     echo
+     echo "   1. 1bpp, black/white"
++    echo "   2. 2bpp, grayscale"
+     echo "   4. 4bpp, grayscale"
+     echo "   8. 8bpp, paletted"
+     echo "  12. 12bpp, rgb 4-4-4"
+@@ -7017,11 +7018,11 @@ if [ "$CFG_QWS_DEPTHS" = "prompted" -a "$PROMPT_FOR_DEPTHS" = "yes" ]; then
+ fi
+ if [ -n "$CFG_QWS_DEPTHS" -a "$PLATFORM_QWS" = "yes" ]; then
+     if [ "$CFG_QWS_DEPTHS" = "all" ]; then
+-        CFG_QWS_DEPTHS="1 4 8 12 15 16 18 24 32 generic"
++        CFG_QWS_DEPTHS="1 2 4 8 12 15 16 18 24 32 generic"
+     fi
+     for D in `echo "$CFG_QWS_DEPTHS" | sed -e 's/,/ /g'`; do
+ 	case $D in
+-	    1|4|8|12|15|16|18|24|32) QCONFIG_FLAGS="$QCONFIG_FLAGS QT_QWS_DEPTH_$D";;
++	    1|2|4|8|12|15|16|18|24|32) QCONFIG_FLAGS="$QCONFIG_FLAGS QT_QWS_DEPTH_$D";;
+ 	    generic) QCONFIG_FLAGS="$QCONFIG_FLAGS QT_QWS_DEPTH_GENERIC";;
+ 	esac
+     done
+diff --git a/src/gui/embedded/qscreen_qws.cpp b/src/gui/embedded/qscreen_qws.cpp
+index d2ad851..d25fc87 100644
+--- a/src/gui/embedded/qscreen_qws.cpp
++++ b/src/gui/embedded/qscreen_qws.cpp
+@@ -469,6 +469,58 @@ static void solidFill_gray4(QScreen *screen, const QColor &color,
+ }
+ #endif // QT_QWS_DEPTH_4
+ 
++#ifdef QT_QWS_DEPTH_2
++static inline void qt_rectfill_gray2(quint8 *dest, quint8 value,
++                                     int x, int y, int width, int height,
++                                     int stride)
++{
++    const int pixelsPerByte = 4;
++    const int alignWidth = qMin(width, (4 - (x & 3)) & 3);
++    const int doAlign = (alignWidth > 0 ? 1 : 0);
++    const int alignStart = pixelsPerByte - 1 - (x & 3);
++    const int alignStop = alignStart - (alignWidth - 1);
++    const quint8 alignMask = ((1 << (2 * alignWidth)) - 1) << (2 * alignStop);
++    const int tailWidth = (width - alignWidth) & 3;
++    const int doTail = (tailWidth > 0 ? 1 : 0);
++    const quint8 tailMask = (1 << (2 * (pixelsPerByte - tailWidth))) - 1;
++    const int width8 = (width - alignWidth) / pixelsPerByte;
++
++    dest += y * stride + x / pixelsPerByte;
++    stride -= (doAlign + width8);
++
++    for (int j = 0; j < height; ++j) {
++        if (doAlign) {
++            *dest = (*dest & ~alignMask) | (value & alignMask);
++            ++dest;
++        }
++        if (width8) {
++            qt_memfill<quint8>(dest, value, width8);
++            dest += width8;
++        }
++        if (doTail)
++            *dest = (*dest & tailMask) | (value & ~tailMask);
++        dest += stride;
++    }
++}
++
++static void solidFill_gray2(QScreen *screen, const QColor &color,
++                            const QRegion &region)
++{
++    quint8 *dest = reinterpret_cast<quint8*>(screen->base());
++    const quint8 c = qGray(color.rgba()) >> 6;
++    const quint8 c8 = (c << 6) | (c << 4) | (c << 2) | c;
++
++    const int stride = screen->linestep();
++    const QVector<QRect> rects = region.rects();
++
++    for (int i = 0; i < rects.size(); ++i) {
++        const QRect r = rects.at(i);
++        qt_rectfill_gray2(dest, c8, r.x(), r.y(), r.width(), r.height(),
++                          stride);
++    }
++}
++#endif // QT_QWS_DEPTH_2
++
+ #ifdef QT_QWS_DEPTH_1
+ static inline void qt_rectfill_mono(quint8 *dest, quint8 value,
+                                     int x, int y, int width, int height,
+@@ -576,6 +628,11 @@ void qt_solidFill_setup(QScreen *screen, const QColor &color,
+         screen->d_ptr->solidFill = solidFill_gray4;
+         break;
+ #endif
++#ifdef QT_QWS_DEPTH_2
++    case 2:
++        screen->d_ptr->solidFill = solidFill_gray2;
++        break;
++#endif
+ #ifdef QT_QWS_DEPTH_1
+     case 1:
+         screen->d_ptr->solidFill = solidFill_mono;
+@@ -1006,6 +1063,149 @@ static void blit_4(QScreen *screen, const QImage &image,
+ }
+ #endif // QT_QWS_DEPTH_4
+ 
++#ifdef QT_QWS_DEPTH_2
++
++struct qgray2 { quint8 dummy; } Q_PACKED;
++
++template <typename SRC>
++static inline quint8 qt_convertToGray2(SRC color);
++
++template <>
++inline quint8 qt_convertToGray2(quint32 color)
++{
++    return qGray(color) >> 6;
++}
++
++template <>
++inline quint8 qt_convertToGray2(quint16 color)
++{
++    const int r = (color & 0xf800) >> 11;
++    const int g = (color & 0x07e0) >> 6; // only keep 5 bit
++    const int b = (color & 0x001f);
++    return (r * 11 + g * 16 + b * 5) >> 8;
++}
++
++template <>
++inline quint8 qt_convertToGray2(qrgb444 color)
++{
++    return qt_convertToGray2(quint32(color));
++}
++
++template <>
++inline quint8 qt_convertToGray2(qargb4444 color)
++{
++    return qt_convertToGray2(quint32(color));
++}
++
++template <typename SRC>
++static inline void qt_rectconvert_gray2(qgray2 *dest2, const SRC *src,
++                                        int x, int y, int width, int height,
++                                        int dstStride, int srcStride)
++{
++    const int pixelsPerByte = 4;
++    quint8 *dest8 = reinterpret_cast<quint8*>(dest2)
++                    + y * dstStride + x / pixelsPerByte;
++    const int alignWidth = qMin(width, (4 - (x & 3)) & 3);
++    const int doAlign = (alignWidth > 0 ? 1 : 0);
++    const int alignStart = pixelsPerByte - 1 - (x & 3);
++    const int alignStop = alignStart - (alignWidth - 1);
++    const quint8 alignMask = ((1 << (2 * alignWidth)) - 1) << (2 * alignStop);
++    const int tailWidth = (width - alignWidth) & 3;
++    const int doTail = (tailWidth > 0 ? 1 : 0);
++    const quint8 tailMask = (1 << (2 * (pixelsPerByte - tailWidth))) - 1;
++    const int width8 = (width - alignWidth) / pixelsPerByte;
++
++    srcStride = srcStride / sizeof(SRC) - (width8 * pixelsPerByte + alignWidth);
++    dstStride -= (width8 + doAlign);
++
++    for (int j = 0;  j < height; ++j) {
++        if (doAlign) {
++            quint8 d = *dest8 & ~alignMask;
++            for (int i = alignStart; i >= alignStop; --i)
++                d |= qt_convertToGray2<SRC>(*src++) << (2 * i);
++            *dest8++ = d;
++        }
++        for (int i = 0; i < width8; ++i) {
++            *dest8 = (qt_convertToGray2<SRC>(src[0]) << 6)
++                     | (qt_convertToGray2<SRC>(src[1]) << 4)
++                     | (qt_convertToGray2<SRC>(src[2]) << 2)
++                     | (qt_convertToGray2<SRC>(src[3]));
++            src += 4;
++            ++dest8;
++        }
++        if (doTail) {
++            quint8 d = *dest8 & tailMask;
++            switch (tailWidth) {
++            case 3: d |= qt_convertToGray2<SRC>(src[2]) << 2;
++            case 2: d |= qt_convertToGray2<SRC>(src[1]) << 4;
++            case 1: d |= qt_convertToGray2<SRC>(src[0]) << 6;
++            }
++            *dest8 = d;
++        }
++
++        dest8 += dstStride;
++        src += srcStride;
++    }
++}
++
++template <>
++void qt_rectconvert(qgray2 *dest, const quint32 *src,
++                    int x, int y, int width, int height,
++                    int dstStride, int srcStride)
++{
++    qt_rectconvert_gray2<quint32>(dest, src, x, y, width, height,
++                                  dstStride, srcStride);
++}
++
++template <>
++void qt_rectconvert(qgray2 *dest, const quint16 *src,
++                    int x, int y, int width, int height,
++                    int dstStride, int srcStride)
++{
++    qt_rectconvert_gray2<quint16>(dest, src, x, y, width, height,
++                                  dstStride, srcStride);
++}
++
++template <>
++void qt_rectconvert(qgray2 *dest, const qrgb444 *src,
++                    int x, int y, int width, int height,
++                    int dstStride, int srcStride)
++{
++    qt_rectconvert_gray2<qrgb444>(dest, src, x, y, width, height,
++                                  dstStride, srcStride);
++}
++
++template <>
++void qt_rectconvert(qgray2 *dest, const qargb4444 *src,
++                    int x, int y, int width, int height,
++                    int dstStride, int srcStride)
++{
++    qt_rectconvert_gray2<qargb4444>(dest, src, x, y, width, height,
++                                    dstStride, srcStride);
++}
++
++static void blit_2(QScreen *screen, const QImage &image,
++                   const QPoint &topLeft, const QRegion &region)
++{
++    switch (image.format()) {
++    case QImage::Format_ARGB32_Premultiplied:
++        blit_template<qgray2, quint32>(screen, image, topLeft, region);
++        return;
++    case QImage::Format_RGB16:
++        blit_template<qgray2, quint16>(screen, image, topLeft, region);
++        return;
++    case QImage::Format_RGB444:
++        blit_template<qgray2, qrgb444>(screen, image, topLeft, region);
++        return;
++    case QImage::Format_ARGB4444_Premultiplied:
++        blit_template<qgray2, qargb4444>(screen, image, topLeft, region);
++        return;
++    default:
++        qCritical("blit_2(): Image format %d not supported!", image.format());
++    }
++}
++#endif // QT_QWS_DEPTH_2
++
+ #ifdef QT_QWS_DEPTH_1
+ 
+ struct qmono { quint8 dummy; } Q_PACKED;
+@@ -1259,6 +1459,11 @@ void qt_blit_setup(QScreen *screen, const QImage &image,
+         screen->d_ptr->blit = blit_4;
+         break;
+ #endif
++#ifdef QT_QWS_DEPTH_2
++    case 2:
++        screen->d_ptr->blit = blit_2;
++        break;
++#endif
+ #ifdef QT_QWS_DEPTH_1
+     case 1:
+         screen->d_ptr->blit = blit_1;
+@@ -2146,6 +2351,8 @@ int QScreen::alloc(unsigned int r,unsigned int g,unsigned int b)
+         }
+     } else if (d == 4) {
+         ret = qGray(r, g, b) >> 4;
++    } else if (d == 2) {
++        ret = qGray(r, g, b) >> 6;
+     } else if (d == 1) {
+         ret = qGray(r, g, b) >= 128;
+     } else {
+@@ -2216,6 +2423,10 @@ bool QScreen::supportsDepth(int d) const
+     } else if(d==1) {
+         return true;
+ #endif
++#ifdef QT_QWS_DEPTH_2
++    } else if(d==2) {
++        return true;
++#endif
+ #ifdef QT_QWS_DEPTH_4
+     } else if(d==4) {
+         return true;
+diff --git a/src/gui/embedded/qscreenlinuxfb_qws.cpp b/src/gui/embedded/qscreenlinuxfb_qws.cpp
+index 04abcd4..06dea6d 100644
+--- a/src/gui/embedded/qscreenlinuxfb_qws.cpp
++++ b/src/gui/embedded/qscreenlinuxfb_qws.cpp
+@@ -466,8 +466,8 @@ bool QLinuxFbScreen::connect(const QString &displaySpec)
+         setupOffScreen();
+ 
+     // Now read in palette
+-    if((vinfo.bits_per_pixel==8) || (vinfo.bits_per_pixel==4)) {
+-        screencols= (vinfo.bits_per_pixel==8) ? 256 : 16;
++    if((vinfo.bits_per_pixel==8) || (vinfo.bits_per_pixel==4) || (vinfo.bits_per_pixel==2)) {
++        screencols= 1 << vinfo.bits_per_pixel;
+         int loopc;
+         ::fb_cmap startcmap;
+         startcmap.start=0;
+-- 
+1.7.12
+
diff --git a/meta/recipes-qt/qt4/qt4-4.8.3/0013-configure-add-crossarch-option.patch b/meta/recipes-qt/qt4/qt4-4.8.3/0013-configure-add-crossarch-option.patch
new file mode 100644
index 0000000..c216c85
--- /dev/null
+++ b/meta/recipes-qt/qt4/qt4-4.8.3/0013-configure-add-crossarch-option.patch
@@ -0,0 +1,47 @@
+From 8785f376533ffdcf4c32b53274e8c40f567d7fd5 Mon Sep 17 00:00:00 2001
+From: Michael Lauer <mickey@vanille-media.de>
+Date: Wed, 26 Sep 2012 20:41:32 +0200
+Subject: [PATCH 13/20] configure: add "-crossarch" option
+
+Upstream-Status: Pending
+
+Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
+---
+ configure | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/configure b/configure
+index cd66d05..f2c0725 100755
+--- a/configure
++++ b/configure
+@@ -1141,7 +1141,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)
+         VAR=`echo $1 | sed "s,^-\(.*\),\1,"`
+         shift
+         VAL="$1"
+@@ -1697,6 +1697,9 @@ while [ "$#" -gt 0 ]; do
+         DEV_VAL=`echo $VAL | sed "s,^.*=\(.*\),\1,"`
+         DeviceVar set $DEV_VAR $DEV_VAL
+         ;;
++	crossarch)
++		CROSSARCH="$VAL"
++		;;
+     debug-and-release)
+         if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
+             CFG_DEBUG_RELEASE="$VAL"
+@@ -3297,6 +3300,8 @@ arm*)
+     ;;
+ esac
+ 
++CFG_ARCH="$CROSSARCH"
++
+ if [ -d "$relpath/src/corelib/arch/$CFG_ARCH" ]; then
+     if [ "$OPT_VERBOSE" = "yes" ]; then
+         echo "    '$CFG_ARCH' is supported"
+-- 
+1.7.12
+
diff --git a/meta/recipes-qt/qt4/qt4-4.8.3/0014-translations-fix-phony-translation-linking-error.patch b/meta/recipes-qt/qt4/qt4-4.8.3/0014-translations-fix-phony-translation-linking-error.patch
new file mode 100644
index 0000000..0874c84
--- /dev/null
+++ b/meta/recipes-qt/qt4/qt4-4.8.3/0014-translations-fix-phony-translation-linking-error.patch
@@ -0,0 +1,41 @@
+From 851eb73f7c2d3fa8dc017c3fb4f448b522cd9873 Mon Sep 17 00:00:00 2001
+From: Otavio Salvador <otavio@ossystems.com.br>
+Date: Wed, 26 Sep 2012 20:45:10 +0200
+Subject: [PATCH 14/20] translations: fix phony translation linking error
+
+  | .../usr/lib/crt1.o: In function `_start':
+  | .../../sysdeps/i386/elf/start.S:115: undefined reference to `main'
+  | collect2: ld returned 1 exit status
+
+Upstream-Status: Pending
+
+Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
+---
+ translations/translations.pro | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/translations/translations.pro b/translations/translations.pro
+index dc99beb..0d98829 100644
+--- a/translations/translations.pro
++++ b/translations/translations.pro
+@@ -101,7 +101,7 @@ updateqm.name = LRELEASE ${QMAKE_FILE_IN}
+ updateqm.CONFIG += no_link
+ QMAKE_EXTRA_COMPILERS += updateqm
+ 
+-isEmpty(vcproj) {
++!isEmpty(vcproj) {
+     QMAKE_LINK = @: IGNORE THIS LINE
+     OBJECTS_DIR =
+     win32:CONFIG -= embed_manifest_exe
+@@ -111,7 +111,7 @@ isEmpty(vcproj) {
+     phony_src.input = PHONY_DEPS
+     phony_src.output = phony.c
+     phony_src.variable_out = GENERATED_SOURCES
+-    phony_src.commands = echo int main() { return 0; } > phony.c
++    phony_src.commands = echo \"int main() { return 0; }\" > phony.c
+     phony_src.name = CREATE phony.c
+     phony_src.CONFIG += combine
+     QMAKE_EXTRA_COMPILERS += phony_src
+-- 
+1.7.12
+
diff --git a/meta/recipes-qt/qt4/qt4-4.8.3/0015-configure-add-nostrip-for-debug-packages.patch b/meta/recipes-qt/qt4/qt4-4.8.3/0015-configure-add-nostrip-for-debug-packages.patch
new file mode 100644
index 0000000..fc13b08
--- /dev/null
+++ b/meta/recipes-qt/qt4/qt4-4.8.3/0015-configure-add-nostrip-for-debug-packages.patch
@@ -0,0 +1,32 @@
+From 1c42c9c5f02845ea4c5b82638b7b2ed4d3dca0ff Mon Sep 17 00:00:00 2001
+From: Fathi Boudra <fabo@debian.org>
+Date: Wed, 26 Sep 2012 20:46:14 +0200
+Subject: [PATCH 15/20] configure: add nostrip for debug packages
+
+Qt is built in release mode and strip files by default.
+Set CONFIG+=nostrip to avoid the stripping and
+let dh_strip do it to generate debug packages.
+
+Upstream-Status: Inappropriate [Configuration]
+
+Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
+---
+ configure | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/configure b/configure
+index f2c0725..d1a0dfd 100755
+--- a/configure
++++ b/configure
+@@ -710,6 +710,8 @@ mkdir -p "$outpath/config.tests"
+ rm -f "$outpath/config.tests/.qmake.cache"
+ cp "$QMAKE_VARS_FILE" "$outpath/config.tests/.qmake.cache"
+ 
++QMakeVar add CONFIG nostrip
++
+ QMakeVar add styles "cde mac motif plastique cleanlooks windows"
+ QMakeVar add decorations "default windows styled"
+ QMakeVar add mouse-drivers "pc"
+-- 
+1.7.12
+
diff --git a/meta/recipes-qt/qt4/qt4-4.8.3/0016-configure-eval-QMAKE_CXX.patch b/meta/recipes-qt/qt4/qt4-4.8.3/0016-configure-eval-QMAKE_CXX.patch
new file mode 100644
index 0000000..87966be
--- /dev/null
+++ b/meta/recipes-qt/qt4/qt4-4.8.3/0016-configure-eval-QMAKE_CXX.patch
@@ -0,0 +1,36 @@
+From ec9d722e08c636e0c672b0adc3b54569367c6502 Mon Sep 17 00:00:00 2001
+From: Paul Eggleton <paul.eggleton@linux.intel.com>
+Date: Wed, 26 Sep 2012 20:47:08 +0200
+Subject: [PATCH 16/20] configure: eval QMAKE_CXX
+
+Allow expansion of $(...) references in QMAKE_CXX (currently its value
+is $(OE_QMAKE_CXX)) in order to allow compiler version check to succeed
+which allows WebKit to be enabled.
+
+Upstream-Status: Pending
+
+Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
+Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
+
+Conflicts:
+	configure
+---
+ configure | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/configure b/configure
+index d1a0dfd..9f59e1a 100755
+--- a/configure
++++ b/configure
+@@ -3438,6 +3438,7 @@ else
+ fi
+ 
+-QMAKE_CONF_COMPILER=`getXQMakeConf QMAKE_CXX`
++QMAKE_CONF_COMPILER=`getXQMakeConf QMAKE_CXX | sed -n 's/$[(]\([0-9a-zA-Z_]*\)[)]/$\1/pg'` 
++QMAKE_CONF_COMPILER=`eval "echo $QMAKE_CONF_COMPILER"`
+ TEST_COMPILER="$CXX"
+ 
+ [ -z "$TEST_COMPILER" ] && TEST_COMPILER=$QMAKE_CONF_COMPILER
+-- 
+1.7.12
+
diff --git a/meta/recipes-qt/qt4/qt4-4.8.3/0017-configure-ensure-we-identify-the-compiler-as-g-in-co.patch b/meta/recipes-qt/qt4/qt4-4.8.3/0017-configure-ensure-we-identify-the-compiler-as-g-in-co.patch
new file mode 100644
index 0000000..ef32932
--- /dev/null
+++ b/meta/recipes-qt/qt4/qt4-4.8.3/0017-configure-ensure-we-identify-the-compiler-as-g-in-co.patch
@@ -0,0 +1,46 @@
+From 5945025c96fd25880565819881b8ef48e1baa3ce Mon Sep 17 00:00:00 2001
+From: Paul Eggleton <paul.eggleton@linux.intel.com>
+Date: Wed, 26 Sep 2012 20:48:37 +0200
+Subject: [PATCH 17/20] configure: ensure we identify the compiler as g++ in
+ configure
+
+Our PLATFORM in OE is ${TARGET_OS}-oe-g++, and previously the configure
+script was interpreting from this that the compiler was "oe-g++" and
+thus
+g++ specific checks were not being run since this string did not match;
+among other things this resulted in a compiler version check in the
+QtWebKit build code not working, and hence the following error at build
+time:
+
+./wtf/NullPtr.h:48:1: error: identifier 'nullptr' will become a keyword
+in C++0x [-Werror=c++0x-compat]
+
+The easiest thing since our PLATFORM is entirely artificial is to just
+force COMPILER to "g++" in the configure script if it is detected as
+"oe-g++".
+
+Upstream-Status: Inappropriate [configuration]
+
+Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
+Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
+---
+ configure | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/configure b/configure
+index 9f59e1a..6989962 100755
+--- a/configure
++++ b/configure
+@@ -7527,6 +7527,9 @@ elif [ "$XPLATFORM" != "$PLATFORM" ]; then
+ else
+     COMPILER=`echo $PLATFORM | cut -f 2- -d-`
+ fi
++case $COMPILER in
++    *oe-g++) COMPILER="g++" ;;
++esac
+ if [ "$CFG_EXCEPTIONS" = "unspecified" -a "$PLATFORM_QWS" = "yes" ]; then
+     CFG_EXCEPTIONS=no
+ fi
+-- 
+1.7.12
+
diff --git a/meta/recipes-qt/qt4/qt4-4.8.3/0018-configure-make-pulseaudio-a-configurable-option.patch b/meta/recipes-qt/qt4/qt4-4.8.3/0018-configure-make-pulseaudio-a-configurable-option.patch
new file mode 100644
index 0000000..f3c17a5
--- /dev/null
+++ b/meta/recipes-qt/qt4/qt4-4.8.3/0018-configure-make-pulseaudio-a-configurable-option.patch
@@ -0,0 +1,46 @@
+From 5da434f2a61ca819ff9a9b0a84de8c2307f9d41b Mon Sep 17 00:00:00 2001
+From: Paul Eggleton <paul.eggleton@linux.intel.com>
+Date: Tue, 28 Feb 2012 15:10:24 +0000
+Subject: [PATCH 18/20] configure: make pulseaudio a configurable option
+
+Allows disabling pulseaudio support within phonon at configure time.
+(This is the Qt 4.8.0 version.)
+
+Upstream-Status: Pending
+
+Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
+Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
+---
+ configure | 9 ++++++++-
+ 1 file changed, 8 insertions(+), 1 deletion(-)
+
+diff --git a/configure b/configure
+index 6989962..58fcedd 100755
+--- a/configure
++++ b/configure
+@@ -1127,7 +1127,7 @@ while [ "$#" -gt 0 ]; do
+         VAL=no
+         ;;
+     #Qt style yes options
+-    -incremental|-qvfb|-profile|-shared|-static|-sm|-xinerama|-xshape|-xsync|-xinput|-egl|-reduce-exports|-pch|-separate-debug-info|-stl|-freetype|-xcursor|-xfixes|-xrandr|-xrender|-mitshm|-fontconfig|-xkb|-nis|-qdbus|-dbus|-dbus-linked|-glib|-gstreamer|-gtkstyle|-cups|-iconv|-largefile|-h|-help|-v|-verbose|-debug|-release|-fast|-accessibility|-confirm-license|-gnumake|-framework|-qt3support|-debug-and-release|-exceptions|-cocoa|-carbon|-universal|-harfbuzz|-prefix-install|-silent|-armfpa|-optimized-qmake|-dwarf2|-reduce-relocations|-sse|-openssl|-openssl-linked|-ptmalloc|-xmlpatterns|-phonon|-phonon-backend|-multimedia|-audio-backend|-svg|-declarative|-declarative-debug|-javascript-jit|-script|-scripttools|-rpath|-force-pkg-config|-s60|-usedeffiles|-icu)
++    -incremental|-qvfb|-profile|-shared|-static|-sm|-xinerama|-xshape|-xsync|-xinput|-egl|-reduce-exports|-pch|-separate-debug-info|-stl|-freetype|-xcursor|-xfixes|-xrandr|-xrender|-mitshm|-fontconfig|-xkb|-nis|-qdbus|-dbus|-dbus-linked|-glib|-gstreamer|-pulseaudio|-gtkstyle|-cups|-iconv|-largefile|-h|-help|-v|-verbose|-debug|-release|-fast|-accessibility|-confirm-license|-gnumake|-framework|-qt3support|-debug-and-release|-exceptions|-cocoa|-carbon|-universal|-harfbuzz|-prefix-install|-silent|-armfpa|-optimized-qmake|-dwarf2|-reduce-relocations|-sse|-openssl|-openssl-linked|-ptmalloc|-xmlpatterns|-phonon|-phonon-backend|-multimedia|-audio-backend|-svg|-declarative|-declarative-debug|-javascript-jit|-script|-scripttools|-rpath|-force-pkg-config|-s60|-usedeffiles|-icu)
+         VAR=`echo $1 | sed "s,^-\(.*\),\1,"`
+         VAL=yes
+         ;;
+@@ -2101,6 +2101,13 @@ while [ "$#" -gt 0 ]; do
+             UNKNOWN_OPT=yes
+         fi
+         ;;
++    pulseaudio)
++        if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
++            CFG_PULSEAUDIO="$VAL"
++        else
++            UNKNOWN_OPT=yes
++        fi
++        ;;
+     gtkstyle)
+         if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
+             CFG_QGTKSTYLE="$VAL"
+-- 
+1.7.12
+
diff --git a/meta/recipes-qt/qt4/qt4-4.8.3/0019-Fixes-for-gcc-4.7.0-particularly-on-qemux86.patch b/meta/recipes-qt/qt4/qt4-4.8.3/0019-Fixes-for-gcc-4.7.0-particularly-on-qemux86.patch
new file mode 100644
index 0000000..9f4adab
--- /dev/null
+++ b/meta/recipes-qt/qt4/qt4-4.8.3/0019-Fixes-for-gcc-4.7.0-particularly-on-qemux86.patch
@@ -0,0 +1,63 @@
+From 915ea240e03f04c6ae788cf369b13afe5d9bfc45 Mon Sep 17 00:00:00 2001
+From: Richard Purdie <richard.purdie@linuxfoundation.org>
+Date: Wed, 26 Sep 2012 20:54:38 +0200
+Subject: [PATCH 19/20] Fixes for gcc 4.7.0, particularly on qemux86
+
+Origin: upstream, http://trac.webkit.org/changeset/93631
+Origin: upstream, http://trac.webkit.org/changeset/113848
+
+Bug: https://bugs.webkit.org/show_bug.cgi?id=62168
+Bug: https://bugs.webkit.org/show_bug.cgi?id=83584
+
+RP 2012/04/30
+
+Upstream-Status: Backport
+
+Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
+---
+ src/3rdparty/webkit/Source/WebCore/dom/Element.cpp                      | 2 +-
+ src/3rdparty/webkit/Source/WebCore/html/HTMLImageElement.cpp            | 2 +-
+ .../webkit/Source/WebCore/platform/graphics/TiledBackingStoreClient.h   | 1 +
+ 3 files changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/src/3rdparty/webkit/Source/WebCore/dom/Element.cpp b/src/3rdparty/webkit/Source/WebCore/dom/Element.cpp
+index 32e47ca..b8e7389 100644
+--- a/src/3rdparty/webkit/Source/WebCore/dom/Element.cpp
++++ b/src/3rdparty/webkit/Source/WebCore/dom/Element.cpp
+@@ -1080,7 +1080,7 @@ void Element::recalcStyle(StyleChange change)
+ {
+     // Ref currentStyle in case it would otherwise be deleted when setRenderStyle() is called.
+     RefPtr<RenderStyle> currentStyle(renderStyle());
+-    bool hasParentStyle = parentNodeForRenderingAndStyle() ? parentNodeForRenderingAndStyle()->renderStyle() : false;
++    bool hasParentStyle = parentNodeForRenderingAndStyle() ? static_cast<bool>(parentNodeForRenderingAndStyle()->renderStyle()) : false;
+     bool hasDirectAdjacentRules = currentStyle && currentStyle->childrenAffectedByDirectAdjacentRules();
+     bool hasIndirectAdjacentRules = currentStyle && currentStyle->childrenAffectedByForwardPositionalRules();
+ 
+diff --git a/src/3rdparty/webkit/Source/WebCore/html/HTMLImageElement.cpp b/src/3rdparty/webkit/Source/WebCore/html/HTMLImageElement.cpp
+index d66075e..ab8f111 100644
+--- a/src/3rdparty/webkit/Source/WebCore/html/HTMLImageElement.cpp
++++ b/src/3rdparty/webkit/Source/WebCore/html/HTMLImageElement.cpp
+@@ -74,7 +74,7 @@ PassRefPtr<HTMLImageElement> HTMLImageElement::createForJSConstructor(Document*
+     RefPtr<HTMLImageElement> image = adoptRef(new HTMLImageElement(imgTag, document));
+     if (optionalWidth)
+         image->setWidth(*optionalWidth);
+-    if (optionalHeight > 0)
++    if (optionalHeight)
+         image->setHeight(*optionalHeight);
+     return image.release();
+ }
+diff --git a/src/3rdparty/webkit/Source/WebCore/platform/graphics/TiledBackingStoreClient.h b/src/3rdparty/webkit/Source/WebCore/platform/graphics/TiledBackingStoreClient.h
+index 6087ec3..6d748f6 100644
+--- a/src/3rdparty/webkit/Source/WebCore/platform/graphics/TiledBackingStoreClient.h
++++ b/src/3rdparty/webkit/Source/WebCore/platform/graphics/TiledBackingStoreClient.h
+@@ -25,6 +25,7 @@ namespace WebCore {
+ #if ENABLE(TILED_BACKING_STORE)
+ class TiledBackingStoreClient {
+ public:
++    virtual ~TiledBackingStoreClient() { }
+     virtual void tiledBackingStorePaintBegin() = 0;
+     virtual void tiledBackingStorePaint(GraphicsContext*, const IntRect&) = 0;
+     virtual void tiledBackingStorePaintEnd(const Vector<IntRect>& paintedArea) = 0;
+-- 
+1.7.12
+
diff --git a/meta/recipes-qt/qt4/qt4-4.8.3/0020-webkit-disable-the-fuse-ld-gold-flag.patch b/meta/recipes-qt/qt4/qt4-4.8.3/0020-webkit-disable-the-fuse-ld-gold-flag.patch
new file mode 100644
index 0000000..1e07a54
--- /dev/null
+++ b/meta/recipes-qt/qt4/qt4-4.8.3/0020-webkit-disable-the-fuse-ld-gold-flag.patch
@@ -0,0 +1,41 @@
+From a10ba547001f4a4ba0ae313a4e9c2c0b5bb36a09 Mon Sep 17 00:00:00 2001
+From: Ken Werner <ken.werner@linaro.org>
+Date: Wed, 26 Sep 2012 20:55:21 +0200
+Subject: [PATCH 20/20] webkit: disable the -fuse-ld=gold flag
+
+This option is a Debian/Ubuntu specific extension to the g++ and causes upstream GCC to throw an error.
+
+Upstream-Status: Pending
+
+Signed-off-by: Ken Werner <ken.werner@linaro.org>
+Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
+---
+ src/3rdparty/webkit/Source/common.pri | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/src/3rdparty/webkit/Source/common.pri b/src/3rdparty/webkit/Source/common.pri
+index 0f62e14..d81a1f0 100644
+--- a/src/3rdparty/webkit/Source/common.pri
++++ b/src/3rdparty/webkit/Source/common.pri
+@@ -3,12 +3,12 @@
+ contains(JAVASCRIPTCORE_JIT,yes): DEFINES+=ENABLE_JIT=1
+ contains(JAVASCRIPTCORE_JIT,no): DEFINES+=ENABLE_JIT=0
+ 
+-linux-g++ {
+-isEmpty($$(SBOX_DPKG_INST_ARCH)):exists(/usr/bin/ld.gold) {
+-    message(Using gold linker)
+-    QMAKE_LFLAGS+=-fuse-ld=gold
+-}
+-}
++#linux-g++ {
++#isEmpty($$(SBOX_DPKG_INST_ARCH)):exists(/usr/bin/ld.gold) {
++#    message(Using gold linker)
++#    QMAKE_LFLAGS+=-fuse-ld=gold
++#}
++#}
+ 
+ # We use this flag on production branches
+ # See https://bugs.webkit.org/show_bug.cgi?id=60824
+-- 
+1.7.12
+
diff --git a/meta/recipes-qt/qt4/qt4-4.8.3/g++.conf b/meta/recipes-qt/qt4/qt4-4.8.3/g++.conf
new file mode 100644
index 0000000..e58fb15
--- /dev/null
+++ b/meta/recipes-qt/qt4/qt4-4.8.3/g++.conf
@@ -0,0 +1,56 @@
+#
+# qmake configuration for common gcc
+#
+
+QMAKE_CC       = $(OE_QMAKE_CC)
+QMAKE_CFLAGS       += -pipe $(OE_QMAKE_CFLAGS)
+QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $(OE_QMAKE_CFLAGS)
+QMAKE_CFLAGS_DEPS	+= -M
+QMAKE_CFLAGS_WARN_ON	+= -Wall -W
+QMAKE_CFLAGS_WARN_OFF	+= -w
+QMAKE_CFLAGS_RELEASE	+=
+QMAKE_CFLAGS_DEBUG	+= -g
+QMAKE_CFLAGS_SHLIB	+= -fPIC
+QMAKE_CFLAGS_STATIC_LIB	+= -fPIC
+QMAKE_CFLAGS_YACC	+= -Wno-unused -Wno-parentheses
+QMAKE_CFLAGS_HIDESYMS   += -fvisibility=hidden
+QMAKE_CFLAGS_PRECOMPILE += -x c-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT}
+QMAKE_CFLAGS_USE_PRECOMPILE += -include ${QMAKE_PCH_OUTPUT_BASE}
+
+QMAKE_CXX      = $(OE_QMAKE_CXX)
+QMAKE_CXXFLAGS     += $$QMAKE_CFLAGS $(OE_QMAKE_CXXFLAGS)
+QMAKE_CXXFLAGS_DEPS	+= $$QMAKE_CFLAGS_DEPS
+QMAKE_CXXFLAGS_WARN_ON	+= $$QMAKE_CFLAGS_WARN_ON
+QMAKE_CXXFLAGS_WARN_OFF	+= $$QMAKE_CFLAGS_WARN_OFF
+QMAKE_CXXFLAGS_RELEASE	+= $$QMAKE_CFLAGS_RELEASE
+QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO
+QMAKE_CXXFLAGS_DEBUG	+= $$QMAKE_CFLAGS_DEBUG
+QMAKE_CXXFLAGS_SHLIB	+= $$QMAKE_CFLAGS_SHLIB
+QMAKE_CXXFLAGS_STATIC_LIB += $$QMAKE_CFLAGS_STATIC_LIB
+QMAKE_CXXFLAGS_YACC	+= $$QMAKE_CFLAGS_YACC
+QMAKE_CXXFLAGS_HIDESYMS += $$QMAKE_CFLAGS_HIDESYMS -fvisibility-inlines-hidden
+QMAKE_CXXFLAGS_PRECOMPILE += -x c++-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT}
+QMAKE_CXXFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE
+
+QMAKE_LINK     = $(OE_QMAKE_LINK)
+QMAKE_LINK_SHLIB   = $(OE_QMAKE_LINK)
+QMAKE_LINK_C		= $(OE_QMAKE_LINK)
+QMAKE_LINK_C_SHLIB	= $(OE_QMAKE_LINK)
+QMAKE_LFLAGS       += $(OE_QMAKE_LDFLAGS)
+QMAKE_LFLAGS_RELEASE	+=
+QMAKE_LFLAGS_DEBUG	+=
+QMAKE_LFLAGS_APP	+=
+QMAKE_LFLAGS_NOUNDEF	+= -Wl,--no-undefined
+QMAKE_LFLAGS_RPATH        = -Wl,-rpath-link,
+
+QMAKE_PCH_OUTPUT_EXT    = .gch
+
+# -Bsymbolic-functions (ld) support
+QMAKE_LFLAGS_BSYMBOLIC_FUNC = -Wl,-Bsymbolic-functions
+QMAKE_LFLAGS_DYNAMIC_LIST = -Wl,--dynamic-list,
+
+# some linking helper...
+CONFIG += rpath_libdirs
+
+# for the SDK
+isEmpty(QMAKE_QT_CONFIG):QMAKE_QT_CONFIG = $(OE_QMAKE_QT_CONFIG)
diff --git a/meta/recipes-qt/qt4/qt4-4.8.3/linux.conf b/meta/recipes-qt/qt4/qt4-4.8.3/linux.conf
new file mode 100644
index 0000000..a541355
--- /dev/null
+++ b/meta/recipes-qt/qt4/qt4-4.8.3/linux.conf
@@ -0,0 +1,66 @@
+#
+# qmake configuration for common linux
+#
+
+QMAKE_CFLAGS_THREAD	+= -D_REENTRANT
+QMAKE_CXXFLAGS_THREAD	+= $$QMAKE_CFLAGS_THREAD
+
+QMAKE_INCDIR          =
+QMAKE_LIBDIR          =
+QMAKE_INCDIR_X11      =
+QMAKE_LIBDIR_X11      =
+QMAKE_INCDIR_QT       = $(OE_QMAKE_INCDIR_QT)
+QMAKE_LIBDIR_QT       = $(OE_QMAKE_LIBDIR_QT)
+QMAKE_INCDIR_OPENGL   =
+QMAKE_LIBDIR_OPENGL   =
+QMAKE_INCDIR_OPENGL_ES1 = $$QMAKE_INCDIR_OPENGL
+QMAKE_LIBDIR_OPENGL_ES1 = $$QMAKE_LIBDIR_OPENGL
+QMAKE_INCDIR_OPENGL_ES2 = $$QMAKE_INCDIR_OPENGL
+QMAKE_LIBDIR_OPENGL_ES2 = $$QMAKE_LIBDIR_OPENGL
+QMAKE_INCDIR_EGL      =
+QMAKE_LIBDIR_EGL      =
+QMAKE_INCDIR_OPENVG   =
+QMAKE_LIBDIR_OPENVG   =
+
+
+QMAKE_LIBS            =
+QMAKE_LIBS_DYNLOAD    = -ldl
+QMAKE_LIBS_X11        = $(OE_QMAKE_LIBS_X11)
+QMAKE_LIBS_X11SM      = $(OE_QMAKE_LIBS_X11SM)
+QMAKE_LIBS_NIS        = -lnsl
+QMAKE_LIBS_EGL        = -lEGL
+QMAKE_LIBS_OPENGL     = -lGLU -lGL
+QMAKE_LIBS_OPENGL_QT  = -lGL
+QMAKE_LIBS_OPENGL_ES1 = -lGLES_CM
+QMAKE_LIBS_OPENGL_ES2 = -lGLESv2
+QMAKE_LIBS_OPENVG     = -lOpenVG
+QMAKE_LIBS_THREAD     = -lpthread
+
+QMAKE_MOC             = $(OE_QMAKE_MOC)
+QMAKE_UIC             = $(OE_QMAKE_UIC)
+QMAKE_UIC3            = $(OE_QMAKE_UIC3)
+QMAKE_RCC             = $(OE_QMAKE_RCC)
+QMAKE_QDBUSCPP2XML    = $(OE_QMAKE_QDBUSCPP2XML)
+QMAKE_QDBUSXML2CPP    = $(OE_QMAKE_QDBUSXML2CPP)
+
+QMAKE_AR              = $(OE_QMAKE_AR) cqs
+QMAKE_OBJCOPY         = objcopy
+QMAKE_RANLIB          =
+
+QMAKE_TAR             = tar -cf
+QMAKE_GZIP            = gzip -9f
+
+QMAKE_COPY            = cp -f
+QMAKE_COPY_FILE       = $(COPY)
+QMAKE_COPY_DIR        = $(COPY) -r
+QMAKE_MOVE            = mv -f
+QMAKE_DEL_FILE        = rm -f
+QMAKE_DEL_DIR         = rmdir
+QMAKE_STRIP           = $(OE_QMAKE_STRIP)
+QMAKE_STRIPFLAGS_LIB += --strip-unneeded
+QMAKE_CHK_DIR_EXISTS  = test -d
+QMAKE_MKDIR           = mkdir -p
+QMAKE_INSTALL_FILE    = install -m 644 -p
+QMAKE_INSTALL_PROGRAM = install -m 755 -p
+
+include(unix.conf)
diff --git a/meta/recipes-qt/qt4/qt4-4.8.3/qte.sh b/meta/recipes-qt/qt4/qt4-4.8.3/qte.sh
new file mode 100644
index 0000000..21d6ecb
--- /dev/null
+++ b/meta/recipes-qt/qt4/qt4-4.8.3/qte.sh
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+if [ -e /dev/input/touchscreen0 ]
+then
+    QWS_MOUSE_PROTO=Tslib:/dev/input/touchscreen0
+    export QWS_MOUSE_PROTO
+fi
diff --git a/meta/recipes-qt/qt4/qt4-embedded_4.8.3.bb b/meta/recipes-qt/qt4/qt4-embedded_4.8.3.bb
new file mode 100644
index 0000000..187de73
--- /dev/null
+++ b/meta/recipes-qt/qt4/qt4-embedded_4.8.3.bb
@@ -0,0 +1,11 @@
+require qt4-${PV}.inc
+require qt4-embedded.inc
+
+PR = "${INC_PR}.0"
+
+QT_CONFIG_FLAGS_append_armv6 = " -no-neon "
+
+QT_CONFIG_FLAGS += " \
+ -exceptions \
+"
+
diff --git a/meta/recipes-qt/qt4/qt4-native_4.8.3.bb b/meta/recipes-qt/qt4/qt4-native_4.8.3.bb
new file mode 100644
index 0000000..0f93187
--- /dev/null
+++ b/meta/recipes-qt/qt4/qt4-native_4.8.3.bb
@@ -0,0 +1,10 @@
+require qt4-native.inc
+
+DEFAULT_PREFERENCE = "-1"
+
+PR = "${INC_PR}.0"
+
+TOBUILD := "src/tools/bootstrap ${TOBUILD}"
+
+SRC_URI[md5sum] = "a663b6c875f8d7caa8ac9c30e4a4ec3b"
+SRC_URI[sha256sum] = "f1f72974f924861be04019f49f07cd43ab3c95056db2ba8f34b283487cccc728"
diff --git a/meta/recipes-qt/qt4/qt4-x11-free_4.8.3.bb b/meta/recipes-qt/qt4/qt4-x11-free_4.8.3.bb
new file mode 100644
index 0000000..bedd201
--- /dev/null
+++ b/meta/recipes-qt/qt4/qt4-x11-free_4.8.3.bb
@@ -0,0 +1,11 @@
+require qt4-x11-free.inc
+require qt4-${PV}.inc
+
+PR = "${INC_PR}.0"
+
+QT_CONFIG_FLAGS_append_armv6 = " -no-neon "
+
+QT_CONFIG_FLAGS += " \
+ -no-embedded \
+ -xrandr \
+ -x11"
-- 
1.7.12

Re: [PATCH 00/10] qt4: upgrade to 4.8.3 and cleanup

[Martin Jansa]

[-- Attachment #1: Type: text/plain, Size: 12417 bytes --]

On Tue, Oct 02, 2012 at 01:26:37AM +0200, Martin Jansa wrote:
> On Mon, Oct 01, 2012 at 04:31:08PM +0200, Martin Jansa wrote:
> > On Sun, Sep 30, 2012 at 10:18:18PM +0200, Martin Jansa wrote:
> > > On Fri, Sep 28, 2012 at 06:43:09PM +0200, Martin Jansa wrote:
> > > > On Thu, Sep 27, 2012 at 12:27:05AM +0200, Martin Jansa wrote:
> > > > > Please test on more architectures.
> > > > > I've tested complete qt4-native + qt4-free-x11 on armv4t.
> > > > > And only do_patch for nativesdk-qt4-tools, qt-mobility-*, qt4-embedded.
> > > > 
> > > > I've finished testing qt4-free-x11 on armv7a, x86_64 and armv5te +
> > > > qt-mobility-x11 on armv4t and armv7a.
> > > > 
> > > > Only python-pyqt_4.8.4.bb from meta-oe is failing with that, probably
> > > > needs to be updated to 4.9.2 or something like that.
> > > 
> > > This seems to be caused by missing webkit support in qt4-4.8.3.
> > > python-pyqt-4.9.4 and 4.9.5 fails the same.
> > > 
> > > Configure ignores -webkit and says that webkit won't be built I've found
> > > some bug reports upstream but those were resolved by forcing xrender
> > > support which doesn't help in our case..
> > 
> > Found it, jansa/qt4-4.8.3 updated and 4.8.3 now added with negative D_P
> > instead of replacing 4.8.1, will send v2 tonight.
> 
> Here is buildhistory log when whole patchset is applied without defining
> P_P.
> 
> https://github.com/shr-distribution/buildhistory/commit/0e0245527626b77d7913c3b44976eab478c04ca5
> https://github.com/shr-distribution/buildhistory/commit/56385ad686ab9591460d3be4d3eb13b4beddc45e
> 
> note that there are few changes, because before PR bump it was built
> with gcc 4.7.1.0+git1+d07e24f4ab59f264d68d21838795349faab5dede not
> 4.7.2.

Here is even better buildhistory log without that gcc change:
https://github.com/shr-distribution/buildhistory/commit/bb6444238bb6dc72b51c24a7dcf5d9b197d60edc
https://github.com/shr-distribution/buildhistory/commit/aed142b2ab93fcdcdf316a667d5bcdde741d27e7

Can it go in, now?

Cheers,
 
> And here are branches (oe-core-4.8.1, oe-core-4.8.3) with all patches applied
> https://github.com/shr-project/qt
> 
> Cheers,
> 
> > 
> > Cheers,
> > 
> > > > Should I resend only 4.8.1 cleanup without adding 4.8.3 or with 4.8.3 
> > > > having negative D_P?
> > > > 
> > > > Cheers,
> > > > 
> > > > > 
> > > > > The following changes since commit 938d07871bedd91f0d95ed6fe338ecbfafa5ebfe:
> > > > > 
> > > > >   busybox: Fix misplaced quote (2012-09-26 18:28:17 +0100)
> > > > > 
> > > > > are available in the git repository at:
> > > > > 
> > > > >   git://git.openembedded.org/openembedded-core-contrib jansa/qt4-4.8.3
> > > > >   http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=jansa/qt4-4.8.3
> > > > > 
> > > > > Martin Jansa (10):
> > > > >   qt4-tools-nativesdk.inc: rename to nativesdk-qt4-tools.inc
> > > > >   qt4: use releases.qt-project.org instead of get.qt.nokia.com
> > > > >   qt4: rename qt-4.8.1 to qt4-4.8.1 to match other .inc and .bb
> > > > >   qt4.inc: move more options to separate variables
> > > > >   qt-mobility: move qt-mobility patches to separate dir
> > > > >   qt4: move patches from files to qt4-4.8.1
> > > > >   qt4: drop patches not used in any recipe
> > > > >   qt4: replace all local patches with git patches with headers
> > > > >   qt4: PR bumps
> > > > >   qt4: upgrade to 4.8.3
> > > > > 
> > > > >  meta/recipes-qt/qt4/files/0004-no-qmake.patch      | 27 ------
> > > > >  meta/recipes-qt/qt4/files/0008-qt-lib-infix.patch  | 41 ----------
> > > > >  .../qt4/files/blacklist-diginotar-certs.diff       | 95 ----------------------
> > > > >  .../recipes-qt/qt4/files/compile.test-lflags.patch | 17 ----
> > > > >  meta/recipes-qt/qt4/files/fix-config-tests.patch   | 38 ---------
> > > > >  ...tools-nativesdk.inc => nativesdk-qt4-tools.inc} | 18 ++--
> > > > >  meta/recipes-qt/qt4/nativesdk-qt4-tools_4.8.1.bb   |  8 --
> > > > >  meta/recipes-qt/qt4/nativesdk-qt4-tools_4.8.3.bb   |  8 ++
> > > > >  .../qt4/qt-4.8.1/fix_conflicting_types.patch       | 29 -------
> > > > >  meta/recipes-qt/qt4/qt-4.8.1/gcc47-fix.patch       | 35 --------
> > > > >  meta/recipes-qt/qt4/qt-4.8.1/qmake_cxx_eval.patch  | 22 -----
> > > > >  ...stvideoconnector-fixed-buffers-allocation.patch |  0
> > > > >  ...nnecessary-rpaths-from-qml_device-example.patch |  0
> > > > >  .../{files => qt-mobility-1.2.0}/gcc-scope.patch   |  0
> > > > >  .../qt-mobility-configure.patch                    |  0
> > > > >  .../qt-mobility-no-opengl.patch                    |  0
> > > > >  meta/recipes-qt/qt4/qt-mobility_1.2.0.inc          |  3 +-
> > > > >  .../recipes-qt/qt4/{qt-4.8.1.inc => qt4-4.8.3.inc} | 41 +++++-----
> > > > >  ...-allow-to-set-qt.conf-from-the-outside-u.patch} | 28 +++++--
> > > > >  ...ty_qws-fix-build-with-old-kernel-headers.patch} | 21 ++++-
> > > > >  ...03-webkit2-set-OUTPUT_DIR-value-if-empty.patch} | 21 ++++-
> > > > >  ...make-is-already-built-in-qt4-tools-native.patch | 29 +++++++
> > > > >  ...-set-LFLAGS-to-pick-up-zlib-from-staging.patch} | 24 ++++--
> > > > >  ...e-OE_QMAKE_-values-to-specify-Qt-utility.patch} | 26 ++++--
> > > > >  ...const-usage-that-causes-compile-failure-.patch} | 26 ++++--
> > > > >  ...low-building-a-separate-qmake-for-the-ta.patch} | 20 +++--
> > > > >  ...-fix-source-file-references-in-qmake.pri.patch} | 15 ++--
> > > > >  ...ck-to-not-use-the-pg_config-of-the-host-.patch} | 25 ++++--
> > > > >  .../0011-freetype-host-includes.patch}             | 20 +++--
> > > > >  .../0012-Add-2bpp-support.patch}                   | 76 ++++++++++-------
> > > > >  .../0013-configure-add-crossarch-option.patch}     | 36 ++++----
> > > > >  ...ions-fix-phony-translation-linking-error.patch} | 19 +++--
> > > > >  ...configure-add-nostrip-for-debug-packages.patch} | 15 +++-
> > > > >  ...sure-we-identify-the-compiler-as-g-in-co.patch} | 27 ++++--
> > > > >  ...re-make-pulseaudio-a-configurable-option.patch} | 17 ++--
> > > > >  ...es-for-gcc-4.7.0-particularly-on-qemux86.patch} | 45 ++++++----
> > > > >  ...019-webkit-disable-the-fuse-ld-gold-flag.patch} | 23 ++++--
> > > > >  .../qt4/{qt-4.8.1 => qt4-4.8.3}/g++.conf           |  0
> > > > >  .../qt4/{qt-4.8.1 => qt4-4.8.3}/linux.conf         |  0
> > > > >  meta/recipes-qt/qt4/{files => qt4-4.8.3}/qte.sh    |  0
> > > > >  meta/recipes-qt/qt4/qt4-embedded.inc               |  2 +-
> > > > >  ...qt4-embedded_4.8.1.bb => qt4-embedded_4.8.3.bb} |  4 +-
> > > > >  meta/recipes-qt/qt4/qt4-native.inc                 | 10 +--
> > > > >  meta/recipes-qt/qt4/qt4-native_4.8.1.bb            | 12 ---
> > > > >  meta/recipes-qt/qt4/qt4-native_4.8.3.bb            |  8 ++
> > > > >  meta/recipes-qt/qt4/qt4-x11-free.inc               |  2 +-
> > > > >  ...qt4-x11-free_4.8.1.bb => qt4-x11-free_4.8.3.bb} |  4 +-
> > > > >  meta/recipes-qt/qt4/qt4.inc                        | 19 ++++-
> > > > >  48 files changed, 427 insertions(+), 529 deletions(-)
> > > > >  delete mode 100644 meta/recipes-qt/qt4/files/0004-no-qmake.patch
> > > > >  delete mode 100644 meta/recipes-qt/qt4/files/0008-qt-lib-infix.patch
> > > > >  delete mode 100644 meta/recipes-qt/qt4/files/blacklist-diginotar-certs.diff
> > > > >  delete mode 100644 meta/recipes-qt/qt4/files/compile.test-lflags.patch
> > > > >  delete mode 100644 meta/recipes-qt/qt4/files/fix-config-tests.patch
> > > > >  rename meta/recipes-qt/qt4/{qt4-tools-nativesdk.inc => nativesdk-qt4-tools.inc} (83%)
> > > > >  delete mode 100644 meta/recipes-qt/qt4/nativesdk-qt4-tools_4.8.1.bb
> > > > >  create mode 100644 meta/recipes-qt/qt4/nativesdk-qt4-tools_4.8.3.bb
> > > > >  delete mode 100644 meta/recipes-qt/qt4/qt-4.8.1/fix_conflicting_types.patch
> > > > >  delete mode 100644 meta/recipes-qt/qt4/qt-4.8.1/gcc47-fix.patch
> > > > >  delete mode 100644 meta/recipes-qt/qt4/qt-4.8.1/qmake_cxx_eval.patch
> > > > >  rename meta/recipes-qt/qt4/{files => qt-mobility-1.2.0}/0001-gstvideoconnector-fixed-buffers-allocation.patch (100%)
> > > > >  rename meta/recipes-qt/qt4/{files => qt-mobility-1.2.0}/0002-Remove-unnecessary-rpaths-from-qml_device-example.patch (100%)
> > > > >  rename meta/recipes-qt/qt4/{files => qt-mobility-1.2.0}/gcc-scope.patch (100%)
> > > > >  rename meta/recipes-qt/qt4/{files => qt-mobility-1.2.0}/qt-mobility-configure.patch (100%)
> > > > >  rename meta/recipes-qt/qt4/{files => qt-mobility-1.2.0}/qt-mobility-no-opengl.patch (100%)
> > > > >  rename meta/recipes-qt/qt4/{qt-4.8.1.inc => qt4-4.8.3.inc} (50%)
> > > > >  rename meta/recipes-qt/qt4/{files/qt-config.patch => qt4-4.8.3/0001-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch} (49%)
> > > > >  rename meta/recipes-qt/qt4/{files/fix_qkbdtty_qws.patch => qt4-4.8.3/0002-qkbdtty_qws-fix-build-with-old-kernel-headers.patch} (68%)
> > > > >  rename meta/recipes-qt/qt4/{files/set-OUTPUT_DIR-if-empty.patch => qt4-4.8.3/0003-webkit2-set-OUTPUT_DIR-value-if-empty.patch} (48%)
> > > > >  create mode 100644 meta/recipes-qt/qt4/qt4-4.8.3/0004-configure-qmake-is-already-built-in-qt4-tools-native.patch
> > > > >  rename meta/recipes-qt/qt4/{qt-4.8.1/configure-lflags.patch => qt4-4.8.3/0005-configure-set-LFLAGS-to-pick-up-zlib-from-staging.patch} (46%)
> > > > >  rename meta/recipes-qt/qt4/{files/configure-paths.patch => qt4-4.8.3/0006-configure-Use-OE_QMAKE_-values-to-specify-Qt-utility.patch} (58%)
> > > > >  rename meta/recipes-qt/qt4/{files/qt-dbus-const.patch => qt4-4.8.3/0007-dbus-Remove-const-usage-that-causes-compile-failure-.patch} (52%)
> > > > >  rename meta/recipes-qt/qt4/{files/target_qmake.patch => qt4-4.8.3/0008-qmake.pro-Allow-building-a-separate-qmake-for-the-ta.patch} (57%)
> > > > >  rename meta/recipes-qt/qt4/{qt-4.8.1/qmake_pri_fixes.patch => qt4-4.8.3/0009-qmake-fix-source-file-references-in-qmake.pri.patch} (81%)
> > > > >  rename meta/recipes-qt/qt4/{qt-4.8.1/hack-out-pg2-4.7.0.patch => qt4-4.8.3/0010-configure-Hack-to-not-use-the-pg_config-of-the-host-.patch} (68%)
> > > > >  rename meta/recipes-qt/qt4/{files/0006-freetype-host-includes.patch => qt4-4.8.3/0011-freetype-host-includes.patch} (50%)
> > > > >  rename meta/recipes-qt/qt4/{files/0009-support-2bpp.patch => qt4-4.8.3/0012-Add-2bpp-support.patch} (83%)
> > > > >  rename meta/recipes-qt/qt4/{qt-4.8.1/0001-Added-Openembedded-crossarch-option.patch => qt4-4.8.3/0013-configure-add-crossarch-option.patch} (49%)
> > > > >  rename meta/recipes-qt/qt4/{qt-4.8.1/fix-translations.patch => qt4-4.8.3/0014-translations-fix-phony-translation-linking-error.patch} (63%)
> > > > >  rename meta/recipes-qt/qt4/{files/add_nostrip_for_debug_packages.diff => qt4-4.8.3/0015-configure-add-nostrip-for-debug-packages.patch} (57%)
> > > > >  rename meta/recipes-qt/qt4/{qt-4.8.1/configure_oe_compiler.patch => qt4-4.8.3/0016-configure-ensure-we-identify-the-compiler-as-g-in-co.patch} (60%)
> > > > >  rename meta/recipes-qt/qt4/{qt-4.8.1/pulseaudio-config.patch => qt4-4.8.3/0017-configure-make-pulseaudio-a-configurable-option.patch} (85%)
> > > > >  rename meta/recipes-qt/qt4/{qt-4.8.1/gcc47-fix2.patch => qt4-4.8.3/0018-Fixes-for-gcc-4.7.0-particularly-on-qemux86.patch} (46%)
> > > > >  rename meta/recipes-qt/qt4/{qt-4.8.1/disable-fuse-gold-flag.patch => qt4-4.8.3/0019-webkit-disable-the-fuse-ld-gold-flag.patch} (46%)
> > > > >  rename meta/recipes-qt/qt4/{qt-4.8.1 => qt4-4.8.3}/g++.conf (100%)
> > > > >  rename meta/recipes-qt/qt4/{qt-4.8.1 => qt4-4.8.3}/linux.conf (100%)
> > > > >  rename meta/recipes-qt/qt4/{files => qt4-4.8.3}/qte.sh (100%)
> > > > >  rename meta/recipes-qt/qt4/{qt4-embedded_4.8.1.bb => qt4-embedded_4.8.3.bb} (73%)
> > > > >  delete mode 100644 meta/recipes-qt/qt4/qt4-native_4.8.1.bb
> > > > >  create mode 100644 meta/recipes-qt/qt4/qt4-native_4.8.3.bb
> > > > >  rename meta/recipes-qt/qt4/{qt4-x11-free_4.8.1.bb => qt4-x11-free_4.8.3.bb} (75%)
> > > > > 
> > > > > -- 
> > > > > 1.7.12
> > > > > 
> > > > 
> > > > -- 
> > > > Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com
> > > 
> > > 
> > > 
> > > -- 
> > > Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com
> > 
> > 
> > 
> > -- 
> > Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com
> 
> 
> 
> -- 
> Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com



-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]

Re: [PATCH 00/10] qt4: upgrade to 4.8.3 and cleanup

[Saul Wold]

On 09/26/2012 03:27 PM, Martin Jansa wrote:
> Please test on more architectures.
> I've tested complete qt4-native + qt4-free-x11 on armv4t.
> And only do_patch for nativesdk-qt4-tools, qt-mobility-*, qt4-embedded.
>
> The following changes since commit 938d07871bedd91f0d95ed6fe338ecbfafa5ebfe:
>
>    busybox: Fix misplaced quote (2012-09-26 18:28:17 +0100)
>
> are available in the git repository at:
>
>    git://git.openembedded.org/openembedded-core-contrib jansa/qt4-4.8.3
>    http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=jansa/qt4-4.8.3
>
> Martin Jansa (10):
>    qt4-tools-nativesdk.inc: rename to nativesdk-qt4-tools.inc
>    qt4: use releases.qt-project.org instead of get.qt.nokia.com
>    qt4: rename qt-4.8.1 to qt4-4.8.1 to match other .inc and .bb
>    qt4.inc: move more options to separate variables
>    qt-mobility: move qt-mobility patches to separate dir
>    qt4: move patches from files to qt4-4.8.1
>    qt4: drop patches not used in any recipe
>    qt4: replace all local patches with git patches with headers
>    qt4: PR bumps
>    qt4: upgrade to 4.8.3
>
Merged into OE-Core

with updated patch 10/10

Thanks
	Sau!


>   meta/recipes-qt/qt4/files/0004-no-qmake.patch      | 27 ------
>   meta/recipes-qt/qt4/files/0008-qt-lib-infix.patch  | 41 ----------
>   .../qt4/files/blacklist-diginotar-certs.diff       | 95 ----------------------
>   .../recipes-qt/qt4/files/compile.test-lflags.patch | 17 ----
>   meta/recipes-qt/qt4/files/fix-config-tests.patch   | 38 ---------
>   ...tools-nativesdk.inc => nativesdk-qt4-tools.inc} | 18 ++--
>   meta/recipes-qt/qt4/nativesdk-qt4-tools_4.8.1.bb   |  8 --
>   meta/recipes-qt/qt4/nativesdk-qt4-tools_4.8.3.bb   |  8 ++
>   .../qt4/qt-4.8.1/fix_conflicting_types.patch       | 29 -------
>   meta/recipes-qt/qt4/qt-4.8.1/gcc47-fix.patch       | 35 --------
>   meta/recipes-qt/qt4/qt-4.8.1/qmake_cxx_eval.patch  | 22 -----
>   ...stvideoconnector-fixed-buffers-allocation.patch |  0
>   ...nnecessary-rpaths-from-qml_device-example.patch |  0
>   .../{files => qt-mobility-1.2.0}/gcc-scope.patch   |  0
>   .../qt-mobility-configure.patch                    |  0
>   .../qt-mobility-no-opengl.patch                    |  0
>   meta/recipes-qt/qt4/qt-mobility_1.2.0.inc          |  3 +-
>   .../recipes-qt/qt4/{qt-4.8.1.inc => qt4-4.8.3.inc} | 41 +++++-----
>   ...-allow-to-set-qt.conf-from-the-outside-u.patch} | 28 +++++--
>   ...ty_qws-fix-build-with-old-kernel-headers.patch} | 21 ++++-
>   ...03-webkit2-set-OUTPUT_DIR-value-if-empty.patch} | 21 ++++-
>   ...make-is-already-built-in-qt4-tools-native.patch | 29 +++++++
>   ...-set-LFLAGS-to-pick-up-zlib-from-staging.patch} | 24 ++++--
>   ...e-OE_QMAKE_-values-to-specify-Qt-utility.patch} | 26 ++++--
>   ...const-usage-that-causes-compile-failure-.patch} | 26 ++++--
>   ...low-building-a-separate-qmake-for-the-ta.patch} | 20 +++--
>   ...-fix-source-file-references-in-qmake.pri.patch} | 15 ++--
>   ...ck-to-not-use-the-pg_config-of-the-host-.patch} | 25 ++++--
>   .../0011-freetype-host-includes.patch}             | 20 +++--
>   .../0012-Add-2bpp-support.patch}                   | 76 ++++++++++-------
>   .../0013-configure-add-crossarch-option.patch}     | 36 ++++----
>   ...ions-fix-phony-translation-linking-error.patch} | 19 +++--
>   ...configure-add-nostrip-for-debug-packages.patch} | 15 +++-
>   ...sure-we-identify-the-compiler-as-g-in-co.patch} | 27 ++++--
>   ...re-make-pulseaudio-a-configurable-option.patch} | 17 ++--
>   ...es-for-gcc-4.7.0-particularly-on-qemux86.patch} | 45 ++++++----
>   ...019-webkit-disable-the-fuse-ld-gold-flag.patch} | 23 ++++--
>   .../qt4/{qt-4.8.1 => qt4-4.8.3}/g++.conf           |  0
>   .../qt4/{qt-4.8.1 => qt4-4.8.3}/linux.conf         |  0
>   meta/recipes-qt/qt4/{files => qt4-4.8.3}/qte.sh    |  0
>   meta/recipes-qt/qt4/qt4-embedded.inc               |  2 +-
>   ...qt4-embedded_4.8.1.bb => qt4-embedded_4.8.3.bb} |  4 +-
>   meta/recipes-qt/qt4/qt4-native.inc                 | 10 +--
>   meta/recipes-qt/qt4/qt4-native_4.8.1.bb            | 12 ---
>   meta/recipes-qt/qt4/qt4-native_4.8.3.bb            |  8 ++
>   meta/recipes-qt/qt4/qt4-x11-free.inc               |  2 +-
>   ...qt4-x11-free_4.8.1.bb => qt4-x11-free_4.8.3.bb} |  4 +-
>   meta/recipes-qt/qt4/qt4.inc                        | 19 ++++-
>   48 files changed, 427 insertions(+), 529 deletions(-)
>   delete mode 100644 meta/recipes-qt/qt4/files/0004-no-qmake.patch
>   delete mode 100644 meta/recipes-qt/qt4/files/0008-qt-lib-infix.patch
>   delete mode 100644 meta/recipes-qt/qt4/files/blacklist-diginotar-certs.diff
>   delete mode 100644 meta/recipes-qt/qt4/files/compile.test-lflags.patch
>   delete mode 100644 meta/recipes-qt/qt4/files/fix-config-tests.patch
>   rename meta/recipes-qt/qt4/{qt4-tools-nativesdk.inc => nativesdk-qt4-tools.inc} (83%)
>   delete mode 100644 meta/recipes-qt/qt4/nativesdk-qt4-tools_4.8.1.bb
>   create mode 100644 meta/recipes-qt/qt4/nativesdk-qt4-tools_4.8.3.bb
>   delete mode 100644 meta/recipes-qt/qt4/qt-4.8.1/fix_conflicting_types.patch
>   delete mode 100644 meta/recipes-qt/qt4/qt-4.8.1/gcc47-fix.patch
>   delete mode 100644 meta/recipes-qt/qt4/qt-4.8.1/qmake_cxx_eval.patch
>   rename meta/recipes-qt/qt4/{files => qt-mobility-1.2.0}/0001-gstvideoconnector-fixed-buffers-allocation.patch (100%)
>   rename meta/recipes-qt/qt4/{files => qt-mobility-1.2.0}/0002-Remove-unnecessary-rpaths-from-qml_device-example.patch (100%)
>   rename meta/recipes-qt/qt4/{files => qt-mobility-1.2.0}/gcc-scope.patch (100%)
>   rename meta/recipes-qt/qt4/{files => qt-mobility-1.2.0}/qt-mobility-configure.patch (100%)
>   rename meta/recipes-qt/qt4/{files => qt-mobility-1.2.0}/qt-mobility-no-opengl.patch (100%)
>   rename meta/recipes-qt/qt4/{qt-4.8.1.inc => qt4-4.8.3.inc} (50%)
>   rename meta/recipes-qt/qt4/{files/qt-config.patch => qt4-4.8.3/0001-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch} (49%)
>   rename meta/recipes-qt/qt4/{files/fix_qkbdtty_qws.patch => qt4-4.8.3/0002-qkbdtty_qws-fix-build-with-old-kernel-headers.patch} (68%)
>   rename meta/recipes-qt/qt4/{files/set-OUTPUT_DIR-if-empty.patch => qt4-4.8.3/0003-webkit2-set-OUTPUT_DIR-value-if-empty.patch} (48%)
>   create mode 100644 meta/recipes-qt/qt4/qt4-4.8.3/0004-configure-qmake-is-already-built-in-qt4-tools-native.patch
>   rename meta/recipes-qt/qt4/{qt-4.8.1/configure-lflags.patch => qt4-4.8.3/0005-configure-set-LFLAGS-to-pick-up-zlib-from-staging.patch} (46%)
>   rename meta/recipes-qt/qt4/{files/configure-paths.patch => qt4-4.8.3/0006-configure-Use-OE_QMAKE_-values-to-specify-Qt-utility.patch} (58%)
>   rename meta/recipes-qt/qt4/{files/qt-dbus-const.patch => qt4-4.8.3/0007-dbus-Remove-const-usage-that-causes-compile-failure-.patch} (52%)
>   rename meta/recipes-qt/qt4/{files/target_qmake.patch => qt4-4.8.3/0008-qmake.pro-Allow-building-a-separate-qmake-for-the-ta.patch} (57%)
>   rename meta/recipes-qt/qt4/{qt-4.8.1/qmake_pri_fixes.patch => qt4-4.8.3/0009-qmake-fix-source-file-references-in-qmake.pri.patch} (81%)
>   rename meta/recipes-qt/qt4/{qt-4.8.1/hack-out-pg2-4.7.0.patch => qt4-4.8.3/0010-configure-Hack-to-not-use-the-pg_config-of-the-host-.patch} (68%)
>   rename meta/recipes-qt/qt4/{files/0006-freetype-host-includes.patch => qt4-4.8.3/0011-freetype-host-includes.patch} (50%)
>   rename meta/recipes-qt/qt4/{files/0009-support-2bpp.patch => qt4-4.8.3/0012-Add-2bpp-support.patch} (83%)
>   rename meta/recipes-qt/qt4/{qt-4.8.1/0001-Added-Openembedded-crossarch-option.patch => qt4-4.8.3/0013-configure-add-crossarch-option.patch} (49%)
>   rename meta/recipes-qt/qt4/{qt-4.8.1/fix-translations.patch => qt4-4.8.3/0014-translations-fix-phony-translation-linking-error.patch} (63%)
>   rename meta/recipes-qt/qt4/{files/add_nostrip_for_debug_packages.diff => qt4-4.8.3/0015-configure-add-nostrip-for-debug-packages.patch} (57%)
>   rename meta/recipes-qt/qt4/{qt-4.8.1/configure_oe_compiler.patch => qt4-4.8.3/0016-configure-ensure-we-identify-the-compiler-as-g-in-co.patch} (60%)
>   rename meta/recipes-qt/qt4/{qt-4.8.1/pulseaudio-config.patch => qt4-4.8.3/0017-configure-make-pulseaudio-a-configurable-option.patch} (85%)
>   rename meta/recipes-qt/qt4/{qt-4.8.1/gcc47-fix2.patch => qt4-4.8.3/0018-Fixes-for-gcc-4.7.0-particularly-on-qemux86.patch} (46%)
>   rename meta/recipes-qt/qt4/{qt-4.8.1/disable-fuse-gold-flag.patch => qt4-4.8.3/0019-webkit-disable-the-fuse-ld-gold-flag.patch} (46%)
>   rename meta/recipes-qt/qt4/{qt-4.8.1 => qt4-4.8.3}/g++.conf (100%)
>   rename meta/recipes-qt/qt4/{qt-4.8.1 => qt4-4.8.3}/linux.conf (100%)
>   rename meta/recipes-qt/qt4/{files => qt4-4.8.3}/qte.sh (100%)
>   rename meta/recipes-qt/qt4/{qt4-embedded_4.8.1.bb => qt4-embedded_4.8.3.bb} (73%)
>   delete mode 100644 meta/recipes-qt/qt4/qt4-native_4.8.1.bb
>   create mode 100644 meta/recipes-qt/qt4/qt4-native_4.8.3.bb
>   rename meta/recipes-qt/qt4/{qt4-x11-free_4.8.1.bb => qt4-x11-free_4.8.3.bb} (75%)
>