summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--conf/distro/include/qt5-versions.inc4
-rw-r--r--recipes-qt/qt5/qt5-git.inc2
-rw-r--r--recipes-qt/qt5/qtbase-git/0001-Add-linux-oe-g-platform.patch22
-rw-r--r--recipes-qt/qt5/qtbase-git/0001-Always-build-uic.patch4
-rw-r--r--recipes-qt/qt5/qtbase-git/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch8
-rw-r--r--recipes-qt/qt5/qtbase-git/0003-Add-external-hostbindir-option.patch106
-rw-r--r--recipes-qt/qt5/qtbase-git/0004-qt_functions-temporary-remove-isEmpty-check.patch18
-rw-r--r--recipes-qt/qt5/qtbase-git/0005-qmake-is-already-built-in-qtbase-native.patch10
-rw-r--r--recipes-qt/qt5/qtbase-git/0006-Allow-building-a-separate-qmake-for-the-target.patch10
-rw-r--r--recipes-qt/qt5/qtbase-git/0007-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch10
-rw-r--r--recipes-qt/qt5/qtbase-git/0008-qt_module-Fix-pkgconfig-replacement.patch22
-rw-r--r--recipes-qt/qt5/qtbase-git/0009-qt_module-Fix-paths-in-.prl-files.patch10
-rw-r--r--recipes-qt/qt5/qtbase-git/0010-wayland-scanner-disable-silent-rules.patch6
-rw-r--r--recipes-qt/qt5/qtbase-git/0011-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch10
-rw-r--r--recipes-qt/qt5/qtbase-git/0012-configure.prf-Allow-to-add-extra-arguments-to-make.patch6
-rw-r--r--recipes-qt/qt5/qtbase-git/0013-Disable-mkv8snapshot.patch12
-rw-r--r--recipes-qt/qt5/qtbase-git/0014-enables-tslib-device-to-be-read-from-env-variable.patch6
-rw-r--r--recipes-qt/qt5/qtbase-git/0015-qtbase-allow-build-of-examples.patch17
-rw-r--r--recipes-qt/qt5/qtbase-git/0018-QOpenGLPaintDevice-sub-area-support.patch34
-rw-r--r--recipes-qt/qt5/qtbase-git/0019-Fix-FBO-restoring-in-QOpenGLTextureGlyphCache.patch48
-rw-r--r--recipes-qt/qt5/qtbase-git/0020-Use-BGRA-extension-in-bindTexture.patch15
-rw-r--r--recipes-qt/qt5/qtbase-git/0021-configure-make-pulseaudio-a-configurable-option.patch6
-rw-r--r--recipes-qt/qt5/qtbase-git/0022-configure-make-alsa-a-configurable-option.patch6
-rw-r--r--recipes-qt/qt5/qtbase-git/0023-configure-make-freetype-a-configurable-option.patch6
-rw-r--r--recipes-qt/qt5/qtbase-native_git.bb8
-rw-r--r--recipes-qt/qt5/qtbase.inc1
-rw-r--r--recipes-qt/qt5/qtbase_5.0.2.bb1
-rw-r--r--recipes-qt/qt5/qtbase_5.1.0.bb4
-rw-r--r--recipes-qt/qt5/qtbase_git.bb4
-rw-r--r--recipes-qt/qt5/qtdeclarative-git/0001-qmltestexample-fix-link.patch46
-rw-r--r--recipes-qt/qt5/qtdeclarative-git/0002-Fix-null-pointer-access-in-QQuickVisualDataModelPriv.patch37
-rw-r--r--recipes-qt/qt5/qtdeclarative-git/0003-Fix-wrong-calculation-of-viewPort-for-transitions.patch (renamed from recipes-qt/qt5/qtdeclarative-git/0001-Fix-wrong-calculation-of-viewPort-for-transitions.patch)8
-rw-r--r--recipes-qt/qt5/qtdeclarative_git.bb9
-rw-r--r--recipes-qt/qt5/qtgraphicaleffects_git.bb4
-rw-r--r--recipes-qt/qt5/qtimageformats_git.bb4
-rw-r--r--recipes-qt/qt5/qtjsbackend-native_git.bb4
-rw-r--r--recipes-qt/qt5/qtjsbackend_git.bb4
-rw-r--r--recipes-qt/qt5/qtmultimedia_git.bb4
-rw-r--r--recipes-qt/qt5/qtquick1_git.bb4
-rw-r--r--recipes-qt/qt5/qtscript_git.bb4
-rw-r--r--recipes-qt/qt5/qtsensors_git.bb7
-rw-r--r--recipes-qt/qt5/qtsvg_git.bb4
-rw-r--r--recipes-qt/qt5/qtwebkit_git.bb4
-rw-r--r--recipes-qt/qt5/qtxmlpatterns_git.bb4
44 files changed, 253 insertions, 310 deletions
diff --git a/conf/distro/include/qt5-versions.inc b/conf/distro/include/qt5-versions.inc
index f033a20a..b946a6a6 100644
--- a/conf/distro/include/qt5-versions.inc
+++ b/conf/distro/include/qt5-versions.inc
@@ -1,5 +1,5 @@
1# Select which version you prefer by defining QT5_VERSION and including this file 1# Select which version you prefer by defining QT5_VERSION and including this file
2# possible values now "5.0.2", "5.0.2+git%", "5.1.0%" 2# possible values now "5.0.2", "5.1.0", "5.1.0+git%"
3 3
4QT5_VERSION ?= "5.0.2" 4QT5_VERSION ?= "5.0.2"
5 5
@@ -17,4 +17,4 @@ PREFERRED_VERSION_qtscript = "${QT5_VERSION}"
17PREFERRED_VERSION_qtsvg = "${QT5_VERSION}" 17PREFERRED_VERSION_qtsvg = "${QT5_VERSION}"
18PREFERRED_VERSION_qtwebkit = "${QT5_VERSION}" 18PREFERRED_VERSION_qtwebkit = "${QT5_VERSION}"
19PREFERRED_VERSION_qtxmlpatterns = "${QT5_VERSION}" 19PREFERRED_VERSION_qtxmlpatterns = "${QT5_VERSION}"
20PREFERRED_VERSION_qtwayland = "${QT5_VERSION}" 20PREFERRED_VERSION_qtwayland = "${QT5_VERSION}%"
diff --git a/recipes-qt/qt5/qt5-git.inc b/recipes-qt/qt5/qt5-git.inc
index 9733a489..98770472 100644
--- a/recipes-qt/qt5/qt5-git.inc
+++ b/recipes-qt/qt5/qt5-git.inc
@@ -10,7 +10,7 @@ SRC_URI += " \
10 10
11S = "${WORKDIR}/git" 11S = "${WORKDIR}/git"
12 12
13PV = "5.0.2+git${SRCPV}" 13PV = "5.1.0+git${SRCPV}"
14 14
15FILESEXTRAPATHS =. "${FILE_DIRNAME}/${BPN}-git:" 15FILESEXTRAPATHS =. "${FILE_DIRNAME}/${BPN}-git:"
16 16
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 942cc9cb..5c16ece5 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 @@
1From e45d617fd823f683ed426d09fd8b6edefb9517ab Mon Sep 17 00:00:00 2001 1From 14fcd5be6d0665b5803a90a1b7887943b350285f Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com> 2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Mon, 15 Apr 2013 04:29:32 +0200 3Date: Mon, 15 Apr 2013 04:29:32 +0200
4Subject: [PATCH 01/15] Add linux-oe-g++ platform 4Subject: [PATCH 01/23] Add linux-oe-g++ platform
5 5
6* This qmake.conf unlike other platforms reads most variables from 6* This qmake.conf unlike other platforms reads most variables from
7 shell environment, because it's easier for qt recipes to export 7 shell environment, because it's easier for qt recipes to export
@@ -41,10 +41,10 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
41 create mode 100644 mkspecs/linux-oe-g++/qplatformdefs.h 41 create mode 100644 mkspecs/linux-oe-g++/qplatformdefs.h
42 42
43diff --git a/configure b/configure 43diff --git a/configure b/configure
44index 9c86fa1..7dea731 100755 44index 938b23b..dacfd30 100755
45--- a/configure 45--- a/configure
46+++ b/configure 46+++ b/configure
47@@ -284,6 +284,16 @@ getQMakeConf() 47@@ -291,6 +291,16 @@ getQMakeConf()
48 getSingleQMakeVariable "$1" "$specvals" 48 getSingleQMakeVariable "$1" "$specvals"
49 } 49 }
50 50
@@ -61,7 +61,7 @@ index 9c86fa1..7dea731 100755
61 getXQMakeConf() 61 getXQMakeConf()
62 { 62 {
63 if [ -z "$xspecvals" ]; then 63 if [ -z "$xspecvals" ]; then
64@@ -293,6 +303,16 @@ getXQMakeConf() 64@@ -300,6 +310,16 @@ getXQMakeConf()
65 getSingleQMakeVariable "$1" "$xspecvals" 65 getSingleQMakeVariable "$1" "$xspecvals"
66 } 66 }
67 67
@@ -78,7 +78,7 @@ index 9c86fa1..7dea731 100755
78 compilerSupportsFlag() 78 compilerSupportsFlag()
79 { 79 {
80 cat >conftest.cpp <<EOF 80 cat >conftest.cpp <<EOF
81@@ -807,6 +827,18 @@ fi 81@@ -816,6 +836,18 @@ fi
82 # initalize variables 82 # initalize variables
83 #------------------------------------------------------------------------------- 83 #-------------------------------------------------------------------------------
84 84
@@ -97,7 +97,7 @@ index 9c86fa1..7dea731 100755
97 SYSTEM_VARIABLES="RANLIB STRIP OBJDUMP LD CC CXX CFLAGS CXXFLAGS LDFLAGS" 97 SYSTEM_VARIABLES="RANLIB STRIP OBJDUMP LD CC CXX CFLAGS CXXFLAGS LDFLAGS"
98 for varname in $SYSTEM_VARIABLES; do 98 for varname in $SYSTEM_VARIABLES; do
99 qmakevarname="${varname}" 99 qmakevarname="${varname}"
100@@ -2847,7 +2879,7 @@ if [ "$BUILD_ON_MAC" = "yes" ] && [ "$CFG_QGTKSTYLE" = "auto" ]; then 100@@ -2894,7 +2926,7 @@ if [ "$BUILD_ON_MAC" = "yes" ] && [ "$CFG_QGTKSTYLE" = "auto" ]; then
101 CFG_QGTKSTYLE=no 101 CFG_QGTKSTYLE=no
102 fi 102 fi
103 103
@@ -106,7 +106,7 @@ index 9c86fa1..7dea731 100755
106 106
107 TEST_COMPILER=$QMAKE_CONF_COMPILER 107 TEST_COMPILER=$QMAKE_CONF_COMPILER
108 108
109@@ -2882,7 +2914,7 @@ if [ "$XPLATFORM_SYMBIAN_SBSV2" = "no" ]; then 109@@ -2929,7 +2961,7 @@ if [ "$XPLATFORM_SYMBIAN_SBSV2" = "no" ]; then
110 exit 1 110 exit 1
111 fi 111 fi
112 fi 112 fi
@@ -115,7 +115,7 @@ index 9c86fa1..7dea731 100755
115 115
116 GCC_MACHINE_DUMP= 116 GCC_MACHINE_DUMP=
117 case "$TEST_COMPILER" in *g++) GCC_MACHINE_DUMP=$($TEST_COMPILER -dumpmachine);; esac 117 case "$TEST_COMPILER" in *g++) GCC_MACHINE_DUMP=$($TEST_COMPILER -dumpmachine);; esac
118@@ -3884,6 +3916,14 @@ setBootstrapVariable() 118@@ -3967,6 +3999,14 @@ setBootstrapVariable()
119 getQMakeConf "$1" | echo ${2-$1} = `if [ -n "$3" ]; then sed "$3"; else cat; fi` >> "$mkfile" 119 getQMakeConf "$1" | echo ${2-$1} = `if [ -n "$3" ]; then sed "$3"; else cat; fi` >> "$mkfile"
120 } 120 }
121 121
@@ -130,7 +130,7 @@ index 9c86fa1..7dea731 100755
130 # build qmake 130 # build qmake
131 if true; then ###[ '!' -f "$outpath/bin/qmake" ]; 131 if true; then ###[ '!' -f "$outpath/bin/qmake" ];
132 echo "Creating qmake..." 132 echo "Creating qmake..."
133@@ -3922,11 +3962,11 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ]; 133@@ -4005,11 +4045,11 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ];
134 fi 134 fi
135 135
136 [ "$CFG_SILENT" = "yes" ] && CC_TRANSFORM='s,^,\@,' || CC_TRANSFORM= 136 [ "$CFG_SILENT" = "yes" ] && CC_TRANSFORM='s,^,\@,' || CC_TRANSFORM=
@@ -300,5 +300,5 @@ index 0000000..dd12003
300+ 300+
301+#endif // QPLATFORMDEFS_H 301+#endif // QPLATFORMDEFS_H
302-- 302--
3031.8.2.1 3031.8.3.2
304 304
diff --git a/recipes-qt/qt5/qtbase-git/0001-Always-build-uic.patch b/recipes-qt/qt5/qtbase-git/0001-Always-build-uic.patch
index a0810bcc..e02815b1 100644
--- a/recipes-qt/qt5/qtbase-git/0001-Always-build-uic.patch
+++ b/recipes-qt/qt5/qtbase-git/0001-Always-build-uic.patch
@@ -1,4 +1,4 @@
1From ebe1148e38c5deb3c67dc041e68cd1623531d67b Mon Sep 17 00:00:00 2001 1From a911109ed920e6a7466b65df86270ed836dd529c Mon Sep 17 00:00:00 2001
2From: Mikko Levonmaa <mikko.levonmaa@palm.com> 2From: Mikko Levonmaa <mikko.levonmaa@palm.com>
3Date: Tue, 27 Nov 2012 12:46:44 -0800 3Date: Tue, 27 Nov 2012 12:46:44 -0800
4Subject: [PATCH] Always build uic 4Subject: [PATCH] Always build uic
@@ -36,5 +36,5 @@ index b4c9602..f30ec1f 100644
36 nacl: SUBDIRS -= src_network src_testlib 36 nacl: SUBDIRS -= src_network src_testlib
37 37
38-- 38--
391.8.2.1 391.8.3.2
40 40
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 e1087f2a..9f301c46 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 @@
1From 4da4d9606efc8d3109296906e5b13814499ae698 Mon Sep 17 00:00:00 2001 1From 64ac02980780a099618b8d47803a1e4da6016c84 Mon Sep 17 00:00:00 2001
2From: Holger Freyther <zecke@selfish.org> 2From: Holger Freyther <zecke@selfish.org>
3Date: Wed, 26 Sep 2012 17:22:30 +0200 3Date: Wed, 26 Sep 2012 17:22:30 +0200
4Subject: [PATCH 02/15] qlibraryinfo: allow to set qt.conf from the outside 4Subject: [PATCH 02/23] qlibraryinfo: allow to set qt.conf from the outside
5 using the environment 5 using the environment
6 6
7Allow to set a qt.conf from the outside using the environment. This allows 7Allow 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>
16 1 file changed, 4 insertions(+), 1 deletion(-) 16 1 file changed, 4 insertions(+), 1 deletion(-)
17 17
18diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp 18diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp
19index 5fb9640..6b40731 100644 19index 53a3ebb..8ca2102 100644
20--- a/src/corelib/global/qlibraryinfo.cpp 20--- a/src/corelib/global/qlibraryinfo.cpp
21+++ b/src/corelib/global/qlibraryinfo.cpp 21+++ b/src/corelib/global/qlibraryinfo.cpp
22@@ -138,7 +138,10 @@ QLibrarySettings::QLibrarySettings() 22@@ -138,7 +138,10 @@ QLibrarySettings::QLibrarySettings()
@@ -32,5 +32,5 @@ index 5fb9640..6b40731 100644
32 if(!QFile::exists(qtconfig)) 32 if(!QFile::exists(qtconfig))
33 qtconfig = qt_libraryInfoFile(); 33 qtconfig = qt_libraryInfoFile();
34-- 34--
351.8.2.1 351.8.3.2
36 36
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 0b98683e..b80189f3 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 @@
1From c9bf00e21ae398575adf4411e67b35cdf44920e5 Mon Sep 17 00:00:00 2001 1From 6e92a3eac477a534226f916018a6ba6996eff318 Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com> 2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Sat, 6 Apr 2013 13:15:07 +0200 3Date: Sat, 6 Apr 2013 13:15:07 +0200
4Subject: [PATCH 03/15] Add -external-hostbindir option 4Subject: [PATCH 03/23] Add -external-hostbindir option
5 5
6* when cross-compiling it's sometimes useful to use existing tools from machine 6* when cross-compiling it's sometimes useful to use existing tools from machine
7 (or in OpenEmbedded built with separate native recipe) when building for target 7 (or in OpenEmbedded built with separate native recipe) when building for target
@@ -12,40 +12,39 @@ Upstream-Status: Pending
12 12
13Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> 13Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
14--- 14---
15 configure | 15 ++++++++++++++- 15 configure | 14 ++++++++++++++
16 mkspecs/features/qt_functions.prf | 5 ++++- 16 mkspecs/features/qt_functions.prf | 5 ++++-
17 mkspecs/features/qt_tool.prf | 2 +- 17 mkspecs/features/qt_tool.prf | 2 +-
18 qmake/property.cpp | 1 + 18 qmake/property.cpp | 1 +
19 qtbase.pro | 15 +++++++++++---- 19 qtbase.pro | 12 +++++++++---
20 src/corelib/global/qlibraryinfo.cpp | 3 ++- 20 src/corelib/global/qlibraryinfo.cpp | 3 ++-
21 src/corelib/global/qlibraryinfo.h | 1 + 21 src/corelib/global/qlibraryinfo.h | 1 +
22 tools/configure/configureapp.cpp | 8 ++++++++ 22 tools/configure/configureapp.cpp | 8 ++++++++
23 8 files changed, 42 insertions(+), 8 deletions(-) 23 8 files changed, 40 insertions(+), 6 deletions(-)
24 24
25diff --git a/configure b/configure 25diff --git a/configure b/configure
26index 7dea731..65f4d26 100755 26index dacfd30..25980c0 100755
27--- a/configure 27--- a/configure
28+++ b/configure 28+++ b/configure
29@@ -1034,6 +1034,7 @@ CFG_GCC_SYSROOT="yes" 29@@ -1046,6 +1046,7 @@ QT_HOST_PREFIX=
30 QT_HOST_PREFIX=
31 QT_HOST_BINS= 30 QT_HOST_BINS=
31 QT_HOST_LIBS=
32 QT_HOST_DATA= 32 QT_HOST_DATA=
33+QT_EXTERNAL_HOST_BINS= 33+QT_EXTERNAL_HOST_BINS=
34 34
35 #flags for SQL drivers 35 #flags for SQL drivers
36 QT_CFLAGS_PSQL= 36 QT_CFLAGS_PSQL=
37@@ -1141,7 +1142,7 @@ while [ "$#" -gt 0 ]; do 37@@ -1170,6 +1171,7 @@ while [ "$#" -gt 0 ]; do
38 VAL=no 38 -testsdir| \
39 ;; 39 -hostdatadir| \
40 #Qt style options that pass an argument 40 -hostbindir| \
41- -prefix|-docdir|-headerdir|-plugindir|-importdir|-qmldir|-archdatadir|-datadir|-libdir|-bindir|-libexecdir|-translationdir|-sysconfdir|-examplesdir|-testsdir|-depths|-make|-nomake|-skip|-platform|-xplatform|-device|-device-option|-sdk|-arch|-host-arch|-mysql_config|-sysroot|-hostdatadir|-hostbindir|-qpa|-qconfig|-android-sdk|-android-ndk|-android-ndk-platform|-android-ndk-host|-android-arch|-android-toolchain-version) 41+ -external-hostbindir| \
42+ -prefix|-docdir|-headerdir|-plugindir|-importdir|-qmldir|-archdatadir|-datadir|-libdir|-bindir|-libexecdir|-translationdir|-sysconfdir|-examplesdir|-testsdir|-depths|-make|-nomake|-skip|-platform|-xplatform|-device|-device-option|-sdk|-arch|-host-arch|-mysql_config|-sysroot|-hostdatadir|-hostbindir|-qpa|-qconfig|-android-sdk|-android-ndk|-android-ndk-platform|-android-ndk-host|-android-arch|-android-toolchain-version|-external-hostbindir) 42 -hostlibdir| \
43 VAR=`echo $1 | sed "s,^-\(.*\),\1,"` 43 -sysroot| \
44 shift 44 -depths| \
45 VAL="$1" 45@@ -1379,6 +1381,9 @@ while [ "$#" -gt 0 ]; do
46@@ -1326,6 +1327,9 @@ while [ "$#" -gt 0 ]; do 46 hostlibdir)
47 hostbindir) 47 QT_HOST_LIBS="$VAL"
48 QT_HOST_BINS="$VAL"
49 ;; 48 ;;
50+ external-hostbindir) 49+ external-hostbindir)
51+ QT_EXTERNAL_HOST_BINS="$VAL" 50+ QT_EXTERNAL_HOST_BINS="$VAL"
@@ -53,8 +52,8 @@ index 7dea731..65f4d26 100755
53 pkg-config) 52 pkg-config)
54 if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then 53 if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
55 CFG_PKGCONFIG="$VAL" 54 CFG_PKGCONFIG="$VAL"
56@@ -3180,6 +3184,11 @@ else 55@@ -3248,6 +3253,11 @@ if [ "$CFG_COMPILE_EXAMPLES" = "yes" ]; then
57 QT_HOST_DATA=`"$relpath/config.tests/unix/makeabs" "$QT_HOST_DATA"` 56 QMAKE_CONFIG="$QMAKE_CONFIG compile_examples"
58 fi 57 fi
59 58
60+# default is empty, don't call makeabs if it is empty 59+# default is empty, don't call makeabs if it is empty
@@ -65,7 +64,7 @@ index 7dea731..65f4d26 100755
65 #------------------------------------------------------------------------------- 64 #-------------------------------------------------------------------------------
66 # help - interactive parts of the script _after_ this section please 65 # help - interactive parts of the script _after_ this section please
67 #------------------------------------------------------------------------------- 66 #-------------------------------------------------------------------------------
68@@ -3346,6 +3355,9 @@ Installation options: 67@@ -3416,6 +3426,9 @@ Installation options:
69 -hostdatadir <dir> . Data used by qmake will be installed to <dir> 68 -hostdatadir <dir> . Data used by qmake will be installed to <dir>
70 (default HOSTPREFIX) 69 (default HOSTPREFIX)
71 70
@@ -75,32 +74,32 @@ index 7dea731..65f4d26 100755
75 Configure options: 74 Configure options:
76 75
77 The defaults (*) are usually acceptable. A plus (+) denotes a default value 76 The defaults (*) are usually acceptable. A plus (+) denotes a default value
78@@ -3855,6 +3867,7 @@ static const char qt_configure_prefix_path_strs[][256 + 12] = { 77@@ -3931,6 +3944,7 @@ static const char qt_configure_prefix_path_strs[][256 + 12] = {
79 "qt_hpfxpath=$QT_HOST_PREFIX",
80 "qt_hbinpath=$QT_HOST_BINS", 78 "qt_hbinpath=$QT_HOST_BINS",
79 "qt_hlibpath=$QT_HOST_LIBS",
81 "qt_hdatpath=$QT_HOST_DATA", 80 "qt_hdatpath=$QT_HOST_DATA",
82+ "qt_ebinpath=$QT_EXTERNAL_HOST_BINS", 81+ "qt_ebinpath=$QT_EXTERNAL_HOST_BINS",
83 "qt_targspec=$shortxspec", 82 "qt_targspec=$shortxspec",
84 "qt_hostspec=$shortspec", 83 "qt_hostspec=$shortspec",
85 #endif 84 #endif
86diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf 85diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf
87index 8cd2473..876f657 100644 86index 2f2c94c..4e12d3d 100644
88--- a/mkspecs/features/qt_functions.prf 87--- a/mkspecs/features/qt_functions.prf
89+++ b/mkspecs/features/qt_functions.prf 88+++ b/mkspecs/features/qt_functions.prf
90@@ -193,7 +193,10 @@ defineTest(qtAddRpathLink) { 89@@ -194,7 +194,10 @@ defineTest(qtAddRpathLink) {
91 defineTest(qtPrepareTool) { 90 defineTest(qtPrepareTool) {
92 $$1 = $$eval(QT_TOOL.$${2}.command) 91 $$1 = $$eval(QT_TOOL.$${2}.binary)
93 isEmpty($$1) { 92 isEmpty($$1) {
94- $$1 = $$[QT_HOST_BINS]/$$2 93- $$1 = $$[QT_HOST_BINS]/$$2
95+ $$1 = $$[QT_EXTERNAL_HOST_BINS]/$$2 94+ $$1 = $$[QT_EXTERNAL_HOST_BINS]/$$2
96+ isEmpty($$[QT_EXTERNAL_HOST_BINS]) { 95+ isEmpty($$[QT_EXTERNAL_HOST_BINS]) {
97+ $$1 = $$[QT_HOST_BINS]/$$2 96+ $$1 = $$[QT_HOST_BINS]/$$2
98+ } 97+ }
99 contains(QMAKE_HOST.os, Windows):!contains($$1, .*\\.(exe|bat)$) { 98 exists($$eval($$1).pl) {
100 exists($$eval($$1).bat) { 99 $$1 = perl -w $$eval($$1).pl
101 $$1 = $$eval($$1).bat 100 } else: contains(QMAKE_HOST.os, Windows) {
102diff --git a/mkspecs/features/qt_tool.prf b/mkspecs/features/qt_tool.prf 101diff --git a/mkspecs/features/qt_tool.prf b/mkspecs/features/qt_tool.prf
103index 0a58880..c110ea5 100644 102index 9a6b963..83ef3a0 100644
104--- a/mkspecs/features/qt_tool.prf 103--- a/mkspecs/features/qt_tool.prf
105+++ b/mkspecs/features/qt_tool.prf 104+++ b/mkspecs/features/qt_tool.prf
106@@ -16,7 +16,7 @@ CONFIG += console 105@@ -16,7 +16,7 @@ CONFIG += console
@@ -111,24 +110,24 @@ index 0a58880..c110ea5 100644
111+!build_pass:if(!host_build|!force_bootstrap|force_independent):isEmpty($$[QT_EXTERNAL_HOST_BINS]) { 110+!build_pass:if(!host_build|!force_bootstrap|force_independent):isEmpty($$[QT_EXTERNAL_HOST_BINS]) {
112 isEmpty(MODULE):MODULE = $$TARGET 111 isEmpty(MODULE):MODULE = $$TARGET
113 112
114 MODULE_DEPENDS = $$replace(QT, -private$, ) 113 !host_build|!force_bootstrap: MODULE_DEPENDS = $$replace(QT, -private$, )
115diff --git a/qmake/property.cpp b/qmake/property.cpp 114diff --git a/qmake/property.cpp b/qmake/property.cpp
116index c4fbcd6..c1b7a9f 100644 115index 4685440..93eb1d4 100644
117--- a/qmake/property.cpp 116--- a/qmake/property.cpp
118+++ b/qmake/property.cpp 117+++ b/qmake/property.cpp
119@@ -74,6 +74,7 @@ static const struct { 118@@ -75,6 +75,7 @@ static const struct {
120 { "QT_HOST_PREFIX", QLibraryInfo::HostPrefixPath, true },
121 { "QT_HOST_DATA", QLibraryInfo::HostDataPath, true }, 119 { "QT_HOST_DATA", QLibraryInfo::HostDataPath, true },
122 { "QT_HOST_BINS", QLibraryInfo::HostBinariesPath, true }, 120 { "QT_HOST_BINS", QLibraryInfo::HostBinariesPath, true },
121 { "QT_HOST_LIBS", QLibraryInfo::HostLibrariesPath, true },
123+ { "QT_EXTERNAL_HOST_BINS", QLibraryInfo::ExternalHostBinariesPath, true }, 122+ { "QT_EXTERNAL_HOST_BINS", QLibraryInfo::ExternalHostBinariesPath, true },
124 { "QMAKE_SPEC", QLibraryInfo::HostSpecPath, true }, 123 { "QMAKE_SPEC", QLibraryInfo::HostSpecPath, true },
125 { "QMAKE_XSPEC", QLibraryInfo::TargetSpecPath, true }, 124 { "QMAKE_XSPEC", QLibraryInfo::TargetSpecPath, true },
126 }; 125 };
127diff --git a/qtbase.pro b/qtbase.pro 126diff --git a/qtbase.pro b/qtbase.pro
128index 4c41cff..997ea6d 100644 127index d6726b5..28ca7d5 100644
129--- a/qtbase.pro 128--- a/qtbase.pro
130+++ b/qtbase.pro 129+++ b/qtbase.pro
131@@ -68,17 +68,24 @@ CONFIG -= qt 130@@ -70,16 +70,22 @@ CONFIG -= qt
132 131
133 #qmake 132 #qmake
134 qmake.path = $$[QT_HOST_BINS] 133 qmake.path = $$[QT_HOST_BINS]
@@ -146,19 +145,16 @@ index 4c41cff..997ea6d 100644
146 145
147 #syncqt 146 #syncqt
148 syncqt.path = $$[QT_HOST_BINS] 147 syncqt.path = $$[QT_HOST_BINS]
149 syncqt.files = $$PWD/bin/syncqt 148 syncqt.files = $$PWD/bin/syncqt.pl
150-equals(QMAKE_HOST.os, Windows):syncqt.files += $$PWD/bin/syncqt.bat 149+syncqt.files = $$PWD/bin/syncqt.pl
151+!isEmpty($$[QT_EXTERNAL_HOST_BINS]) { 150+!isEmpty($$[QT_EXTERNAL_HOST_BINS]) {
152+ syncqt.files = $$[QT_EXTERNAL_HOST_BINS]/bin/syncqt 151+ syncqt.files = $$[QT_EXTERNAL_HOST_BINS]/bin/syncqt.pl
153+}
154+equals(QMAKE_HOST.os, Windows) {
155+ syncqt.files = $${syncqt.files}.bat
156+} 152+}
157 INSTALLS += syncqt 153 INSTALLS += syncqt
158 154
159 # If we are doing a prefix build, create a "module" pri which enables 155 # If we are doing a prefix build, create a "module" pri which enables
160diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp 156diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp
161index 6b40731..139a60f 100644 157index 8ca2102..9f5d444 100644
162--- a/src/corelib/global/qlibraryinfo.cpp 158--- a/src/corelib/global/qlibraryinfo.cpp
163+++ b/src/corelib/global/qlibraryinfo.cpp 159+++ b/src/corelib/global/qlibraryinfo.cpp
164@@ -270,7 +270,7 @@ QLibraryInfo::isDebugBuild() 160@@ -270,7 +270,7 @@ QLibraryInfo::isDebugBuild()
@@ -170,31 +166,31 @@ index 6b40731..139a60f 100644
170 } qtConfEntries[] = { 166 } qtConfEntries[] = {
171 { "Prefix", "." }, 167 { "Prefix", "." },
172 { "Documentation", "doc" }, // should be ${Data}/doc 168 { "Documentation", "doc" }, // should be ${Data}/doc
173@@ -295,6 +295,7 @@ static const struct { 169@@ -296,6 +296,7 @@ static const struct {
174 { "HostPrefix", "" },
175 { "HostBinaries", "bin" }, 170 { "HostBinaries", "bin" },
171 { "HostLibraries", "lib" },
176 { "HostData", "." }, 172 { "HostData", "." },
177+ { "ExternalHostBinaries", "" }, 173+ { "ExternalHostBinaries", "" },
178 { "TargetSpec", "" }, 174 { "TargetSpec", "" },
179 { "HostSpec", "" }, 175 { "HostSpec", "" },
180 #endif 176 #endif
181diff --git a/src/corelib/global/qlibraryinfo.h b/src/corelib/global/qlibraryinfo.h 177diff --git a/src/corelib/global/qlibraryinfo.h b/src/corelib/global/qlibraryinfo.h
182index 1a00a14..7e4829c 100644 178index b275e01..0e6baed 100644
183--- a/src/corelib/global/qlibraryinfo.h 179--- a/src/corelib/global/qlibraryinfo.h
184+++ b/src/corelib/global/qlibraryinfo.h 180+++ b/src/corelib/global/qlibraryinfo.h
185@@ -83,6 +83,7 @@ public: 181@@ -84,6 +84,7 @@ public:
186 HostPrefixPath,
187 HostBinariesPath, 182 HostBinariesPath,
183 HostLibrariesPath,
188 HostDataPath, 184 HostDataPath,
189+ ExternalHostBinariesPath, 185+ ExternalHostBinariesPath,
190 TargetSpecPath, 186 TargetSpecPath,
191 HostSpecPath, 187 HostSpecPath,
192 LastHostPath = HostSpecPath, 188 LastHostPath = HostSpecPath,
193diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp 189diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
194index a18aac3..57409b1 100644 190index 5b62e8f..c752df3 100644
195--- a/tools/configure/configureapp.cpp 191--- a/tools/configure/configureapp.cpp
196+++ b/tools/configure/configureapp.cpp 192+++ b/tools/configure/configureapp.cpp
197@@ -1173,6 +1173,13 @@ void Configure::parseCmdLine() 193@@ -1162,6 +1162,13 @@ void Configure::parseCmdLine()
198 dictionary[ "QT_HOST_DATA" ] = configCmdLine.at(i); 194 dictionary[ "QT_HOST_DATA" ] = configCmdLine.at(i);
199 } 195 }
200 196
@@ -208,14 +204,14 @@ index a18aac3..57409b1 100644
208 else if (configCmdLine.at(i) == "-make-tool") { 204 else if (configCmdLine.at(i) == "-make-tool") {
209 ++i; 205 ++i;
210 if (i == argCount) 206 if (i == argCount)
211@@ -3775,6 +3782,7 @@ void Configure::generateQConfigCpp() 207@@ -3715,6 +3722,7 @@ void Configure::generateQConfigCpp()
212 << " \"qt_hpfxpath=" << formatPath(dictionary["QT_HOST_PREFIX"]) << "\"," << endl
213 << " \"qt_hbinpath=" << formatPath(dictionary["QT_HOST_BINS"]) << "\"," << endl 208 << " \"qt_hbinpath=" << formatPath(dictionary["QT_HOST_BINS"]) << "\"," << endl
209 << " \"qt_hlibpath=" << formatPath(dictionary["QT_HOST_LIBS"]) << "\"," << endl
214 << " \"qt_hdatpath=" << formatPath(dictionary["QT_HOST_DATA"]) << "\"," << endl 210 << " \"qt_hdatpath=" << formatPath(dictionary["QT_HOST_DATA"]) << "\"," << endl
215+ << " \"qt_ebinpath=" << formatPath(dictionary["QT_EXTERNAL_HOST_BINS"]) << "\"," << endl 211+ << " \"qt_ebinpath=" << formatPath(dictionary["QT_EXTERNAL_HOST_BINS"]) << "\"," << endl
216 << " \"qt_targspec=" << targSpec << "\"," << endl 212 << " \"qt_targspec=" << targSpec << "\"," << endl
217 << " \"qt_hostspec=" << hostSpec << "\"," << endl 213 << " \"qt_hostspec=" << hostSpec << "\"," << endl
218 << "#endif" << endl 214 << "#endif" << endl
219-- 215--
2201.8.2.1 2161.8.3.2
221 217
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 77b1c41f..ccb8a093 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 @@
1From e561978ab73e72d7b088c9927fb6a87d2eff6833 Mon Sep 17 00:00:00 2001 1From 1e0f35bd94719f77f7be5e059e72a51576b6f94b Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com> 2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Wed, 17 Apr 2013 18:06:25 +0200 3Date: Wed, 17 Apr 2013 18:06:25 +0200
4Subject: [PATCH 04/15] qt_functions: temporary remove isEmpty check 4Subject: [PATCH 04/23] qt_functions: temporary remove isEmpty check
5 5
6* now we assume that every build will provide QT_EXTERNAL_HOST_BINS value 6* now we assume that every build will provide QT_EXTERNAL_HOST_BINS value
7* isEmpty works correctly only with qmake variables (e.g. $$FOO - 7* isEmpty works correctly only with qmake variables (e.g. $$FOO -
@@ -16,11 +16,11 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
16 2 files changed, 6 insertions(+), 3 deletions(-) 16 2 files changed, 6 insertions(+), 3 deletions(-)
17 17
18diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf 18diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf
19index 876f657..0e094a8 100644 19index 4e12d3d..e20ad9d 100644
20--- a/mkspecs/features/qt_functions.prf 20--- a/mkspecs/features/qt_functions.prf
21+++ b/mkspecs/features/qt_functions.prf 21+++ b/mkspecs/features/qt_functions.prf
22@@ -194,7 +194,11 @@ defineTest(qtPrepareTool) { 22@@ -195,7 +195,11 @@ defineTest(qtPrepareTool) {
23 $$1 = $$eval(QT_TOOL.$${2}.command) 23 $$1 = $$eval(QT_TOOL.$${2}.binary)
24 isEmpty($$1) { 24 isEmpty($$1) {
25 $$1 = $$[QT_EXTERNAL_HOST_BINS]/$$2 25 $$1 = $$[QT_EXTERNAL_HOST_BINS]/$$2
26- isEmpty($$[QT_EXTERNAL_HOST_BINS]) { 26- isEmpty($$[QT_EXTERNAL_HOST_BINS]) {
@@ -31,9 +31,9 @@ index 876f657..0e094a8 100644
31+ !exists($$[QT_EXTERNAL_HOST_BINS]/$$2) { 31+ !exists($$[QT_EXTERNAL_HOST_BINS]/$$2) {
32 $$1 = $$[QT_HOST_BINS]/$$2 32 $$1 = $$[QT_HOST_BINS]/$$2
33 } 33 }
34 contains(QMAKE_HOST.os, Windows):!contains($$1, .*\\.(exe|bat)$) { 34 exists($$eval($$1).pl) {
35diff --git a/mkspecs/features/qt_tool.prf b/mkspecs/features/qt_tool.prf 35diff --git a/mkspecs/features/qt_tool.prf b/mkspecs/features/qt_tool.prf
36index c110ea5..34ee9ca 100644 36index 83ef3a0..21c9eb7 100644
37--- a/mkspecs/features/qt_tool.prf 37--- a/mkspecs/features/qt_tool.prf
38+++ b/mkspecs/features/qt_tool.prf 38+++ b/mkspecs/features/qt_tool.prf
39@@ -15,8 +15,7 @@ CONFIG += console 39@@ -15,8 +15,7 @@ CONFIG += console
@@ -45,7 +45,7 @@ index c110ea5..34ee9ca 100644
45+!build_pass:if(!host_build|!force_bootstrap|force_independent):!exists($$[QT_EXTERNAL_HOST_BINS]) { 45+!build_pass:if(!host_build|!force_bootstrap|force_independent):!exists($$[QT_EXTERNAL_HOST_BINS]) {
46 isEmpty(MODULE):MODULE = $$TARGET 46 isEmpty(MODULE):MODULE = $$TARGET
47 47
48 MODULE_DEPENDS = $$replace(QT, -private$, ) 48 !host_build|!force_bootstrap: MODULE_DEPENDS = $$replace(QT, -private$, )
49-- 49--
501.8.2.1 501.8.3.2
51 51
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 d95e0b45..7bd2ba6b 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 @@
1From f42c4156c3e056e9fd2d6b0542662d705efb2722 Mon Sep 17 00:00:00 2001 1From 33e87dae3b9dc4007c7cddd82a1b9058010a1992 Mon Sep 17 00:00:00 2001
2From: Michael Krelin <hacker@klever.net> 2From: Michael Krelin <hacker@klever.net>
3Date: Mon, 29 Oct 2012 20:07:49 -0700 3Date: Mon, 29 Oct 2012 20:07:49 -0700
4Subject: [PATCH 05/15] qmake is already built in qtbase-native 4Subject: [PATCH 05/23] qmake is already built in qtbase-native
5 5
6Ported from OE by: Yu Ke <ke.yu@intel.com> 6Ported from OE by: Yu Ke <ke.yu@intel.com>
7Upstream-Status: Inappropriate [configuration] 7Upstream-Status: Inappropriate [configuration]
@@ -13,10 +13,10 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
13 1 file changed, 1 insertion(+), 1 deletion(-) 13 1 file changed, 1 insertion(+), 1 deletion(-)
14 14
15diff --git a/configure b/configure 15diff --git a/configure b/configure
16index 65f4d26..dbf99a9 100755 16index 25980c0..74f9e65 100755
17--- a/configure 17--- a/configure
18+++ b/configure 18+++ b/configure
19@@ -3938,7 +3938,7 @@ setBootstrapEvalVariable() 19@@ -4022,7 +4022,7 @@ setBootstrapEvalVariable()
20 20
21 21
22 # build qmake 22 # build qmake
@@ -26,5 +26,5 @@ index 65f4d26..dbf99a9 100755
26 26
27 mkdir -p "$outpath/qmake" || exit 27 mkdir -p "$outpath/qmake" || exit
28-- 28--
291.8.2.1 291.8.3.2
30 30
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 a8778469..d074c3da 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 @@
1From 8be64919365240728dcce02fac44e5018aaec191 Mon Sep 17 00:00:00 2001 1From 6007028a92806a0fd0683f539dba178ad33ab87d Mon Sep 17 00:00:00 2001
2From: Paul Eggleton <paul.eggleton@linux.intel.com> 2From: Paul Eggleton <paul.eggleton@linux.intel.com>
3Date: Mon, 29 Oct 2012 20:26:36 -0700 3Date: Mon, 29 Oct 2012 20:26:36 -0700
4Subject: [PATCH 06/15] Allow building a separate qmake for the target 4Subject: [PATCH 06/23] Allow building a separate qmake for the target
5 5
6Upstream-Status: Inappropriate [config] 6Upstream-Status: Inappropriate [config]
7 7
@@ -13,10 +13,10 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
13 1 file changed, 1 insertion(+) 13 1 file changed, 1 insertion(+)
14 14
15diff --git a/qmake/qmake.pro b/qmake/qmake.pro 15diff --git a/qmake/qmake.pro b/qmake/qmake.pro
16index 0d92ac2..9be0e9b 100644 16index a81d0cd..ed7aebf 100644
17--- a/qmake/qmake.pro 17--- a/qmake/qmake.pro
18+++ b/qmake/qmake.pro 18+++ b/qmake/qmake.pro
19@@ -9,6 +9,7 @@ CONFIG -= qt shared app_bundle uic 19@@ -8,6 +8,7 @@ CONFIG -= qt shared app_bundle uic
20 DEFINES += QT_BUILD_QMAKE QT_BOOTSTRAPPED \ 20 DEFINES += QT_BUILD_QMAKE QT_BOOTSTRAPPED \
21 PROEVALUATOR_FULL PROEVALUATOR_DEBUG 21 PROEVALUATOR_FULL PROEVALUATOR_DEBUG
22 DESTDIR = ../bin/ 22 DESTDIR = ../bin/
@@ -25,5 +25,5 @@ index 0d92ac2..9be0e9b 100644
25 OBJECTS_DIR = . 25 OBJECTS_DIR = .
26 MOC_DIR = . 26 MOC_DIR = .
27-- 27--
281.8.2.1 281.8.3.2
29 29
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 f873aae9..4562fe15 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 @@
1From 98d14c01a92c5caad2bb0e0b4a097ae11d83b58e Mon Sep 17 00:00:00 2001 1From bd192d0261e39765d895446e9d914a68a0590365 Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com> 2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Sat, 27 Apr 2013 22:33:33 +0200 3Date: Sat, 27 Apr 2013 22:33:33 +0200
4Subject: [PATCH 07/15] configureapp: Prefix default LIBDIRS and INCDIRS with 4Subject: [PATCH 07/23] configureapp: Prefix default LIBDIRS and INCDIRS with
5 SYSROOT 5 SYSROOT
6 6
7Upstream-Status: Pending 7Upstream-Status: Pending
@@ -10,10 +10,10 @@ Upstream-Status: Pending
10 1 file changed, 2 insertions(+), 2 deletions(-) 10 1 file changed, 2 insertions(+), 2 deletions(-)
11 11
12diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp 12diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
13index 57409b1..f443007 100644 13index c752df3..0d1bca6 100644
14--- a/tools/configure/configureapp.cpp 14--- a/tools/configure/configureapp.cpp
15+++ b/tools/configure/configureapp.cpp 15+++ b/tools/configure/configureapp.cpp
16@@ -3172,8 +3172,8 @@ void Configure::generateQConfigPri() 16@@ -3118,8 +3118,8 @@ void Configure::generateQConfigPri()
17 configStream << "QT_HOST_CPU_FEATURES = " << dictionary["QT_HOST_CPU_FEATURES"] << endl; 17 configStream << "QT_HOST_CPU_FEATURES = " << dictionary["QT_HOST_CPU_FEATURES"] << endl;
18 if (dictionary.contains("XQMAKESPEC") && !dictionary["XQMAKESPEC"].startsWith("wince")) { 18 if (dictionary.contains("XQMAKESPEC") && !dictionary["XQMAKESPEC"].startsWith("wince")) {
19 // FIXME: add detection 19 // FIXME: add detection
@@ -25,5 +25,5 @@ index 57409b1..f443007 100644
25 if (dictionary["QT_EDITION"].contains("OPENSOURCE")) 25 if (dictionary["QT_EDITION"].contains("OPENSOURCE"))
26 configStream << "QT_EDITION = " << QLatin1String("OpenSource") << endl; 26 configStream << "QT_EDITION = " << QLatin1String("OpenSource") << endl;
27-- 27--
281.8.2.1 281.8.3.2
29 29
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 4d15ee06..f855292c 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 @@
1From 1ac376893b75c36cc1ee6465e814546e2215354e Mon Sep 17 00:00:00 2001 1From 5168edad24f2c27061286707603bc2126365bcb2 Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com> 2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Sat, 27 Apr 2013 23:15:37 +0200 3Date: Sat, 27 Apr 2013 23:15:37 +0200
4Subject: [PATCH 08/15] qt_module: Fix pkgconfig replacement 4Subject: [PATCH 08/23] qt_module: Fix pkgconfig replacement
5 5
6* in situation like this: 6* in situation like this:
7 QT_SYSROOT:/OE/oe-core/tmp-eglibc/sysroots/qemuarm 7 QT_SYSROOT:/OE/oe-core/tmp-eglibc/sysroots/qemuarm
@@ -23,14 +23,14 @@ Upstream-Status: Pending
23 23
24Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> 24Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
25--- 25---
26 mkspecs/features/qt_module.prf | 16 ++++++++++++++-- 26 mkspecs/features/qt_module.prf | 20 ++++++++++++++++----
27 1 file changed, 14 insertions(+), 2 deletions(-) 27 1 file changed, 16 insertions(+), 4 deletions(-)
28 28
29diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf 29diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf
30index 3531d28..1c43972 100644 30index 7f7de85..7741b96 100644
31--- a/mkspecs/features/qt_module.prf 31--- a/mkspecs/features/qt_module.prf
32+++ b/mkspecs/features/qt_module.prf 32+++ b/mkspecs/features/qt_module.prf
33@@ -136,18 +136,30 @@ unix|win32-g++* { 33@@ -140,18 +140,30 @@ unix|win32-g++* {
34 rplbase = $$dirname(_QMAKE_SUPER_CACHE_)/[^/][^/]* 34 rplbase = $$dirname(_QMAKE_SUPER_CACHE_)/[^/][^/]*
35 else: \ 35 else: \
36 rplbase = $$MODULE_BASE_OUTDIR 36 rplbase = $$MODULE_BASE_OUTDIR
@@ -41,8 +41,9 @@ index 3531d28..1c43972 100644
41 include_replace.match = $$rplbase/include 41 include_replace.match = $$rplbase/include
42 include_replace.replace = $$[QT_INSTALL_HEADERS/raw] 42 include_replace.replace = $$[QT_INSTALL_HEADERS/raw]
43 lib_replace.match = $$rplbase/lib 43 lib_replace.match = $$rplbase/lib
44 lib_replace.replace = $$[QT_INSTALL_LIBS/raw] 44- lib_replace.replace = $$QMAKE_PKGCONFIG_LIBDIR
45- QMAKE_PKGCONFIG_INSTALL_REPLACE += include_replace lib_replace 45- QMAKE_PKGCONFIG_INSTALL_REPLACE += include_replace lib_replace
46+ lib_replace.replace = $$[QT_INSTALL_LIBS/raw]
46+ lafile_replace.match = $$rplbase 47+ lafile_replace.match = $$rplbase
47+ lafile_replace.replace = "=$$[QT_INSTALL_PREFIX/raw]" 48+ lafile_replace.replace = "=$$[QT_INSTALL_PREFIX/raw]"
48+ 49+
@@ -57,12 +58,13 @@ index 3531d28..1c43972 100644
57 58
58 unix { 59 unix {
59 CONFIG += create_libtool explicitlib 60 CONFIG += create_libtool explicitlib
60 QMAKE_LIBTOOL_LIBDIR = $$[QT_INSTALL_LIBS/raw] 61- QMAKE_LIBTOOL_LIBDIR = $$QMAKE_PKGCONFIG_LIBDIR
61- QMAKE_LIBTOOL_INSTALL_REPLACE += include_replace lib_replace 62- QMAKE_LIBTOOL_INSTALL_REPLACE += include_replace lib_replace
62+ QMAKE_LIBTOOL_INSTALL_REPLACE += lafile_replace 63+ QMAKE_LIBTOOL_LIBDIR = $$[QT_INSTALL_LIBS/raw]
64+ QMAKE_LIBTOOL_INSTALL_REPLACE += include_replace lib_replace lafile_replace
63 } 65 }
64 66
65 unix|win32-g++* { 67 unix|win32-g++* {
66-- 68--
671.8.2.1 691.8.3.2
68 70
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 8a3ef3c1..c1e80bc2 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 @@
1From 111583f7a46871d130ac1c6688972ebf98452af4 Mon Sep 17 00:00:00 2001 1From fdd0a04cca9cb991b7073d01312218d3387c1e43 Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com> 2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Sun, 28 Apr 2013 12:56:55 +0200 3Date: Sun, 28 Apr 2013 12:56:55 +0200
4Subject: [PATCH 09/15] qt_module: Fix paths in .prl files 4Subject: [PATCH 09/23] qt_module: Fix paths in .prl files
5 5
6* qmake does not prefix them with QT_SYSROOT when using them 6* qmake does not prefix them with QT_SYSROOT when using them
7 so e.g. when building qtdeclarative we get -L/usr/lib to LINKAGE 7 so e.g. when building qtdeclarative we get -L/usr/lib to LINKAGE
@@ -19,10 +19,10 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
19 1 file changed, 17 insertions(+), 11 deletions(-) 19 1 file changed, 17 insertions(+), 11 deletions(-)
20 20
21diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf 21diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf
22index 1c43972..feec2d5 100644 22index 7741b96..3874067 100644
23--- a/mkspecs/features/qt_module.prf 23--- a/mkspecs/features/qt_module.prf
24+++ b/mkspecs/features/qt_module.prf 24+++ b/mkspecs/features/qt_module.prf
25@@ -140,17 +140,23 @@ unix|win32-g++* { 25@@ -144,17 +144,23 @@ unix|win32-g++* {
26 pkgconfig_include_replace.replace = "\$$\\{includedir}" 26 pkgconfig_include_replace.replace = "\$$\\{includedir}"
27 pkgconfig_lib_replace.match = $$rplbase/lib 27 pkgconfig_lib_replace.match = $$rplbase/lib
28 pkgconfig_lib_replace.replace = "\$$\\{libdir}" 28 pkgconfig_lib_replace.replace = "\$$\\{libdir}"
@@ -58,5 +58,5 @@ index 1c43972..feec2d5 100644
58 QMAKE_PKGCONFIG_INSTALL_REPLACE += pkgconfig_include_replace pkgconfig_lib_replace 58 QMAKE_PKGCONFIG_INSTALL_REPLACE += pkgconfig_include_replace pkgconfig_lib_replace
59 QMAKE_PRL_INSTALL_REPLACE += include_replace lib_replace 59 QMAKE_PRL_INSTALL_REPLACE += include_replace lib_replace
60-- 60--
611.8.2.1 611.8.3.2
62 62
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 5b14c818..749edeee 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 @@
1From 1224e23a7990ac877265a2736827a98c300a8bf7 Mon Sep 17 00:00:00 2001 1From 346e27a30ee7e480c5bdb789d12aa41e8e2efad5 Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com> 2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Sun, 5 May 2013 11:18:34 +0200 3Date: Sun, 5 May 2013 11:18:34 +0200
4Subject: [PATCH 10/15] wayland-scanner: disable silent rules 4Subject: [PATCH 10/23] wayland-scanner: disable silent rules
5 5
6* for some reason "$$qtwayland-server-header.commands" on second line gets expanded as -server-header.commands 6* for some reason "$$qtwayland-server-header.commands" on second line gets expanded as -server-header.commands
7 7
@@ -78,5 +78,5 @@ index 2ec064f..847d0f7 100644
78+#silent:qtwayland-server-code.commands = @echo QtWayland server code ${QMAKE_FILE_IN} && $$qtwayland-server-code.commands 78+#silent:qtwayland-server-code.commands = @echo QtWayland server code ${QMAKE_FILE_IN} && $$qtwayland-server-code.commands
79 QMAKE_EXTRA_COMPILERS += qtwayland-server-code 79 QMAKE_EXTRA_COMPILERS += qtwayland-server-code
80-- 80--
811.8.2.1 811.8.3.2
82 82
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 2c2360e6..6117e7fb 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 @@
1From 9ffc6dba623bb44e1787f4e4af13af03f9f7a0d2 Mon Sep 17 00:00:00 2001 1From df07d747bdbb5652165a3c9395247729a4bf2fce Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com> 2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Wed, 8 May 2013 23:54:35 +0200 3Date: Wed, 8 May 2013 23:54:35 +0200
4Subject: [PATCH 11/15] configure: don't export SYSTEM_VARIABLES to .qmake.vars 4Subject: [PATCH 11/23] configure: don't export SYSTEM_VARIABLES to .qmake.vars
5 5
6* linux-oe-g++ should handle this correctly and exporting LD as QMAKE_LINK is 6* linux-oe-g++ should handle this correctly and exporting LD as QMAKE_LINK is
7 causing issues as we need g++ to be used as linker 7 causing issues as we need g++ to be used as linker
@@ -14,10 +14,10 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
14 1 file changed, 1 insertion(+), 14 deletions(-) 14 1 file changed, 1 insertion(+), 14 deletions(-)
15 15
16diff --git a/configure b/configure 16diff --git a/configure b/configure
17index dbf99a9..9ca23a4 100755 17index 74f9e65..7a9a77c 100755
18--- a/configure 18--- a/configure
19+++ b/configure 19+++ b/configure
20@@ -840,20 +840,7 @@ fi'` 20@@ -849,20 +849,7 @@ fi'`
21 done 21 done
22 22
23 SYSTEM_VARIABLES="RANLIB STRIP OBJDUMP LD CC CXX CFLAGS CXXFLAGS LDFLAGS" 23 SYSTEM_VARIABLES="RANLIB STRIP OBJDUMP LD CC CXX CFLAGS CXXFLAGS LDFLAGS"
@@ -40,5 +40,5 @@ index dbf99a9..9ca23a4 100755
40 mkdir -p "$outpath/config.tests" 40 mkdir -p "$outpath/config.tests"
41 rm -f "$outpath/config.tests/.qmake.cache" 41 rm -f "$outpath/config.tests/.qmake.cache"
42-- 42--
431.8.2.1 431.8.3.2
44 44
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 e6602b43..e0a21667 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 @@
1From 7389b5556de11258d3084ede10c12859353fb13b Mon Sep 17 00:00:00 2001 1From e72d6d0528bb0032dddfbdb01a232f62e5931ba8 Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com> 2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Thu, 9 May 2013 10:06:50 +0200 3Date: Thu, 9 May 2013 10:06:50 +0200
4Subject: [PATCH 12/15] configure.prf: Allow to add extra arguments to make 4Subject: [PATCH 12/23] configure.prf: Allow to add extra arguments to make
5 5
6* sometimes we would like to add -e or define some variable and respect it from both 6* sometimes we would like to add -e or define some variable and respect it from both
7 Makefiles used in configure tests and also Makefiles to build the application 7 Makefiles used in configure tests and also Makefiles to build the application
@@ -33,5 +33,5 @@ index b4569df..d189e50 100644
33 msg = "test $$1 succeeded" 33 msg = "test $$1 succeeded"
34 write_file($$QMAKE_CONFIG_LOG, msg, append) 34 write_file($$QMAKE_CONFIG_LOG, msg, append)
35-- 35--
361.8.2.1 361.8.3.2
37 37
diff --git a/recipes-qt/qt5/qtbase-git/0013-Disable-mkv8snapshot.patch b/recipes-qt/qt5/qtbase-git/0013-Disable-mkv8snapshot.patch
index cd0c0596..32982662 100644
--- a/recipes-qt/qt5/qtbase-git/0013-Disable-mkv8snapshot.patch
+++ b/recipes-qt/qt5/qtbase-git/0013-Disable-mkv8snapshot.patch
@@ -1,7 +1,7 @@
1From c3e47eeb4dec8348c3a9f2cf9044c568c5334070 Mon Sep 17 00:00:00 2001 1From 4d9e581943ed3a7440e8176ab81c82fe949ae300 Mon Sep 17 00:00:00 2001
2From: Mikko Levonmaa <mikko.levonmaa@palm.com> 2From: Mikko Levonmaa <mikko.levonmaa@palm.com>
3Date: Tue, 8 Jan 2013 15:58:29 -0800 3Date: Tue, 8 Jan 2013 15:58:29 -0800
4Subject: [PATCH 13/15] Disable mkv8snapshot 4Subject: [PATCH 13/23] Disable mkv8snapshot
5 5
6It seems to generate code that throws SIGILL, so disabling it 6It seems to generate code that throws SIGILL, so disabling it
7 7
@@ -30,11 +30,11 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
30 1 file changed, 1 insertion(+), 1 deletion(-) 30 1 file changed, 1 insertion(+), 1 deletion(-)
31 31
32diff --git a/configure b/configure 32diff --git a/configure b/configure
33index 9ca23a4..96965b6 100755 33index 7a9a77c..69e30b5 100755
34--- a/configure 34--- a/configure
35+++ b/configure 35+++ b/configure
36@@ -899,7 +899,7 @@ CFG_NOBUILD_PARTS="" 36@@ -910,7 +910,7 @@ CFG_SKIP_MODULES=""
37 CFG_SKIP_MODULES="" 37 CFG_COMPILE_EXAMPLES=auto
38 CFG_RELEASE_QMAKE=no 38 CFG_RELEASE_QMAKE=no
39 CFG_AUDIO_BACKEND=auto 39 CFG_AUDIO_BACKEND=auto
40-CFG_V8SNAPSHOT=auto 40-CFG_V8SNAPSHOT=auto
@@ -43,5 +43,5 @@ index 9ca23a4..96965b6 100755
43 CFG_JAVASCRIPTCORE_JIT=auto 43 CFG_JAVASCRIPTCORE_JIT=auto
44 CFG_PKGCONFIG=auto 44 CFG_PKGCONFIG=auto
45-- 45--
461.8.2.1 461.8.3.2
47 47
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
index e55ac7a3..a2dc5fb8 100644
--- 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
@@ -1,7 +1,7 @@
1From 8d037dfbe0b9cffa098c3de7010651590c1d6e6c Mon Sep 17 00:00:00 2001 1From 99c5a9d546a37e244bfc12b0aa134fccd31905b9 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Eric=20B=C3=A9nard?= <eric@eukrea.com> 2From: =?UTF-8?q?Eric=20B=C3=A9nard?= <eric@eukrea.com>
3Date: Mon, 27 May 2013 18:32:37 +0200 3Date: Mon, 27 May 2013 18:32:37 +0200
4Subject: [PATCH 14/15] enables tslib device to be read from env variable 4Subject: [PATCH 14/23] enables tslib device to be read from env variable
5MIME-Version: 1.0 5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8 6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit 7Content-Transfer-Encoding: 8bit
@@ -31,5 +31,5 @@ index 6986fd5..2ed4a69 100644
31 device = specification.toLocal8Bit(); 31 device = specification.toLocal8Bit();
32 32
33-- 33--
341.8.2.1 341.8.3.2
35 35
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
index 45a49a62..9cf06419 100644
--- 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
@@ -1,7 +1,7 @@
1From 3d83f570e081e23a6cf6d0ccf57ad8db34c5ca3e Mon Sep 17 00:00:00 2001 1From 1936e953e2273c204230c931c0b86b34107340c7 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Eric=20B=C3=A9nard?= <eric@eukrea.com> 2From: =?UTF-8?q?Eric=20B=C3=A9nard?= <eric@eukrea.com>
3Date: Sat, 25 May 2013 17:34:32 +0200 3Date: Sat, 25 May 2013 17:34:32 +0200
4Subject: [PATCH 15/15] qtbase: allow build of examples 4Subject: [PATCH 15/23] qtbase: allow build of examples
5MIME-Version: 1.0 5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8 6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit 7Content-Transfer-Encoding: 8bit
@@ -24,20 +24,19 @@ Date: Fri Dec 21 19:36:12 2012 +0100
24 24
25Signed-off-by: Eric Bénard <eric@eukrea.com> 25Signed-off-by: Eric Bénard <eric@eukrea.com>
26--- 26---
27 mkspecs/features/qt_example_installs.prf | 8 -------- 27 mkspecs/features/qt_example_installs.prf | 7 -------
28 1 file changed, 8 deletions(-) 28 1 file changed, 7 deletions(-)
29 29
30diff --git a/mkspecs/features/qt_example_installs.prf b/mkspecs/features/qt_example_installs.prf 30diff --git a/mkspecs/features/qt_example_installs.prf b/mkspecs/features/qt_example_installs.prf
31index 479a16a..ca1b0c7 100644 31index 2db752c..ca1b0c7 100644
32--- a/mkspecs/features/qt_example_installs.prf 32--- a/mkspecs/features/qt_example_installs.prf
33+++ b/mkspecs/features/qt_example_installs.prf 33+++ b/mkspecs/features/qt_example_installs.prf
34@@ -92,12 +92,4 @@ probase = $$relative_path($$_PRO_FILE_PWD_, $$dirname(_QMAKE_CONF_)/examples) 34@@ -92,11 +92,4 @@ probase = $$relative_path($$_PRO_FILE_PWD_, $$dirname(_QMAKE_CONF_)/examples)
35 allfiles -= doc 35 allfiles -= doc
36 !isEmpty(allfiles): warning("remaining files in $$_PRO_FILE_PWD_: $$allfiles") 36 !isEmpty(allfiles): warning("remaining files in $$_PRO_FILE_PWD_: $$allfiles")
37 } 37 }
38- 38-
39- # Do not actually build the examples in production builds with -prefix 39- !equals(TEMPLATE, subdirs):!compile_examples {
40- !equals(TEMPLATE, subdirs):prefix_build:!contains(QT_CONFIG, private_tests) {
41- TEMPLATE = aux 40- TEMPLATE = aux
42- CONFIG -= have_target qt staticlib dll 41- CONFIG -= have_target qt staticlib dll
43- SOURCES = 42- SOURCES =
@@ -45,5 +44,5 @@ index 479a16a..ca1b0c7 100644
45- } 44- }
46 } 45 }
47-- 46--
481.8.2.1 471.8.3.2
49 48
diff --git a/recipes-qt/qt5/qtbase-git/0018-QOpenGLPaintDevice-sub-area-support.patch b/recipes-qt/qt5/qtbase-git/0018-QOpenGLPaintDevice-sub-area-support.patch
index 9d581f82..e26d237f 100644
--- a/recipes-qt/qt5/qtbase-git/0018-QOpenGLPaintDevice-sub-area-support.patch
+++ b/recipes-qt/qt5/qtbase-git/0018-QOpenGLPaintDevice-sub-area-support.patch
@@ -1,7 +1,7 @@
1From 2efd051d3093ee4e4091a8947f28d9bd528f2e9e Mon Sep 17 00:00:00 2001 1From b485950725b776bc1f0cf4edd5330d61732262cb Mon Sep 17 00:00:00 2001
2From: Jani Hautakangas <jani.hautakangas@ixonos.com> 2From: Jani Hautakangas <jani.hautakangas@ixonos.com>
3Date: Thu, 16 May 2013 09:52:07 +0300 3Date: Thu, 16 May 2013 09:52:07 +0300
4Subject: [PATCH] QOpenGLPaintDevice sub-area support 4Subject: [PATCH 18/23] QOpenGLPaintDevice sub-area support
5 5
6Allows creating QOpenGLPaintDevice targetting sub-area 6Allows creating QOpenGLPaintDevice targetting sub-area
7of binded framebuffer. 7of binded framebuffer.
@@ -9,12 +9,14 @@ of binded framebuffer.
9Upstream-Status: Pending 9Upstream-Status: Pending
10 10
11Change-Id: Ida2f079aa1ac0b87d36b54129e226399dbcdda80 11Change-Id: Ida2f079aa1ac0b87d36b54129e226399dbcdda80
12
13Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
12--- 14---
13 src/gui/opengl/qopenglpaintdevice.cpp | 12 ++++++++++++ 15 src/gui/opengl/qopenglpaintdevice.cpp | 12 ++++++++++++
14 src/gui/opengl/qopenglpaintdevice.h | 2 ++ 16 src/gui/opengl/qopenglpaintdevice.h | 2 ++
15 src/gui/opengl/qopenglpaintengine.cpp | 10 +++++++--- 17 src/gui/opengl/qopenglpaintengine.cpp | 10 +++++++---
16 src/gui/opengl/qopenglpaintengine_p.h | 1 + 18 src/gui/opengl/qopenglpaintengine_p.h | 1 +
17 src/gui/opengl/qopengltextureglyphcache.cpp | 2 +- 19 src/gui/opengl/qopengltextureglyphcache.cpp | 2 +-
18 5 files changed, 23 insertions(+), 4 deletions(-) 20 5 files changed, 23 insertions(+), 4 deletions(-)
19 21
20diff --git a/src/gui/opengl/qopenglpaintdevice.cpp b/src/gui/opengl/qopenglpaintdevice.cpp 22diff --git a/src/gui/opengl/qopenglpaintdevice.cpp b/src/gui/opengl/qopenglpaintdevice.cpp
@@ -74,10 +76,10 @@ index c05571c..01eb1bc 100644
74 void setSize(const QSize &size); 76 void setSize(const QSize &size);
75 void setDevicePixelRatio(qreal devicePixelRatio); 77 void setDevicePixelRatio(qreal devicePixelRatio);
76diff --git a/src/gui/opengl/qopenglpaintengine.cpp b/src/gui/opengl/qopenglpaintengine.cpp 78diff --git a/src/gui/opengl/qopenglpaintengine.cpp b/src/gui/opengl/qopenglpaintengine.cpp
77index 0782e42..52afc60 100644 79index 78f5080..20db620 100644
78--- a/src/gui/opengl/qopenglpaintengine.cpp 80--- a/src/gui/opengl/qopenglpaintengine.cpp
79+++ b/src/gui/opengl/qopenglpaintengine.cpp 81+++ b/src/gui/opengl/qopenglpaintengine.cpp
80@@ -1978,7 +1978,10 @@ bool QOpenGL2PaintEngineEx::begin(QPaintDevice *pdev) 82@@ -2004,7 +2004,10 @@ bool QOpenGL2PaintEngineEx::begin(QPaintDevice *pdev)
81 for (int i = 0; i < QT_GL_VERTEX_ARRAY_TRACKED_COUNT; ++i) 83 for (int i = 0; i < QT_GL_VERTEX_ARRAY_TRACKED_COUNT; ++i)
82 d->vertexAttributeArraysEnabledState[i] = false; 84 d->vertexAttributeArraysEnabledState[i] = false;
83 85
@@ -88,7 +90,7 @@ index 0782e42..52afc60 100644
88 d->width = sz.width(); 90 d->width = sz.width();
89 d->height = sz.height(); 91 d->height = sz.height();
90 d->mode = BrushDrawingMode; 92 d->mode = BrushDrawingMode;
91@@ -2066,7 +2069,7 @@ void QOpenGL2PaintEngineEx::ensureActive() 93@@ -2092,7 +2095,7 @@ void QOpenGL2PaintEngineEx::ensureActive()
92 d->device->ensureActiveTarget(); 94 d->device->ensureActiveTarget();
93 95
94 d->transferMode(BrushDrawingMode); 96 d->transferMode(BrushDrawingMode);
@@ -97,7 +99,7 @@ index 0782e42..52afc60 100644
97 d->needsSync = false; 99 d->needsSync = false;
98 d->lastMaskTextureUsed = 0; 100 d->lastMaskTextureUsed = 0;
99 d->shaderManager->setDirty(); 101 d->shaderManager->setDirty();
100@@ -2109,6 +2112,7 @@ void QOpenGL2PaintEngineExPrivate::updateClipScissorTest() 102@@ -2135,6 +2138,7 @@ void QOpenGL2PaintEngineExPrivate::updateClipScissorTest()
101 if (bounds == QRect(0, 0, width, height)) { 103 if (bounds == QRect(0, 0, width, height)) {
102 glDisable(GL_SCISSOR_TEST); 104 glDisable(GL_SCISSOR_TEST);
103 } else { 105 } else {
@@ -105,7 +107,7 @@ index 0782e42..52afc60 100644
105 glEnable(GL_SCISSOR_TEST); 107 glEnable(GL_SCISSOR_TEST);
106 setScissor(bounds); 108 setScissor(bounds);
107 } 109 }
108@@ -2117,14 +2121,14 @@ void QOpenGL2PaintEngineExPrivate::updateClipScissorTest() 110@@ -2143,14 +2147,14 @@ void QOpenGL2PaintEngineExPrivate::updateClipScissorTest()
109 111
110 void QOpenGL2PaintEngineExPrivate::setScissor(const QRect &rect) 112 void QOpenGL2PaintEngineExPrivate::setScissor(const QRect &rect)
111 { 113 {
@@ -135,11 +137,11 @@ index d51f0e5..0d4b38d 100644
135 QOpenGLContext *ctx; 137 QOpenGLContext *ctx;
136 EngineMode mode; 138 EngineMode mode;
137diff --git a/src/gui/opengl/qopengltextureglyphcache.cpp b/src/gui/opengl/qopengltextureglyphcache.cpp 139diff --git a/src/gui/opengl/qopengltextureglyphcache.cpp b/src/gui/opengl/qopengltextureglyphcache.cpp
138index 83f4075..ec29900 100644 140index 7d49c03..d9eb3fe 100644
139--- a/src/gui/opengl/qopengltextureglyphcache.cpp 141--- a/src/gui/opengl/qopengltextureglyphcache.cpp
140+++ b/src/gui/opengl/qopengltextureglyphcache.cpp 142+++ b/src/gui/opengl/qopengltextureglyphcache.cpp
141@@ -268,7 +268,7 @@ void QOpenGLTextureGlyphCache::resizeTextureData(int width, int height) 143@@ -271,7 +271,7 @@ void QOpenGLTextureGlyphCache::resizeTextureData(int width, int height)
142 funcs.glBindFramebuffer(GL_FRAMEBUFFER, ctx->d_func()->current_fbo); 144 funcs.glBindFramebuffer(GL_FRAMEBUFFER, (GLuint)oldFbo);
143 145
144 if (pex != 0) { 146 if (pex != 0) {
145- glViewport(0, 0, pex->width, pex->height); 147- glViewport(0, 0, pex->width, pex->height);
@@ -148,5 +150,5 @@ index 83f4075..ec29900 100644
148 } else { 150 } else {
149 m_blitProgram->disableAttributeArray(int(QT_VERTEX_COORDS_ATTR)); 151 m_blitProgram->disableAttributeArray(int(QT_VERTEX_COORDS_ATTR));
150-- 152--
1511.7.9.5 1531.8.3.2
152 154
diff --git a/recipes-qt/qt5/qtbase-git/0019-Fix-FBO-restoring-in-QOpenGLTextureGlyphCache.patch b/recipes-qt/qt5/qtbase-git/0019-Fix-FBO-restoring-in-QOpenGLTextureGlyphCache.patch
deleted file mode 100644
index 96b0a71a..00000000
--- a/recipes-qt/qt5/qtbase-git/0019-Fix-FBO-restoring-in-QOpenGLTextureGlyphCache.patch
+++ /dev/null
@@ -1,48 +0,0 @@
1From dd2a427857612798071d3f8c23286322654669d6 Mon Sep 17 00:00:00 2001
2From: Valery Volgutov <valery.volgutov@lge.com>
3Date: Tue, 21 May 2013 12:02:19 -0700
4Subject: [PATCH] Fix FBO restoring in QOpenGLTextureGlyphCache
5
6QOpenGLTextureGlyphCache::restoreTextureData restores FBO which
7was binded before restoreTextureData call. More specifically,
8it restores QOpenGLContextPrivate's current_fbo member. This works
9if FBO was binded by QOpenGLFramebufferObject but not if FBO was
10binded using glBindFramebufferObject and rendering done via
11QOpenGLPaintDevice.
12
13This patch fixes it by querying current FBO using
14GL_FRAMEBUFFER_BINDING query and restoring it.
15
16Upstream-Status: Backport
17https://codereview.qt-project.org/#change,56608
18
19---
20 src/gui/opengl/qopengltextureglyphcache.cpp | 5 ++++-
21 1 file changed, 4 insertions(+), 1 deletion(-)
22
23diff --git a/src/gui/opengl/qopengltextureglyphcache.cpp b/src/gui/opengl/qopengltextureglyphcache.cpp
24index 4e20f6a..3e66bad 100644
25--- a/src/gui/opengl/qopengltextureglyphcache.cpp
26+++ b/src/gui/opengl/qopengltextureglyphcache.cpp
27@@ -147,6 +147,9 @@ void QOpenGLTextureGlyphCache::resizeTextureData(int width, int height)
28 return;
29 }
30
31+ GLuint saveFbo;
32+ glGetIntegerv(GL_FRAMEBUFFER_BINDING, &saveFbo);
33+
34 int oldWidth = m_textureResource->m_width;
35 int oldHeight = m_textureResource->m_height;
36
37@@ -265,7 +268,7 @@ void QOpenGLTextureGlyphCache::resizeTextureData(int width, int height)
38 glDeleteTextures(1, &tmp_texture);
39 glDeleteTextures(1, &oldTexture);
40
41- funcs.glBindFramebuffer(GL_FRAMEBUFFER, ctx->d_func()->current_fbo);
42+ funcs.glBindFramebuffer(GL_FRAMEBUFFER, saveFbo);
43
44 if (pex != 0) {
45 glViewport(0, 0, pex->width, pex->height);
46--
471.7.9.5
48
diff --git a/recipes-qt/qt5/qtbase-git/0020-Use-BGRA-extension-in-bindTexture.patch b/recipes-qt/qt5/qtbase-git/0020-Use-BGRA-extension-in-bindTexture.patch
index a3543077..5919bbad 100644
--- a/recipes-qt/qt5/qtbase-git/0020-Use-BGRA-extension-in-bindTexture.patch
+++ b/recipes-qt/qt5/qtbase-git/0020-Use-BGRA-extension-in-bindTexture.patch
@@ -1,17 +1,19 @@
1From 9108a53309ae584d6622881b418742a9213cb9f1 Mon Sep 17 00:00:00 2001 1From 893bf856c5f61c75cd9a2c44dff911f31db261e1 Mon Sep 17 00:00:00 2001
2From: Jani Hautakangas <jani.hautakangas@ixonos.com> 2From: Jani Hautakangas <jani.hautakangas@ixonos.com>
3Date: Mon, 27 May 2013 15:25:25 -0700 3Date: Mon, 27 May 2013 15:25:25 -0700
4Subject: [PATCH] Use BGRA extension in bindTexture 4Subject: [PATCH 20/23] Use BGRA extension in bindTexture
5 5
6Upstream-Status: Pending 6Upstream-Status: Pending
7 7
8Change-Id: I18aecc87c5c7d4483cabe5555da33ca6bb8580f1 8Change-Id: I18aecc87c5c7d4483cabe5555da33ca6bb8580f1
9
10Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
9--- 11---
10 src/gui/opengl/qopengltexturecache.cpp | 6 ++---- 12 src/gui/opengl/qopengltexturecache.cpp | 6 +-----
11 1 file changed, 2 insertions(+), 4 deletions(-) 13 1 file changed, 1 insertion(+), 5 deletions(-)
12 14
13diff --git a/src/gui/opengl/qopengltexturecache.cpp b/src/gui/opengl/qopengltexturecache.cpp 15diff --git a/src/gui/opengl/qopengltexturecache.cpp b/src/gui/opengl/qopengltexturecache.cpp
14index 94b8288..45aad1f 100644 16index 94b8288..5c8aa3c 100644
15--- a/src/gui/opengl/qopengltexturecache.cpp 17--- a/src/gui/opengl/qopengltexturecache.cpp
16+++ b/src/gui/opengl/qopengltexturecache.cpp 18+++ b/src/gui/opengl/qopengltexturecache.cpp
17@@ -181,11 +181,7 @@ GLuint QOpenGLTextureCache::bindTexture(QOpenGLContext *context, qint64 key, con 19@@ -181,11 +181,7 @@ GLuint QOpenGLTextureCache::bindTexture(QOpenGLContext *context, qint64 key, con
@@ -28,4 +30,5 @@ index 94b8288..45aad1f 100644
28 int cost = tx.width() * tx.height() * 4 / 1024; 30 int cost = tx.width() * tx.height() * 4 / 1024;
29 m_cache.insert(key, new QOpenGLCachedTexture(id, context), cost); 31 m_cache.insert(key, new QOpenGLCachedTexture(id, context), cost);
30-- 32--
311.7.9.5 331.8.3.2
34
diff --git a/recipes-qt/qt5/qtbase-git/0021-configure-make-pulseaudio-a-configurable-option.patch b/recipes-qt/qt5/qtbase-git/0021-configure-make-pulseaudio-a-configurable-option.patch
index 2fe0a182..f259284c 100644
--- a/recipes-qt/qt5/qtbase-git/0021-configure-make-pulseaudio-a-configurable-option.patch
+++ b/recipes-qt/qt5/qtbase-git/0021-configure-make-pulseaudio-a-configurable-option.patch
@@ -1,4 +1,4 @@
1From 1f5a36de9bb01192d3cdbcbef7a009ab4651040b Mon Sep 17 00:00:00 2001 1From f6156776d191b9d848d6892c473dfa2cd8963884 Mon Sep 17 00:00:00 2001
2From: Paul Eggleton <paul.eggleton@linux.intel.com> 2From: Paul Eggleton <paul.eggleton@linux.intel.com>
3Date: Tue, 28 Feb 2012 15:10:24 +0000 3Date: Tue, 28 Feb 2012 15:10:24 +0000
4Subject: [PATCH 21/23] configure: make pulseaudio a configurable option 4Subject: [PATCH 21/23] configure: make pulseaudio a configurable option
@@ -14,10 +14,10 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
14 1 file changed, 7 insertions(+) 14 1 file changed, 7 insertions(+)
15 15
16diff --git a/configure b/configure 16diff --git a/configure b/configure
17index 96965b6..595c9d9 100755 17index 69e30b5..290b9ac 100755
18--- a/configure 18--- a/configure
19+++ b/configure 19+++ b/configure
20@@ -1959,6 +1959,13 @@ while [ "$#" -gt 0 ]; do 20@@ -2039,6 +2039,13 @@ while [ "$#" -gt 0 ]; do
21 UNKNOWN_OPT=yes 21 UNKNOWN_OPT=yes
22 fi 22 fi
23 ;; 23 ;;
diff --git a/recipes-qt/qt5/qtbase-git/0022-configure-make-alsa-a-configurable-option.patch b/recipes-qt/qt5/qtbase-git/0022-configure-make-alsa-a-configurable-option.patch
index 76d1400c..3513a171 100644
--- a/recipes-qt/qt5/qtbase-git/0022-configure-make-alsa-a-configurable-option.patch
+++ b/recipes-qt/qt5/qtbase-git/0022-configure-make-alsa-a-configurable-option.patch
@@ -1,4 +1,4 @@
1From eb93499e26486957a93b2f8f82853d3de9769cce Mon Sep 17 00:00:00 2001 1From 39dc112aa81a9e658fa00e1fc88ed3f712b4687a Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com> 2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Fri, 19 Jul 2013 23:21:28 +0200 3Date: Fri, 19 Jul 2013 23:21:28 +0200
4Subject: [PATCH 22/23] configure: make alsa a configurable option 4Subject: [PATCH 22/23] configure: make alsa a configurable option
@@ -13,10 +13,10 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
13 1 file changed, 7 insertions(+) 13 1 file changed, 7 insertions(+)
14 14
15diff --git a/configure b/configure 15diff --git a/configure b/configure
16index 595c9d9..864967c 100755 16index 290b9ac..5e9bfd4 100755
17--- a/configure 17--- a/configure
18+++ b/configure 18+++ b/configure
19@@ -1966,6 +1966,13 @@ while [ "$#" -gt 0 ]; do 19@@ -2046,6 +2046,13 @@ while [ "$#" -gt 0 ]; do
20 UNKNOWN_OPT=yes 20 UNKNOWN_OPT=yes
21 fi 21 fi
22 ;; 22 ;;
diff --git a/recipes-qt/qt5/qtbase-git/0023-configure-make-freetype-a-configurable-option.patch b/recipes-qt/qt5/qtbase-git/0023-configure-make-freetype-a-configurable-option.patch
index 76b58355..f141725f 100644
--- a/recipes-qt/qt5/qtbase-git/0023-configure-make-freetype-a-configurable-option.patch
+++ b/recipes-qt/qt5/qtbase-git/0023-configure-make-freetype-a-configurable-option.patch
@@ -1,4 +1,4 @@
1From 6729c056b4d3ab43e59ce1c8303ae58d7c6ba8cf Mon Sep 17 00:00:00 2001 1From 059904ca921dfbdc9d702be67dcce66957ef6ecd Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com> 2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Sat, 20 Jul 2013 10:56:37 +0200 3Date: Sat, 20 Jul 2013 10:56:37 +0200
4Subject: [PATCH 23/23] configure: make freetype a configurable option 4Subject: [PATCH 23/23] configure: make freetype a configurable option
@@ -13,10 +13,10 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
13 1 file changed, 7 insertions(+) 13 1 file changed, 7 insertions(+)
14 14
15diff --git a/configure b/configure 15diff --git a/configure b/configure
16index 864967c..1b4225a 100755 16index 5e9bfd4..5b1f5f2 100755
17--- a/configure 17--- a/configure
18+++ b/configure 18+++ b/configure
19@@ -1973,6 +1973,13 @@ while [ "$#" -gt 0 ]; do 19@@ -2053,6 +2053,13 @@ while [ "$#" -gt 0 ]; do
20 UNKNOWN_OPT=yes 20 UNKNOWN_OPT=yes
21 fi 21 fi
22 ;; 22 ;;
diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb
index 71177825..0db74da8 100644
--- a/recipes-qt/qt5/qtbase-native_git.bb
+++ b/recipes-qt/qt5/qtbase-native_git.bb
@@ -1,6 +1,10 @@
1require qt5-git.inc 1require qt5-git.inc
2require ${PN}.inc 2require ${PN}.inc
3 3
4PR = "${INC_PR}.0" 4do_install_append() {
5 # for modules which are still using syncqt and call qtPrepareTool(QMAKE_SYNCQT, syncqt)
6 # e.g. qt3d, qtjsondb, qtwayland
7 ln -sf syncqt.pl ${D}${OE_QMAKE_PATH_QT_BINS}/syncqt
8}
5 9
6SRCREV = "4d6572aac0eb1f75f3c810ce8e92635b956d29fc" 10SRCREV = "bd1dc60d6555a901fb3005273d7a86efe470739a"
diff --git a/recipes-qt/qt5/qtbase.inc b/recipes-qt/qt5/qtbase.inc
index f4cce29f..0e091235 100644
--- a/recipes-qt/qt5/qtbase.inc
+++ b/recipes-qt/qt5/qtbase.inc
@@ -17,7 +17,6 @@ SRC_URI += " \
17 file://0014-enables-tslib-device-to-be-read-from-env-variable.patch \ 17 file://0014-enables-tslib-device-to-be-read-from-env-variable.patch \
18 file://0015-qtbase-allow-build-of-examples.patch \ 18 file://0015-qtbase-allow-build-of-examples.patch \
19 file://0018-QOpenGLPaintDevice-sub-area-support.patch \ 19 file://0018-QOpenGLPaintDevice-sub-area-support.patch \
20 file://0019-Fix-FBO-restoring-in-QOpenGLTextureGlyphCache.patch \
21 file://0020-Use-BGRA-extension-in-bindTexture.patch \ 20 file://0020-Use-BGRA-extension-in-bindTexture.patch \
22 file://0021-configure-make-pulseaudio-a-configurable-option.patch \ 21 file://0021-configure-make-pulseaudio-a-configurable-option.patch \
23 file://0022-configure-make-alsa-a-configurable-option.patch \ 22 file://0022-configure-make-alsa-a-configurable-option.patch \
diff --git a/recipes-qt/qt5/qtbase_5.0.2.bb b/recipes-qt/qt5/qtbase_5.0.2.bb
index c2cd97b6..15ac3718 100644
--- a/recipes-qt/qt5/qtbase_5.0.2.bb
+++ b/recipes-qt/qt5/qtbase_5.0.2.bb
@@ -6,6 +6,7 @@ PR = "${INC_PR}.0"
6SRC_URI += " \ 6SRC_URI += " \
7 file://0016-Allow-tslib-to-be-specified-at-configure-time.patch \ 7 file://0016-Allow-tslib-to-be-specified-at-configure-time.patch \
8 file://0017-Rename-qAbs-Function-for-timeval.patch \ 8 file://0017-Rename-qAbs-Function-for-timeval.patch \
9 file://0019-Fix-FBO-restoring-in-QOpenGLTextureGlyphCache.patch \
9" 10"
10 11
11SRC_URI[md5sum] = "a4fec8ed03867c4ee4fe5a46001a11f0" 12SRC_URI[md5sum] = "a4fec8ed03867c4ee4fe5a46001a11f0"
diff --git a/recipes-qt/qt5/qtbase_5.1.0.bb b/recipes-qt/qt5/qtbase_5.1.0.bb
index b5554641..54e2da94 100644
--- a/recipes-qt/qt5/qtbase_5.1.0.bb
+++ b/recipes-qt/qt5/qtbase_5.1.0.bb
@@ -1,5 +1,9 @@
1require qt5-${PV}.inc 1require qt5-${PV}.inc
2require ${PN}.inc 2require ${PN}.inc
3 3
4SRC_URI += " \
5 file://0019-Fix-FBO-restoring-in-QOpenGLTextureGlyphCache.patch \
6"
7
4SRC_URI[md5sum] = "0f8d14bb4039a2996c501a376ca7dae0" 8SRC_URI[md5sum] = "0f8d14bb4039a2996c501a376ca7dae0"
5SRC_URI[sha256sum] = "1fa8c591adab9d45e4f322edea9a55a517ebf1a006dd481eace0236623adc90a" 9SRC_URI[sha256sum] = "1fa8c591adab9d45e4f322edea9a55a517ebf1a006dd481eace0236623adc90a"
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb
index 71177825..2994d3fa 100644
--- a/recipes-qt/qt5/qtbase_git.bb
+++ b/recipes-qt/qt5/qtbase_git.bb
@@ -1,6 +1,4 @@
1require qt5-git.inc 1require qt5-git.inc
2require ${PN}.inc 2require ${PN}.inc
3 3
4PR = "${INC_PR}.0" 4SRCREV = "bd1dc60d6555a901fb3005273d7a86efe470739a"
5
6SRCREV = "4d6572aac0eb1f75f3c810ce8e92635b956d29fc"
diff --git a/recipes-qt/qt5/qtdeclarative-git/0001-qmltestexample-fix-link.patch b/recipes-qt/qt5/qtdeclarative-git/0001-qmltestexample-fix-link.patch
new file mode 100644
index 00000000..7a68dd53
--- /dev/null
+++ b/recipes-qt/qt5/qtdeclarative-git/0001-qmltestexample-fix-link.patch
@@ -0,0 +1,46 @@
1From ea698b0a2588585356d1ea5139ca6feb7110611a Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Eric=20B=C3=A9nard?= <eric@eukrea.com>
3Date: Sun, 26 May 2013 14:26:19 +0200
4Subject: [PATCH 1/3] qmltestexample: fix link
5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit
8
9else we get :
10ld: warning: libQt5Quick.so.5, needed by libQt5QuickTest.so, not found
11
12Upstream-Status: Inappropriate
13
14Signed-off-by: Eric Bénard <eric@eukrea.com>
15---
16 examples/qmltest/qmltest/qmltest.pro | 2 +-
17 tools/qmltestrunner/qmltestrunner.pro | 2 +-
18 2 files changed, 2 insertions(+), 2 deletions(-)
19
20diff --git a/examples/qmltest/qmltest/qmltest.pro b/examples/qmltest/qmltest/qmltest.pro
21index b5893c5..1b00e6c 100644
22--- a/examples/qmltest/qmltest/qmltest.pro
23+++ b/examples/qmltest/qmltest/qmltest.pro
24@@ -14,7 +14,7 @@ TESTDATA += tst_basic.qml tst_item.qml
25 # This code exists solely for the purpose of building this example
26 # inside the examples/ hierarchy.
27
28-QT += qml qmltest
29+QT += qml qmltest quick
30
31 macx: CONFIG -= app_bundle
32
33diff --git a/tools/qmltestrunner/qmltestrunner.pro b/tools/qmltestrunner/qmltestrunner.pro
34index 5184c1f..668cf17 100644
35--- a/tools/qmltestrunner/qmltestrunner.pro
36+++ b/tools/qmltestrunner/qmltestrunner.pro
37@@ -1,5 +1,5 @@
38 SOURCES += main.cpp
39
40-QT += qml qmltest
41+QT += qml qmltest quick
42
43 load(qt_tool)
44--
451.8.3.2
46
diff --git a/recipes-qt/qt5/qtdeclarative-git/0002-Fix-null-pointer-access-in-QQuickVisualDataModelPriv.patch b/recipes-qt/qt5/qtdeclarative-git/0002-Fix-null-pointer-access-in-QQuickVisualDataModelPriv.patch
deleted file mode 100644
index a61f8de2..00000000
--- a/recipes-qt/qt5/qtdeclarative-git/0002-Fix-null-pointer-access-in-QQuickVisualDataModelPriv.patch
+++ /dev/null
@@ -1,37 +0,0 @@
1From b47cfc601cf5d3c67289f72f43293846371993e2 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Florian=20H=C3=A4nel?= <florian.haenel@basyskom.com>
3Date: Mon, 3 Jun 2013 13:40:09 +0200
4Subject: [PATCH 2/2] Fix null-pointer access in QQuickVisualDataModelPrivate
5
6I observed null cachItem->contextData which lead to null-pointer access
7on cacheItem->contextData->destroy().
8
9Task-number: QTBUG-31439
10
11Upstream-Status: Backport https://codereview.qt-project.org/57789
12
13Signed-of-by: Florian Haenel <florian.haenel@lge.com>
14Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
15
16Change-Id: I91f28a3ee1ac83446ecde1801a1cb7962fb883f3
17---
18 src/qml/types/qqmldelegatemodel.cpp | 3 ++-
19 1 file changed, 2 insertions(+), 1 deletion(-)
20
21diff --git a/src/qml/types/qqmldelegatemodel.cpp b/src/qml/types/qqmldelegatemodel.cpp
22index 16572c4..f457538 100644
23--- a/src/qml/types/qqmldelegatemodel.cpp
24+++ b/src/qml/types/qqmldelegatemodel.cpp
25@@ -835,7 +835,8 @@ void QQmlDelegateModelPrivate::incubatorStatusChanged(QQDMIncubationTask *incuba
26 delete cacheItem->object;
27 cacheItem->object = 0;
28 cacheItem->scriptRef -= 1;
29- cacheItem->contextData->destroy();
30+ if (cacheItem->contextData)
31+ cacheItem->contextData->destroy();
32 cacheItem->contextData = 0;
33
34 if (!cacheItem->isReferenced()) {
35--
361.8.2.1
37
diff --git a/recipes-qt/qt5/qtdeclarative-git/0001-Fix-wrong-calculation-of-viewPort-for-transitions.patch b/recipes-qt/qt5/qtdeclarative-git/0003-Fix-wrong-calculation-of-viewPort-for-transitions.patch
index 5f201f97..84f8f661 100644
--- a/recipes-qt/qt5/qtdeclarative-git/0001-Fix-wrong-calculation-of-viewPort-for-transitions.patch
+++ b/recipes-qt/qt5/qtdeclarative-git/0003-Fix-wrong-calculation-of-viewPort-for-transitions.patch
@@ -1,7 +1,7 @@
1From b93b61260b8eda33c01cef542777efbae2e8c570 Mon Sep 17 00:00:00 2001 1From 3919fe89e7adbc9f163eabce9269a924273c64ec Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Florian=20H=C3=A4nel?= <florian.haenel@basyskom.com> 2From: =?UTF-8?q?Florian=20H=C3=A4nel?= <florian.haenel@basyskom.com>
3Date: Wed, 5 Jun 2013 19:23:32 +0200 3Date: Wed, 5 Jun 2013 19:23:32 +0200
4Subject: [PATCH 1/2] Fix wrong calculation of viewPort for transitions 4Subject: [PATCH 2/2] Fix wrong calculation of viewPort for transitions
5 5
6Viewport is calculated wrong for horizontal layout in a second instance 6Viewport is calculated wrong for horizontal layout in a second instance
7 7
@@ -24,7 +24,7 @@ Change-Id: I136ae4484278d14f796613505e3f38c65ec51ebe
24 1 file changed, 1 insertion(+), 1 deletion(-) 24 1 file changed, 1 insertion(+), 1 deletion(-)
25 25
26diff --git a/src/quick/items/qquickitemview.cpp b/src/quick/items/qquickitemview.cpp 26diff --git a/src/quick/items/qquickitemview.cpp b/src/quick/items/qquickitemview.cpp
27index d774091..aa489eb 100644 27index a6dabee..290f283 100644
28--- a/src/quick/items/qquickitemview.cpp 28--- a/src/quick/items/qquickitemview.cpp
29+++ b/src/quick/items/qquickitemview.cpp 29+++ b/src/quick/items/qquickitemview.cpp
30@@ -1815,7 +1815,7 @@ void QQuickItemViewPrivate::layout() 30@@ -1815,7 +1815,7 @@ void QQuickItemViewPrivate::layout()
@@ -37,5 +37,5 @@ index d774091..aa489eb 100644
37 it != releasePendingTransition.end(); ) { 37 it != releasePendingTransition.end(); ) {
38 FxViewItem *item = *it; 38 FxViewItem *item = *it;
39-- 39--
401.8.2.1 401.8.3.2
41 41
diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb
index e1418db5..407dd886 100644
--- a/recipes-qt/qt5/qtdeclarative_git.bb
+++ b/recipes-qt/qt5/qtdeclarative_git.bb
@@ -1,10 +1,9 @@
1require qt5-git.inc 1require qt5-git.inc
2require ${PN}.inc 2require ${PN}.inc
3 3
4PR = "${INC_PR}.0" 4SRC_URI += " \
5 5 file://0001-qmltestexample-fix-link.patch \
6SRC_URI += "file://0001-Fix-wrong-calculation-of-viewPort-for-transitions.patch \ 6 file://0003-Fix-wrong-calculation-of-viewPort-for-transitions.patch \
7 file://0002-Fix-null-pointer-access-in-QQuickVisualDataModelPriv.patch \
8" 7"
9 8
10SRCREV = "1d594c4e10caa9258f00bb7bcf61c307d027633b" 9SRCREV = "672354676d8e968e2523d1aeb450213a46b8b27c"
diff --git a/recipes-qt/qt5/qtgraphicaleffects_git.bb b/recipes-qt/qt5/qtgraphicaleffects_git.bb
index 19921487..3f0f8790 100644
--- a/recipes-qt/qt5/qtgraphicaleffects_git.bb
+++ b/recipes-qt/qt5/qtgraphicaleffects_git.bb
@@ -1,6 +1,4 @@
1require qt5-git.inc 1require qt5-git.inc
2require ${PN}.inc 2require ${PN}.inc
3 3
4PR = "${INC_PR}.0" 4SRCREV = "94ba2a255c4ca7f07e024c9dedf5547f371fd3a2"
5
6SRCREV = "bd434a6ea358e96c373e3ad65bfb6d939904abf5"
diff --git a/recipes-qt/qt5/qtimageformats_git.bb b/recipes-qt/qt5/qtimageformats_git.bb
index 08f9bd3e..1bb88ae0 100644
--- a/recipes-qt/qt5/qtimageformats_git.bb
+++ b/recipes-qt/qt5/qtimageformats_git.bb
@@ -1,6 +1,4 @@
1require qt5-git.inc 1require qt5-git.inc
2require ${PN}.inc 2require ${PN}.inc
3 3
4PR = "${INC_PR}.0" 4SRCREV = "a196fc62304ae23e68f60ae85a6106692f419f98"
5
6SRCREV = "f293cc8539da5d4ea915c957abbba473515793ad"
diff --git a/recipes-qt/qt5/qtjsbackend-native_git.bb b/recipes-qt/qt5/qtjsbackend-native_git.bb
index f825b993..29e97c49 100644
--- a/recipes-qt/qt5/qtjsbackend-native_git.bb
+++ b/recipes-qt/qt5/qtjsbackend-native_git.bb
@@ -1,6 +1,4 @@
1require qt5-git.inc 1require qt5-git.inc
2require ${PN}.inc 2require ${PN}.inc
3 3
4PR = "${INC_PR}.0" 4SRCREV = "904d8b8825aa82dbc6b888968f983ba6aa339832"
5
6SRCREV = "c97afb08eb28ce36f726fe427556622790a287c1"
diff --git a/recipes-qt/qt5/qtjsbackend_git.bb b/recipes-qt/qt5/qtjsbackend_git.bb
index f825b993..29e97c49 100644
--- a/recipes-qt/qt5/qtjsbackend_git.bb
+++ b/recipes-qt/qt5/qtjsbackend_git.bb
@@ -1,6 +1,4 @@
1require qt5-git.inc 1require qt5-git.inc
2require ${PN}.inc 2require ${PN}.inc
3 3
4PR = "${INC_PR}.0" 4SRCREV = "904d8b8825aa82dbc6b888968f983ba6aa339832"
5
6SRCREV = "c97afb08eb28ce36f726fe427556622790a287c1"
diff --git a/recipes-qt/qt5/qtmultimedia_git.bb b/recipes-qt/qt5/qtmultimedia_git.bb
index 207424b9..d1eced6c 100644
--- a/recipes-qt/qt5/qtmultimedia_git.bb
+++ b/recipes-qt/qt5/qtmultimedia_git.bb
@@ -1,6 +1,4 @@
1require qt5-git.inc 1require qt5-git.inc
2require ${PN}.inc 2require ${PN}.inc
3 3
4PR = "${INC_PR}.0" 4SRCREV = "c74b544610376c753ea0a29ff2465e2bcfe70e1d"
5
6SRCREV = "07f20b8afe6976d69359c27278cbda2c4d0a47c7"
diff --git a/recipes-qt/qt5/qtquick1_git.bb b/recipes-qt/qt5/qtquick1_git.bb
index 717a9999..1d4a7253 100644
--- a/recipes-qt/qt5/qtquick1_git.bb
+++ b/recipes-qt/qt5/qtquick1_git.bb
@@ -1,6 +1,4 @@
1require qt5-git.inc 1require qt5-git.inc
2require ${PN}.inc 2require ${PN}.inc
3 3
4PR = "${INC_PR}.0" 4SRCREV = "cb9d1a61b127030562a206c0142d99997eb82c8e"
5
6SRCREV = "31c3dec9fe1341d412830eb1163e252112f9765c"
diff --git a/recipes-qt/qt5/qtscript_git.bb b/recipes-qt/qt5/qtscript_git.bb
index ceccb971..4328b583 100644
--- a/recipes-qt/qt5/qtscript_git.bb
+++ b/recipes-qt/qt5/qtscript_git.bb
@@ -1,6 +1,4 @@
1require qt5-git.inc 1require qt5-git.inc
2require ${PN}.inc 2require ${PN}.inc
3 3
4PR = "${INC_PR}.0" 4SRCREV = "a8e3602554c3225046a831cad7a727a56501439b"
5
6SRCREV = "15f8b3a5f8623d5230865e2fd9811c986a91f7e6"
diff --git a/recipes-qt/qt5/qtsensors_git.bb b/recipes-qt/qt5/qtsensors_git.bb
index 7d3e7663..7d082a1d 100644
--- a/recipes-qt/qt5/qtsensors_git.bb
+++ b/recipes-qt/qt5/qtsensors_git.bb
@@ -1,9 +1,4 @@
1require qt5-git.inc 1require qt5-git.inc
2require ${PN}.inc 2require ${PN}.inc
3 3
4# qtsensors wasn't released yet, last tag before this SRCREV is 5.0.0-beta1 4SRCREV = "0862901b142f36e91b98dbdcb2c36585020bb33d"
5PV = "4.999+5.0.0-beta1+git${SRCPV}"
6
7PR = "${INC_PR}.0"
8
9SRCREV = "a8bb2b1720372b79b1e7c03692252a3d6f0a7c0f"
diff --git a/recipes-qt/qt5/qtsvg_git.bb b/recipes-qt/qt5/qtsvg_git.bb
index 735c3446..fef5ecdb 100644
--- a/recipes-qt/qt5/qtsvg_git.bb
+++ b/recipes-qt/qt5/qtsvg_git.bb
@@ -1,6 +1,4 @@
1require qt5-git.inc 1require qt5-git.inc
2require ${PN}.inc 2require ${PN}.inc
3 3
4PR = "${INC_PR}.0" 4SRCREV = "a29af8f024c8fb4bfdf1ce9e6c03387c3abcaffa"
5
6SRCREV = "04959ec43e93877348c41ff1d36916993948e43d"
diff --git a/recipes-qt/qt5/qtwebkit_git.bb b/recipes-qt/qt5/qtwebkit_git.bb
index 1b0737a7..ebfc56c7 100644
--- a/recipes-qt/qt5/qtwebkit_git.bb
+++ b/recipes-qt/qt5/qtwebkit_git.bb
@@ -1,6 +1,4 @@
1require qt5-git.inc 1require qt5-git.inc
2require ${PN}.inc 2require ${PN}.inc
3 3
4PR = "${INC_PR}.0" 4SRCREV = "c31ff44d3a17fab37754acb2a0a29cd6eba10699"
5
6SRCREV = "a2e31061d4a24fceb4d32f4df301150ee1cc8af1"
diff --git a/recipes-qt/qt5/qtxmlpatterns_git.bb b/recipes-qt/qt5/qtxmlpatterns_git.bb
index 1277e346..e824b8e7 100644
--- a/recipes-qt/qt5/qtxmlpatterns_git.bb
+++ b/recipes-qt/qt5/qtxmlpatterns_git.bb
@@ -1,6 +1,4 @@
1require qt5-git.inc 1require qt5-git.inc
2require ${PN}.inc 2require ${PN}.inc
3 3
4PR = "${INC_PR}.0" 4SRCREV = "808c59c00f23109d1887022c2d9a6f4e5ecc72a4"
5
6SRCREV = "3ca482d01c07ee25213533b31a3ad626c224d95e"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-05-31 22:51:01 +0000