15 files changed, 143 insertions, 12 deletions

diff --git a/recipes-qt/qt5/qtbase-git/0001-Add-linux-oe-g-platform.patch b/recipes-qt/qt5/qtbase-git/0001-Add-linux-oe-g-platform.patch
index f55d474a..942cc9cb 100644
--- a/recipes-qt/qt5/qtbase-git/0001-Add-linux-oe-g-platform.patch
+++ b/recipes-qt/qt5/qtbase-git/0001-Add-linux-oe-g-platform.patch
@@ -1,7 +1,7 @@
 From e45d617fd823f683ed426d09fd8b6edefb9517ab Mon Sep 17 00:00:00 2001
 From: Martin Jansa <Martin.Jansa@gmail.com>
 Date: Mon, 15 Apr 2013 04:29:32 +0200
-Subject: [PATCH 01/12] Add linux-oe-g++ platform
+Subject: [PATCH 01/15] Add linux-oe-g++ platform
 
 * This qmake.conf unlike other platforms reads most variables from
   shell environment, because it's easier for qt recipes to export
diff --git a/recipes-qt/qt5/qtbase-git/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch b/recipes-qt/qt5/qtbase-git/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch
index 0725347a..e1087f2a 100644
--- a/recipes-qt/qt5/qtbase-git/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch
+++ b/recipes-qt/qt5/qtbase-git/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch
@@ -1,7 +1,7 @@
 From 4da4d9606efc8d3109296906e5b13814499ae698 Mon Sep 17 00:00:00 2001
 From: Holger Freyther <zecke@selfish.org>
 Date: Wed, 26 Sep 2012 17:22:30 +0200
-Subject: [PATCH 02/12] qlibraryinfo: allow to set qt.conf from the outside
+Subject: [PATCH 02/15] 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
diff --git a/recipes-qt/qt5/qtbase-git/0003-Add-external-hostbindir-option.patch b/recipes-qt/qt5/qtbase-git/0003-Add-external-hostbindir-option.patch
index 2a64291a..0b98683e 100644
--- a/recipes-qt/qt5/qtbase-git/0003-Add-external-hostbindir-option.patch
+++ b/recipes-qt/qt5/qtbase-git/0003-Add-external-hostbindir-option.patch
@@ -1,7 +1,7 @@
 From c9bf00e21ae398575adf4411e67b35cdf44920e5 Mon Sep 17 00:00:00 2001
 From: Martin Jansa <Martin.Jansa@gmail.com>
 Date: Sat, 6 Apr 2013 13:15:07 +0200
-Subject: [PATCH 03/12] Add -external-hostbindir option
+Subject: [PATCH 03/15] Add -external-hostbindir option
 
 * when cross-compiling it's sometimes useful to use existing tools from machine
   (or in OpenEmbedded built with separate native recipe) when building for target
diff --git a/recipes-qt/qt5/qtbase-git/0004-qt_functions-temporary-remove-isEmpty-check.patch b/recipes-qt/qt5/qtbase-git/0004-qt_functions-temporary-remove-isEmpty-check.patch
index 6e694544..77b1c41f 100644
--- a/recipes-qt/qt5/qtbase-git/0004-qt_functions-temporary-remove-isEmpty-check.patch
+++ b/recipes-qt/qt5/qtbase-git/0004-qt_functions-temporary-remove-isEmpty-check.patch
@@ -1,7 +1,7 @@
 From e561978ab73e72d7b088c9927fb6a87d2eff6833 Mon Sep 17 00:00:00 2001
 From: Martin Jansa <Martin.Jansa@gmail.com>
 Date: Wed, 17 Apr 2013 18:06:25 +0200
