summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5
diff options
context:
space:
mode:
Diffstat (limited to 'recipes-qt/qt5')
-rw-r--r--recipes-qt/qt5/nativesdk-qtbase_git.bb7
-rw-r--r--recipes-qt/qt5/qtbase-native_git.bb7
-rw-r--r--recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch16
-rw-r--r--recipes-qt/qt5/qtbase/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch6
-rw-r--r--recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch8
-rw-r--r--recipes-qt/qt5/qtbase/0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch8
-rw-r--r--recipes-qt/qt5/qtbase/0005-configure-bump-path-length-from-256-to-512-character.patch6
-rw-r--r--recipes-qt/qt5/qtbase/0006-Disable-all-unknown-features-instead-of-erroring-out.patch (renamed from recipes-qt/qt5/qtbase/0009-Disable-all-unknown-features-instead-of-erroring-out.patch)9
-rw-r--r--recipes-qt/qt5/qtbase/0007-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch (renamed from recipes-qt/qt5/qtbase/0010-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch)6
-rw-r--r--recipes-qt/qt5/qtbase/0008-Delete-qlonglong-and-qulonglong.patch (renamed from recipes-qt/qt5/qtbase/0001-Delete-qlonglong-and-qulonglong.patch)7
-rw-r--r--recipes-qt/qt5/qtbase/0009-tst_qstring-Disable-Wformat-security-with-clang-as-w.patch (renamed from recipes-qt/qt5/qtbase/0010-tst_qstring-Disable-Wformat-security-with-clang-as-w.patch)8
-rw-r--r--recipes-qt/qt5/qtbase/0010-Replace-pthread_yield-with-sched_yield.patch (renamed from recipes-qt/qt5/qtbase/0011-Replace-pthread_yield-with-sched_yield.patch)5
-rw-r--r--recipes-qt/qt5/qtbase/0011-Always-build-uic.patch6
-rw-r--r--recipes-qt/qt5/qtbase/0011-configure-paths-for-target-qmake-properly.patch (renamed from recipes-qt/qt5/qtbase/0008-configure-paths-for-target-qmake-properly.patch)12
-rw-r--r--recipes-qt/qt5/qtbase_git.bb12
15 files changed, 57 insertions, 66 deletions
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb
index f2ff5f7e..0f1c6d6c 100644
--- a/recipes-qt/qt5/nativesdk-qtbase_git.bb
+++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb
@@ -31,8 +31,11 @@ SRC_URI += "\
31 file://0003-Add-external-hostbindir-option.patch \ 31 file://0003-Add-external-hostbindir-option.patch \
32 file://0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch \ 32 file://0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch \
33 file://0005-configure-bump-path-length-from-256-to-512-character.patch \ 33 file://0005-configure-bump-path-length-from-256-to-512-character.patch \
34 file://0009-Disable-all-unknown-features-instead-of-erroring-out.patch \ 34 file://0006-Disable-all-unknown-features-instead-of-erroring-out.patch \
35 file://0010-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch \ 35 file://0007-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch \
36 file://0008-Delete-qlonglong-and-qulonglong.patch \
37 file://0009-tst_qstring-Disable-Wformat-security-with-clang-as-w.patch \
38 file://0010-Replace-pthread_yield-with-sched_yield.patch \
36" 39"
37 40
38# common for qtbase-native and nativesdk-qtbase 41# common for qtbase-native and nativesdk-qtbase
diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb
index 98cbeccf..2420580b 100644
--- a/recipes-qt/qt5/qtbase-native_git.bb
+++ b/recipes-qt/qt5/qtbase-native_git.bb
@@ -26,8 +26,11 @@ SRC_URI += "\
26 file://0003-Add-external-hostbindir-option.patch \ 26 file://0003-Add-external-hostbindir-option.patch \
27 file://0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch \ 27 file://0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch \
28 file://0005-configure-bump-path-length-from-256-to-512-character.patch \ 28 file://0005-configure-bump-path-length-from-256-to-512-character.patch \
29 file://0009-Disable-all-unknown-features-instead-of-erroring-out.patch \ 29 file://0006-Disable-all-unknown-features-instead-of-erroring-out.patch \
30 file://0010-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch \ 30 file://0007-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch \
31 file://0008-Delete-qlonglong-and-qulonglong.patch \
32 file://0009-tst_qstring-Disable-Wformat-security-with-clang-as-w.patch \
33 file://0010-Replace-pthread_yield-with-sched_yield.patch \
31" 34"
32 35
33# common for qtbase-native and nativesdk-qtbase 36# common for qtbase-native and nativesdk-qtbase
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 df2016e1..3f373c76 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,4 +1,4 @@
1From 2784921c40d0b523c75e613e48b7fd1e90ba3ef1 Mon Sep 17 00:00:00 2001 1From 805b338154ed0262a7b8bf5c582ff5b193a55492 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] Add linux-oe-g++ platform 4Subject: [PATCH] Add linux-oe-g++ platform
@@ -30,10 +30,10 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
30 create mode 100644 mkspecs/linux-oe-g++/qplatformdefs.h 30 create mode 100644 mkspecs/linux-oe-g++/qplatformdefs.h
31 31
32diff --git a/configure b/configure 32diff --git a/configure b/configure
33index 789ba4c..59cce01 100755 33index bc18e614d2..579a96d787 100755
34--- a/configure 34--- a/configure
35+++ b/configure 35+++ b/configure
36@@ -1624,7 +1624,7 @@ fi 36@@ -1614,7 +1614,7 @@ fi
37 # is where the resulting variable is written to 37 # is where the resulting variable is written to
38 setBootstrapVariable() 38 setBootstrapVariable()
39 { 39 {
@@ -43,10 +43,10 @@ index 789ba4c..59cce01 100755
43 43
44 # build qmake 44 # build qmake
45diff --git a/mkspecs/features/configure.prf b/mkspecs/features/configure.prf 45diff --git a/mkspecs/features/configure.prf b/mkspecs/features/configure.prf
46index f275e3a..5aa15f5 100644 46index 4ca7c6ba07..5b5ac13f1d 100644
47--- a/mkspecs/features/configure.prf 47--- a/mkspecs/features/configure.prf
48+++ b/mkspecs/features/configure.prf 48+++ b/mkspecs/features/configure.prf
49@@ -37,14 +37,14 @@ defineTest(qtCompileTest) { 49@@ -44,14 +44,14 @@ defineTest(qtCompileTest) {
50 } 50 }
51 51
52 # Clean up after previous run 52 # Clean up after previous run
@@ -64,7 +64,7 @@ index f275e3a..5aa15f5 100644
64 msg = "test $$1 succeeded" 64 msg = "test $$1 succeeded"
65 write_file($$QMAKE_CONFIG_LOG, msg, append) 65 write_file($$QMAKE_CONFIG_LOG, msg, append)
66diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf 66diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf
67index 708815d..097ac49 100644 67index 999cd18154..2ac91ba519 100644
68--- a/mkspecs/features/qt_functions.prf 68--- a/mkspecs/features/qt_functions.prf
69+++ b/mkspecs/features/qt_functions.prf 69+++ b/mkspecs/features/qt_functions.prf
70@@ -67,7 +67,7 @@ defineTest(qtHaveModule) { 70@@ -67,7 +67,7 @@ defineTest(qtHaveModule) {
@@ -78,7 +78,7 @@ index 708815d..097ac49 100644
78 cmd = perl -w $$system_path($${cmd}.pl) 78 cmd = perl -w $$system_path($${cmd}.pl)
79diff --git a/mkspecs/linux-oe-g++/qmake.conf b/mkspecs/linux-oe-g++/qmake.conf 79diff --git a/mkspecs/linux-oe-g++/qmake.conf b/mkspecs/linux-oe-g++/qmake.conf
80new file mode 100644 80new file mode 100644
81index 0000000..c1837e6 81index 0000000000..c1837e6d55
82--- /dev/null 82--- /dev/null
83+++ b/mkspecs/linux-oe-g++/qmake.conf 83+++ b/mkspecs/linux-oe-g++/qmake.conf
84@@ -0,0 +1,43 @@ 84@@ -0,0 +1,43 @@
@@ -127,7 +127,7 @@ index 0000000..c1837e6
127+load(qt_config) 127+load(qt_config)
128diff --git a/mkspecs/linux-oe-g++/qplatformdefs.h b/mkspecs/linux-oe-g++/qplatformdefs.h 128diff --git a/mkspecs/linux-oe-g++/qplatformdefs.h b/mkspecs/linux-oe-g++/qplatformdefs.h
129new file mode 100644 129new file mode 100644
130index 0000000..5d22fb4 130index 0000000000..5d22fb4101
131--- /dev/null 131--- /dev/null
132+++ b/mkspecs/linux-oe-g++/qplatformdefs.h 132+++ b/mkspecs/linux-oe-g++/qplatformdefs.h
133@@ -0,0 +1 @@ 133@@ -0,0 +1 @@
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 4b72ebf1..f9859620 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,4 +1,4 @@
1From e5f8607cfa1d2bcc798686cdf7c87ea0c6577d30 Mon Sep 17 00:00:00 2001 1From 18e2f4368f22bf5ac8b2a36c30a7ad39ed97bf49 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] qlibraryinfo: allow to set qt.conf from the outside using the 4Subject: [PATCH] qlibraryinfo: allow to set qt.conf from the outside using the
@@ -19,7 +19,7 @@ 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 27fe10a..29ffcda 100644 22index 27fe10a79e..29ffcda203 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@@ -164,7 +164,10 @@ void QLibrarySettings::load() 25@@ -164,7 +164,10 @@ void QLibrarySettings::load()
@@ -34,5 +34,3 @@ index 27fe10a..29ffcda 100644
34 if (QFile::exists(qtconfig)) 34 if (QFile::exists(qtconfig))
35 return new QSettings(qtconfig, QSettings::IniFormat); 35 return new QSettings(qtconfig, QSettings::IniFormat);
36 #else 36 #else
37--
382.9.3
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 8224171a..9f1a2b2c 100644
--- a/recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch
+++ b/recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch
@@ -1,4 +1,4 @@
1From 502b95b840a5f79e5a68e9bd5b10dbdc92485f1f Mon Sep 17 00:00:00 2001 1From 67977e16e5d0aecd931d8e4355c12cc907df592f 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] Add -external-hostbindir option 4Subject: [PATCH] Add -external-hostbindir option
@@ -19,7 +19,7 @@ Change-Id: Iacaa1c5531cd6dcc094891610c351673db55d7b2
19 3 files changed, 6 insertions(+), 6 deletions(-) 19 3 files changed, 6 insertions(+), 6 deletions(-)
20 20
21diff --git a/src/corelib/Qt5CoreConfigExtras.cmake.in b/src/corelib/Qt5CoreConfigExtras.cmake.in 21diff --git a/src/corelib/Qt5CoreConfigExtras.cmake.in b/src/corelib/Qt5CoreConfigExtras.cmake.in
22index a5ed8b2..0e11a1e 100644 22index 545b9a3d1e..c991a9ba41 100644
23--- a/src/corelib/Qt5CoreConfigExtras.cmake.in 23--- a/src/corelib/Qt5CoreConfigExtras.cmake.in
24+++ b/src/corelib/Qt5CoreConfigExtras.cmake.in 24+++ b/src/corelib/Qt5CoreConfigExtras.cmake.in
25@@ -5,7 +5,7 @@ if (NOT TARGET Qt5::qmake) 25@@ -5,7 +5,7 @@ if (NOT TARGET Qt5::qmake)
@@ -50,7 +50,7 @@ index a5ed8b2..0e11a1e 100644
50 _qt5_Core_check_file_exists(${imported_location}) 50 _qt5_Core_check_file_exists(${imported_location})
51 51
52diff --git a/src/dbus/Qt5DBusConfigExtras.cmake.in b/src/dbus/Qt5DBusConfigExtras.cmake.in 52diff --git a/src/dbus/Qt5DBusConfigExtras.cmake.in b/src/dbus/Qt5DBusConfigExtras.cmake.in
53index 1d94715..301af8f 100644 53index 1d947159e2..301af8f1b2 100644
54--- a/src/dbus/Qt5DBusConfigExtras.cmake.in 54--- a/src/dbus/Qt5DBusConfigExtras.cmake.in
55+++ b/src/dbus/Qt5DBusConfigExtras.cmake.in 55+++ b/src/dbus/Qt5DBusConfigExtras.cmake.in
56@@ -5,7 +5,7 @@ if (NOT TARGET Qt5::qdbuscpp2xml) 56@@ -5,7 +5,7 @@ if (NOT TARGET Qt5::qdbuscpp2xml)
@@ -72,7 +72,7 @@ index 1d94715..301af8f 100644
72 _qt5_DBus_check_file_exists(${imported_location}) 72 _qt5_DBus_check_file_exists(${imported_location})
73 73
74diff --git a/src/widgets/Qt5WidgetsConfigExtras.cmake.in b/src/widgets/Qt5WidgetsConfigExtras.cmake.in 74diff --git a/src/widgets/Qt5WidgetsConfigExtras.cmake.in b/src/widgets/Qt5WidgetsConfigExtras.cmake.in
75index 99d87e2..5621dc0 100644 75index 99d87e2e46..5621dc0fae 100644
76--- a/src/widgets/Qt5WidgetsConfigExtras.cmake.in 76--- a/src/widgets/Qt5WidgetsConfigExtras.cmake.in
77+++ b/src/widgets/Qt5WidgetsConfigExtras.cmake.in 77+++ b/src/widgets/Qt5WidgetsConfigExtras.cmake.in
78@@ -5,7 +5,7 @@ if (NOT TARGET Qt5::uic) 78@@ -5,7 +5,7 @@ if (NOT TARGET Qt5::uic)
diff --git a/recipes-qt/qt5/qtbase/0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch b/recipes-qt/qt5/qtbase/0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch
index c105488e..aa97b56f 100644
--- a/recipes-qt/qt5/qtbase/0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch
+++ b/recipes-qt/qt5/qtbase/0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch
@@ -1,4 +1,4 @@
1From bf1498618415e7b1e57b54881b1e56d74f2cdf6b Mon Sep 17 00:00:00 2001 1From fe9cfbde28c651d00b8f5fda7dc85a97af0c50a1 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] qt_module: Fix pkgconfig and libtool replacements 4Subject: [PATCH] qt_module: Fix pkgconfig and libtool replacements
@@ -68,10 +68,10 @@ Signed-off-by: Jonathan Liu <net147@gmail.com>
68 2 files changed, 14 insertions(+), 1 deletion(-) 68 2 files changed, 14 insertions(+), 1 deletion(-)
69 69
70diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf 70diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf
71index 0c5f080..a6e4f09 100644 71index 98f794c485..bd8b7b52e4 100644
72--- a/mkspecs/features/qt.prf 72--- a/mkspecs/features/qt.prf
73+++ b/mkspecs/features/qt.prf 73+++ b/mkspecs/features/qt.prf
74@@ -317,6 +317,19 @@ contains(TEMPLATE, .*app) { 74@@ -315,6 +315,19 @@ contains(TEMPLATE, .*app) {
75 QTPLUGIN = $$manualplugs $$autoplugs 75 QTPLUGIN = $$manualplugs $$autoplugs
76 } 76 }
77 77
@@ -92,7 +92,7 @@ index 0c5f080..a6e4f09 100644
92 qtConfig(static) { 92 qtConfig(static) {
93 QT_PLUGIN_VERIFY += QTPLUGIN 93 QT_PLUGIN_VERIFY += QTPLUGIN
94diff --git a/mkspecs/features/qt_common.prf b/mkspecs/features/qt_common.prf 94diff --git a/mkspecs/features/qt_common.prf b/mkspecs/features/qt_common.prf
95index e754a17..4c1530e 100644 95index d30983f62b..6da07e032c 100644
96--- a/mkspecs/features/qt_common.prf 96--- a/mkspecs/features/qt_common.prf
97+++ b/mkspecs/features/qt_common.prf 97+++ b/mkspecs/features/qt_common.prf
98@@ -37,7 +37,7 @@ contains(TEMPLATE, .*lib) { 98@@ -37,7 +37,7 @@ contains(TEMPLATE, .*lib) {
diff --git a/recipes-qt/qt5/qtbase/0005-configure-bump-path-length-from-256-to-512-character.patch b/recipes-qt/qt5/qtbase/0005-configure-bump-path-length-from-256-to-512-character.patch
index d455d2cd..0c0d2c73 100644
--- a/recipes-qt/qt5/qtbase/0005-configure-bump-path-length-from-256-to-512-character.patch
+++ b/recipes-qt/qt5/qtbase/0005-configure-bump-path-length-from-256-to-512-character.patch
@@ -1,4 +1,4 @@
1From 60f490b57faf979a912074506a75c74767a27d3b Mon Sep 17 00:00:00 2001 1From be9179d2cbb9009794940092d30dac7800708964 Mon Sep 17 00:00:00 2001
2From: Denys Dmytriyenko <denys@ti.com> 2From: Denys Dmytriyenko <denys@ti.com>
3Date: Tue, 25 Aug 2015 10:05:15 -0400 3Date: Tue, 25 Aug 2015 10:05:15 -0400
4Subject: [PATCH] configure: bump path length from 256 to 512 characters 4Subject: [PATCH] configure: bump path length from 256 to 512 characters
@@ -14,10 +14,10 @@ Signed-off-by: Denys Dmytriyenko <denys@ti.com>
14 1 file changed, 3 insertions(+), 3 deletions(-) 14 1 file changed, 3 insertions(+), 3 deletions(-)
15 15
16diff --git a/configure b/configure 16diff --git a/configure b/configure
17index 1fcbb3a..f49a674 100755 17index 579a96d787..5af98cd77e 100755
18--- a/configure 18--- a/configure
19+++ b/configure 19+++ b/configure
20@@ -3847,10 +3847,10 @@ static const char qt_configure_licensed_products_str [256 + 12] = "qt_lcnsprod=$ 20@@ -1551,10 +1551,10 @@ cat > "$outpath/src/corelib/global/qconfig.cpp.new" <<EOF
21 static const char qt_configure_installation [12+11] = "qt_instdate=2012-12-20"; 21 static const char qt_configure_installation [12+11] = "qt_instdate=2012-12-20";
22 22
23 /* Installation Info */ 23 /* Installation Info */
diff --git a/recipes-qt/qt5/qtbase/0009-Disable-all-unknown-features-instead-of-erroring-out.patch b/recipes-qt/qt5/qtbase/0006-Disable-all-unknown-features-instead-of-erroring-out.patch
index cb9de793..c2b44381 100644
--- a/recipes-qt/qt5/qtbase/0009-Disable-all-unknown-features-instead-of-erroring-out.patch
+++ b/recipes-qt/qt5/qtbase/0006-Disable-all-unknown-features-instead-of-erroring-out.patch
@@ -1,4 +1,4 @@
1From 9eb81e3bdeda4f90e5f2942400aef38b51a356bd Mon Sep 17 00:00:00 2001 1From 8acdd69a4083080f4dd40001eee30209ec5de0b2 Mon Sep 17 00:00:00 2001
2From: Samuli Piippo <samuli.piippo@qt.io> 2From: Samuli Piippo <samuli.piippo@qt.io>
3Date: Mon, 24 Oct 2016 09:45:18 +0300 3Date: Mon, 24 Oct 2016 09:45:18 +0300
4Subject: [PATCH] Disable all unknown features instead of erroring out 4Subject: [PATCH] Disable all unknown features instead of erroring out
@@ -10,10 +10,10 @@ Change-Id: Ib884fe33cac74439f9592b145937f6b75ced8447
10 1 file changed, 2 insertions(+), 1 deletion(-) 10 1 file changed, 2 insertions(+), 1 deletion(-)
11 11
12diff --git a/mkspecs/features/qt_configure.prf b/mkspecs/features/qt_configure.prf 12diff --git a/mkspecs/features/qt_configure.prf b/mkspecs/features/qt_configure.prf
13index e8fa0c6..0ca5670 100644 13index eaaa161270..fa3addae11 100644
14--- a/mkspecs/features/qt_configure.prf 14--- a/mkspecs/features/qt_configure.prf
15+++ b/mkspecs/features/qt_configure.prf 15+++ b/mkspecs/features/qt_configure.prf
16@@ -1009,7 +1009,8 @@ defineReplace(qtConfEvaluateSingleExpression) { 16@@ -1035,7 +1035,8 @@ defineReplace(qtConfEvaluateSingleExpression) {
17 error("Expression '$$1' is accessing field '$$var' of non-local feature $${feature}.") 17 error("Expression '$$1' is accessing field '$$var' of non-local feature $${feature}.")
18 return($$result) 18 return($$result)
19 } 19 }
@@ -23,6 +23,3 @@ index e8fa0c6..0ca5670 100644
23 } 23 }
24 !qtConfCheckFeature($$feature): \ 24 !qtConfCheckFeature($$feature): \
25 error("Expression '$$1' is accessing non-emitted feature $${feature}.") 25 error("Expression '$$1' is accessing non-emitted feature $${feature}.")
26--
271.9.1
28
diff --git a/recipes-qt/qt5/qtbase/0010-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch b/recipes-qt/qt5/qtbase/0007-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch
index 1d0ea3e8..b70b0d35 100644
--- a/recipes-qt/qt5/qtbase/0010-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch
+++ b/recipes-qt/qt5/qtbase/0007-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch
@@ -1,4 +1,4 @@
1From b397a71531e31383ee86135e21072d033480f5bc Mon Sep 17 00:00:00 2001 1From 5316b420dc408d3a47daa3ba854a7883c911f6b9 Mon Sep 17 00:00:00 2001
2From: Pascal Bach <pascal.bach@siemens.com> 2From: Pascal Bach <pascal.bach@siemens.com>
3Date: Wed, 11 May 2016 15:20:41 +0200 3Date: Wed, 11 May 2016 15:20:41 +0200
4Subject: [PATCH] Pretend Qt5 wasn't found if OE_QMAKE_PATH_EXTERNAL_HOST_BINS 4Subject: [PATCH] Pretend Qt5 wasn't found if OE_QMAKE_PATH_EXTERNAL_HOST_BINS
@@ -30,7 +30,7 @@ Signed-off-by: Pascal Bach <pascal.bach@siemens.com>
30 2 files changed, 10 insertions(+) 30 2 files changed, 10 insertions(+)
31 31
32diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in 32diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
33index d2358ca..feb73c0 100644 33index d2358cae4b..feb73c02a5 100644
34--- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in 34--- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
35+++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in 35+++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
36@@ -9,6 +9,11 @@ if (CMAKE_VERSION VERSION_LESS 3.0.0) 36@@ -9,6 +9,11 @@ if (CMAKE_VERSION VERSION_LESS 3.0.0)
@@ -46,7 +46,7 @@ index d2358ca..feb73c0 100644
46 !!IF !isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) 46 !!IF !isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
47 set(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"$$[QT_INSTALL_PREFIX]\") 47 set(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"$$[QT_INSTALL_PREFIX]\")
48diff --git a/src/corelib/Qt5Config.cmake.in b/src/corelib/Qt5Config.cmake.in 48diff --git a/src/corelib/Qt5Config.cmake.in b/src/corelib/Qt5Config.cmake.in
49index a872d0e..233d663 100644 49index 75b53485b7..ed31888c93 100644
50--- a/src/corelib/Qt5Config.cmake.in 50--- a/src/corelib/Qt5Config.cmake.in
51+++ b/src/corelib/Qt5Config.cmake.in 51+++ b/src/corelib/Qt5Config.cmake.in
52@@ -3,6 +3,11 @@ if (CMAKE_VERSION VERSION_LESS 2.8.9) 52@@ -3,6 +3,11 @@ if (CMAKE_VERSION VERSION_LESS 2.8.9)
diff --git a/recipes-qt/qt5/qtbase/0001-Delete-qlonglong-and-qulonglong.patch b/recipes-qt/qt5/qtbase/0008-Delete-qlonglong-and-qulonglong.patch
index 975cd28d..c992586a 100644
--- a/recipes-qt/qt5/qtbase/0001-Delete-qlonglong-and-qulonglong.patch
+++ b/recipes-qt/qt5/qtbase/0008-Delete-qlonglong-and-qulonglong.patch
@@ -1,4 +1,4 @@
1From c67a4af2e5db4c1e2213961e6392b59affd1959f Mon Sep 17 00:00:00 2001 1From 2755a80114433e75f08fbb0df0fee9f7526172aa Mon Sep 17 00:00:00 2001
2From: Huang Qiyu <huangqy.fnst@cn.fujitsu.com> 2From: Huang Qiyu <huangqy.fnst@cn.fujitsu.com>
3Date: Wed, 7 Jun 2017 21:00:49 +0900 3Date: Wed, 7 Jun 2017 21:00:49 +0900
4Subject: [PATCH] Delete qlonglong and qulonglong 4Subject: [PATCH] Delete qlonglong and qulonglong
@@ -9,7 +9,7 @@ Signed-off-by: Huang Qiyu <huangqy.fnst@cn.fujitsu.com>
9 1 file changed, 2 deletions(-) 9 1 file changed, 2 deletions(-)
10 10
11diff --git a/tests/auto/corelib/thread/qatomicinteger/qatomicinteger.pro b/tests/auto/corelib/thread/qatomicinteger/qatomicinteger.pro 11diff --git a/tests/auto/corelib/thread/qatomicinteger/qatomicinteger.pro b/tests/auto/corelib/thread/qatomicinteger/qatomicinteger.pro
12index 09458bd..59a120e 100644 12index 09458bd9c3..59a120eb26 100644
13--- a/tests/auto/corelib/thread/qatomicinteger/qatomicinteger.pro 13--- a/tests/auto/corelib/thread/qatomicinteger/qatomicinteger.pro
14+++ b/tests/auto/corelib/thread/qatomicinteger/qatomicinteger.pro 14+++ b/tests/auto/corelib/thread/qatomicinteger/qatomicinteger.pro
15@@ -5,10 +5,8 @@ SUBDIRS=\ 15@@ -5,10 +5,8 @@ SUBDIRS=\
@@ -23,6 +23,3 @@ index 09458bd..59a120e 100644
23 schar \ 23 schar \
24 short \ 24 short \
25 uchar \ 25 uchar \
26--
272.7.4
28
diff --git a/recipes-qt/qt5/qtbase/0010-tst_qstring-Disable-Wformat-security-with-clang-as-w.patch b/recipes-qt/qt5/qtbase/0009-tst_qstring-Disable-Wformat-security-with-clang-as-w.patch
index 77b357cb..609cd846 100644
--- a/recipes-qt/qt5/qtbase/0010-tst_qstring-Disable-Wformat-security-with-clang-as-w.patch
+++ b/recipes-qt/qt5/qtbase/0009-tst_qstring-Disable-Wformat-security-with-clang-as-w.patch
@@ -1,8 +1,7 @@
1From 8284ebfe59c0011db71df7fb143b8e6a99f6952e Mon Sep 17 00:00:00 2001 1From 7bab0171601bc769403be62d145164137f1b7b66 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Tue, 25 Jul 2017 19:40:52 -0700 3Date: Tue, 25 Jul 2017 19:40:52 -0700
4Subject: [PATCH 10/10] tst_qstring: Disable Wformat-security with clang as 4Subject: [PATCH] tst_qstring: Disable Wformat-security with clang as well
5 well
6 5
7Currently, its only disabled for gcc, but we need to disable 6Currently, its only disabled for gcc, but we need to disable
8it with clang as well in order to compile it successfully with 7it with clang as well in order to compile it successfully with
@@ -27,6 +26,3 @@ index a0a872710c..20a9a9f9db 100644
27 26
28 void tst_QString::isNull() 27 void tst_QString::isNull()
29 { 28 {
30--
312.13.3
32
diff --git a/recipes-qt/qt5/qtbase/0011-Replace-pthread_yield-with-sched_yield.patch b/recipes-qt/qt5/qtbase/0010-Replace-pthread_yield-with-sched_yield.patch
index ed0d4bc9..5c625e08 100644
--- a/recipes-qt/qt5/qtbase/0011-Replace-pthread_yield-with-sched_yield.patch
+++ b/recipes-qt/qt5/qtbase/0010-Replace-pthread_yield-with-sched_yield.patch
@@ -1,4 +1,4 @@
1From d1d4b520e29b58e427fc7bd336d34b82d0d2b1f3 Mon Sep 17 00:00:00 2001 1From bbe822066913c0908b6366009517c19e828e1458 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Thu, 27 Jul 2017 08:02:51 -0700 3Date: Thu, 27 Jul 2017 08:02:51 -0700
4Subject: [PATCH] Replace pthread_yield with sched_yield 4Subject: [PATCH] Replace pthread_yield with sched_yield
@@ -58,6 +58,3 @@ index fe1057bdde..e23e97b259 100644
58 #endif 58 #endif
59 if (!sock->waitForConnected()) { 59 if (!sock->waitForConnected()) {
60 networkTimeout = true; 60 networkTimeout = true;
61--
622.13.3
63
diff --git a/recipes-qt/qt5/qtbase/0011-Always-build-uic.patch b/recipes-qt/qt5/qtbase/0011-Always-build-uic.patch
index fb3d316f..244cc0bc 100644
--- a/recipes-qt/qt5/qtbase/0011-Always-build-uic.patch
+++ b/recipes-qt/qt5/qtbase/0011-Always-build-uic.patch
@@ -1,4 +1,4 @@
1From 1b94b0f2579edcf870bc953f820af8fb2ec4376f Mon Sep 17 00:00:00 2001 1From 7c42f9b42c34d75f6c8e21e55af9b0e58f5743cc 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] Always build uic 4Subject: [PATCH] Always build uic
@@ -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 3d18540..d128b3a 100644 17index 90d7e2b76c..4ca6b0bd01 100644
18--- a/src/src.pro 18--- a/src/src.pro
19+++ b/src/src.pro 19+++ b/src/src.pro
20@@ -195,7 +195,7 @@ contains(QT_CONFIG, concurrent):SUBDIRS += src_concurrent 20@@ -188,7 +188,7 @@ qtConfig(gui) {
21 } 21 }
22 } 22 }
23 } 23 }
diff --git a/recipes-qt/qt5/qtbase/0008-configure-paths-for-target-qmake-properly.patch b/recipes-qt/qt5/qtbase/0011-configure-paths-for-target-qmake-properly.patch
index 6d64e6b5..c527c131 100644
--- a/recipes-qt/qt5/qtbase/0008-configure-paths-for-target-qmake-properly.patch
+++ b/recipes-qt/qt5/qtbase/0011-configure-paths-for-target-qmake-properly.patch
@@ -1,4 +1,4 @@
1From cc926956758bf8170c4e49c66e1066524b43f65f Mon Sep 17 00:00:00 2001 1From b8e94df3d49be69659e8dfb0809c614f73c21706 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: Fri, 13 Nov 2015 12:36:11 +0100 3Date: Fri, 13 Nov 2015 12:36:11 +0100
4Subject: [PATCH] configure paths for target qmake properly 4Subject: [PATCH] configure paths for target qmake properly
@@ -19,10 +19,10 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
19 1 file changed, 19 insertions(+), 4 deletions(-) 19 1 file changed, 19 insertions(+), 4 deletions(-)
20 20
21diff --git a/configure b/configure 21diff --git a/configure b/configure
22index 8b33c5b..1df248f 100755 22index 5af98cd77e..34dedafe91 100755
23--- a/configure 23--- a/configure
24+++ b/configure 24+++ b/configure
25@@ -1545,8 +1545,13 @@ if [ -z "$QT_REL_HOST_DATA" ]; then 25@@ -1500,8 +1500,13 @@ if [ -z "$QT_REL_HOST_DATA" ]; then
26 fi 26 fi
27 fi 27 fi
28 28
@@ -38,7 +38,7 @@ index 8b33c5b..1df248f 100755
38 38
39 QT_CONFIGURE_STR_OFF=0 39 QT_CONFIGURE_STR_OFF=0
40 40
41@@ -1579,7 +1584,11 @@ QT_CONFIGURE_STRS_ALL=$QT_CONFIGURE_STRS 41@@ -1534,7 +1539,11 @@ QT_CONFIGURE_STRS_ALL=$QT_CONFIGURE_STRS
42 42
43 QT_CONFIGURE_STR_OFFSETS= 43 QT_CONFIGURE_STR_OFFSETS=
44 QT_CONFIGURE_STRS= 44 QT_CONFIGURE_STRS=
@@ -51,7 +51,7 @@ index 8b33c5b..1df248f 100755
51 addConfStr "$QT_REL_HOST_BINS" 51 addConfStr "$QT_REL_HOST_BINS"
52 addConfStr "$QT_REL_HOST_LIBS" 52 addConfStr "$QT_REL_HOST_LIBS"
53 addConfStr "$QT_REL_HOST_DATA" 53 addConfStr "$QT_REL_HOST_DATA"
54@@ -1591,6 +1600,12 @@ addConfStr "$shortspec" 54@@ -1546,6 +1555,12 @@ addConfStr "$shortspec"
55 #------------------------------------------------------------------------------- 55 #-------------------------------------------------------------------------------
56 [ -d "$outpath/src/corelib/global" ] || mkdir -p "$outpath/src/corelib/global" 56 [ -d "$outpath/src/corelib/global" ] || mkdir -p "$outpath/src/corelib/global"
57 57
@@ -64,7 +64,7 @@ index 8b33c5b..1df248f 100755
64 cat > "$outpath/src/corelib/global/qconfig.cpp.new" <<EOF 64 cat > "$outpath/src/corelib/global/qconfig.cpp.new" <<EOF
65 /* Installation date */ 65 /* Installation date */
66 static const char qt_configure_installation [12+11] = "qt_instdate=2012-12-20"; 66 static const char qt_configure_installation [12+11] = "qt_instdate=2012-12-20";
67@@ -1599,7 +1614,7 @@ static const char qt_configure_installation [12+11] = "qt_instdate=2 67@@ -1554,7 +1569,7 @@ static const char qt_configure_installation [12+11] = "qt_instdate=2
68 static const char qt_configure_prefix_path_str [512 + 12] = "qt_prfxpath=$QT_INSTALL_PREFIX"; 68 static const char qt_configure_prefix_path_str [512 + 12] = "qt_prfxpath=$QT_INSTALL_PREFIX";
69 #ifdef QT_BUILD_QMAKE 69 #ifdef QT_BUILD_QMAKE
70 static const char qt_configure_ext_prefix_path_str [512 + 12] = "qt_epfxpath=$QT_EXT_PREFIX"; 70 static const char qt_configure_ext_prefix_path_str [512 + 12] = "qt_epfxpath=$QT_EXT_PREFIX";
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb
index 368d07fc..2115557f 100644
--- a/recipes-qt/qt5/qtbase_git.bb
+++ b/recipes-qt/qt5/qtbase_git.bb
@@ -21,11 +21,11 @@ SRC_URI += "\
21 file://0003-Add-external-hostbindir-option.patch \ 21 file://0003-Add-external-hostbindir-option.patch \
22 file://0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch \ 22 file://0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch \
23 file://0005-configure-bump-path-length-from-256-to-512-character.patch \ 23 file://0005-configure-bump-path-length-from-256-to-512-character.patch \
24 file://0009-Disable-all-unknown-features-instead-of-erroring-out.patch \ 24 file://0006-Disable-all-unknown-features-instead-of-erroring-out.patch \
25 file://0010-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch \ 25 file://0007-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch \
26 file://0001-Delete-qlonglong-and-qulonglong.patch \ 26 file://0008-Delete-qlonglong-and-qulonglong.patch \
27 file://0010-tst_qstring-Disable-Wformat-security-with-clang-as-w.patch \ 27 file://0009-tst_qstring-Disable-Wformat-security-with-clang-as-w.patch \
28 file://0011-Replace-pthread_yield-with-sched_yield.patch \ 28 file://0010-Replace-pthread_yield-with-sched_yield.patch \
29 file://run-ptest \ 29 file://run-ptest \
30" 30"
31 31
@@ -33,7 +33,7 @@ inherit ptest
33 33
34# only for target qtbase 34# only for target qtbase
35SRC_URI += "\ 35SRC_URI += "\
36 file://0008-configure-paths-for-target-qmake-properly.patch \ 36 file://0011-configure-paths-for-target-qmake-properly.patch \
37" 37"
38 38
39# LGPL-3.0 is used only in src/plugins/platforms/android/extract.cpp 39# LGPL-3.0 is used only in src/plugins/platforms/android/extract.cpp
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-17 06:34:06 +0000