diff options
author | Jani Suonpera <jani.suonpera@qt.io> | 2020-11-03 12:43:11 +0200 |
---|---|---|
committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2020-11-17 07:09:19 +0200 |
commit | 72459ce0639eb3ce408558a7abede945e1f8ddc9 (patch) | |
tree | 775d465f8db9fab5c4202be3d4a17f9cead61ee2 /recipes-qt/qt5/qtbase | |
parent | 6557244eca22a8722cf0fde2f3cc62f45cb72651 (diff) |
Submodule update for 5.15v5.15.2
Modify patches for removing "Fuzz detected".
Remove patches which already merged to upstream branch.
Add depends jpeg-native and freetype-native.
Task-number: QTBUG-86641
Change-Id: I40c6fed9b47d6a7749069554ea080db3e017f724
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
Diffstat (limited to 'recipes-qt/qt5/qtbase')
4 files changed, 20 insertions, 20 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 a8d85346..37e0a6a9 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 @@ -From 8442f94819458c79a88ad6177207c0e922a007bd Mon Sep 17 00:00:00 2001 +From c97da220d95091386724e1eadc360ed16ed52dfe Mon Sep 17 00:00:00 2001 From: Martin Jansa <Martin.Jansa@gmail.com> Date: Mon, 15 Apr 2013 04:29:32 +0200 Subject: [PATCH] Add linux-oe-g++ platform @@ -65,10 +65,10 @@ index 934a18a924..0f5b1b6333 100644 msg = "test $$1 succeeded" write_file($$QMAKE_CONFIG_LOG, msg, append) diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf -index 99b7fe6562..1ddfddb2bd 100644 +index 69d1954306..37f7c9c4a2 100644 --- a/mkspecs/features/qt.prf +++ b/mkspecs/features/qt.prf -@@ -148,7 +148,7 @@ import_plugins:qtConfig(static) { +@@ -151,7 +151,7 @@ import_plugins:qtConfig(static) { plug_name = $$QMAKE_PREFIX_STATICLIB$${plug}$$qtPlatformTargetSuffix().$$QMAKE_EXTENSION_STATICLIB plug_path = $$eval(QT_PLUGIN.$${plug}.PATH) isEmpty(plug_path): \ @@ -77,7 +77,7 @@ index 99b7fe6562..1ddfddb2bd 100644 LIBS += $$plug_path/$$plug_type/$$plug_name } else { LIBS += -l$${plug}$$qtPlatformTargetSuffix() -@@ -271,8 +271,8 @@ for(ever) { +@@ -274,8 +274,8 @@ for(ever) { # static builds: link qml import plugins into the target. contains(all_qt_module_deps, qml): \ qtConfig(static):import_plugins:!host_build:!no_import_scan { diff --git a/recipes-qt/qt5/qtbase/0004-configure-bump-path-length-from-256-to-512-character.patch b/recipes-qt/qt5/qtbase/0004-configure-bump-path-length-from-256-to-512-character.patch index f91792c0..751e59d7 100644 --- a/recipes-qt/qt5/qtbase/0004-configure-bump-path-length-from-256-to-512-character.patch +++ b/recipes-qt/qt5/qtbase/0004-configure-bump-path-length-from-256-to-512-character.patch @@ -1,4 +1,4 @@ -From 56eb22b1063d9bbdcf6ec39828e4c3498b72c99c Mon Sep 17 00:00:00 2001 +From 44e37eab48ff04bd20815fd4ae0b5d79d493aabc Mon Sep 17 00:00:00 2001 From: Denys Dmytriyenko <denys@ti.com> Date: Tue, 25 Aug 2015 10:05:15 -0400 Subject: [PATCH] configure: bump path length from 256 to 512 characters @@ -15,10 +15,10 @@ Signed-off-by: Denys Dmytriyenko <denys@ti.com> 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.pri b/configure.pri -index e775bf046e..a20eded987 100644 +index 49755f7abf..f84862d1ca 100644 --- a/configure.pri +++ b/configure.pri -@@ -876,10 +876,10 @@ defineTest(qtConfOutput_preparePaths) { +@@ -883,10 +883,10 @@ defineTest(qtConfOutput_preparePaths) { $${currentConfig}.output.qconfigSource = \ "/* Installation Info */" \ diff --git a/recipes-qt/qt5/qtbase/0008-Replace-pthread_yield-with-sched_yield.patch b/recipes-qt/qt5/qtbase/0008-Replace-pthread_yield-with-sched_yield.patch index 4353d43e..08a79898 100644 --- a/recipes-qt/qt5/qtbase/0008-Replace-pthread_yield-with-sched_yield.patch +++ b/recipes-qt/qt5/qtbase/0008-Replace-pthread_yield-with-sched_yield.patch @@ -1,4 +1,4 @@ -From c4393e037ebfc6bfa1a58ceab29fdb78389cd47e Mon Sep 17 00:00:00 2001 +From 18904a169397f343e75bee5f29fa9ae1444a295f Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Thu, 27 Jul 2017 08:02:51 -0700 Subject: [PATCH] Replace pthread_yield with sched_yield @@ -36,7 +36,7 @@ index 19b3289390..4d0cdf8b5f 100644 QMetaType info(tp); if (!info.isValid()) { diff --git a/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp b/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp -index 6dd390ccbd..43b92606d9 100644 +index e397e80fe0..cdb7893e56 100644 --- a/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp +++ b/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp @@ -78,6 +78,7 @@ @@ -46,8 +46,8 @@ index 6dd390ccbd..43b92606d9 100644 +#include <sched.h> #endif - #include "private/qhostinfo_p.h" -@@ -2199,8 +2200,8 @@ public slots: + #include <memory> +@@ -2200,8 +2201,8 @@ public slots: #if defined(Q_OS_MAC) pthread_yield_np(); diff --git a/recipes-qt/qt5/qtbase/0018-tst_qpainter-FE_-macros-are-not-defined-for-every-pl.patch b/recipes-qt/qt5/qtbase/0018-tst_qpainter-FE_-macros-are-not-defined-for-every-pl.patch index c032ec03..69063457 100644 --- a/recipes-qt/qt5/qtbase/0018-tst_qpainter-FE_-macros-are-not-defined-for-every-pl.patch +++ b/recipes-qt/qt5/qtbase/0018-tst_qpainter-FE_-macros-are-not-defined-for-every-pl.patch @@ -1,4 +1,4 @@ -From 557aa4d5584525cca4efcf20d6a86ad3ae99e36b Mon Sep 17 00:00:00 2001 +From 6c9e68cffb15cc1e848ca57ea12d4e5905d46507 Mon Sep 17 00:00:00 2001 From: Nicola Lunghi <nick83ola@gmail.com> Date: Wed, 5 Feb 2020 15:32:25 +0000 Subject: [PATCH] tst_qpainter: FE_ macros are not defined for every platform @@ -13,10 +13,10 @@ Upstream-Status: submitted [https://codereview.qt-project.org/c/qt/qtbase/+/2894 1 file changed, 37 insertions(+), 13 deletions(-) diff --git a/tests/auto/gui/painting/qpainter/tst_qpainter.cpp b/tests/auto/gui/painting/qpainter/tst_qpainter.cpp -index 45798cc527..de3f156cae 100644 +index 42e98ce363..0ca9b87f04 100644 --- a/tests/auto/gui/painting/qpainter/tst_qpainter.cpp +++ b/tests/auto/gui/painting/qpainter/tst_qpainter.cpp -@@ -2894,19 +2894,43 @@ void tst_QPainter::monoImages() +@@ -2931,19 +2931,43 @@ void tst_QPainter::monoImages() #if !defined(Q_OS_AIX) && !defined(Q_CC_MSVC) && !defined(Q_OS_SOLARIS) && !defined(__UCLIBC__) #include <fenv.h> @@ -67,7 +67,7 @@ index 45798cc527..de3f156cae 100644 return QLatin1String("Invalid operation"); return QLatin1String("No exception"); } -@@ -2932,7 +2956,7 @@ private: +@@ -2969,7 +2993,7 @@ private: void fpe_rasterizeLine_task232012() { @@ -76,7 +76,7 @@ index 45798cc527..de3f156cae 100644 QImage img(128, 128, QImage::Format_ARGB32_Premultiplied); img.fill(0x0); QPainter p(&img); -@@ -2944,7 +2968,7 @@ void fpe_rasterizeLine_task232012() +@@ -2981,7 +3005,7 @@ void fpe_rasterizeLine_task232012() void fpe_pixmapTransform() { @@ -85,7 +85,7 @@ index 45798cc527..de3f156cae 100644 QImage img(128, 128, QImage::Format_ARGB32_Premultiplied); -@@ -2972,7 +2996,7 @@ void fpe_pixmapTransform() +@@ -3009,7 +3033,7 @@ void fpe_pixmapTransform() void fpe_zeroLengthLines() { @@ -94,7 +94,7 @@ index 45798cc527..de3f156cae 100644 QImage img(128, 128, QImage::Format_ARGB32_Premultiplied); -@@ -2984,7 +3008,7 @@ void fpe_zeroLengthLines() +@@ -3021,7 +3045,7 @@ void fpe_zeroLengthLines() void fpe_divByZero() { @@ -103,7 +103,7 @@ index 45798cc527..de3f156cae 100644 QImage img(128, 128, QImage::Format_ARGB32_Premultiplied); -@@ -3007,7 +3031,7 @@ void fpe_divByZero() +@@ -3044,7 +3068,7 @@ void fpe_divByZero() void fpe_steepSlopes() { @@ -112,7 +112,7 @@ index 45798cc527..de3f156cae 100644 QImage img(1024, 1024, QImage::Format_ARGB32_Premultiplied); -@@ -3026,7 +3050,7 @@ void fpe_steepSlopes() +@@ -3063,7 +3087,7 @@ void fpe_steepSlopes() void fpe_radialGradients() { |