From 3ccdc239b02aca03dc1e9316b7c5c870b3b59368 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Thu, 16 Apr 2015 13:14:57 +0200 Subject: git-recipes: upgrade to latest revision in 5.4 branch * this gets us close to 5.4.2 for people who want to test it in advance * I plan to apply this to fido branch (as well as final upgrade to 5.4.2 recipes * I'm preparing similar patch for 5.5 revisions, which will be applied only in master branch Signed-off-by: Martin Jansa --- .../0010-Make-Qt5GuiConfigExtras.cmake-find-gl-es-include-dir.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'recipes-qt/qt5/qtbase-git/0010-Make-Qt5GuiConfigExtras.cmake-find-gl-es-include-dir.patch') diff --git a/recipes-qt/qt5/qtbase-git/0010-Make-Qt5GuiConfigExtras.cmake-find-gl-es-include-dir.patch b/recipes-qt/qt5/qtbase-git/0010-Make-Qt5GuiConfigExtras.cmake-find-gl-es-include-dir.patch index 1f92eed8..f2eed114 100644 --- a/recipes-qt/qt5/qtbase-git/0010-Make-Qt5GuiConfigExtras.cmake-find-gl-es-include-dir.patch +++ b/recipes-qt/qt5/qtbase-git/0010-Make-Qt5GuiConfigExtras.cmake-find-gl-es-include-dir.patch @@ -1,4 +1,4 @@ -From 276b5046788007bcbc5607046becdd44151960c0 Mon Sep 17 00:00:00 2001 +From 16a55457ce31d467cb331ab8e94b672757ef42b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Thu, 18 Dec 2014 13:41:09 +0100 Subject: [PATCH 10/12] Make Qt5GuiConfigExtras.cmake find gl(es) include dir @@ -38,5 +38,5 @@ index 9a846d4..07869ef 100644 if (NOT _qt5gui_OPENGL_INCLUDE_DIR) message(FATAL_ERROR \"Failed to find \\\"$$CMAKE_GL_HEADER_NAME\\\" in \\\"${_GL_INCDIRS}\\\".\") -- -2.3.1 +2.3.5 -- cgit v1.2.3-54-g00ecf