-Subject: [PATCH 04/12] qt_functions: temporary remove isEmpty check
+Subject: [PATCH 04/15] qt_functions: temporary remove isEmpty check
 
 * now we assume that every build will provide QT_EXTERNAL_HOST_BINS value
 * isEmpty works correctly only with qmake variables (e.g. $$FOO -
diff --git a/recipes-qt/qt5/qtbase-git/0005-qmake-is-already-built-in-qtbase-native.patch b/recipes-qt/qt5/qtbase-git/0005-qmake-is-already-built-in-qtbase-native.patch
index febefb8a..d95e0b45 100644
--- a/recipes-qt/qt5/qtbase-git/0005-qmake-is-already-built-in-qtbase-native.patch
+++ b/recipes-qt/qt5/qtbase-git/0005-qmake-is-already-built-in-qtbase-native.patch
@@ -1,7 +1,7 @@
 From f42c4156c3e056e9fd2d6b0542662d705efb2722 Mon Sep 17 00:00:00 2001
 From: Michael Krelin <hacker@klever.net>
 Date: Mon, 29 Oct 2012 20:07:49 -0700
-Subject: [PATCH 05/12] qmake is already built in qtbase-native
+Subject: [PATCH 05/15] qmake is already built in qtbase-native
 
 Ported from OE by: Yu Ke <ke.yu@intel.com>
 Upstream-Status: Inappropriate [configuration]
diff --git a/recipes-qt/qt5/qtbase-git/0006-Allow-building-a-separate-qmake-for-the-target.patch b/recipes-qt/qt5/qtbase-git/0006-Allow-building-a-separate-qmake-for-the-target.patch
index 4d04c7ce..a8778469 100644
--- a/recipes-qt/qt5/qtbase-git/0006-Allow-building-a-separate-qmake-for-the-target.patch
+++ b/recipes-qt/qt5/qtbase-git/0006-Allow-building-a-separate-qmake-for-the-target.patch
@@ -1,7 +1,7 @@
 From 8be64919365240728dcce02fac44e5018aaec191 Mon Sep 17 00:00:00 2001
 From: Paul Eggleton <paul.eggleton@linux.intel.com>
 Date: Mon, 29 Oct 2012 20:26:36 -0700
-Subject: [PATCH 06/12] Allow building a separate qmake for the target
+Subject: [PATCH 06/15] Allow building a separate qmake for the target
 
 Upstream-Status: Inappropriate [config]
 
diff --git a/recipes-qt/qt5/qtbase-git/0007-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch b/recipes-qt/qt5/qtbase-git/0007-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch
index a1129f79..f873aae9 100644
--- a/recipes-qt/qt5/qtbase-git/0007-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch
+++ b/recipes-qt/qt5/qtbase-git/0007-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch
@@ -1,7 +1,7 @@
 From 98d14c01a92c5caad2bb0e0b4a097ae11d83b58e Mon Sep 17 00:00:00 2001
 From: Martin Jansa <Martin.Jansa@gmail.com>
 Date: Sat, 27 Apr 2013 22:33:33 +0200
-Subject: [PATCH 07/12] configureapp: Prefix default LIBDIRS and INCDIRS with
+Subject: [PATCH 07/15] configureapp: Prefix default LIBDIRS and INCDIRS with
  SYSROOT
 
 Upstream-Status: Pending
diff --git a/recipes-qt/qt5/qtbase-git/0008-qt_module-Fix-pkgconfig-replacement.patch b/recipes-qt/qt5/qtbase-git/0008-qt_module-Fix-pkgconfig-replacement.patch
index 1b3c185f..4d15ee06 100644
--- a/recipes-qt/qt5/qtbase-git/0008-qt_module-Fix-pkgconfig-replacement.patch
+++ b/recipes-qt/qt5/qtbase-git/0008-qt_module-Fix-pkgconfig-replacement.patch
@@ -1,7 +1,7 @@
 From 1ac376893b75c36cc1ee6465e814546e2215354e Mon Sep 17 00:00:00 2001
 From: Martin Jansa <Martin.Jansa@gmail.com>
 Date: Sat, 27 Apr 2013 23:15:37 +0200
-Subject: [PATCH 08/12] qt_module: Fix pkgconfig replacement
+Subject: [PATCH 08/15] qt_module: Fix pkgconfig replacement
 
 * in situation like this:
   QT_SYSROOT:/OE/oe-core/tmp-eglibc/sysroots/qemuarm
diff --git a/recipes-qt/qt5/qtbase-git/0009-qt_module-Fix-paths-in-.prl-files.patch b/recipes-qt/qt5/qtbase-git/0009-qt_module-Fix-paths-in-.prl-files.patch
index 1d68efc9..8a3ef3c1 100644
--- a/recipes-qt/qt5/qtbase-git/0009-qt_module-Fix-paths-in-.prl-files.patch
+++ b/recipes-qt/qt5/qtbase-git/0009-qt_module-Fix-paths-in-.prl-files.patch
@@ -1,7 +1,7 @@
 From 111583f7a46871d130ac1c6688972ebf98452af4 Mon Sep 17 00:00:00 2001
 From: Martin Jansa <Martin.Jansa@gmail.com>
 Date: Sun, 28 Apr 2013 12:56:55 +0200
-Subject: [PATCH 09/12] qt_module: Fix paths in .prl files
+Subject: [PATCH 09/15] qt_module: Fix paths in .prl files
 
 * qmake does not prefix them with QT_SYSROOT when using them
   so e.g. when building qtdeclarative we get -L/usr/lib to LINKAGE
diff --git a/recipes-qt/qt5/qtbase-git/0010-wayland-scanner-disable-silent-rules.patch b/recipes-qt/qt5/qtbase-git/0010-wayland-scanner-disable-silent-rules.patch
index cac9bef4..5b14c818 100644
--- a/recipes-qt/qt5/qtbase-git/0010-wayland-scanner-disable-silent-rules.patch
+++ b/recipes-qt/qt5/qtbase-git/0010-wayland-scanner-disable-silent-rules.patch
@@ -1,7 +1,7 @@
 From 1224e23a7990ac877265a2736827a98c300a8bf7 Mon Sep 17 00:00:00 2001
 From: Martin Jansa <Martin.Jansa@gmail.com>
 Date: Sun, 5 May 2013 11:18:34 +0200
-Subject: [PATCH 10/12] wayland-scanner: disable silent rules
+Subject: [PATCH 10/15] wayland-scanner: disable silent rules
 
 * for some reason "$$qtwayland-server-header.commands" on second line gets expanded as -server-header.commands
 
diff --git a/recipes-qt/qt5/qtbase-git/0011-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch b/recipes-qt/qt5/qtbase-git/0011-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch
index fda64981..2c2360e6 100644
--- a/recipes-qt/qt5/qtbase-git/0011-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch
+++ b/recipes-qt/qt5/qtbase-git/0011-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch
@@ -1,7 +1,7 @@
 From 9ffc6dba623bb44e1787f4e4af13af03f9f7a0d2 Mon Sep 17 00:00:00 2001
 From: Martin Jansa <Martin.Jansa@gmail.com>
 Date: Wed, 8 May 2013 23:54:35 +0200
-Subject: [PATCH 11/12] configure: don't export SYSTEM_VARIABLES to .qmake.vars
+Subject: [PATCH 11/15] configure: don't export SYSTEM_VARIABLES to .qmake.vars
 
 * linux-oe-g++ should handle this correctly and exporting LD as QMAKE_LINK is
   causing issues as we need g++ to be used as linker
diff --git a/recipes-qt/qt5/qtbase-git/0012-configure.prf-Allow-to-add-extra-arguments-to-make.patch b/recipes-qt/qt5/qtbase-git/0012-configure.prf-Allow-to-add-extra-arguments-to-make.patch
index 7bcfd7f7..e6602b43 100644
--- a/recipes-qt/qt5/qtbase-git/0012-configure.prf-Allow-to-add-extra-arguments-to-make.patch
+++ b/recipes-qt/qt5/qtbase-git/0012-configure.prf-Allow-to-add-extra-arguments-to-make.patch
@@ -1,7 +1,7 @@
 From 7389b5556de11258d3084ede10c12859353fb13b Mon Sep 17 00:00:00 2001
 From: Martin Jansa <Martin.Jansa@gmail.com>
 Date: Thu, 9 May 2013 10:06:50 +0200
-Subject: [PATCH 12/12] configure.prf: Allow to add extra arguments to make
+Subject: [PATCH 12/15] configure.prf: Allow to add extra arguments to make
 
 * sometimes we would like to add -e or define some variable and respect it from both
   Makefiles used in configure tests and also Makefiles to build the application
diff --git a/recipes-qt/qt5/qtbase-git/0013-Disable-mkv8snapshot.patch b/recipes-qt/qt5/qtbase-git/0013-Disable-mkv8snapshot.patch
new file mode 100644
index 00000000..cd0c0596
--- /dev/null
+++ b/recipes-qt/qt5/qtbase-git/0013-Disable-mkv8snapshot.patch
@@ -0,0 +1,47 @@
+From c3e47eeb4dec8348c3a9f2cf9044c568c5334070 Mon Sep 17 00:00:00 2001
+From: Mikko Levonmaa <mikko.levonmaa@palm.com>
+Date: Tue, 8 Jan 2013 15:58:29 -0800
+Subject: [PATCH 13/15] Disable mkv8snapshot
+
+It seems to generate code that throws SIGILL, so disabling it
+
+Program received signal SIGILL, Illegal instruction.
+0x26312c60 in ?? ()
+(gdb) bt
+    function=..., receiver=..., argc=1978934572, args=0x7efff254,
+    has_pending_exception=0x7efff277, qml=...)
+    at ../3rdparty/v8/src/execution.cc:125
+    argc=1, argv=0x7efff254, pending_exception=0x7efff277,
+    convert_receiver=false, qml=...) at ../3rdparty/v8/src/execution.cc:194
+    receiver=<optimized out>, argc=<optimized out>, argv=<optimized out>,
+    pending_exception=0x7efff277, convert_receiver=false)
+    at ../3rdparty/v8/src/execution.cc:161
+    data=<optimized out>, exc=0x7efff277)
+    at ../3rdparty/v8/src/execution.cc:734
+    at ../3rdparty/v8/src/api.cc:4742
+    at qml/v8/qv8contextwrapper.cpp:155
+    ownership=<optimized out>) at qml/v8/qv8engine.cpp:155
+    parent=<optimized out>) at qml/v8/qjsengine.cpp:192
+
+Signed-off-by: Mikko Levonmaa <mikko.levonmaa@palm.com>
+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 9ca23a4..96965b6 100755
+--- a/configure
++++ b/configure
+@@ -899,7 +899,7 @@ CFG_NOBUILD_PARTS=""
+ CFG_SKIP_MODULES=""
+ CFG_RELEASE_QMAKE=no
+ CFG_AUDIO_BACKEND=auto
+-CFG_V8SNAPSHOT=auto
++CFG_V8SNAPSHOT=no
+ CFG_QML_DEBUG=yes
+ CFG_JAVASCRIPTCORE_JIT=auto
+ CFG_PKGCONFIG=auto
+-- 
+1.8.2.1
+
diff --git a/recipes-qt/qt5/qtbase-git/0014-enables-tslib-device-to-be-read-from-env-variable.patch b/recipes-qt/qt5/qtbase-git/0014-enables-tslib-device-to-be-read-from-env-variable.patch
new file mode 100644
index 00000000..e55ac7a3
--- /dev/null
+++ b/recipes-qt/qt5/qtbase-git/0014-enables-tslib-device-to-be-read-from-env-variable.patch
@@ -0,0 +1,35 @@
+From 8d037dfbe0b9cffa098c3de7010651590c1d6e6c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Eric=20B=C3=A9nard?= <eric@eukrea.com>
+Date: Mon, 27 May 2013 18:32:37 +0200
+Subject: [PATCH 14/15] enables tslib device to be read from env variable
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+from :
+https://github.com/prabindh/qt-configs/blob/master/qt5_1.0_Feb13/tslib.patch
+
+Signed-off-by: Eric Bénard <eric@eukrea.com>
+Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
+---
+ src/plugins/generic/tslib/qtslib.cpp | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/src/plugins/generic/tslib/qtslib.cpp b/src/plugins/generic/tslib/qtslib.cpp
+index 6986fd5..2ed4a69 100644
+--- a/src/plugins/generic/tslib/qtslib.cpp
++++ b/src/plugins/generic/tslib/qtslib.cpp
+@@ -64,7 +64,9 @@ QTsLibMouseHandler::QTsLibMouseHandler(const QString &key,
+     qDebug() << "QTsLibMouseHandler" << key << specification;
+     setObjectName(QLatin1String("TSLib Mouse Handler"));
+ 
+-    QByteArray device = "/dev/input/event1";
++    QByteArray device = qgetenv("TSLIB_TSDEVICE");
++    if(device.isEmpty())
++       device = "/dev/input/event1";
+     if (specification.startsWith("/dev/"))
+         device = specification.toLocal8Bit();
+ 
+-- 
+1.8.2.1
+
diff --git a/recipes-qt/qt5/qtbase-git/0015-qtbase-allow-build-of-examples.patch b/recipes-qt/qt5/qtbase-git/0015-qtbase-allow-build-of-examples.patch
new file mode 100644
index 00000000..45a49a62
--- /dev/null
+++ b/recipes-qt/qt5/qtbase-git/0015-qtbase-allow-build-of-examples.patch
@@ -0,0 +1,49 @@
+From 3d83f570e081e23a6cf6d0ccf57ad8db34c5ca3e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Eric=20B=C3=A9nard?= <eric@eukrea.com>
+Date: Sat, 25 May 2013 17:34:32 +0200
+Subject: [PATCH 15/15] qtbase: allow build of examples
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+this revert the following commit :
+
+commit 2b397f985e4ef6ae5c0571a928bb1320fb048c61
+Author: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
+Date:   Fri Dec 21 19:36:12 2012 +0100
+
+    do not actually build examples in production builds
+
+    -developer-build enables an actual build of examples, based on the
+    assumption that developers want to test it (it can be still disabled
+    with -nomake examples). regular users otoh want only the examples
+    sources installed.
+
+    Change-Id: Ifc6a108099929175a3960480802b271a758fdd38
+    Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
+
+Signed-off-by: Eric Bénard <eric@eukrea.com>
+---
+ mkspecs/features/qt_example_installs.prf | 8 --------
+ 1 file changed, 8 deletions(-)
+
+diff --git a/mkspecs/features/qt_example_installs.prf b/mkspecs/features/qt_example_installs.prf
+index 479a16a..ca1b0c7 100644
+--- a/mkspecs/features/qt_example_installs.prf
++++ b/mkspecs/features/qt_example_installs.prf
+@@ -92,12 +92,4 @@ probase = $$relative_path($$_PRO_FILE_PWD_, $$dirname(_QMAKE_CONF_)/examples)
+         allfiles -= doc
+         !isEmpty(allfiles): warning("remaining files in $$_PRO_FILE_PWD_: $$allfiles")
+     }
+-
+-    # Do not actually build the examples in production builds with -prefix
+-    !equals(TEMPLATE, subdirs):prefix_build:!contains(QT_CONFIG, private_tests) {
+-        TEMPLATE = aux
+-        CONFIG -= have_target qt staticlib dll
+-        SOURCES =
+-        INSTALLS -= target
+-    }
+ }
+-- 
+1.8.2.1
+