diff options
| author | Martin Jansa <Martin.Jansa@gmail.com> | 2019-10-31 11:40:30 +0000 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2019-10-31 15:26:55 +0000 |
| commit | 81156172a83da2210e9af290f95f45fd194c84a2 (patch) | |
| tree | 1026e1a48d6ac51358cec65c1a8552eb1d5c77a7 /recipes-qt/qt5/qtmultimedia/0001-qtmultimedia-fix-a-conflicting-declaration.patch | |
| parent | 267e64612558cd562a63925e07e3e87e976a8a44 (diff) | |
| download | meta-qt5-81156172a83da2210e9af290f95f45fd194c84a2.tar.gz | |
qt5: Upgrade to Qt 5.13.2
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 | 4 |
1 files changed, 2 insertions, 2 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 838044a1..2864cb81 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 @@ | |||
| 1 | From dd3b3190fd65ac636afd55c1d2e746c9fe7b6df0 Mon Sep 17 00:00:00 2001 | 1 | From c39c68f73c86378897dbc6f59b48c2ced1eaa72f Mon Sep 17 00:00:00 2001 |
| 2 | From: Wenlin Kang <wenlin.kang@windriver.com> | 2 | From: Wenlin Kang <wenlin.kang@windriver.com> |
| 3 | Date: Thu, 8 Sep 2016 12:18:13 +0800 | 3 | Date: Thu, 8 Sep 2016 12:18:13 +0800 |
| 4 | Subject: [PATCH] qtmultimedia: fix a conflicting declaration | 4 | Subject: [PATCH] qtmultimedia: fix a conflicting declaration |
| @@ -67,7 +67,7 @@ index 00000000..24236976 | |||
| 67 | + | 67 | + |
| 68 | +#endif | 68 | +#endif |
| 69 | diff --git a/src/plugins/videonode/imx6/qsgvivantevideomaterial.cpp b/src/plugins/videonode/imx6/qsgvivantevideomaterial.cpp | 69 | diff --git a/src/plugins/videonode/imx6/qsgvivantevideomaterial.cpp b/src/plugins/videonode/imx6/qsgvivantevideomaterial.cpp |
| 70 | index 4b68f47a..dade1382 100644 | 70 | index e1468fe3..a77a9d6a 100644 |
| 71 | --- a/src/plugins/videonode/imx6/qsgvivantevideomaterial.cpp | 71 | --- a/src/plugins/videonode/imx6/qsgvivantevideomaterial.cpp |
| 72 | +++ b/src/plugins/videonode/imx6/qsgvivantevideomaterial.cpp | 72 | +++ b/src/plugins/videonode/imx6/qsgvivantevideomaterial.cpp |
| 73 | @@ -37,8 +37,9 @@ | 73 | @@ -37,8 +37,9 @@ |