diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2020-01-27 13:37:21 +0100 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2020-01-27 14:36:20 +0100 |
commit | 8cadcbcb52af124417cdc29eb94bf8cdfe86f3d4 (patch) | |
tree | e6e12e0480851ea23e87b9085fa3c2f17e8ee644 /recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch | |
parent | f13a3cec17a9eb0b11f8ecdb6a36df44f22e2831 (diff) | |
download | meta-qt5-8cadcbcb52af124417cdc29eb94bf8cdfe86f3d4.tar.gz |
qt5: upgrade to 5.14.1
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
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 | 6 |
1 files changed, 3 insertions, 3 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 3b71adad..95e236ae 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 5668523aa073c1ef430b1662c735ead8fd64c83b Mon Sep 17 00:00:00 2001 | 1 | From 0d13aba5a2ab1794bfea5a3bbf2096da17f0cae1 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 |
@@ -89,10 +89,10 @@ index 3a71376029..dd6020f1fe 100644 | |||
89 | # run qmlimportscanner | 89 | # run qmlimportscanner |
90 | qtPrepareTool(QMLIMPORTSCANNER, qmlimportscanner, , system) | 90 | qtPrepareTool(QMLIMPORTSCANNER, qmlimportscanner, , system) |
91 | diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf | 91 | diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf |
92 | index 661b7dd961..3bc73ab0c6 100644 | 92 | index 7777e615bd..8d792fa70a 100644 |
93 | --- a/mkspecs/features/qt_functions.prf | 93 | --- a/mkspecs/features/qt_functions.prf |
94 | +++ b/mkspecs/features/qt_functions.prf | 94 | +++ b/mkspecs/features/qt_functions.prf |
95 | @@ -76,7 +76,7 @@ defineTest(qtHaveModule) { | 95 | @@ -87,7 +87,7 @@ defineTest(qtHaveModule) { |
96 | defineTest(qtPrepareTool) { | 96 | defineTest(qtPrepareTool) { |
97 | cmd = $$eval(QT_TOOL.$${2}.binary) | 97 | cmd = $$eval(QT_TOOL.$${2}.binary) |
98 | isEmpty(cmd) { | 98 | isEmpty(cmd) { |