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/0001-Add-linux-oe-g-platform.patch | |
parent | 6557244eca22a8722cf0fde2f3cc62f45cb72651 (diff) | |
download | meta-qt5-72459ce0639eb3ce408558a7abede945e1f8ddc9.tar.gz |
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/0001-Add-linux-oe-g-platform.patch')
-rw-r--r-- | recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch | 8 |
1 files changed, 4 insertions, 4 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 @@ | |||
1 | From 8442f94819458c79a88ad6177207c0e922a007bd Mon Sep 17 00:00:00 2001 | 1 | From c97da220d95091386724e1eadc360ed16ed52dfe Mon Sep 17 00:00:00 2001 |
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | 2 | From: Martin Jansa <Martin.Jansa@gmail.com> |
3 | Date: Mon, 15 Apr 2013 04:29:32 +0200 | 3 | Date: Mon, 15 Apr 2013 04:29:32 +0200 |
4 | Subject: [PATCH] Add linux-oe-g++ platform | 4 | Subject: [PATCH] Add linux-oe-g++ platform |
@@ -65,10 +65,10 @@ index 934a18a924..0f5b1b6333 100644 | |||
65 | msg = "test $$1 succeeded" | 65 | msg = "test $$1 succeeded" |
66 | write_file($$QMAKE_CONFIG_LOG, msg, append) | 66 | write_file($$QMAKE_CONFIG_LOG, msg, append) |
67 | diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf | 67 | diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf |
68 | index 99b7fe6562..1ddfddb2bd 100644 | 68 | index 69d1954306..37f7c9c4a2 100644 |
69 | --- a/mkspecs/features/qt.prf | 69 | --- a/mkspecs/features/qt.prf |
70 | +++ b/mkspecs/features/qt.prf | 70 | +++ b/mkspecs/features/qt.prf |
71 | @@ -148,7 +148,7 @@ import_plugins:qtConfig(static) { | 71 | @@ -151,7 +151,7 @@ import_plugins:qtConfig(static) { |
72 | plug_name = $$QMAKE_PREFIX_STATICLIB$${plug}$$qtPlatformTargetSuffix().$$QMAKE_EXTENSION_STATICLIB | 72 | plug_name = $$QMAKE_PREFIX_STATICLIB$${plug}$$qtPlatformTargetSuffix().$$QMAKE_EXTENSION_STATICLIB |
73 | plug_path = $$eval(QT_PLUGIN.$${plug}.PATH) | 73 | plug_path = $$eval(QT_PLUGIN.$${plug}.PATH) |
74 | isEmpty(plug_path): \ | 74 | isEmpty(plug_path): \ |
@@ -77,7 +77,7 @@ index 99b7fe6562..1ddfddb2bd 100644 | |||
77 | LIBS += $$plug_path/$$plug_type/$$plug_name | 77 | LIBS += $$plug_path/$$plug_type/$$plug_name |
78 | } else { | 78 | } else { |
79 | LIBS += -l$${plug}$$qtPlatformTargetSuffix() | 79 | LIBS += -l$${plug}$$qtPlatformTargetSuffix() |
80 | @@ -271,8 +271,8 @@ for(ever) { | 80 | @@ -274,8 +274,8 @@ for(ever) { |
81 | # static builds: link qml import plugins into the target. | 81 | # static builds: link qml import plugins into the target. |
82 | contains(all_qt_module_deps, qml): \ | 82 | contains(all_qt_module_deps, qml): \ |
83 | qtConfig(static):import_plugins:!host_build:!no_import_scan { | 83 | qtConfig(static):import_plugins:!host_build:!no_import_scan { |