diff options
| author | Martin Jansa <Martin.Jansa@gmail.com> | 2018-09-14 08:37:18 +0000 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2018-09-25 09:34:49 +0000 |
| commit | f9e80edff01159375b6e03f3cb9ea1f8ed5ced79 (patch) | |
| tree | ada273f12808c8c1ed9e4585638c63d93d8363a4 /recipes-qt/qt5/qtmultimedia/0001-qtmultimedia-fix-a-conflicting-declaration.patch | |
| parent | 3e7da25564d74195610adede9391ca733a0a1412 (diff) | |
qt5: update to latest revision in 5.11 branch
* drop nobranch=1 again
* update the branches and tags on meta-qt5/qt* forks and the tag name
in recipes
* use latest revision in 5.11 branch instead of 5.11.2 which might be
removed again
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtmultimedia/0001-qtmultimedia-fix-a-conflicting-declaration.patch')
| -rw-r--r-- | recipes-qt/qt5/qtmultimedia/0001-qtmultimedia-fix-a-conflicting-declaration.patch | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/recipes-qt/qt5/qtmultimedia/0001-qtmultimedia-fix-a-conflicting-declaration.patch b/recipes-qt/qt5/qtmultimedia/0001-qtmultimedia-fix-a-conflicting-declaration.patch index 9e1a7f70..2bd66be8 100644 --- a/recipes-qt/qt5/qtmultimedia/0001-qtmultimedia-fix-a-conflicting-declaration.patch +++ b/recipes-qt/qt5/qtmultimedia/0001-qtmultimedia-fix-a-conflicting-declaration.patch @@ -1,4 +1,4 @@ -From 5c42b403e8ddb3c6a49baa7c370c7fdd6014fa7c Mon Sep 17 00:00:00 2001 +From a583a22e433d6f9d3c2edb4ea45195a967848b9e Mon Sep 17 00:00:00 2001 From: Wenlin Kang <wenlin.kang@windriver.com> Date: Thu, 8 Sep 2016 12:18:13 +0800 Subject: [PATCH] qtmultimedia: fix a conflicting declaration |