summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtbase
diff options
context:
space:
mode:
Diffstat (limited to 'recipes-qt/qt5/qtbase')
-rw-r--r--recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch11
-rw-r--r--recipes-qt/qt5/qtbase/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch10
-rw-r--r--recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch14
-rw-r--r--recipes-qt/qt5/qtbase/0004-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch30
-rw-r--r--recipes-qt/qt5/qtbase/0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch (renamed from recipes-qt/qt5/qtbase/0005-qt_module-Fix-pkgconfig-and-libtool-replacements.patch)8
-rw-r--r--recipes-qt/qt5/qtbase/0005-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch (renamed from recipes-qt/qt5/qtbase/0006-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch)8
-rw-r--r--recipes-qt/qt5/qtbase/0006-qeglplatformintegration-Undefine-CursorShape-from-X..patch (renamed from recipes-qt/qt5/qtbase/0007-qeglplatformintegration-Undefine-CursorShape-from-X..patch)6
-rw-r--r--recipes-qt/qt5/qtbase/0007-configure-bump-path-length-from-256-to-512-character.patch (renamed from recipes-qt/qt5/qtbase/0008-configure-bump-path-length-from-256-to-512-character.patch)8
-rw-r--r--recipes-qt/qt5/qtbase/0008-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch (renamed from recipes-qt/qt5/qtbase/0009-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch)6
-rw-r--r--recipes-qt/qt5/qtbase/0009-QOpenGLPaintDevice-sub-area-support.patch (renamed from recipes-qt/qt5/qtbase/0010-QOpenGLPaintDevice-sub-area-support.patch)22
-rw-r--r--recipes-qt/qt5/qtbase/0010-Make-Qt5GuiConfigExtras.cmake-find-gl-es-include-dir.patch (renamed from recipes-qt/qt5/qtbase/0013-Make-Qt5GuiConfigExtras.cmake-find-gl-es-include-dir.patch)6
-rw-r--r--recipes-qt/qt5/qtbase/0011-Always-build-uic.patch10
-rw-r--r--recipes-qt/qt5/qtbase/0011-qmake-don-t-build-it-in-configure-but-allow-to-build.patch21
-rw-r--r--recipes-qt/qt5/qtbase/0012-Add-external-hostbindir-option-for-native-sdk.patch (renamed from recipes-qt/qt5/qtbase/0014-Add-external-hostbindir-option-native.patch)76
-rw-r--r--recipes-qt/qt5/qtbase/0012-Set-paths-for-target-properly.patch (renamed from recipes-qt/qt5/qtbase/0015-Set-paths-for-target-properly.patch)14
-rw-r--r--recipes-qt/qt5/qtbase/0013-Fix-build-of-egl-integration.patch (renamed from recipes-qt/qt5/qtbase/0014-fix-build-of-egl-integration.patch)39
-rw-r--r--recipes-qt/qt5/qtbase/0013-configure-preserve-built-qmake-and-swap-with-native-.patch (renamed from recipes-qt/qt5/qtbase/0012-configure-preserve-built-qmake-and-swap-with-native-.patch)8
17 files changed, 145 insertions, 152 deletions
diff --git a/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch b/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch
index 7a94dffe..5f7ab145 100644
--- a/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch
+++ b/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch
@@ -1,7 +1,7 @@
1From 81cd2947e9b1290498bdc2505a76fb053ff33be8 Mon Sep 17 00:00:00 2001 1From df887cc51d1cf5328e536708b461f475e9fb4577 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/11] Add linux-oe-g++ platform 4Subject: [PATCH 01/13] 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
@@ -40,6 +40,7 @@ Subject: [PATCH 01/11] Add linux-oe-g++ platform
40Upstream-Status: Inappropriate [embedded specific] 40Upstream-Status: Inappropriate [embedded specific]
41 too OE specific, probably cannot be upstreamed 41 too OE specific, probably cannot be upstreamed
42 42
43Change-Id: I0591ed5da0d61d7cf1509d420e6b293582f1863c
43Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> 44Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
44--- 45---
45 configure | 66 ++++++++++++++++------- 46 configure | 66 ++++++++++++++++-------
@@ -51,7 +52,7 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
51 create mode 100644 mkspecs/linux-oe-g++/qplatformdefs.h 52 create mode 100644 mkspecs/linux-oe-g++/qplatformdefs.h
52 53
53diff --git a/configure b/configure 54diff --git a/configure b/configure
54index 229fb4e..b7a6fe3 100755 55index 5ad29bb..0bcc175 100755
55--- a/configure 56--- a/configure
56+++ b/configure 57+++ b/configure
57@@ -316,6 +316,16 @@ getQMakeConf() 58@@ -316,6 +316,16 @@ getQMakeConf()
@@ -195,7 +196,7 @@ index 6b37a04..dcf6025 100644
195 write_file($$QMAKE_CONFIG_LOG, msg, append) 196 write_file($$QMAKE_CONFIG_LOG, msg, append)
196diff --git a/mkspecs/linux-oe-g++/qmake.conf b/mkspecs/linux-oe-g++/qmake.conf 197diff --git a/mkspecs/linux-oe-g++/qmake.conf b/mkspecs/linux-oe-g++/qmake.conf
197new file mode 100644 198new file mode 100644
198index 0000000..ca26b10 199index 0000000..2ad2810
199--- /dev/null 200--- /dev/null
200+++ b/mkspecs/linux-oe-g++/qmake.conf 201+++ b/mkspecs/linux-oe-g++/qmake.conf
201@@ -0,0 +1,40 @@ 202@@ -0,0 +1,40 @@
@@ -346,5 +347,5 @@ index 0000000..dd12003
346+ 347+
347+#endif // QPLATFORMDEFS_H 348+#endif // QPLATFORMDEFS_H
348-- 349--
3492.1.3 3502.3.1
350 351
diff --git a/recipes-qt/qt5/qtbase/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch b/recipes-qt/qt5/qtbase/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch
index bae0dd3b..f8420c04 100644
--- a/recipes-qt/qt5/qtbase/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch
+++ b/recipes-qt/qt5/qtbase/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch
@@ -1,7 +1,7 @@
1From aae38b0ff226f287ad40f6eb423f1b974f548b73 Mon Sep 17 00:00:00 2001 1From 046ff855191e587ce9263f40bd46183c175b6387 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/11] qlibraryinfo: allow to set qt.conf from the outside 4Subject: [PATCH 02/13] 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
@@ -19,10 +19,10 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
19 1 file changed, 4 insertions(+), 1 deletion(-) 19 1 file changed, 4 insertions(+), 1 deletion(-)
20 20
21diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp 21diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp
22index 7ca0aa7..d68c51b 100644 22index d592032..c418c5e 100644
23--- a/src/corelib/global/qlibraryinfo.cpp 23--- a/src/corelib/global/qlibraryinfo.cpp
24+++ b/src/corelib/global/qlibraryinfo.cpp 24+++ b/src/corelib/global/qlibraryinfo.cpp
25@@ -139,7 +139,10 @@ QLibrarySettings::QLibrarySettings() 25@@ -138,7 +138,10 @@ QLibrarySettings::QLibrarySettings()
26 26
27 QSettings *QLibraryInfoPrivate::findConfiguration() 27 QSettings *QLibraryInfoPrivate::findConfiguration()
28 { 28 {
@@ -35,5 +35,5 @@ index 7ca0aa7..d68c51b 100644
35 if(!QFile::exists(qtconfig)) 35 if(!QFile::exists(qtconfig))
36 qtconfig = qt_libraryInfoFile(); 36 qtconfig = qt_libraryInfoFile();
37-- 37--
382.1.3 382.3.1
39 39
diff --git a/recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch b/recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch
index 87e8f0f3..ff269677 100644
--- a/recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch
+++ b/recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch
@@ -1,7 +1,7 @@
1From f2d51e50a7fbdf485696d1b8b2d29e64c729c76b Mon Sep 17 00:00:00 2001 1From 6c015d77a95910deec0a8c4a265587578531b476 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/11] Add -external-hostbindir option 4Subject: [PATCH 03/13] 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
@@ -31,10 +31,10 @@ Signed-off-by: Jonathan Liu <net147@gmail.com>
31 src/corelib/Qt5CoreConfigExtras.cmake.in | 6 +++--- 31 src/corelib/Qt5CoreConfigExtras.cmake.in | 6 +++---
32 src/dbus/Qt5DBusConfigExtras.cmake.in | 4 ++-- 32 src/dbus/Qt5DBusConfigExtras.cmake.in | 4 ++--
33 src/widgets/Qt5WidgetsConfigExtras.cmake.in | 2 +- 33 src/widgets/Qt5WidgetsConfigExtras.cmake.in | 2 +-
34 11 files changed, 50 insertions(+), 13 deletions(-) 34 7 files changed, 38 insertions(+), 12 deletions(-)
35 35
36diff --git a/configure b/configure 36diff --git a/configure b/configure
37index b7a6fe3..d715f6c 100755 37index 0bcc175..996ce50 100755
38--- a/configure 38--- a/configure
39+++ b/configure 39+++ b/configure
40@@ -769,6 +769,7 @@ QT_HOST_BINS= 40@@ -769,6 +769,7 @@ QT_HOST_BINS=
@@ -95,10 +95,10 @@ index b7a6fe3..d715f6c 100755
95 "qt_hostspec=$shortspec", 95 "qt_hostspec=$shortspec",
96 #endif 96 #endif
97diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf 97diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf
98index a9a622d..b6f1db0 100644 98index 7961f65..e11b23d 100644
99--- a/mkspecs/features/qt_functions.prf 99--- a/mkspecs/features/qt_functions.prf
100+++ b/mkspecs/features/qt_functions.prf 100+++ b/mkspecs/features/qt_functions.prf
101@@ -191,7 +191,11 @@ defineTest(qtAddRpathLink) { 101@@ -192,7 +192,11 @@ defineTest(qtAddRpathLink) {
102 defineTest(qtPrepareTool) { 102 defineTest(qtPrepareTool) {
103 cmd = $$eval(QT_TOOL.$${2}.binary) 103 cmd = $$eval(QT_TOOL.$${2}.binary)
104 isEmpty(cmd) { 104 isEmpty(cmd) {
@@ -229,5 +229,5 @@ index 99d87e2..5621dc0 100644
229 _qt5_Widgets_check_file_exists(${imported_location}) 229 _qt5_Widgets_check_file_exists(${imported_location})
230 230
231-- 231--
2322.1.3 2322.3.1
233 233
diff --git a/recipes-qt/qt5/qtbase/0004-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch b/recipes-qt/qt5/qtbase/0004-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch
deleted file mode 100644
index 83694b7d..00000000
--- a/recipes-qt/qt5/qtbase/0004-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch
+++ /dev/null
@@ -1,30 +0,0 @@
1From 13a61389aa33fdfd5d9a1adf824d98c5ebf1cdff Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Sat, 27 Apr 2013 22:33:33 +0200
4Subject: [PATCH 04/11] configureapp: Prefix default LIBDIRS and INCDIRS with
5 SYSROOT
6
7Upstream-Status: Pending
8 again a bit OE specific
9---
10 tools/configure/configureapp.cpp | 4 ++--
11 1 file changed, 2 insertions(+), 2 deletions(-)
12
13diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
14index d0a62c8..b3f3ff8 100644
15--- a/tools/configure/configureapp.cpp
16+++ b/tools/configure/configureapp.cpp
17@@ -3384,8 +3384,8 @@ void Configure::generateQConfigPri()
18 configStream << " QT_ARCH = " << dictionary["QT_ARCH"] << endl;
19 if (dictionary.contains("XQMAKESPEC") && !dictionary["XQMAKESPEC"].startsWith("wince")) {
20 // FIXME: add detection
21- configStream << " QMAKE_DEFAULT_LIBDIRS = /lib /usr/lib" << endl;
22- configStream << " QMAKE_DEFAULT_INCDIRS = /usr/include /usr/local/include" << endl;
23+ configStream << " QMAKE_DEFAULT_LIBDIRS = $$[QT_SYSROOT]/lib $$[QT_SYSROOT]/usr/lib" << endl;
24+ configStream << " QMAKE_DEFAULT_INCDIRS = $$[QT_SYSROOT]/usr/include $$[QT_SYSROOT]/usr/local/include" << endl;
25 }
26 configStream << "}" << endl;
27 configStream << "QT_CONFIG += " << qtConfig.join(' ') << endl;
28--
292.1.3
30
diff --git a/recipes-qt/qt5/qtbase/0005-qt_module-Fix-pkgconfig-and-libtool-replacements.patch b/recipes-qt/qt5/qtbase/0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch
index a6e90894..45fca3aa 100644
--- a/recipes-qt/qt5/qtbase/0005-qt_module-Fix-pkgconfig-and-libtool-replacements.patch
+++ b/recipes-qt/qt5/qtbase/0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch
@@ -1,7 +1,7 @@
1From 5778f98f990781710e72be8275dae32a7999330d Mon Sep 17 00:00:00 2001 1From 55e85e61eb93bce5b84f856ea5cc47af73e01a1d 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 05/11] qt_module: Fix pkgconfig and libtool replacements 4Subject: [PATCH 04/13] qt_module: Fix pkgconfig and libtool replacements
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
@@ -67,7 +67,7 @@ Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
67 2 files changed, 16 insertions(+), 1 deletion(-) 67 2 files changed, 16 insertions(+), 1 deletion(-)
68 68
69diff --git a/mkspecs/features/qt_common.prf b/mkspecs/features/qt_common.prf 69diff --git a/mkspecs/features/qt_common.prf b/mkspecs/features/qt_common.prf
70index af9d6ca..a4781d6 100644 70index eb65e73..4db40d0 100644
71--- a/mkspecs/features/qt_common.prf 71--- a/mkspecs/features/qt_common.prf
72+++ b/mkspecs/features/qt_common.prf 72+++ b/mkspecs/features/qt_common.prf
73@@ -33,7 +33,7 @@ contains(TEMPLATE, .*lib) { 73@@ -33,7 +33,7 @@ contains(TEMPLATE, .*lib) {
@@ -110,5 +110,5 @@ index d213f9e..915c596 100644
110 } 110 }
111 111
112-- 112--
1132.1.3 1132.3.1
114 114
diff --git a/recipes-qt/qt5/qtbase/0006-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch b/recipes-qt/qt5/qtbase/0005-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch
index 042d7638..4a71e0f2 100644
--- a/recipes-qt/qt5/qtbase/0006-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch
+++ b/recipes-qt/qt5/qtbase/0005-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch
@@ -1,7 +1,7 @@
1From 4a067c162d08596e3ec89dcfb3ecdf197b1bf22a Mon Sep 17 00:00:00 2001 1From 129d2a82da2ef6eede761967d981c5edcc0820d8 Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com> 2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Mon, 21 Apr 2014 19:22:04 +0200 3Date: Mon, 21 Apr 2014 19:22:04 +0200
4Subject: [PATCH 06/11] Revert "eglfs: Print the chosen config in debug mode" 4Subject: [PATCH 05/13] Revert "eglfs: Print the chosen config in debug mode"
5 5
6With this change the build is failing with: 6With this change the build is failing with:
7| In file included from /OE/build/oe-core/tmp-glibc/sysroots/qemux86-64/usr/include/EGL/eglplatform.h:118:0, 7| In file included from /OE/build/oe-core/tmp-glibc/sysroots/qemux86-64/usr/include/EGL/eglplatform.h:118:0,
@@ -68,7 +68,7 @@ index c1a491c..7a0fc87 100644
68 68
69 #ifdef Q_OS_UNIX 69 #ifdef Q_OS_UNIX
70diff --git a/src/platformsupport/eglconvenience/qeglplatformcontext.cpp b/src/platformsupport/eglconvenience/qeglplatformcontext.cpp 70diff --git a/src/platformsupport/eglconvenience/qeglplatformcontext.cpp b/src/platformsupport/eglconvenience/qeglplatformcontext.cpp
71index 7cc3300..ccbd974 100644 71index 7cc3300..ccbd974a 100644
72--- a/src/platformsupport/eglconvenience/qeglplatformcontext.cpp 72--- a/src/platformsupport/eglconvenience/qeglplatformcontext.cpp
73+++ b/src/platformsupport/eglconvenience/qeglplatformcontext.cpp 73+++ b/src/platformsupport/eglconvenience/qeglplatformcontext.cpp
74@@ -37,7 +37,6 @@ 74@@ -37,7 +37,6 @@
@@ -93,5 +93,5 @@ index 7cc3300..ccbd974 100644
93 } 93 }
94 94
95-- 95--
962.1.3 962.3.1
97 97
diff --git a/recipes-qt/qt5/qtbase/0007-qeglplatformintegration-Undefine-CursorShape-from-X..patch b/recipes-qt/qt5/qtbase/0006-qeglplatformintegration-Undefine-CursorShape-from-X..patch
index c528f0c9..84e5dbac 100644
--- a/recipes-qt/qt5/qtbase/0007-qeglplatformintegration-Undefine-CursorShape-from-X..patch
+++ b/recipes-qt/qt5/qtbase/0006-qeglplatformintegration-Undefine-CursorShape-from-X..patch
@@ -1,7 +1,7 @@
1From 8e152449beb18454347cfdb300c50d113fa48383 Mon Sep 17 00:00:00 2001 1From f2092e73beaffe163a5c7f66f73956477f0d97a1 Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com> 2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Wed, 19 Mar 2014 18:32:28 +0100 3Date: Wed, 19 Mar 2014 18:32:28 +0100
4Subject: [PATCH 07/11] qeglplatformintegration: Undefine CursorShape from X.h 4Subject: [PATCH 06/13] qeglplatformintegration: Undefine CursorShape from X.h
5 5
6Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> 6Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
7--- 7---
@@ -26,5 +26,5 @@ index 4d7adce..c9b6873 100644
26 26
27 class QEGLPlatformScreen; 27 class QEGLPlatformScreen;
28-- 28--
292.1.3 292.3.1
30 30
diff --git a/recipes-qt/qt5/qtbase/0008-configure-bump-path-length-from-256-to-512-character.patch b/recipes-qt/qt5/qtbase/0007-configure-bump-path-length-from-256-to-512-character.patch
index c20d6f15..1bbda758 100644
--- a/recipes-qt/qt5/qtbase/0008-configure-bump-path-length-from-256-to-512-character.patch
+++ b/recipes-qt/qt5/qtbase/0007-configure-bump-path-length-from-256-to-512-character.patch
@@ -1,7 +1,7 @@
1From 3a31a14c9c244a22337f22d083a680f69a1b1ce8 Mon Sep 17 00:00:00 2001 1From 24e36583f44a17ce6d21e4392dd4f6a83ea9846a Mon Sep 17 00:00:00 2001
2From: Denys Dmytriyenko <denys@ti.com> 2From: Denys Dmytriyenko <denys@ti.com>
3Date: Mon, 11 Nov 2013 20:27:30 -0500 3Date: Mon, 11 Nov 2013 20:27:30 -0500
4Subject: [PATCH 08/11] configure: bump path length from 256 to 512 characters 4Subject: [PATCH 07/13] configure: bump path length from 256 to 512 characters
5 5
6Increase the path length that gets hardcoded into generated config.cpp file 6Increase the path length that gets hardcoded into generated config.cpp file
7from 256 to 512 characters, as nativesdk path can be quite long. 7from 256 to 512 characters, as nativesdk path can be quite long.
@@ -12,7 +12,7 @@ Signed-off-by: Denys Dmytriyenko <denys@ti.com>
12 1 file changed, 1 insertion(+), 1 deletion(-) 12 1 file changed, 1 insertion(+), 1 deletion(-)
13 13
14diff --git a/configure b/configure 14diff --git a/configure b/configure
15index d715f6c..bd43281 100755 15index 996ce50..a40d471 100755
16--- a/configure 16--- a/configure
17+++ b/configure 17+++ b/configure
18@@ -3622,7 +3622,7 @@ static const char qt_configure_licensed_products_str [256 + 12] = "qt_lcnsprod=$ 18@@ -3622,7 +3622,7 @@ static const char qt_configure_licensed_products_str [256 + 12] = "qt_lcnsprod=$
@@ -25,5 +25,5 @@ index d715f6c..bd43281 100755
25 "qt_prfxpath=$QT_SYSROOT_PREFIX", 25 "qt_prfxpath=$QT_SYSROOT_PREFIX",
26 "qt_docspath=$QT_SYSROOT_DOCS", 26 "qt_docspath=$QT_SYSROOT_DOCS",
27-- 27--
282.1.3 282.3.1
29 29
diff --git a/recipes-qt/qt5/qtbase/0009-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch b/recipes-qt/qt5/qtbase/0008-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch
index 200864a9..f908e780 100644
--- a/recipes-qt/qt5/qtbase/0009-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch
+++ b/recipes-qt/qt5/qtbase/0008-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch
@@ -1,7 +1,7 @@
1From 621d867223a135a9babd452d4918200bc6d0463b Mon Sep 17 00:00:00 2001 1From 7886d849487f0c0bbfa54f9ef9708fdc9cc84c04 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> 2From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
3Date: Wed, 5 Feb 2014 18:35:08 +0100 3Date: Wed, 5 Feb 2014 18:35:08 +0100
4Subject: [PATCH 09/11] eglfs: fix egl error for platforms only supporting one 4Subject: [PATCH 08/13] eglfs: fix egl error for platforms only supporting one
5 window/surface 5 window/surface
6MIME-Version: 1.0 6MIME-Version: 1.0
7Content-Type: text/plain; charset=UTF-8 7Content-Type: text/plain; charset=UTF-8
@@ -68,5 +68,5 @@ index f5839e0..5ebde6d 100644
68 68
69 if (isRaster()) { 69 if (isRaster()) {
70-- 70--
712.1.3 712.3.1
72 72
diff --git a/recipes-qt/qt5/qtbase/0010-QOpenGLPaintDevice-sub-area-support.patch b/recipes-qt/qt5/qtbase/0009-QOpenGLPaintDevice-sub-area-support.patch
index 986d2a93..f7062ffe 100644
--- a/recipes-qt/qt5/qtbase/0010-QOpenGLPaintDevice-sub-area-support.patch
+++ b/recipes-qt/qt5/qtbase/0009-QOpenGLPaintDevice-sub-area-support.patch
@@ -1,7 +1,7 @@
1From 46074ffb4525e8217acd78c9cbe29f3d62f85c78 Mon Sep 17 00:00:00 2001 1From 47ee1da94f74c46fd692bcd55c2770f6c3be92f3 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 10/11] QOpenGLPaintDevice sub-area support 4Subject: [PATCH 09/13] QOpenGLPaintDevice sub-area support
5 5
6Allows creating QOpenGLPaintDevice targetting sub-area 6Allows creating QOpenGLPaintDevice targetting sub-area
7of binded framebuffer. 7of binded framebuffer.
@@ -81,10 +81,10 @@ index 0b01129..211f2f3 100644
81 81
82 qreal dpmx; 82 qreal dpmx;
83diff --git a/src/gui/opengl/qopenglpaintengine.cpp b/src/gui/opengl/qopenglpaintengine.cpp 83diff --git a/src/gui/opengl/qopenglpaintengine.cpp b/src/gui/opengl/qopenglpaintengine.cpp
84index c490726..1d775fd 100644 84index 8eeaa31..e17520e 100644
85--- a/src/gui/opengl/qopenglpaintengine.cpp 85--- a/src/gui/opengl/qopenglpaintengine.cpp
86+++ b/src/gui/opengl/qopenglpaintengine.cpp 86+++ b/src/gui/opengl/qopenglpaintengine.cpp
87@@ -2002,7 +2002,10 @@ bool QOpenGL2PaintEngineEx::begin(QPaintDevice *pdev) 87@@ -2080,7 +2080,10 @@ bool QOpenGL2PaintEngineEx::begin(QPaintDevice *pdev)
88 for (int i = 0; i < QT_GL_VERTEX_ARRAY_TRACKED_COUNT; ++i) 88 for (int i = 0; i < QT_GL_VERTEX_ARRAY_TRACKED_COUNT; ++i)
89 d->vertexAttributeArraysEnabledState[i] = false; 89 d->vertexAttributeArraysEnabledState[i] = false;
90 90
@@ -95,16 +95,16 @@ index c490726..1d775fd 100644
95 d->width = sz.width(); 95 d->width = sz.width();
96 d->height = sz.height(); 96 d->height = sz.height();
97 d->mode = BrushDrawingMode; 97 d->mode = BrushDrawingMode;
98@@ -2089,7 +2092,7 @@ void QOpenGL2PaintEngineEx::ensureActive() 98@@ -2167,7 +2170,7 @@ void QOpenGL2PaintEngineEx::ensureActive()
99 d->device->ensureActiveTarget(); 99 d->device->ensureActiveTarget();
100 100
101 d->transferMode(BrushDrawingMode); 101 d->transferMode(BrushDrawingMode);
102- d->funcs.glViewport(0, 0, d->width, d->height); 102- d->funcs.glViewport(0, 0, d->width, d->height);
103+ d->funcs.glViewport(d->x, d->y, d->width, d->height); 103+ d->funcs.glViewport(d->x, d->y, d->width, d->height);
104 d->needsSync = false; 104 d->needsSync = false;
105 d->lastMaskTextureUsed = 0;
106 d->shaderManager->setDirty(); 105 d->shaderManager->setDirty();
107@@ -2132,6 +2135,7 @@ void QOpenGL2PaintEngineExPrivate::updateClipScissorTest() 106 d->syncGlState();
107@@ -2209,6 +2212,7 @@ void QOpenGL2PaintEngineExPrivate::updateClipScissorTest()
108 if (bounds == QRect(0, 0, width, height)) { 108 if (bounds == QRect(0, 0, width, height)) {
109 funcs.glDisable(GL_SCISSOR_TEST); 109 funcs.glDisable(GL_SCISSOR_TEST);
110 } else { 110 } else {
@@ -112,7 +112,7 @@ index c490726..1d775fd 100644
112 funcs.glEnable(GL_SCISSOR_TEST); 112 funcs.glEnable(GL_SCISSOR_TEST);
113 setScissor(bounds); 113 setScissor(bounds);
114 } 114 }
115@@ -2140,12 +2144,13 @@ void QOpenGL2PaintEngineExPrivate::updateClipScissorTest() 115@@ -2217,12 +2221,13 @@ void QOpenGL2PaintEngineExPrivate::updateClipScissorTest()
116 116
117 void QOpenGL2PaintEngineExPrivate::setScissor(const QRect &rect) 117 void QOpenGL2PaintEngineExPrivate::setScissor(const QRect &rect)
118 { 118 {
@@ -128,10 +128,10 @@ index c490726..1d775fd 100644
128 128
129 funcs.glScissor(left, bottom, width, height); 129 funcs.glScissor(left, bottom, width, height);
130diff --git a/src/gui/opengl/qopenglpaintengine_p.h b/src/gui/opengl/qopenglpaintengine_p.h 130diff --git a/src/gui/opengl/qopenglpaintengine_p.h b/src/gui/opengl/qopenglpaintengine_p.h
131index 5ef0366..c5b517d 100644 131index 9722ea3..07e3163 100644
132--- a/src/gui/opengl/qopenglpaintengine_p.h 132--- a/src/gui/opengl/qopenglpaintengine_p.h
133+++ b/src/gui/opengl/qopenglpaintengine_p.h 133+++ b/src/gui/opengl/qopenglpaintengine_p.h
134@@ -256,6 +256,7 @@ public: 134@@ -264,6 +264,7 @@ public:
135 QOpenGL2PaintEngineEx* q; 135 QOpenGL2PaintEngineEx* q;
136 QOpenGLEngineShaderManager* shaderManager; 136 QOpenGLEngineShaderManager* shaderManager;
137 QOpenGLPaintDevice* device; 137 QOpenGLPaintDevice* device;
@@ -153,5 +153,5 @@ index cd268cd..997bc35 100644
153 } else { 153 } else {
154 if (m_vao.isCreated()) { 154 if (m_vao.isCreated()) {
155-- 155--
1562.1.3 1562.3.1
157 157
diff --git a/recipes-qt/qt5/qtbase/0013-Make-Qt5GuiConfigExtras.cmake-find-gl-es-include-dir.patch b/recipes-qt/qt5/qtbase/0010-Make-Qt5GuiConfigExtras.cmake-find-gl-es-include-dir.patch
index 6ea42bc5..188ae157 100644
--- a/recipes-qt/qt5/qtbase/0013-Make-Qt5GuiConfigExtras.cmake-find-gl-es-include-dir.patch
+++ b/recipes-qt/qt5/qtbase/0010-Make-Qt5GuiConfigExtras.cmake-find-gl-es-include-dir.patch
@@ -1,7 +1,7 @@
1From f5df17e2a02cf67f3436b7fe640c6bf54ba93ad6 Mon Sep 17 00:00:00 2001 1From d6158c2cb6ce64af531246636c3b2adb35afeb72 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> 2From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
3Date: Thu, 18 Dec 2014 13:41:09 +0100 3Date: Thu, 18 Dec 2014 13:41:09 +0100
4Subject: [PATCH] Make Qt5GuiConfigExtras.cmake find gl(es) include dir 4Subject: [PATCH 10/13] Make Qt5GuiConfigExtras.cmake find gl(es) include dir
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
@@ -38,5 +38,5 @@ index 9a846d4..07869ef 100644
38 if (NOT _qt5gui_OPENGL_INCLUDE_DIR) 38 if (NOT _qt5gui_OPENGL_INCLUDE_DIR)
39 message(FATAL_ERROR \"Failed to find \\\"$$CMAKE_GL_HEADER_NAME\\\" in \\\"${_GL_INCDIRS}\\\".\") 39 message(FATAL_ERROR \"Failed to find \\\"$$CMAKE_GL_HEADER_NAME\\\" in \\\"${_GL_INCDIRS}\\\".\")
40-- 40--
411.8.3.1 412.3.1
42 42
diff --git a/recipes-qt/qt5/qtbase/0011-Always-build-uic.patch b/recipes-qt/qt5/qtbase/0011-Always-build-uic.patch
index 86bf90d7..b0870c85 100644
--- a/recipes-qt/qt5/qtbase/0011-Always-build-uic.patch
+++ b/recipes-qt/qt5/qtbase/0011-Always-build-uic.patch
@@ -1,7 +1,7 @@
1From d48323aae1bee4b2398d61e1777815ffac15ccce Mon Sep 17 00:00:00 2001 1From fa0cf613bc9ef4de65de12791eedc337de85d911 Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com> 2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Sat, 16 Nov 2013 00:32:30 +0100 3Date: Sat, 16 Nov 2013 00:32:30 +0100
4Subject: [PATCH 11/12] Always build uic 4Subject: [PATCH 11/13] Always build uic
5 5
6Even if we are not building gui or widgets. This tool is needed later 6Even if we are not building gui or widgets. This tool is needed later
7as a native tool when compiling the target. 7as a native tool when compiling the target.
@@ -14,10 +14,10 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
14 1 file changed, 1 insertion(+), 1 deletion(-) 14 1 file changed, 1 insertion(+), 1 deletion(-)
15 15
16diff --git a/src/src.pro b/src/src.pro 16diff --git a/src/src.pro b/src/src.pro
17index 81f4fa5..74ec23d 100644 17index 83f7587..9dbcf70 100644
18--- a/src/src.pro 18--- a/src/src.pro
19+++ b/src/src.pro 19+++ b/src/src.pro
20@@ -162,7 +162,7 @@ contains(QT_CONFIG, concurrent):SUBDIRS += src_concurrent 20@@ -163,7 +163,7 @@ contains(QT_CONFIG, concurrent):SUBDIRS += src_concurrent
21 } 21 }
22 } 22 }
23 } 23 }
@@ -27,5 +27,5 @@ index 81f4fa5..74ec23d 100644
27 nacl: SUBDIRS -= src_network src_testlib 27 nacl: SUBDIRS -= src_network src_testlib
28 28
29-- 29--
302.1.3 302.3.1
31 31
diff --git a/recipes-qt/qt5/qtbase/0011-qmake-don-t-build-it-in-configure-but-allow-to-build.patch b/recipes-qt/qt5/qtbase/0011-qmake-don-t-build-it-in-configure-but-allow-to-build.patch
index 4d4291cf..874bc697 100644
--- a/recipes-qt/qt5/qtbase/0011-qmake-don-t-build-it-in-configure-but-allow-to-build.patch
+++ b/recipes-qt/qt5/qtbase/0011-qmake-don-t-build-it-in-configure-but-allow-to-build.patch
@@ -1,7 +1,7 @@
1From ee542556da221be99fa3344630b78529555be2bc Mon Sep 17 00:00:00 2001 1From 7943ec2256163f6049d442ff00f579a5cbff5acc 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 11/11] qmake: don't build it in configure, but allow to build 4Subject: [PATCH 11/13] qmake: don't build it in configure, but allow to build
5 it separately 5 it separately
6 6
7* it is already built in qtbase-native, so we don't need it in configure 7* it is already built in qtbase-native, so we don't need it in configure
@@ -18,13 +18,18 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
18 qmake/qmake.pri | 3 ++- 18 qmake/qmake.pri | 3 ++-
19 qmake/qmake.pro | 2 ++ 19 qmake/qmake.pro | 2 ++
20 3 files changed, 5 insertions(+), 2 deletions(-) 20 3 files changed, 5 insertions(+), 2 deletions(-)
21---
22 configure | 2 +-
23 qmake/qmake.pri | 3 ++-
24 qmake/qmake.pro | 1 +
25 3 files changed, 4 insertions(+), 2 deletions(-)
21 26
22diff --git a/configure b/configure 27diff --git a/configure b/configure
23index 43be722..39516d2 100755 28index a40d471..8d15f59 100755
24--- a/configure 29--- a/configure
25+++ b/configure 30+++ b/configure
26@@ -3759,7 +3759,7 @@ setBootstrapVariable() 31@@ -3724,7 +3724,7 @@ setBootstrapEvalVariable()
27 } 32
28 33
29 # build qmake 34 # build qmake
30-if true; then ###[ '!' -f "$outpath/bin/qmake" ]; 35-if true; then ###[ '!' -f "$outpath/bin/qmake" ];
@@ -33,7 +38,7 @@ index 43be722..39516d2 100755
33 38
34 mkdir -p "$outpath/qmake" || exit 39 mkdir -p "$outpath/qmake" || exit
35diff --git a/qmake/qmake.pri b/qmake/qmake.pri 40diff --git a/qmake/qmake.pri b/qmake/qmake.pri
36index 57dcbb0..e2c5845 100644 41index 4de41d6..69982b7 100644
37--- a/qmake/qmake.pri 42--- a/qmake/qmake.pri
38+++ b/qmake/qmake.pri 43+++ b/qmake/qmake.pri
39@@ -82,7 +82,8 @@ bootstrap { #Qt code 44@@ -82,7 +82,8 @@ bootstrap { #Qt code
@@ -47,7 +52,7 @@ index 57dcbb0..e2c5845 100644
47 HEADERS+= \ 52 HEADERS+= \
48 qbitarray.h \ 53 qbitarray.h \
49diff --git a/qmake/qmake.pro b/qmake/qmake.pro 54diff --git a/qmake/qmake.pro b/qmake/qmake.pro
50index 89d6ea5..7c605b9 100644 55index 89d6ea5..0ff4a96 100644
51--- a/qmake/qmake.pro 56--- a/qmake/qmake.pro
52+++ b/qmake/qmake.pro 57+++ b/qmake/qmake.pro
53@@ -8,6 +8,7 @@ CONFIG -= qt 58@@ -8,6 +8,7 @@ CONFIG -= qt
@@ -59,5 +64,5 @@ index 89d6ea5..7c605b9 100644
59 VPATH += \ 64 VPATH += \
60 ../src/corelib/global \ 65 ../src/corelib/global \
61-- 66--
622.1.3 672.3.1
63 68
diff --git a/recipes-qt/qt5/qtbase/0014-Add-external-hostbindir-option-native.patch b/recipes-qt/qt5/qtbase/0012-Add-external-hostbindir-option-for-native-sdk.patch
index 08a1cbd3..06476cb8 100644
--- a/recipes-qt/qt5/qtbase/0014-Add-external-hostbindir-option-native.patch
+++ b/recipes-qt/qt5/qtbase/0012-Add-external-hostbindir-option-for-native-sdk.patch
@@ -1,7 +1,7 @@
1From f2d51e50a7fbdf485696d1b8b2d29e64c729c76b Mon Sep 17 00:00:00 2001 1From 932cb18540fc4634e02d048cf9ab9e519ce0811d 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/11] Add -external-hostbindir option 4Subject: [PATCH 12/13] Add -external-hostbindir option for native(sdk)
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
@@ -20,42 +20,18 @@ Upstream-Status: Pending
20 Oswald) but in 5.2.0 I've noticed that he added something similar for 20 Oswald) but in 5.2.0 I've noticed that he added something similar for
21 android builds 21 android builds
22 22
23Change-Id: I4f6e634bf0b2cb96065ee5c38b9cd8a224c3bd37
23Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> 24Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
24Signed-off-by: Simon Busch <morphis@gravedo.de> 25Signed-off-by: Simon Busch <morphis@gravedo.de>
25Signed-off-by: Jonathan Liu <net147@gmail.com> 26Signed-off-by: Jonathan Liu <net147@gmail.com>
27Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
26--- 28---
27 qmake/property.cpp | 1 + 29 qmake/property.cpp | 1 +
28 tools/configure/configureapp.cpp | 8 ++++++++ 30 src/corelib/global/qlibraryinfo.cpp | 3 ++-
29 src/corelib/global/qlibraryinfo.cpp | 3 ++- 31 src/corelib/global/qlibraryinfo.h | 1 +
30 src/corelib/global/qlibraryinfo.h | 1 + 32 tools/configure/configureapp.cpp | 8 ++++++++
31 1 files changed, 50 insertions(+), 13 deletions(-) 33 4 files changed, 12 insertions(+), 1 deletion(-)
32 34
33diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
34index 92422c2..d0a62c8 100644
35--- a/tools/configure/configureapp.cpp
36+++ b/tools/configure/configureapp.cpp
37@@ -1191,6 +1191,13 @@ void Configure::parseCmdLine()
38 dictionary[ "QT_EXT_PREFIX" ] = configCmdLine.at(i);
39 }
40
41+ else if (configCmdLine.at(i) == "-external-hostbindir") {
42+ ++i;
43+ if (i == argCount)
44+ break;
45+ dictionary[ "QT_EXTERNAL_HOST_BINS" ] = configCmdLine.at(i);
46+ }
47+
48 else if (configCmdLine.at(i) == "-make-tool") {
49 ++i;
50 if (i == argCount)
51@@ -3995,6 +4002,7 @@ void Configure::generateQConfigCpp()
52 << " \"qt_hbinpath=" << formatPath(dictionary["QT_HOST_BINS"]) << "\"," << endl
53 << " \"qt_hlibpath=" << formatPath(dictionary["QT_HOST_LIBS"]) << "\"," << endl
54 << " \"qt_hdatpath=" << formatPath(dictionary["QT_HOST_DATA"]) << "\"," << endl
55+ << " \"qt_ebinpath=" << formatPath(dictionary["QT_EXTERNAL_HOST_BINS"]) << "\"," << endl
56 << " \"qt_targspec=" << targSpec << "\"," << endl
57 << " \"qt_hostspec=" << hostSpec << "\"," << endl
58 << "#endif" << endl
59diff --git a/qmake/property.cpp b/qmake/property.cpp 35diff --git a/qmake/property.cpp b/qmake/property.cpp
60index 051e056..50da6ed 100644 36index 051e056..50da6ed 100644
61--- a/qmake/property.cpp 37--- a/qmake/property.cpp
@@ -69,10 +45,10 @@ index 051e056..50da6ed 100644
69 { "QMAKE_XSPEC", QLibraryInfo::TargetSpecPath, true }, 45 { "QMAKE_XSPEC", QLibraryInfo::TargetSpecPath, true },
70 }; 46 };
71diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp 47diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp
72index d68c51b..7191159 100644 48index c418c5e..c8c4188 100644
73--- a/src/corelib/global/qlibraryinfo.cpp 49--- a/src/corelib/global/qlibraryinfo.cpp
74+++ b/src/corelib/global/qlibraryinfo.cpp 50+++ b/src/corelib/global/qlibraryinfo.cpp
75@@ -349,7 +349,7 @@ QLibraryInfo::isDebugBuild() 51@@ -348,7 +348,7 @@ QLibraryInfo::isDebugBuild()
76 */ 52 */
77 53
78 static const struct { 54 static const struct {
@@ -81,7 +57,7 @@ index d68c51b..7191159 100644
81 } qtConfEntries[] = { 57 } qtConfEntries[] = {
82 { "Prefix", "." }, 58 { "Prefix", "." },
83 { "Documentation", "doc" }, // should be ${Data}/doc 59 { "Documentation", "doc" }, // should be ${Data}/doc
84@@ -375,6 +375,7 @@ static const struct { 60@@ -374,6 +374,7 @@ static const struct {
85 { "HostBinaries", "bin" }, 61 { "HostBinaries", "bin" },
86 { "HostLibraries", "lib" }, 62 { "HostLibraries", "lib" },
87 { "HostData", "." }, 63 { "HostData", "." },
@@ -101,6 +77,32 @@ index 543c4b3..a02e03a 100644
101 TargetSpecPath, 77 TargetSpecPath,
102 HostSpecPath, 78 HostSpecPath,
103 LastHostPath = HostSpecPath, 79 LastHostPath = HostSpecPath,
80diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
81index 6e9d4aa..0ca4daf 100644
82--- a/tools/configure/configureapp.cpp
83+++ b/tools/configure/configureapp.cpp
84@@ -1191,6 +1191,13 @@ void Configure::parseCmdLine()
85 dictionary[ "QT_EXT_PREFIX" ] = configCmdLine.at(i);
86 }
87
88+ else if (configCmdLine.at(i) == "-external-hostbindir") {
89+ ++i;
90+ if (i == argCount)
91+ break;
92+ dictionary[ "QT_EXTERNAL_HOST_BINS" ] = configCmdLine.at(i);
93+ }
94+
95 else if (configCmdLine.at(i) == "-make-tool") {
96 ++i;
97 if (i == argCount)
98@@ -4004,6 +4011,7 @@ void Configure::generateQConfigCpp()
99 << " \"qt_hbinpath=" << formatPath(dictionary["QT_HOST_BINS"]) << "\"," << endl
100 << " \"qt_hlibpath=" << formatPath(dictionary["QT_HOST_LIBS"]) << "\"," << endl
101 << " \"qt_hdatpath=" << formatPath(dictionary["QT_HOST_DATA"]) << "\"," << endl
102+ << " \"qt_ebinpath=" << formatPath(dictionary["QT_EXTERNAL_HOST_BINS"]) << "\"," << endl
103 << " \"qt_targspec=" << targSpec << "\"," << endl
104 << " \"qt_hostspec=" << hostSpec << "\"," << endl
105 << "#endif" << endl
104-- 106--
1052.1.3 1072.3.1
106 108
diff --git a/recipes-qt/qt5/qtbase/0015-Set-paths-for-target-properly.patch b/recipes-qt/qt5/qtbase/0012-Set-paths-for-target-properly.patch
index 28512f0b..671c6365 100644
--- a/recipes-qt/qt5/qtbase/0015-Set-paths-for-target-properly.patch
+++ b/recipes-qt/qt5/qtbase/0012-Set-paths-for-target-properly.patch
@@ -1,7 +1,7 @@
1From d84b7386902e024a0cfe5a6689930e5548a60480 Mon Sep 17 00:00:00 2001 1From 62ec5bc2946911b2cd2f577d58f07f566d84c88d Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> 2From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
3Date: Thu, 22 Jan 2015 16:09:35 +0100 3Date: Thu, 22 Jan 2015 16:09:35 +0100
4Subject: [PATCH] Set paths for target properly 4Subject: [PATCH 12/13] Set paths for target properly
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
@@ -10,14 +10,14 @@ Upstream-Status: Inappropriate [OE specific]
10 10
11Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> 11Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
12--- 12---
13 configure | 42 +++++++++++++++++++++--------------------- 13 configure | 43 +++++++++++++++++++++----------------------
14 1 file changed, 21 insertions(+), 21 deletions(-) 14 1 file changed, 21 insertions(+), 22 deletions(-)
15 15
16diff --git a/configure b/configure 16diff --git a/configure b/configure
17index 43be722..0e1a64a 100755 17index 8d15f59..bf2bac0 100755
18--- a/configure 18--- a/configure
19+++ b/configure 19+++ b/configure
20@@ -3634,28 +3634,27 @@ static const char qt_configure_prefix_path_strs[][512 + 12] = { 20@@ -3639,28 +3639,27 @@ static const char qt_configure_prefix_path_strs[][512 + 12] = {
21 "qt_xmplpath=$QT_SYSROOT_EXAMPLES", 21 "qt_xmplpath=$QT_SYSROOT_EXAMPLES",
22 "qt_tstspath=$QT_SYSROOT_TESTS", 22 "qt_tstspath=$QT_SYSROOT_TESTS",
23 #else 23 #else
@@ -68,5 +68,5 @@ index 43be722..0e1a64a 100755
68 }; 68 };
69 static const char qt_configure_settings_path_str[256 + 12] = "qt_stngpath=$QT_INSTALL_SETTINGS"; 69 static const char qt_configure_settings_path_str[256 + 12] = "qt_stngpath=$QT_INSTALL_SETTINGS";
70-- 70--
711.8.3.1 712.3.1
72 72
diff --git a/recipes-qt/qt5/qtbase/0014-fix-build-of-egl-integration.patch b/recipes-qt/qt5/qtbase/0013-Fix-build-of-egl-integration.patch
index f21e8207..1fa4aca4 100644
--- a/recipes-qt/qt5/qtbase/0014-fix-build-of-egl-integration.patch
+++ b/recipes-qt/qt5/qtbase/0013-Fix-build-of-egl-integration.patch
@@ -1,13 +1,25 @@
1commit f8c8c79029867a087c9a753269d82b808c16f047 1From 2cece4539990f9e7b0239681bd2fc2808aeb8dbc Mon Sep 17 00:00:00 2001
2Author: Stephan Binner <stephan.binner@basyskom.com> 2From: Stephan Binner <stephan.binner@basyskom.com>
3Date: Mon Feb 2 13:10:50 2015 +0100 3Date: Mon, 2 Feb 2015 13:10:50 +0100
4Subject: [PATCH 13/13] Fix build of egl integration
4 5
5 Fix build of egl integration 6Add missing includes and reorder includes to avoid X defines breakage
6 7
7 Add missing includes and reorder includes to avoid X defines breakage 8Upstream-Status: Backport from 5.4 branch https://codereview.qt-project.org/#/c/105116/
8 9
9 Change-Id: Iaf95ae2488df3d3301436262ed79f7091b4be0a9 10Change-Id: Iaf95ae2488df3d3301436262ed79f7091b4be0a9
10 Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com> 11Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
12Signed-off-by: Stephan Binner <stephan.binner@basyskom.com>
13---
14 .../eglconvenience/qeglplatformcontext_p.h | 1 +
15 .../eglconvenience/qeglplatformintegration_p.h | 2 +-
16 src/plugins/platforms/eglfs/qeglfscontext.cpp | 13 +++++++------
17 src/plugins/platforms/eglfs/qeglfshooks_stub.cpp | 2 +-
18 src/plugins/platforms/eglfs/qeglfsintegration.cpp | 20 ++++++++++----------
19 src/plugins/platforms/eglfs/qeglfsscreen.cpp | 4 +++-
20 src/plugins/platforms/eglfs/qeglfswindow.cpp | 6 ++++--
21 .../platforms/minimalegl/qminimaleglwindow.cpp | 4 ++--
22 8 files changed, 29 insertions(+), 23 deletions(-)
11 23
12diff --git a/src/platformsupport/eglconvenience/qeglplatformcontext_p.h b/src/platformsupport/eglconvenience/qeglplatformcontext_p.h 24diff --git a/src/platformsupport/eglconvenience/qeglplatformcontext_p.h b/src/platformsupport/eglconvenience/qeglplatformcontext_p.h
13index 7825c7b..0c10710 100644 25index 7825c7b..0c10710 100644
@@ -22,7 +34,7 @@ index 7825c7b..0c10710 100644
22 #include <qpa/qplatformopenglcontext.h> 34 #include <qpa/qplatformopenglcontext.h>
23 #include <QtCore/QVariant> 35 #include <QtCore/QVariant>
24diff --git a/src/platformsupport/eglconvenience/qeglplatformintegration_p.h b/src/platformsupport/eglconvenience/qeglplatformintegration_p.h 36diff --git a/src/platformsupport/eglconvenience/qeglplatformintegration_p.h b/src/platformsupport/eglconvenience/qeglplatformintegration_p.h
25index 4d7adce..2b5d5f5 100644 37index c9b6873..a0aab03 100644
26--- a/src/platformsupport/eglconvenience/qeglplatformintegration_p.h 38--- a/src/platformsupport/eglconvenience/qeglplatformintegration_p.h
27+++ b/src/platformsupport/eglconvenience/qeglplatformintegration_p.h 39+++ b/src/platformsupport/eglconvenience/qeglplatformintegration_p.h
28@@ -45,9 +45,9 @@ 40@@ -45,9 +45,9 @@
@@ -35,7 +47,7 @@ index 4d7adce..2b5d5f5 100644
35-#include <QtCore/QVariant> 47-#include <QtCore/QVariant>
36 #include <EGL/egl.h> 48 #include <EGL/egl.h>
37 49
38 QT_BEGIN_NAMESPACE 50 // Undefine CursorShape from X.h, which is causing breakage in Qt::CursorShape in platformsupport/eglconvenience/
39diff --git a/src/plugins/platforms/eglfs/qeglfscontext.cpp b/src/plugins/platforms/eglfs/qeglfscontext.cpp 51diff --git a/src/plugins/platforms/eglfs/qeglfscontext.cpp b/src/plugins/platforms/eglfs/qeglfscontext.cpp
40index 6216fa8..6470280 100644 52index 6216fa8..6470280 100644
41--- a/src/plugins/platforms/eglfs/qeglfscontext.cpp 53--- a/src/plugins/platforms/eglfs/qeglfscontext.cpp
@@ -139,7 +151,7 @@ index cd68540..bc93fe2 100644
139 QT_BEGIN_NAMESPACE 151 QT_BEGIN_NAMESPACE
140 152
141diff --git a/src/plugins/platforms/eglfs/qeglfswindow.cpp b/src/plugins/platforms/eglfs/qeglfswindow.cpp 153diff --git a/src/plugins/platforms/eglfs/qeglfswindow.cpp b/src/plugins/platforms/eglfs/qeglfswindow.cpp
142index f5839e0..39a3ef9 100644 154index 5ebde6d..2c05979 100644
143--- a/src/plugins/platforms/eglfs/qeglfswindow.cpp 155--- a/src/plugins/platforms/eglfs/qeglfswindow.cpp
144+++ b/src/plugins/platforms/eglfs/qeglfswindow.cpp 156+++ b/src/plugins/platforms/eglfs/qeglfswindow.cpp
145@@ -31,8 +31,7 @@ 157@@ -31,8 +31,7 @@
@@ -179,3 +191,6 @@ index 906a130..d4bee2c 100644
179 QT_BEGIN_NAMESPACE 191 QT_BEGIN_NAMESPACE
180 192
181 QMinimalEglWindow::QMinimalEglWindow(QWindow *w) 193 QMinimalEglWindow::QMinimalEglWindow(QWindow *w)
194--
1952.3.1
196
diff --git a/recipes-qt/qt5/qtbase/0012-configure-preserve-built-qmake-and-swap-with-native-.patch b/recipes-qt/qt5/qtbase/0013-configure-preserve-built-qmake-and-swap-with-native-.patch
index 6a428ed2..fb897c90 100644
--- a/recipes-qt/qt5/qtbase/0012-configure-preserve-built-qmake-and-swap-with-native-.patch
+++ b/recipes-qt/qt5/qtbase/0013-configure-preserve-built-qmake-and-swap-with-native-.patch
@@ -1,7 +1,7 @@
1From 9089bf90632ffc983625816c5b0f2f2509ffc176 Mon Sep 17 00:00:00 2001 1From 137890aa64442866a861f0a9f028ee632f19cae4 Mon Sep 17 00:00:00 2001
2From: Denys Dmytriyenko <denys@ti.com> 2From: Denys Dmytriyenko <denys@ti.com>
3Date: Mon, 11 Nov 2013 20:22:34 -0500 3Date: Mon, 11 Nov 2013 20:22:34 -0500
4Subject: [PATCH 12/12] configure: preserve built qmake and swap with native 4Subject: [PATCH 13/13] configure: preserve built qmake and swap with native
5 one 5 one
6 6
7Let configure script build the real qmake, but right after it's built, swap 7Let configure script build the real qmake, but right after it's built, swap
@@ -13,7 +13,7 @@ Signed-off-by: Denys Dmytriyenko <denys@ti.com>
13 1 file changed, 2 insertions(+) 13 1 file changed, 2 insertions(+)
14 14
15diff --git a/configure b/configure 15diff --git a/configure b/configure
16index bd43281..d331711 100755 16index a40d471..c007427 100755
17--- a/configure 17--- a/configure
18+++ b/configure 18+++ b/configure
19@@ -3874,6 +3874,8 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ]; 19@@ -3874,6 +3874,8 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ];
@@ -26,5 +26,5 @@ index bd43281..d331711 100755
26 echo "Running configuration tests..." 26 echo "Running configuration tests..."
27 27
28-- 28--
292.1.3 292.3.1
30 30
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-05-31 22:56:14 +0000