diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2018-12-20 12:01:21 +0000 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2018-12-21 21:01:45 +0000 |
commit | 6531fa731203debe1b42dedfa225bfa2e1847064 (patch) | |
tree | 86c78f54d737f7f49810289d47a561143bcfba0a /recipes-qt/qt5/qtbase/0015-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch | |
parent | c8d5ef50d52bee6d8fc691cf08dcd0210ab14ce0 (diff) |
qtbase: use v5.12.0 as base
* restore 0018-Fix-compile-issue-with-gcc-9.patch which is only in v5.12.1
* zlib detection got broken probably in:
commit e80bf655e922e9864f8843b5e7bbb47019a6d95a
Author: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Date: Thu Dec 7 19:30:07 2017 +0100
configure: verify header presence against sources
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtbase/0015-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch')
-rw-r--r-- | recipes-qt/qt5/qtbase/0015-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/recipes-qt/qt5/qtbase/0015-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch b/recipes-qt/qt5/qtbase/0015-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch index f620b3d7..b8b5b39f 100644 --- a/recipes-qt/qt5/qtbase/0015-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch +++ b/recipes-qt/qt5/qtbase/0015-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch @@ -1,4 +1,4 @@ -From 744a866a54780ab2c1acf9da875be0845726b20f Mon Sep 17 00:00:00 2001 +From d7bd980370d701fa9aeea48f1494d2df6ce3dd2f Mon Sep 17 00:00:00 2001 From: Max Krummenacher <max.krummenacher@toradex.com> Date: Sat, 27 Oct 2018 12:29:31 +0000 Subject: [PATCH] Qt5GuiConfigExtras.cmake.in: cope with variable path to |